From rene at FreeBSD.org Wed Feb 2 12:18:52 2011
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Feb 2 12:18:56 2011
Subject: PERFORCE change 188447 for review
Message-ID: <201102021218.p12CIowf024388@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188447?ac=10
Change 188447 by rene@rene_acer on 2011/02/02 12:18:14
IFC
IFC
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#15 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#32 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#23 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#27 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#15 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#12 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#56 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#36 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#14 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#8 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#24 integrate
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#15 (text+ko) ====
@@ -1,8 +1,8 @@
@@ -82,6 +82,7 @@
200820092010
+ 2011The &os; Dutch Documentation Project
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#9 (text+ko) ====
@@ -1,11 +1,11 @@
@@ -870,11 +870,6 @@
Device hints
-
- Dit onderwerp is alleen van toepassing op &os; 5.0 en
- later.
-
-
Tijdens het opstarten van het systeem leest de boot
&man.loader.8; het bestand &man.device.hints.5;. Dit bestand
slaat opstartinformatie voor de kernel op in variabelen, ook wel
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#32 (text+ko) ====
@@ -1,11 +1,11 @@
@@ -135,6 +135,13 @@
+
+ &a.chromium.name;
+
+ &os; specifieke Chromium problemen
+
+
+ &a.current.name;Discussie over het gebruik van &os.current;
@@ -226,12 +233,6 @@
- &a.alpha.name;
-
- Porten van &os; naar de Alpha
-
-
- &a.amd64.name;Porten van &os; naar AMD64-systemen
@@ -554,13 +555,6 @@
- &a.qa.name;
-
- Discussie over Quality Assurance, meestal in een
- uitgavetraject
-
-
- &a.realtime.name;Ontwikkeling van realtime-uitbreidingen voor
@@ -601,13 +595,6 @@
- &a.smp.name;
-
- Discussies over het ontwerp voor [A]Symmetric
- MultiProcessing
-
-
- &a.sparc.name;Porten van &os; naar op &sparc; gebaseerde
@@ -1237,6 +1224,18 @@
+ &a.chromium.name;
+
+
+ &os; specifieke Chromium problemen
+
+ Dit is een lijst voor het bespreken van Chromium
+ ondersteuning voor &os;. Dit is een technische lijst om de
+ ontwikkelingen en installatie van Chromium te bespreken.
+
+
+
+ &a.core.name;
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#23 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -273,14 +273,10 @@
pf_rules="/pad/naar/pf.conf"
-
- Sinds &os; 7.0 is het voorbeeld
- pf.conf dat in /etc/ stond verplaatst naar
- /usr/share/examples/pf/.
- Voor versies van &os; voor 7.0 is er standaard een
- /etc/pf.conf aanwezig.
-
+ Het voorbeeld pf.conf bestand
+ kan gevonden worden in /usr/share/examples/pf
+ De module PF kan ook handmatig vanaf de
opdrachtregel geladen worden:
@@ -398,9 +394,9 @@
Houd tijdens het doornemen van de PF FAQ in de gaten dat
verschillende versies van &os; verschillende versies van PF kunnen
- bevatten. Momenteel gebruiken
- &os; 7.X en nieuwer dezelfde versie
- van PF als OpenBSD 4.1.
+ bevatten. Momenteel gebruikt
+ &os; dezelfde versie van PF als
+ OpenBSD 4.1.De &a.pf; is een goede plaats om vragen over het instellen
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#20 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -105,16 +105,12 @@
De minimale configuratie om &os; te installeren varieert met
de versie van &os; en de hardware-architectuur.
- Informatie over de minimale configuratie is beschikbaar in
- de Installatie Notes op de Uitgave
- Informatie pagina op de &os; website. Een samenvatting
- van deze informatie is gegeven in de volgende secties.
- Afhankelijk van de methode die u kiest om &os; te installeren,
- heeft u misschien ook een floppydrive, een ondersteunde CDROM
- drive, en in sommige gevallen een netwerkadapter nodig. Dit zal
- worden behandeld door het .
-
+ Een samenvatting van deze informatie wordt in de volgende
+ secties gegeven. Afhankelijk van de methode die u kiest om &os;
+ te installeren, heeft u misschien ook een floppydrive, een
+ ondersteunde CDROM drive, en in sommige gevallen een
+ netwerkadapter nodig. Dit zal worden behandeld door het
+ .&os;/&arch.i386; en &os;/&arch.pc98;
@@ -132,20 +128,6 @@
- &os;/&arch.alpha;
-
- Alpha
-
- Ondersteuning voor de Alpha was verwijderd te beginnen
- met &os; 7.0. De
- &os; 6.X uitgaveserie is de
- laatste die ondersteuning biedt voor deze architectuur. Kijk op de
- Release
- Information pagina van de &os; website voor meer
- informatie.
-
-
- &os;/&arch.amd64;Er zijn twee klassen processoren die &os;/&arch.amd64;
@@ -1196,13 +1178,11 @@
GENERIC kernel zitten, zoals
geluidskaarten.
- Voor &os; 6.2 en later ziet u na de procedure voor het
+ Na de procedure voor het
opsporen van apparaten . Gebruik
de pijltoetsen om een land, regio, of groep te kiezen. Druk
daarna op Enter, dit stelt gemakkelijk uw land in.
- Het is ook gemakkelijk om het programma
- sysinstall te verlaten en opnieuw te
- beginnen.
+ Landmenu kiezen
@@ -1230,32 +1210,8 @@
-
- Sysinstall verlaten
-
-
-
-
-
-
-
-
- Gebruik de pijltjestoetsen om in het hoofdmenu
- Exit Install te selecteren. Het
- volgende bericht verschijnt:
-
- User Confirmation Requested
- Are you sure you wish to exit? The system will reboot
-
- [ Yes ] No
-
- Het installatieprogramma start opnieuw als &gui.yes; gekozen wordt
- en de CD-ROM in het station is gelaten tijdens het opnieuw
- opstarten.
-
- Bij opstarten van diskettes is het nodig om de diskette met
- boot.flp uit de drive te halen voordat
- opnieuw wordt gestart.
+ Nadat het juiste land is gekozen zal
+ sysinstall het hoofd menu tonen.
@@ -5212,8 +5168,8 @@
gestuurd met het commando set log local
....
- Als een hard-wired verbinding naar een andere &os; (2.0-R
- of later) machine beschikbaar is kan ook overwogen worden te
+ Als een hard-wired verbinding naar een andere &os;
+ machine beschikbaar is kan ook overwogen worden te
installeren via een laplink parallelle poort
kabel. De snelheid van een parallelle poort is veel hoger dan
wat normaal mogelijk is over een seriële kabel (tot
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#27 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -70,8 +70,7 @@
4.4BSD-Lite&os; is een op 4.4BSD-Lite gebaseerd besturingssysteem
- voor Intel (x86 en &itanium;), AMD64,
- Alpha en Sun &ultrasparc; computers.
+ voor Intel (x86 en &itanium;), AMD64 en Sun &ultrasparc; computers.
Er zijn ook ports naar andere architecturen in voorbereiding.
Er is nog meer informatie over de geschiedenis van &os; of over de
&os; is een 32-bits
besturingssysteem (64-bits op de
- Alpha, &itanium;, AMD64, en &ultrasparc;) en is van de
+ &itanium;, AMD64, en &ultrasparc;) en is van de
grond af aan zo ontworpen.X Window systeem
-
- XFree86
@@ -418,8 +415,6 @@
X Window systeem
-
- XFree86
@@ -787,7 +782,9 @@
De RELENG_6 tak is gemaakt in juli 2005, de eerste uitgave
van de 6.X tak werd vrijgegeven in november 2005. De meest
recente 6.4-RELEASE kwam uit in november 2008.
- Er zullen geen verdere uitgaven komen van de RELENG_6 tak.
+ Er zullen geen verdere uitgaven komen van de RELENG_6 tak.
+ Deze tak is de laatste tak waarin ondersteuning zit voor de
+ Alpha architectuur.De RELENG_7 tak is gemaakt in oktober 2007. De eerste
uitgave van deze tak is 7.0-RELEASE, welke is uitgekomen in
@@ -1108,7 +1105,7 @@
&os; is een open source, op 4.4BSD-Lite gebaseerd
besturingssysteem voor Intel (x86 en &itanium;), AMD64,
- Alpha en Sun &ultrasparc; computers.
+ n Sun &ultrasparc; computers.
Het is grotendeels gebaseerd op software van de Computer
Systems Research Group (CSRG) van de University of California
in Berkeley (U.C. Berkeley), met verbeteringen overgenomen van
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#16 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -313,7 +313,7 @@
compile, waarin de aangepaste kernel gebouwd
wordt. arch representeert hier
één van i386,
- alpha, amd64,
+ amd64,
ia64, powerpc,
sparc64 of pc98 (een
alternatieve ontwikkelingstak van PC-hardware die populair is in
@@ -516,7 +516,7 @@
JoelDahl
- Bijgewerkt voor &os; 6.X door
+ Bijgewerkt door
@@ -554,8 +554,8 @@
Architectuuronafhankelijke opties staan in
/usr/src/sys/conf/NOTES.
- Sinds &os; 5.0 is er een nieuwe directief
- include beschikbaar om te gebruiken in
+ Een nieuwe directief include is beschikbaar
+ om te gebruiken in
instellingenbestanden. Hiermee kan een ander instellingenbestand logisch
in het huidige worden opgenomen, waardoor het eenvoudig wordt om kleine
veranderingen relatief aan een bestaand bestand te onderhouden. Als u
@@ -611,8 +611,8 @@
machine i386Dit is de architectuur van de machine. Het moet
- één van alpha,
- amd64, i386,
+ één van amd64,
+ i386,
ia64, pc98,
powerpc of sparc64
zijn.
@@ -808,7 +808,7 @@
options PSEUDOFS # Pseudo-bestandssysteem raamwerk
- 6.X kernels die PROCFS gebruiken moeten ook
+ Kernels die PROCFS gebruiken moeten ook
ondersteuning voor PSEUDOFS opnemen.options GEOM_GPT # GUID Partitietabellen.
@@ -824,21 +824,32 @@
options COMPAT_FREEBSD4 # Compatibel met &os; 4
- Deze optie is nodig op &os; 5.X &i386; en Alpha systemen
+ Deze optie is nodig
om ondersteuning te bieden aan applicaties die gecompileerd zijn
op oudere versies van &os; en gebruik maken van oudere
systeemaanroep-interfaces. Het is aanbevolen dat deze optie
- gebruikt wordt op alle &i386; en Alpha systemen die mogelijk
+ gebruikt wordt op alle &i386; systemen die mogelijk
oudere applicaties draaien. Voor platformen die pas in 5.X
ondersteuning verwierven, zoals ia64 en &sparc64;, is deze optie
niet nodig.options COMPAT_FREEBSD5 # Compatibel met &os;5
- Deze optie is vereist in &os; 6.X en hoger om
- toepassingen die op &os; 5.X zijn gecompileerd en
- systeemaanroepinterfaces van &os; 5.X gebruiken te
- ondersteunen.
+ Deze optie is vereist om ondersteuning te geven aan
+ applicaties die gecompileerd zijn op &os; 5.X die gebruik
+ maken van de systeemaanroepinterfaces van &os; 5.X.
+
+ options COMPAT_FREEBSD6 # Compatibel met &os;5
+
+ Deze optie is vereist om ondersteuning te geven aan
+ applicaties die gecompileerd zijn op &os; 6.X die gebruik
+ maken van de systeemaanroepinterfaces van &os; 6.X.
+
+ options COMPAT_FREEBSD7 # Compatibel met &os;5
+
+ Deze optie is vereist om ondersteuning te geven aan
+ applicaties die gecompileerd zijn op &os; 7.X die gebruik
+ maken van de systeemaanroepinterfaces van &os; 7.X.options SCSI_DELAY=5000 # Vertraging (in ms) voordat SCSI wordt ondergezocht.
@@ -908,7 +919,7 @@
geval van twijfel instaan.
- Merk op dat in &os; 8.0-CURRENT en later alle mutexen
+ Merk op dat in &os; 8.0-RELEASE en later alle mutexen
standaard adaptief zijn, tenzij ze expliciet op niet-adaptief
zijn gezet door met de optie
NO_ADAPTIVE_MUTEXES te compileren. Een
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#17 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -713,9 +713,7 @@
X11 &truetype; lettertypeserverEerst moet &xorg; server
- (x11-servers/xorg-server)
- of &xfree86; server (x11-servers/XFree86-4-Server)
+ (x11-servers/xorg-server),
geïnstalleerd worden en daarna de &truetype;
lettertypen van de taal. Door de gewenste locale in te
stellen worden de menu's en dergelijke in de gekozen taal
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#15 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -578,11 +578,6 @@
door ze aan xorg.conf toe te
voegen.
-
- Voor &xfree86; servers is het
- instellingenbestand XF86Config.
-
-
lettertypenAls er nog geen map
@@ -1332,2547 +1327,6 @@
-
-
-
-
- Holger
- Kipp
- Bijgedragen door
-
-
-
-
-
- Valentino
- Vaschetto
- Originele versie omgezet naar SGML door
-
-
-
-
- &sap.r3; installeren
-
-
- applicaties
-
- &sap.r3;
-
-
- Installaties van &sap; Systemen
- die &os; gebruiken worden niet ondersteund door het &sap;
- ondersteuningsteam. Zij bieden alleen ondersteuning voor
- gecertificeerde platformen.
-
-
- Voorwoord
-
- Dit document beschrijft een mogelijke manier om een
- &sap.r3; System met
- &oracle; Database voor &linux; op
- een &os; machine, inclusief de installatie van &os; en
- &oracle;. Er worden twee
- instellingen beschreven:
-
-
-
- &sap.r3; 4.6B (IDES) met
- &oracle; 8.0.5 op
- &os; 4.3–STABLE;.
-
-
-
- &sap.r3; 4.6C met
- &oracle; 8.1.7 op
- &os; 4.5–STABLE.
-
-
-
- Hoewel dit document alle belangrijke stappen in meer detail
- probeert te beschrijven, is het niet bedoeld als een vervanging
- voor de &oracle; en
- &sap.r3;
- installatiehandleidingen.
-
- Voor specifieke vragen wordt verwezen naar de documentatie
- die geleverd wordt bij de &sap.r3;
- &linux; editie voor &sap; en
- &oracle; en de bronnen van
- &oracle; en
- &sap; OSS.
-
-
-
- Software
-
- Voor de &sap; installaties zijn
- de volgende CD-ROM gebruikt:
-
-
- &sap.r3; 4.6B, &oracle; 8.0.5
-
-
-
-
-
- Naam
-
- Nummer
-
- Beschrijving
-
-
-
-
-
- KERNEL
-
- 51009113
-
- SAP Kernel Oracle / Installation / AIX, Linux,
- Solaris
-
-
-
- RDBMS
-
- 51007558
-
- Oracle / RDBMS 8.0.5.X / Linux
-
-
-
- EXPORT1
-
- 51010208
-
- IDES / DB-Export / Disc 1 of 6
-
-
-
- EXPORT2
-
- 51010209
-
- IDES / DB-Export / Disc 2 of 6
-
-
-
- EXPORT3
-
- 51010210
-
- IDES / DB-Export / Disc 3 of 6
-
-
-
- EXPORT4
-
- 51010211
-
- IDES / DB-Export / Disc 4 of 6
-
-
-
- EXPORT5
-
- 51010212
-
- IDES / DB-Export / Disc 5 of 6
-
-
-
- EXPORT6
-
- 51010213
-
- IDES / DB-Export / Disc 6 of 6
-
-
-
-
-
- Ook zijn de &oracle; 8 Server
- (Pre-productie versie 8.0.5 voor &linux; kernelversie 2.0.33)
- CD-ROM gebruikt, die niet echt noodzakelijk is en
- &os; 4.3-STABLE (een paar dagen na de 4.3-RELEASE).
-
-
-
-
- &sap.r3; 4.6C SR2, &oracle; 8.1.7
-
-
-
-
-
- Naam
-
- Nummer
-
- Beschrijving
-
-
-
-
-
- KERNEL
-
- 51014004
-
- SAP Kernel Oracle / SAP Kernel Version 4.6D /
- DEC, Linux
-
-
-
- RDBMS
-
- 51012930
-
- Oracle 8.1.7/ RDBMS / Linux
-
-
-
- EXPORT1
-
- 51013953
-
- Release 4.6C SR2 / Export / Disc 1 of 4
-
-
-
- EXPORT1
-
- 51013953
-
- Release 4.6C SR2 / Export / Disc 2 of 4
-
-
-
- EXPORT1
-
- 51013953
-
- Release 4.6C SR2 / Export / Disc 3 of 4
-
-
-
- EXPORT1
-
- 51013953
-
- Release 4.6C SR2 / Export / Disc 4 of 4
-
-
-
- LANG1
-
- 51013954
-
- Release 4.6C SR2 / Language / DE, EN, FR /
- Disc 1 van 3
-
-
-
-
-
- Afhankelijk van de talen die geïnstalleerd moeten
- worden kunnen aanvullende taal-CD-ROMs nodig zijn. Hier
- worden DE en EN gebruikt, dus is alleen de eerste taal-CD-ROM
- nodig. Een kleine kanttekening is dat de nummers van alle
- vier de EXPORT CD-ROMs identiek zijn. Ook hebben alle drie de
- taal-CD-ROMs hetzelfde nummer (dit verschilt met de 4.6B IDES
- release CD-ROM-nummering). Ten tijde van schrijven draait
- deze installatie op &os; 4.5-STABLE (20.03.2002).
-
-
-
-
- Opmerkingen over &sap;
-
- Het wordt aangeraden de volgende notities
- vóór de installatie van
- &sap.r3; gelezen te hebben. Ze
- waren bruikbaar tijdens de installatie:
-
-
- &sap.r3; 4.6B, &oracle; 8.0.5
-
-
-
-
-
- Nummer
-
- Titel
-
-
-
-
-
- 0171356
-
- SAP Software on Linux: Essential Comments
-
-
-
- 0201147
-
- INST: 4.6C R/3 Inst. on UNIX - Oracle
-
-
-
- 0373203
-
- Update / Migration Oracle 8.0.5 -->
- 8.0.6/8.1.6 LINUX
-
-
-
- 0072984
-
- Release of Digital UNIX 4.0B for Oracle
-
-
-
- 0130581
-
- R3SETUP step DIPGNTAB terminates
-
-
-
- 0144978
-
- Your system has not been installed correctly
-
-
-
- 0162266
-
- Questions and tips for R3SETUP on
- Windows NT / W2K
-
-
-
-
-
-
-
- &sap.r3; 4.6C, &oracle; 8.1.7
-
-
-
-
-
- Nummer
-
- Titel
-
-
-
-
-
- 0015023
-
- Initializing table TCPDB (RSXP0004) (EBCDIC)
-
-
-
- 0045619
-
- R/3 with several languages or typefaces
-
-
-
- 0171356
-
- SAP Software on Linux: Essential Comments
-
-
-
- 0195603
-
- RedHat 6.1 Enterprise version: Known problems
-
-
-
- 0212876
-
- The new archiving tool SAPCAR
-
-
-
- 0300900
-
- Linux: Released DELL Hardware
-
-
-
- 0377187
-
- RedHat 6.2: important remarks
-
-
-
- 0387074
-
- INST: R/3 4.6C SR2 Installation on UNIX
-
-
-
- 0387077
-
- INST: R/3 4.6C SR2 Inst. on UNIX - Oracle
-
-
-
- 0387078
-
- SAP Software on UNIX: OS Dependencies 4.6C SR2
-
-
-
-
-
-
-
-
- Benodigde hardware
-
- De volgende uitrusting is voldoende voor de installatie van
- een &sap.r3; Systeem. Voor
- productiegebruik geldt natuurlijk dat exactere gegevens nodig
- zijn:
-
-
-
-
-
- Component
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From trasz at FreeBSD.org Wed Feb 2 16:27:50 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 16:27:52 2011
Subject: PERFORCE change 188454 for review
Message-ID: <201102021627.p12GRoot076099@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188454?ac=10
Change 188454 by trasz@trasz_victim on 2011/02/02 16:27:15
Add -n option to rctl(8).
Affected files ...
.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#4 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#4 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#4 (text+ko) ====
@@ -34,12 +34,14 @@
.Sh SYNOPSIS
.Nm
.Op Fl h
+.Op Fl n
.Op Ar filter
.Nm
.Fl a
.Op Ar rule
.Nm
.Op Fl h
+.Op Fl n
.Fl l
.Op Ar filter
.Nm
@@ -78,6 +80,8 @@
"Human-readable" output.
Use unit suffixes: Byte, Kilobyte, Megabyte,
Gigabyte, Terabyte and Petabyte.
+.It Fl n
+Display user IDs numerically rather than converting them to a user name.
.Pp
.Sh RULE SYNTAX
Syntax for a rule is subject:subject-id:resource:action=amount/per.
==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#4 (text+ko) ====
@@ -283,18 +283,18 @@
* Print rules, one per line.
*/
static void
-print_rules(char *rules, int hflag)
+print_rules(char *rules, int hflag, int nflag)
{
char *rule;
while ((rule = strsep(&rules, ",")) != NULL) {
if (rule[0] == '\0')
break; /* XXX */
- rule = humanize_ids(rule);
+ if (nflag == 0)
+ rule = humanize_ids(rule);
if (hflag)
rule = humanize_amount(rule);
printf("%s\n", rule);
- free(rule);
}
}
@@ -310,7 +310,7 @@
}
static void
-show_limits(char *filter, int hflag)
+show_limits(char *filter, int hflag, int nflag)
{
int error;
char *outbuf = NULL;
@@ -327,7 +327,7 @@
err(1, "rctl_get_limits");
} while (error && errno == ERANGE);
- print_rules(outbuf, hflag);
+ print_rules(outbuf, hflag, nflag);
free(filter);
free(outbuf);
}
@@ -412,7 +412,7 @@
* Query the kernel about resource limit rules and print them out.
*/
static void
-show_rules(char *filter, int hflag)
+show_rules(char *filter, int hflag, int nflag)
{
int error;
char *outbuf = NULL;
@@ -434,7 +434,7 @@
err(1, "rctl_get_rules");
} while (error && errno == ERANGE);
- print_rules(outbuf, hflag);
+ print_rules(outbuf, hflag, nflag);
free(outbuf);
}
@@ -449,10 +449,11 @@
int
main(int argc __unused, char **argv __unused)
{
- int ch, aflag = 0, hflag = 0, lflag = 0, rflag = 0, uflag = 0;
+ int ch, aflag = 0, hflag = 0, nflag = 0, lflag = 0, rflag = 0,
+ uflag = 0;
char *rule = NULL;
- while ((ch = getopt(argc, argv, "a:hl:r:u:")) != -1) {
+ while ((ch = getopt(argc, argv, "a:hl:nr:u:")) != -1) {
switch (ch) {
case 'a':
aflag = 1;
@@ -465,6 +466,9 @@
lflag = 1;
rule = strdup(optarg);
break;
+ case 'n':
+ nflag = 1;
+ break;
case 'r':
rflag = 1;
rule = strdup(optarg);
@@ -506,7 +510,7 @@
}
if (lflag) {
- show_limits(rule, hflag);
+ show_limits(rule, hflag, nflag);
return (0);
}
@@ -520,6 +524,6 @@
return (0);
}
- show_rules(rule, hflag);
+ show_rules(rule, hflag, nflag);
return (0);
}
From trasz at FreeBSD.org Wed Feb 2 16:30:02 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 16:30:05 2011
Subject: PERFORCE change 188455 for review
Message-ID: <201102021630.p12GU2eO076217@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188455?ac=10
Change 188455 by trasz@trasz_victim on 2011/02/02 16:29:59
Fix kernel config.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#19 edit
.. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#20 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#19 (text+ko) ====
@@ -78,7 +78,7 @@
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
options CONTAINERS
-options HRL
+options RCTL
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
==== //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#20 (text+ko) ====
@@ -77,6 +77,9 @@
options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
+options CONTAINERS
+options RCTL
+
# To make an SMP kernel, the next two lines are needed
options SMP # Symmetric MultiProcessor Kernel
device apic # I/O APIC
From trasz at FreeBSD.org Wed Feb 2 16:33:20 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 16:33:22 2011
Subject: PERFORCE change 188456 for review
Message-ID: <201102021633.p12GXJDA078080@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188456?ac=10
Change 188456 by trasz@trasz_victim on 2011/02/02 16:32:58
Fix units in the manual page.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#5 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#5 (text+ko) ====
@@ -123,28 +123,28 @@
.Pp
.Sh RESOURCES
.Bl -column -offset 3n "msgqqueued"
-.It cpu CPU time, in microseconds
-.It fsize maximum file size, in megabytes
-.It data data size, in megabytes
-.It stack stack size, in megabytes
-.It core core dump size, in megabytes
-.It rss resident set size, in megabytes
-.It memlock locked memory, in megabytes
+.It cpu CPU time, in milliseconds
+.It fsize maximum file size, in bytes
+.It data data size, in bytes
+.It stack stack size, in bytes
+.It core core dump size, in bytes
+.It rss resident set size, in bytes
+.It memlock locked memory, in bytes
.It nproc number of processes
.It nofile file descriptor table size
-.It sbsize memory consumed by socket buffers, in megabytes
-.It vmem address space limit, in megabytes
+.It sbsize memory consumed by socket buffers, in bytes
+.It vmem address space limit, in bytes
.It npts number of PTYs
-.It swap swap usage, in megabytes
+.It swap swap usage, in bytes
.It nthr number of threads
.It msgqqueued number of queued SysV messages
-.It msgqsize SysV message queue size, in megabytes
+.It msgqsize SysV message queue size, in bytes
.It nmsgq number of SysV message queues
.It nsem number of SysV semaphores
.It nsemop number of SysV semaphores modified in a single semop(2) call
.It nshm number of SysV shared memory segments
-.It shmsize SysV shared memory size, in megabytes
-.It wallclock wallclock time
+.It shmsize SysV shared memory size, in bytes
+.It wallclock wallclock time, in milliseconds
.It pctcpu %cpu time
.El
.Pp
From rene at FreeBSD.org Wed Feb 2 16:36:38 2011
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Feb 2 16:36:42 2011
Subject: PERFORCE change 188458 for review
Message-ID: <201102021636.p12GabnK078137@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188458?ac=10
Change 188458 by rene@rene_acer on 2011/02/02 16:35:55
IFC
Affected files ...
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/vinum/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#33 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#4 integrate
Differences ...
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#10 (text+ko) ====
@@ -1,11 +1,11 @@
@@ -82,6 +82,18 @@
Inleiding
+
+ Vanaf &os; 8.0 zijn de seriële poorten
+ hernoemd van
+ /dev/cuadN naar
+ /dev/cuauN en
+ van
+ /dev/ttydN naar
+ /dev/ttyuN.
+ &os; 7.X gebruikers moeten de documentatie aanpassen naar
+ deze wijzigingen.
+
+
Terminologie
@@ -618,7 +630,7 @@
Inbelpoorten heten
- /dev/ttydN
+ /dev/ttyuN
waarbij N het poortnummer
is, beginnend met nul. In het algemeen kunnen
inbelpoorten voor terminals gebruikt worden.
@@ -629,7 +641,7 @@
Uitbelpoorten heten
- /dev/cuadN.
+ /dev/cuauN.
In het algemeen worden uitbelpoorten niet voor
terminals maar voor modems gebruikt. Gebruik een
uitbelpoort als een seriële kabel of terminal het
@@ -639,11 +651,11 @@
Als er een terminal met de eerste seriële poort
(COM1 in &ms-dos;) verbonden is,
- wordt /dev/ttyd0 gebruikt om naar de
+ wordt /dev/ttyu0 gebruikt om naar de
terminal te verwijzen. Als een terminal op de tweede
seriële poort is aangesloten (ook bekend als
COM2), dient
- /dev/ttyd1 gebruikt te worden,
+ /dev/ttyu1 gebruikt te worden,
enzovoort.
@@ -725,15 +737,15 @@
speciale apparaatbestanden die in de map
/dev staan. De apparaten
sio worden benaderd met de apparaten
- /dev/ttydN
+ /dev/ttyuN
(inbellen) en
- /dev/cuadN
+ /dev/cuauN
(uitbellen). &os; biedt ook initialisatie-apparaten
- (/dev/ttydN.init
+ (/dev/ttyuN.init
en
- /dev/cuadN.init)
+ /dev/cuauN.init)
en slotapparaten
- (/dev/ttydN.lock
+ (/dev/ttyuN.lock
en
/dev/cuadN.lock).
De initialisatie-apparaten worden gebruikt om telkens als een
@@ -752,19 +764,19 @@
De seriële poort instellen
- ttyd
+ ttyu
- cuad
+ cuauHet apparaat
- ttydN (of
- cuadN) is
+ ttyuN (of
+ cuauN) is
het gebruikelijke apparaat dat geopend dient te worden voor de
applicaties. Wanneer een proces het apparaat opent, heeft het
een standaardverzameling aan terminal I/O-instellingen. Bekijk
deze instellingen met het volgende commando:
- &prompt.root; stty -a -f /dev/ttyd1
+ &prompt.root; stty -a -f /dev/ttyu1Als de instellingen van dit apparaat veranderd worden,
blijven de instellingen geldig totdat het apparaat gesloten
@@ -775,9 +787,9 @@
veranderd te worden. Om bijvoorbeeld de
-modus, 8-bits-communicatie en
-gegevensstroombeheer voor apparaat
- ttyd5 standaard aan te zetten:
+ ttyu5 standaard aan te zetten:
- &prompt.root; stty -f /dev/ttyd5.init clocal cs8 ixon ixoff
+ &prompt.root; stty -f /dev/ttyu5.init clocal cs8 ixon ixoffrc-bestanden
@@ -793,12 +805,12 @@
Om te voorkomen dat bepaalde instellingen door een
applicatie worden veranderd, dienen wijzigingen aan het
slottoestand-apparaat te worden aangebracht. Om
- bijvoorbeeld de snelheid van ttyd5
+ bijvoorbeeld de snelheid van ttyu5
vast te zetten op 57600 bps:
- &prompt.root; stty -f /dev/ttyd5.lock 57600
+ &prompt.root; stty -f /dev/ttyu5.lock 57600
- Nu blijft een applicatie die ttyd5
+ Nu blijft een applicatie die ttyu5
en de snelheid van de poort probeert te veranderen zitten op
57600 bps.
@@ -822,6 +834,18 @@
Terminals
+
+ Vanaf &os; 8.0 zijn de seriële poorten
+ hernoemd van
+ /dev/cuadN naar
+ /dev/cuauN en
+ van
+ /dev/ttydN naar
+ /dev/ttyuN.
+ &os; 7.X gebruikers moeten de documentatie aanpassen naar
+ deze wijzigingen.
+
+
terminalsTerminals bieden een handige en goedkope manier om een &os;
@@ -937,7 +961,7 @@
Hierbij is serial-port-device de naam is
van de speciale apparaatnode die gebruikt wordt voor de
seriële poort op het systeem. Deze bestanden heten
- /dev/cuadN.
+ /dev/cuauN.Het N gedeelte van de apparaatnaam is het
nummer van de seriële poort.
@@ -947,7 +971,7 @@
niet bij één (zoals ze bijvoorbeeld wel doen
bij &ms-dos; gebaseerde systemen). Dit betekend dat wat
&ms-dos; gebaseerde systemen COM1
- noemt bij &os; meestal /dev/cuad0
+ noemt bij &os; meestal /dev/cuau0
genoemd wordt.
@@ -1059,8 +1083,8 @@
Een standaard &os; installatie bevat een bestand
/etc/ttys met ondersteuning voor de
eerste vier seriële poorten:
- ttyd0 tot en met
- ttyd3. Indien er aan een van deze
+ ttyu0 tot en met
+ ttyu3. Indien er aan een van deze
poorten een terminal wordt gekoppeld is het niet nodig om een
regel toe te voegen.
@@ -1078,13 +1102,13 @@
/etc/ttys zien er als volgt
uit:
- ttyd1ttyu1 "/usr/libexec getty std.38400" wy50 on insecure
-ttyd5 "/usr/libexec/getty std.19200" vt100 on insecure
+ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure
@@ -1243,11 +1267,11 @@
Er zou een regel voor de terminal zichtbaar moeten zijn.
Het volgende scherm geeft bijvoorbeeld weer dat
getty op de tweede seriële poort
- ttyd1 draait en de regel
+ ttyu1 draait en de regel
std.38400 in
/etc/gettytab gebruikt:
- 22189 d1 Is+ 0:00.03 /usr/libexec/getty std.38400 ttyd1
+ 22189 d1 Is+ 0:00.03 /usr/libexec/getty std.38400 ttyu1Indien er geen proces getty draait,
controleer dan of de poort in /etc/ttys
@@ -1314,6 +1338,18 @@
Inbeldienst
+
+ Vanaf &os; 8.0 zijn de seriële poorten
+ hernoemd van
+ /dev/cuadN naar
+ /dev/cuauN en
+ van
+ /dev/ttydN naar
+ /dev/ttyuN.
+ &os; 7.X gebruikers moeten de documentatie aanpassen naar
+ deze wijzigingen.
+
+
Het instellen van het &os;-systeem voor inbeldiensten is
vrijwel gelijk aan het verbinden van terminals, behalve dat er
met modems in plaats van terminals wordt gewerkt.
@@ -1461,11 +1497,11 @@
Net als met terminals zet init een
getty-proces op voor elke seriële poort
die voor inbelverbindingen is ingesteld. Indien bijvoorbeeld
- een modem aan /dev/ttyd0 is gekoppeld, kan
+ een modem aan /dev/ttyu0 is gekoppeld, kan
het commando ps ax het volgende
weergeven:
- 4850 ?? I 0:00.09 /usr/libexec/getty V19200 ttyd0
+ 4850 ?? I 0:00.09 /usr/libexec/getty V19200 ttyu0Wanneer een gebruiker naar de modemlijn belt en de modems
verbinding maken, wordt de CD-lijn (Carrier
@@ -1671,11 +1707,11 @@
formaat voor zowel vaste snelheid als overeenkomstige
snelheid is:
- ttyd0 "/usr/libexec/getty xxx" dialup on
+ ttyu0 "/usr/libexec/getty xxx" dialup onHet eerste item op bovenstaande regel is het speciale
- apparaatbestand. ttyd0 betekent dat
- /dev/ttyd0 het bestand is dat door
+ apparaatbestand. ttyu0 betekent dat
+ /dev/ttyu0 het bestand is dat door
getty in de gaten wordt gehouden. Het
tweede item,
"/usr/libexec/gettyxxx"
@@ -1724,7 +1760,7 @@
een vaste poortsnelheid van 19,2 kbps kan de regel in
ttys er als volgt uitzien:
- ttyd0 "/usr/libexec/getty std.19200" dialup on
+ ttyu0 "/usr/libexec/getty std.19200" dialup onIndien een modem op een andere gegevenssnelheid is
ingesteld, dient de juiste waarde voor
@@ -1747,7 +1783,7 @@
V19200), kan de regel in
ttys er als volgt uitzien:
- ttyd0 "/usr/libexec/getty V19200" dialup on
+ ttyu0 "/usr/libexec/getty V19200" dialup on
@@ -1776,8 +1812,8 @@
worden toegevoegd:# Seriële poort initieel instellen
-stty -f /dev/ttyd1.init crtscts
-stty -f /dev/cuad1.init crtscts
+stty -f /dev/ttyu1.init crtscts
+stty -f /dev/cuau1.init crtscts
@@ -1972,12 +2008,12 @@
draaien. Er dienen tussen de weergegeven processen regels
zoals de onderstaande te verschijnen:
- 114 ?? I 0:00.10 /usr/libexec/getty V19200 ttyd0
- 115 ?? I 0:00.10 /usr/libexec/getty V19200 ttyd1
+ 114 ?? I 0:00.10 /usr/libexec/getty V19200 ttyu0
+ 115 ?? I 0:00.10 /usr/libexec/getty V19200 ttyu1Er kan ook iets als het volgende verschijnen:
- 114 d0 I 0:00.10 /usr/libexec/getty V19200 ttyd0
+ 114 d0 I 0:00.10 /usr/libexec/getty V19200 ttyu0Als het modem nog geen gesprek heeft aangenomen, betekent
dit dat getty het openen van de
@@ -1990,7 +2026,7 @@
Indien er geen enkel getty-proces
verschijnt dat wacht op het openen van de gewenste poort
- ttydN,
+ ttyuN,
controleer dan de regels in /etc/ttys op
vergissingen. Controleer ook het logboekbestand
/var/log/messages om te zien of er
@@ -1999,7 +2035,7 @@
Indien er problemen zijn, controleer dan nogmaals de
instellingenbestanden /etc/ttys en
/etc/gettytab, alsook de betreffende
- speciale apparaatbestanden /dev/ttydN,
+ speciale apparaatbestanden /dev/ttyuN,
op vergissingen, ontbrekende regels of ontbrekende speciale
apparaatbestanden.
@@ -2065,6 +2101,18 @@
Uitbeldienst
+
+ Vanaf &os; 8.0 zijn de seriële poorten
+ hernoemd van
+ /dev/cuadN naar
+ /dev/cuauN en
+ van
+ /dev/ttydN naar
+ /dev/ttyuN.
+ &os; 7.X gebruikers moeten de documentatie aanpassen naar
+ deze wijzigingen.
+
+
uitbeldienstDe volgende tips dienen voor het maken van een verbinding met
@@ -2112,14 +2160,14 @@
Maak een zogenaamde directe regel in het
bestand /etc/remote aan. Als het modem
bijvoorbeeld aan de eerste seriële poort,
- /dev/cuad0, is gekoppeld, voeg dan de
+ /dev/cuau0, is gekoppeld, voeg dan de
volgende regel toe:
- cuad0:dv=/dev/cuad0:br#19200:pa=none
+ cuau0:dv=/dev/cuau0:br#19200:pa=noneGebruik voor de mogelijkheid br de
hoogst ondersteunde snelheid van het modem in bps. Typ hierna
- tip cuad0 om een verbinding met het modem te
+ tip cuau0 om een verbinding met het modem te
maken.Als alternatief kan cu als
@@ -2132,7 +2180,7 @@
De waarde lijn is de
seriële poort (bijvoorbeeld
- /dev/cuad0) en
+ /dev/cuau0) en
snelheid is de snelheid
(bijvoorbeeld 57600). Als alle
AT-commando's zijn ingevoerd, voer dan ~. in
@@ -2163,9 +2211,9 @@
Bijvoorbeeld:tip115200|Bel elk telefoonnummer met 115200 bps:\
- :dv=/dev/cuad0:br#115200:at=hayes:pa=none:du:
+ :dv=/dev/cuau0:br#115200:at=hayes:pa=none:du:
tip57600|Bel elk telefoonnummer met 57600 bps:\
- :dv=/dev/cuad0:br#57600:at=hayes:pa=none:du:
+ :dv=/dev/cuau0:br#57600:at=hayes:pa=none:du:
Hierna zijn onder andere de volgende mogelijkheden
beschikbaar:
@@ -2177,7 +2225,7 @@
cu gebruikt te worden:cu115200|Gebruik cu om elk nummer met 115200bps te bellen:\
- :dv=/dev/cuad1:br#57600:at=hayes:pa=none:du:
+ :dv=/dev/cuau1:br#57600:at=hayes:pa=none:du:
Voer in:
@@ -2214,7 +2262,7 @@
muffin|muffin.deep13.com|Franks machine:\
:cm=CONNECT muffin\n:tc=deep13:
deep13:Gizmonics Institute terminalserver:\
- :dv=/dev/cuad2:br#38400:at=hayes:du:pa=none:pn=5551234:
+ :dv=/dev/cuau2:br#38400:at=hayes:du:pa=none:pn=5551234:
@@ -2233,7 +2281,7 @@
grote-universiteit:\
:pn=\@:tc=dialout
dialout:\
- :dv=/dev/cuad3:br#9600:at=courier:du:pa=none:
+ :dv=/dev/cuau3:br#9600:at=courier:du:pa=none:
Voeg hierna de telefoonnummers voor de universiteit toe aan
/etc/phones:
@@ -2385,6 +2433,18 @@
Seriële console opzetten
+
+ Vanaf &os; 8.0 zijn de seriële poorten
+ hernoemd van
+ /dev/cuadN naar
+ /dev/cuauN en
+ van
+ /dev/ttydN naar
+ /dev/ttyuN.
+ &os; 7.X gebruikers moeten de documentatie aanpassen naar
+ deze wijzigingen.
+
+
seriële console
@@ -2437,7 +2497,7 @@
Bewerk /etc/ttys en wijzig
off in on en
dialup in vt100 voor
- de regel ttyd0. Indien dit niet
+ de regel ttyu0. Indien dit niet
gebeurt is er geen wachtwoord nodig om met de seriële
console te verbinden, wat tot een mogelijk beveiligingslek
leidt;
@@ -3156,13 +3216,13 @@
Open het bestand /etc/ttys met een
tekstverwerker en zoek de volgende regels:
- ttyd0 "/usr/libexec/getty std.9600" unknown off secure
-ttyd1 "/usr/libexec/getty std.9600" unknown off secure
-ttyd2 "/usr/libexec/getty std.9600" unknown off secure
-ttyd3 "/usr/libexec/getty std.9600" unknown off secure
+ ttyu0 "/usr/libexec/getty std.9600" unknown off secure
+ttyu1 "/usr/libexec/getty std.9600" unknown off secure
+ttyu2 "/usr/libexec/getty std.9600" unknown off secure
+ttyu3 "/usr/libexec/getty std.9600" unknown off secure
- ttyd0 tot en met
- ttyd3 komen overeen met
+ ttyu0 tot en met
+ ttyu3 komen overeen met
COM1 tot en met
COM4. Wijzig off
in on voor de gewenste poort. Als de
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/vinum/chapter.sgml#9 (text+ko) ====
@@ -7,10 +7,10 @@
The Dutch FreeBSD Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.8 2009/06/30 21:07:24 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.9 2011/02/02 12:22:07 remko Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
- %SRCID% 1.47
+ %SRCID% 1.49
-->
@@ -847,19 +847,6 @@
-
- Dit heeft alleen betrekking op de historische
- Vinum implementatie.
-
-
- De controleapparaten
- /dev/vinum/control en
- /dev/vinum/controld, die door
- respectievelijk &man.gvinum.8; en de Vinum daemon gebruikt
- worden.
-
-
- Karakterapparaatingangen voor elk volume. Dit zijn de
primaire apparaten die door Vinum gebruikt worden. De
bovenstaande configuratie zou dus deze apparaten bevatten:
@@ -871,17 +858,6 @@
-
- Dit heeft alleen betrekking op de historische
- Vinum implementatie.
-
-
- Een map /dev/vinum/drive
- met ingangen voor elke schijf. Deze ingangen zijn eigenlijk
- symbolische links naar de bijbehorende schijfknooppunten.
-
-
- Alle volumes krijgen ingangen direct onder
/dev/gvinum/.
@@ -957,23 +933,10 @@
heten, een naam die geen enkele relatie met een partitienaam
heeft.
- Normaliter klaagt &man.newfs.8; als het de naam van de
- schijf niet kan interpreteren. Bijvoorbeeld:
-
- &prompt.root; newfs /dev/gvinum/concat
- newfs: /dev/vinum/gconcat: can't figure out file system partition
-
Gebruik &man.newfs.8; om een bestandssysteem op dit volume
aan te maken:&prompt.root; newfs /dev/gvinum/concat
-
-
- Op versies van &os; voor 5.0 heeft &man.newfs.8; een
- aanvullende vlag en het oude apparaatnaamgevingsschema:
-
- &prompt.root; newfs -v /dev/vinum/concat
-
@@ -1030,34 +993,15 @@
Automatisch opstarten
-
- Deze informatie heeft alleen betrekking op de
- historische implementatie van Vinum.
- Gvinum start altijd automatisch op
+ Gvinum start altijd automatisch op
wanneer de kernelmodule eenmaal is geladen, via
&man.loader.conf.5;. Voeg
geom_vinum_load="YES" toe aan
/boot/loader.conf om de module
GVinum tijdens het opstarten te
laden.
-
- Om Vinum automatisch te laten starten als het systeem
- opgestart wordt, moet de volgende regel in het
- /etc/rc.conf bestand staan:
-
- start_vinum="YES" # op YES zetten om vinum te starten
-
- Als het /etc/rc.conf bestand niet
- bestaat, moet het gemaakt worden met de bovengenoemde inhoud.
- Hierdoor laadt het systeem de Vinum kld
- tijdens het starten en worden de objecten uit de instellingen
- ook gestart. Dit gebeurt voordat de bestandssystemen
- aangekoppeld worden. &man.fsck.8; kan dus automatisch draaien
- en bestandssystemen op Vinum volumes kunnen aangekoppeld
- worden.
-
- Als Vinum met vinum start wordt
+ Als Vinum met gvinum start wordt
gestart, leest Vinum de instellingendatabase van
één van de Vinum schijven. Normaal gesproken
bevat iedere schijf een identieke kopie van de
@@ -1127,46 +1071,10 @@
-
- Voor Gvinum wordt alles
- automatisch opgestart nadat de kernelmodule eenmaal is
- geladen, dus is alleen de procedure die hierboven is
- beschreven nodig. De volgende tekst documenteert het
- gedrag van het historische Vinum systeem, voor oudere
- installaties.
-
-
- Vinum moet in een vroeg stadium geïnitialiseerd
- worden om het volume voor het rootbestandssysteem te
- kunnen leveren. De Vinum kernel module gaat niet uit
- zichzelf op zoek naar schijven die mogelijk een Vinum
- volume kunnen bevatten totdat de administrator (of een
- van de opstartscripts) een vinum start
- commando geeft.
-
-
- De volgende paragrafen laten de benodigde stappen
- zien voor &os;.
-
-
- Door de onderstaande regel in
- /boot/loader.conf te zetten, zoekt
- Vinum automatisch alle schijven af naar Vinum informatie
- als onderdeel van het starten van de kernel:
-
- vinum.autostart="YES"
-
-
- Het is dus niet nodig om de kernel te vertellen waar
- het rootbestandssysteem staat.
- /boot/loader zoekt de naam voor het
- root apparaat op in /etc/fstab en
- geeft deze informatie door aan de kernel. Op het moment
- dat het rootbestandssysteem aangekoppeld moet worden,
- haalt de kernel uit de apparaatnaam welk stuurprogramma
- gebruikt moet worden om dit te vertalen naar het interne
- apparaat-ID (grote/kleine nummer).
-
+ Voor Gvinum wordt alles
+ automatisch opgestart nadat de kernelmodule eenmaal is
+ geladen, dus is alleen de procedure die hierboven is
+ beschreven nodig.
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#33 (text+ko) ====
@@ -1,9 +1,9 @@
@@ -39,29 +39,16 @@
&os; gebruikt X11 om gebruikers een krachtige grafische
gebruikersschil te bieden. X11 is een vrij beschikbare versie van
- het X Window System dat geïmplementeerd is in zowel
- &xorg; als
+ het X Window System dat geïmplementeerd is in
+ &xorg;&xfree86; (en andere softwarepakketten
- die hier niet worden besproken). &os; versies tot en met
- &os; 5.2.1-RELEASE hebben
- &xfree86; als standaard, de X11 server
- die is uitgebracht door The &xfree86; Project, Inc. Vanaf
- &os; 5.3-RELEASE is de officiële standaardversie van X11
- gewijzigd naar &xorg;, de X11-server
+ die hier niet worden besproken).
+ De standaard en officiele smaak van X11 in &os; is
+ &xorg;, de X11-server
die is ontwikkeld door de X.Org Foundation onder een licentie die
veel lijkt op degene die door &os; wordt gebruikt. Er zijn ook
commerciële X-servers voor &os; beschikbaar.
- In dit hoofdstuk wordt de installatie en instelling van X11
- behandeld met de nadruk op &xorg;
- &xorg.version; release. Voor informatie over het configureren van
- &xfree86; (i.e. op oudere uitgaven van
- &os; waar &xfree86; de standaard
- X11-distributie was) of vorige uitgave van
- &xorg;, is het altijd mogelijk om
- gearchiveerde versies van het &os; Handboek op te raadplegen.
-
Meer informatie over de videohardware die X11 ondersteunt
kan gevonden worden op de &xorg; website.
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#4 (text+ko) ====
@@ -1,10 +1,10 @@
- .")
- (make empty-element gi: "br")
- (literal "Vragen over deze documentatie kunnen per e-mail naar <")
- (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
- (literal "doc@FreeBSD.org"))
- (literal ">.")))))
- ]]>
From trasz at FreeBSD.org Wed Feb 2 17:02:59 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 17:03:05 2011
Subject: PERFORCE change 188460 for review
Message-ID: <201102021702.p12H2wAp084010@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188460?ac=10
Change 188460 by trasz@trasz_victim on 2011/02/02 17:01:54
Improve rctl manual page.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#6 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#6 (text+ko) ====
@@ -148,6 +148,23 @@
.It pctcpu %cpu time
.El
.Pp
+.Sh ACTIONS
+.Bl -column -offset 3n "msgqqueued"
+.It deny deny the allocation; not supported for cpu and wallclock
+.It log log a warning to the console
+.It sig* e.g. sigterm; send a signal to the offending process
+.El
+.Pp
+See
+.Xr signal 3
+for a list of supported signals.
+.Pp
+Not all actions are supported for all resources.
+Attempt to add rule with action not supported by a given resouce will result
+in error.
+.Pp
+Note that limiting RSS may kill the machine due to thrashing.
+.Pp
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
From trasz at FreeBSD.org Wed Feb 2 18:59:14 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 18:59:15 2011
Subject: PERFORCE change 188463 for review
Message-ID: <201102021859.p12IxDhI007746@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188463?ac=10
Change 188463 by trasz@trasz_victim on 2011/02/02 18:58:19
Properly guard RCTL syscalls with privileges.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#27 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#14 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#27 (text+ko) ====
@@ -1213,6 +1213,10 @@
struct loginclass *lc;
struct prison *pr;
+ error = priv_check(td, PRIV_RCTL_GET_USAGE);
+ if (error != 0)
+ return (error);
+
error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
if (error != 0)
return (error);
@@ -1304,6 +1308,10 @@
struct rctl_rule_link *link;
struct proc *p;
+ error = priv_check(td, PRIV_RCTL_GET_RULES);
+ if (error != 0)
+ return (error);
+
error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
if (error != 0)
return (error);
@@ -1373,6 +1381,10 @@
struct rctl_rule *filter;
struct rctl_rule_link *link;
+ error = priv_check(td, PRIV_RCTL_GET_LIMITS);
+ if (error != 0)
+ return (error);
+
error = rctl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
if (error != 0)
return (error);
@@ -1439,7 +1451,7 @@
struct rctl_rule *rule;
char *inputstr;
- error = priv_check(td, PRIV_RCTL_SET);
+ error = priv_check(td, PRIV_RCTL_ADD_RULE);
if (error != 0)
return (error);
@@ -1481,7 +1493,7 @@
struct rctl_rule *filter;
char *inputstr;
- error = priv_check(td, PRIV_RCTL_SET);
+ error = priv_check(td, PRIV_RCTL_REMOVE_RULE);
if (error != 0)
return (error);
==== //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#14 (text+ko) ====
@@ -486,13 +486,16 @@
/*
* Resource Limits privileges.
*/
-#define PRIV_RCTL_SET 670
-#define PRIV_RCTL_GET 671
+#define PRIV_RCTL_GET_RULES 670
+#define PRIV_RCTL_ADD_RULE 671
+#define PRIV_RCTL_REMOVE_RULE 672
+#define PRIV_RCTL_GET_USAGE 673
+#define PRIV_RCTL_GET_LIMITS 674
/*
* Track end of privilege list.
*/
-#define _PRIV_HIGHEST 672
+#define _PRIV_HIGHEST 674
/*
* Validate that a named privilege is known by the privilege system. Invalid
From trasz at FreeBSD.org Wed Feb 2 20:22:27 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 20:22:29 2011
Subject: PERFORCE change 188466 for review
Message-ID: <201102022022.p12KMQWU026655@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188466?ac=10
Change 188466 by trasz@trasz_victim on 2011/02/02 20:21:50
Fix panic caused by previous commit.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#15 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#15 (text+ko) ====
@@ -495,7 +495,7 @@
/*
* Track end of privilege list.
*/
-#define _PRIV_HIGHEST 674
+#define _PRIV_HIGHEST 675
/*
* Validate that a named privilege is known by the privilege system. Invalid
From trasz at FreeBSD.org Wed Feb 2 20:52:05 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 20:52:07 2011
Subject: PERFORCE change 188468 for review
Message-ID: <201102022052.p12Kq4Cg032328@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188468?ac=10
Change 188468 by trasz@trasz_victim on 2011/02/02 20:51:01
Fix misplaced goto target that could cause an infinite loop
and ifdef out debugging printf.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#26 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#26 (text+ko) ====
@@ -1651,8 +1651,8 @@
* scan the processes for exceeding their rlimits or if
* process is swapped out -- deactivate pages
*/
+ tryagain = 0;
again:
- tryagain = 0;
sx_slock(&allproc_lock);
FOREACH_PROC_IN_SYSTEM(p) {
vm_pindex_t limit, size;
@@ -1738,8 +1738,10 @@
if (rsize > ravailable)
tryagain++;
if (tryagain > 20) {
+#if 0
printf("still too much: rsize = %ju, ravailable = %ju\n",
(uintmax_t)rsize, (uintmax_t)ravailable);
+#endif
tryagain = 0;
}
}
From trasz at FreeBSD.org Wed Feb 2 21:03:04 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Feb 2 21:03:06 2011
Subject: PERFORCE change 188469 for review
Message-ID: <201102022103.p12L33Uq034252@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188469?ac=10
Change 188469 by trasz@trasz_victim on 2011/02/02 21:02:49
Improve the manual page even more.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#7 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#7 (text+ko) ====
@@ -90,18 +90,16 @@
It can be either process, user, login class, or jail.
.Pp
Subject ID identifies the subject. It can be user name,
-login class name, or a numerical UID, or JID.
+numerical user ID, login class name, or numerical jail ID.
.Pp
Resource identifies the resource the rule controls.
.Pp
Action defines what will happen when a process exceeds the allowed amount.
-It can be either deny, delay, log, sighup, sigint, sigkill, sigsegv, sigxcpu,
-or sigxfsz.
.Pp
Amount defines how much of the resource a process can use before
the defined action triggers.
.Pp
-The per field defines what entity the limit gets accounted for.
+The per field defines what entity the amount gets accounted for.
For example, rule "loginclass:users:vmem:deny=100M/process" means
that each process of any user belonging to login class "users" may allocate
up to 100MB of virtual memory.
@@ -117,9 +115,10 @@
.Pp
A filter is a rule for which one of more fields other than per is left empty.
For example, a filter that matches every rule could be written as ":::=/",
-or, in short, ":". A filter that matches all the login classes would be
-"loginclass:". A filter that matches all defined limits for maxprocesses
-resource would be "::maxprocesses".
+or, in short, ":".
+A filter that matches all the login classes would be "loginclass:".
+A filter that matches all defined rules for maxprocesses resource would be
+"::maxprocesses".
.Pp
.Sh RESOURCES
.Bl -column -offset 3n "msgqqueued"
@@ -167,6 +166,22 @@
.Pp
.Sh EXIT STATUS
.Ex -std
+.Sh EXAMPLES
+.Dl rctl -a user:joe:vmem:deny=1g
+.Pp
+Prevent user "joe" from allocating more than 1GB of virtual memory.
+.Pp
+.Dl rctl -r :
+.Pp
+Remove all RCTL rules.
+.Pp
+.Dl rctl -hu jail:5
+.Pp
+Display resource usage information for jail with JID 5.
+.Pp
+.Dl rctl -l process:512
+.Pp
+Display all the rules applicable to process with PID 512.
.Sh SEE ALSO
.Xr jailstat 8 ,
.Xr userstat 8
From trasz at FreeBSD.org Sat Feb 5 19:16:44 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sat Feb 5 19:16:46 2011
Subject: PERFORCE change 188568 for review
Message-ID: <201102051916.p15JGhRC017627@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188568?ac=10
Change 188568 by trasz@trasz_victim on 2011/02/05 19:16:41
Update TODO.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/TODO#44 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/TODO#44 (text+ko) ====
@@ -25,6 +25,10 @@
but some optimisation could be in order. Maybe a list of pointers to rules,
one entry per resource?
+ - Make it possible to add persistent rules for jails - right now, rules can
+ only be added after the jail is created and disappear when the jail gets
+ destroyed.
+
Issues:
- Setting RSS limit too low can make the system thrash to death.
From trasz at FreeBSD.org Sat Feb 5 19:31:04 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sat Feb 5 19:31:07 2011
Subject: PERFORCE change 188571 for review
Message-ID: <201102051931.p15JV4vL020623@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188571?ac=10
Change 188571 by trasz@trasz_victim on 2011/02/05 19:30:11
Improve comments.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#11 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#11 (text+ko) ====
@@ -51,21 +51,18 @@
#ifdef _KERNEL
/*
- * 'rctl_rule' describes a single limit configured by the system
- * administrator or a temporary limit set using setrlimit(2).
- * The difference between 'subject' and 'per' is best described
- * by example: to specify that every process of user with uid 1984
- * can consume 1gb of virtual memory, the 'rr_subject_type' would be
- * RCTL_SUBJECT_TYPE_USER, 'rctl_subject.rs_uip' would point to
- * 'struct uidinfo' for uid 1984, and 'rr_per' would be equal
- * RCTL_SUBJECT_TYPE_PROCESS.
+ * Rules describe an action to be taken when conditions defined
+ * in the rule are met. There is no global list of rules; instead,
+ * rules are linked to by the container structures for all the subjects
+ * they apply to - for example, a rule of type "user" is linked to the
+ * appropriate struct uidinfo, and to all the processes of that user.
*
* 'rr_refcount' is equal to the number of rctl_rule_link structures
* pointing to the rule.
*
* This structure must never change after being added, via rctl_rule_link
- * structures, to subjects. In order to change a limit, add a new
- * rule and remove the previous one.
+ * structures, to subjects. In order to change a rule, add a new rule
+ * and remove the previous one.
*/
struct rctl_rule {
int rr_subject_type;
@@ -83,6 +80,9 @@
struct task rr_task;
};
+/*
+ * Allowed values for rr_subject_type and rr_per fields.
+ */
#define RCTL_SUBJECT_TYPE_UNDEFINED -1
#define RCTL_SUBJECT_TYPE_PROCESS 0x0000
#define RCTL_SUBJECT_TYPE_USER 0x0001
@@ -91,9 +91,8 @@
#define RCTL_SUBJECT_TYPE_MAX RCTL_SUBJECT_TYPE_JAIL
/*
- * 'rr_per' takes the same flags as 'rr_subject_type'.
+ * Allowed values for rr_action field.
*/
-
#define RCTL_ACTION_UNDEFINED -1
#define RCTL_ACTION_SIGHUP SIGHUP
#define RCTL_ACTION_SIGINT SIGINT
From trasz at FreeBSD.org Thu Feb 10 15:53:33 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Thu Feb 10 15:53:34 2011
Subject: PERFORCE change 188687 for review
Message-ID: <201102101553.p1AFrWO5085197@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188687?ac=10
Change 188687 by trasz@trasz_victim on 2011/02/10 15:52:47
Remove duplicated include.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#24 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#24 (text+ko) ====
@@ -37,7 +37,6 @@
#include
#include
#include
-#include
#include
#include
#include
From trasz at FreeBSD.org Thu Feb 10 17:19:39 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Thu Feb 10 17:19:41 2011
Subject: PERFORCE change 188689 for review
Message-ID: <201102101719.p1AHJc9q002355@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188689?ac=10
Change 188689 by trasz@trasz_victim on 2011/02/10 17:19:24
Replace signal(3) with sigaction(3).
Affected files ...
.. //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#8 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#8 (text+ko) ====
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -425,7 +426,7 @@
quad_t p;
mode_t mymask;
login_cap_t *llc = NULL;
- sig_t prevsig;
+ struct sigaction sa, prevsa;
struct rtprio rtp;
int error;
@@ -519,9 +520,12 @@
* XXX: This is a workaround to fail gracefully in case the kernel
* does not support setloginclass(2).
*/
- prevsig = signal(SIGSYS, SIG_IGN);
+ bzero(&sa, sizeof(sa));
+ sa.sa_handler = SIG_IGN;
+ sigfillset(&sa.sa_mask);
+ sigaction(SIGSYS, &sa, &prevsa);
error = setloginclass(lc->lc_class);
- signal(SIGSYS, prevsig);
+ sigaction(SIGSYS, &prevsa, NULL);
if (error != 0) {
syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class);
#ifdef notyet
From trasz at FreeBSD.org Thu Feb 10 17:21:50 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Thu Feb 10 17:21:52 2011
Subject: PERFORCE change 188690 for review
Message-ID: <201102101721.p1AHLnWQ004198@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188690?ac=10
Change 188690 by trasz@trasz_victim on 2011/02/10 17:21:46
Fix indent.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#9 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/lib/libutil/login_class.c#9 (text+ko) ====
@@ -514,8 +514,8 @@
return (-1);
}
+ /* Inform the kernel about current login class */
if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) {
- /* Inform the kernel about current login class */
/*
* XXX: This is a workaround to fail gracefully in case the kernel
* does not support setloginclass(2).
@@ -526,13 +526,13 @@
sigaction(SIGSYS, &sa, &prevsa);
error = setloginclass(lc->lc_class);
sigaction(SIGSYS, &prevsa, NULL);
- if (error != 0) {
+ if (error != 0) {
syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class);
#ifdef notyet
login_close(llc);
return (-1);
#endif
- }
+ }
}
mymask = (flags & LOGIN_SETUMASK) ? umask(LOGIN_DEFUMASK) : 0;
From trasz at FreeBSD.org Thu Feb 10 19:41:09 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Thu Feb 10 19:41:11 2011
Subject: PERFORCE change 188692 for review
Message-ID: <201102101941.p1AJf8rE033058@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188692?ac=10
Change 188692 by trasz@trasz_victim on 2011/02/10 19:40:25
Jails are not like uidinfo structures - we can't just increase their
refcount when rules get linked to them, because it would leave them
hanging in "dead" state after all the jailed processes died. Instead,
treat them like we do with processes - instead of bumping their
reference counts, just hold allprison_lock.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#73 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#36 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#28 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#12 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#73 (text+ko) ====
@@ -615,7 +615,7 @@
PROC_UNLOCK(p);
#ifdef RCTL
- rctl_proc_exit(p);
+ rctl_container_release(p->p_container);
#endif
container_destroy(&p->p_container);
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#36 (text+ko) ====
@@ -50,6 +50,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2532,6 +2533,9 @@
if (pr->pr_cpuset != NULL)
cpuset_rel(pr->pr_cpuset);
osd_jail_exit(pr);
+#ifdef RCTL
+ rctl_container_release(pr->pr_container);
+#endif
container_destroy(&pr->pr_container);
free(pr, M_PRISON);
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#28 (text+ko) ====
@@ -607,6 +607,7 @@
switch (rule->rr_subject_type) {
case RCTL_SUBJECT_TYPE_UNDEFINED:
case RCTL_SUBJECT_TYPE_PROCESS:
+ case RCTL_SUBJECT_TYPE_JAIL:
break;
case RCTL_SUBJECT_TYPE_USER:
if (rule->rr_subject.rs_uip != NULL)
@@ -616,10 +617,6 @@
if (rule->rr_subject.hr_loginclass != NULL)
loginclass_acquire(rule->rr_subject.hr_loginclass);
break;
- case RCTL_SUBJECT_TYPE_JAIL:
- if (rule->rr_subject.hr_loginclass != NULL)
- prison_hold(rule->rr_subject.rs_prison);
- break;
default:
panic("rctl_rule_acquire_subject: unknown subject type %d",
rule->rr_subject_type);
@@ -633,6 +630,7 @@
switch (rule->rr_subject_type) {
case RCTL_SUBJECT_TYPE_UNDEFINED:
case RCTL_SUBJECT_TYPE_PROCESS:
+ case RCTL_SUBJECT_TYPE_JAIL:
break;
case RCTL_SUBJECT_TYPE_USER:
if (rule->rr_subject.rs_uip != NULL)
@@ -642,10 +640,6 @@
if (rule->rr_subject.hr_loginclass != NULL)
loginclass_release(rule->rr_subject.hr_loginclass);
break;
- case RCTL_SUBJECT_TYPE_JAIL:
- if (rule->rr_subject.rs_prison != NULL)
- prison_free(rule->rr_subject.rs_prison);
- break;
default:
panic("rctl_rule_release_subject: unknown subject type %d",
rule->rr_subject_type);
@@ -842,17 +836,13 @@
rule->rr_subject.hr_loginclass = loginclass_find(subject_idstr);
break;
case RCTL_SUBJECT_TYPE_JAIL:
- sx_slock(&allprison_lock);
rule->rr_subject.rs_prison = prison_find(id);
if (rule->rr_subject.rs_prison == NULL) {
- sx_sunlock(&allprison_lock);
error = ESRCH;
goto out;
}
- prison_hold_locked(rule->rr_subject.rs_prison);
/* prison_find() returns with mutex held. */
mtx_unlock(&rule->rr_subject.rs_prison->pr_mtx);
- sx_sunlock(&allprison_lock);
break;
default:
panic("rctl_rule_from_string: unknown subject type %d",
@@ -1222,9 +1212,11 @@
return (error);
sx_slock(&allproc_lock);
+ sx_slock(&allprison_lock);
filter = rctl_rule_from_string(inputstr);
free(inputstr, M_RCTL);
if (filter == NULL) {
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EINVAL);
}
@@ -1271,6 +1263,7 @@
}
out:
rctl_rule_release(filter);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
if (error != 0)
return (error);
@@ -1317,9 +1310,11 @@
return (error);
sx_slock(&allproc_lock);
+ sx_slock(&allprison_lock);
filter = rctl_rule_from_string(inputstr);
free(inputstr, M_RCTL);
if (filter == NULL) {
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EINVAL);
}
@@ -1366,6 +1361,7 @@
error = rctl_write_outbuf(sb, uap->outbufp, uap->outbuflen);
rctl_rule_release(filter);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
free(buf, M_RCTL);
return (error);
@@ -1390,25 +1386,30 @@
return (error);
sx_slock(&allproc_lock);
+ sx_slock(&allprison_lock);
filter = rctl_rule_from_string(inputstr);
free(inputstr, M_RCTL);
if (filter == NULL) {
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EINVAL);
}
if (filter->rr_subject_type == RCTL_SUBJECT_TYPE_UNDEFINED) {
rctl_rule_release(filter);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EINVAL);
}
if (filter->rr_subject_type != RCTL_SUBJECT_TYPE_PROCESS) {
rctl_rule_release(filter);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EOPNOTSUPP);
}
if (filter->rr_subject.rs_proc == NULL) {
rctl_rule_release(filter);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EINVAL);
}
@@ -1439,6 +1440,7 @@
error = rctl_write_outbuf(sb, uap->outbufp, uap->outbuflen);
rctl_rule_release(filter);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
free(buf, M_RCTL);
return (error);
@@ -1460,9 +1462,11 @@
return (error);
sx_slock(&allproc_lock);
+ sx_slock(&allprison_lock);
rule = rctl_rule_from_string(inputstr);
free(inputstr, M_RCTL);
if (rule == NULL) {
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EINVAL);
}
@@ -1482,6 +1486,7 @@
out:
rctl_rule_release(rule);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (error);
}
@@ -1502,15 +1507,18 @@
return (error);
sx_slock(&allproc_lock);
+ sx_slock(&allprison_lock);
filter = rctl_rule_from_string(inputstr);
free(inputstr, M_RCTL);
if (filter == NULL) {
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (EINVAL);
}
error = rctl_rule_remove(filter);
rctl_rule_release(filter);
+ sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
return (error);
@@ -1725,16 +1733,16 @@
}
/*
- * Go through the process' limits, freeing them.
+ * Release rules attached to the container.
*/
void
-rctl_proc_exit(struct proc *p)
+rctl_container_release(struct container *container)
{
struct rctl_rule_link *link;
rw_wlock(&rctl_lock);
- while (!LIST_EMPTY(&p->p_container->c_rule_links)) {
- link = LIST_FIRST(&p->p_container->c_rule_links);
+ while (!LIST_EMPTY(&container->c_rule_links)) {
+ link = LIST_FIRST(&container->c_rule_links);
LIST_REMOVE(link, rrl_next);
rctl_rule_release(link->rrl_rule);
uma_zfree(rctl_rule_link_zone, link);
==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#12 (text+ko) ====
@@ -132,7 +132,6 @@
#define RCTL_AMOUNT_UNDEFINED -1
-void rctl_proc_ucred_changed(struct proc *p, struct ucred *newcred);
struct rctl_rule *rctl_rule_alloc(int flags);
struct rctl_rule *rctl_rule_duplicate(const struct rctl_rule *rule, int flags);
void rctl_rule_acquire(struct rctl_rule *rule);
@@ -144,8 +143,9 @@
uint64_t rctl_get_limit(struct proc *p, int resource);
uint64_t rctl_get_available(struct proc *p, int resource);
const char *rctl_resource_name(int resource);
+void rctl_proc_ucred_changed(struct proc *p, struct ucred *newcred);
int rctl_proc_fork(struct proc *parent, struct proc *child);
-void rctl_proc_exit(struct proc *p);
+void rctl_container_release(struct container *container);
#else /* !_KERNEL */
/*
From trasz at FreeBSD.org Thu Feb 10 20:25:01 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Thu Feb 10 20:25:04 2011
Subject: PERFORCE change 188693 for review
Message-ID: <201102102025.p1AKP073041709@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188693?ac=10
Change 188693 by trasz@trasz_victim on 2011/02/10 20:24:38
Use jail names instead of jail IDs.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#29 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#29 (text+ko) ====
@@ -807,20 +807,14 @@
rule->rr_subject.hr_loginclass = NULL;
rule->rr_subject.rs_prison = NULL;
} else {
-
- /*
- * Loginclasses don't have any numerical ID's.
- */
- if (rule->rr_subject_type != RCTL_SUBJECT_TYPE_LOGINCLASS) {
- error = str2id(subject_idstr, &id);
- if (error != 0)
- goto out;
- }
switch (rule->rr_subject_type) {
case RCTL_SUBJECT_TYPE_UNDEFINED:
error = EINVAL;
goto out;
case RCTL_SUBJECT_TYPE_PROCESS:
+ error = str2id(subject_idstr, &id);
+ if (error != 0)
+ goto out;
sx_assert(&allproc_lock, SA_LOCKED);
rule->rr_subject.rs_proc = pfind(id);
if (rule->rr_subject.rs_proc == NULL) {
@@ -830,16 +824,30 @@
PROC_UNLOCK(rule->rr_subject.rs_proc);
break;
case RCTL_SUBJECT_TYPE_USER:
+ error = str2id(subject_idstr, &id);
+ if (error != 0)
+ goto out;
rule->rr_subject.rs_uip = uifind(id);
break;
case RCTL_SUBJECT_TYPE_LOGINCLASS:
- rule->rr_subject.hr_loginclass = loginclass_find(subject_idstr);
+ rule->rr_subject.hr_loginclass =
+ loginclass_find(subject_idstr);
break;
case RCTL_SUBJECT_TYPE_JAIL:
- rule->rr_subject.rs_prison = prison_find(id);
+ rule->rr_subject.rs_prison =
+ prison_find_name(&prison0, subject_idstr);
if (rule->rr_subject.rs_prison == NULL) {
- error = ESRCH;
- goto out;
+ /*
+ * No jail with that name; try with the JID.
+ */
+ error = str2id(subject_idstr, &id);
+ if (error != 0)
+ goto out;
+ rule->rr_subject.rs_prison = prison_find(id);
+ if (rule->rr_subject.rs_prison == NULL) {
+ error = ESRCH;
+ goto out;
+ }
}
/* prison_find() returns with mutex held. */
mtx_unlock(&rule->rr_subject.rs_prison->pr_mtx);
@@ -1104,7 +1112,7 @@
if (rule->rr_subject.rs_prison == NULL)
sbuf_printf(sb, ":");
else
- sbuf_printf(sb, "%d:", rule->rr_subject.rs_prison->pr_id);
+ sbuf_printf(sb, "%s:", rule->rr_subject.rs_prison->pr_name);
break;
default:
panic("rctl_rule_to_sbuf: unknown subject type %d",
From trasz at FreeBSD.org Thu Feb 10 20:52:28 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Thu Feb 10 20:52:31 2011
Subject: PERFORCE change 188695 for review
Message-ID: <201102102052.p1AKqRpw047379@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188695?ac=10
Change 188695 by trasz@trasz_victim on 2011/02/10 20:52:13
Simplify.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/jailstat.sh#4 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/jailstat.sh#4 (text+ko) ====
@@ -70,9 +70,8 @@
n=0
while :; do
if [ "`basename $0`" = "jailstat" ]; then
- jails="`ps ax -o jid= | sort -u | sed 1d`"
printf "JID\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n"
- for jail in $jails; do
+ jls jid | while read jail; do
# Put resource=value pairs into environment variables.
eval `rctl $hflag -u j:$jail`
@@ -85,9 +84,8 @@
done
else
- users="`ps ax -o user= | sort -u`"
printf "USER\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n"
- for user in $users; do
+ ps ax -o user= | sort -u | while read user; do
# Put resource=value pairs into environment variables.
eval `rctl $hflag -u u:$user`
From lz at FreeBSD.org Sat Feb 12 08:13:09 2011
From: lz at FreeBSD.org (Zheng Liu)
Date: Sat Feb 12 08:13:14 2011
Subject: PERFORCE change 188743 for review
Message-ID: <201102120813.p1C8D5u7082795@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188743?ac=10
Change 188743 by lz@gnehzuil-freebsd on 2011/02/12 08:12:55
IFC.
Affected files ...
.. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/arm/sys_machdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/arm/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/at91/if_ate.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/include/fdt.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/include/pmap.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/include/proc.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/mv/gpio.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/mv/ic.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/mv/mv_pci.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/mv/timer.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/arm/s3c2xx0/std.ln2410sbc#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/boot/fdt/dts/db78100.dts#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/boot/pc98/Makefile#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/boot/pc98/pc98boot/Makefile#1 branch
.. //depot/projects/soc2010/extfs/src/sys/cam/ata/ata_xpt.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_futex.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_futex.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/conf/files#5 integrate
.. //depot/projects/soc2010/extfs/src/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/conf/options#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/changes.txt#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslbtypes.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslmessages.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslpredef.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/aslwalks.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/dtcompile.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/dtexpress.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/dtfield.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/dtio.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/dttable.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbdisply.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbinput.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbmethod.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbnames.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/dispatcher/dsargs.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/dispatcher/dscontrol.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/dispatcher/dswload2.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/events/evgpe.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/events/evregion.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/events/evxfregn.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/executer/exfldio.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acdebug.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acdisasm.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acdispat.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acglobal.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/aclocal.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acoutput.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/actbl.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/tables/tbfadt.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/utilities/utdecode.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/aac/aacvar.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ahci/ahci.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/alc/if_alc.c#5 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_debug.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9280.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9280.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285v2.ini#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_rate/sample/tx_schedules.h#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_debug.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_debug.h#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_misc.h#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_tx.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_tx.h#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_tx_ht.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_tx_ht.h#1 branch
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_athioctl.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/bce/if_bcereg.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/cs/if_cs.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/cs/if_csreg.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/cs/if_csvar.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_82540.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_82541.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_82542.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_82543.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_82571.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_82575.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_82575.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_api.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_api.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_defines.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_hw.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_mac.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_mac.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_manage.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_manage.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_mbx.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_nvm.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_nvm.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_osdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_phy.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_phy.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_regs.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_vf.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/e1000_vf.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/if_igb.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/e1000/if_igb.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/fdt/fdt_common.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/fdt/fdt_pci.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/fdt/fdtbus.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/flash/mx25l.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/ichwd/ichwd.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/mii/miidevs#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/mii/rlphy.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/tsec/if_tsec_fdt.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/controller/ehci_mv.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/controller/usb_controller.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/u3g.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/umodem.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_pf.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_pf.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_run.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_runvar.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/dev/xen/netfront/netfront.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#32 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_mount.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#9 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2fs.h#6 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/procfs/procfs_fpregs.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/fs/procfs/procfs_regs.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_ebr.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_pc98.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/i386/i386/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/i386/linux/imgact_linux.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_context.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/kern_sysctl.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_lock.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_module.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_smp.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_uio.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/sys_process.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/cavium/if_octm.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/cavium/octe/ethernet-common.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/cavium/octeon_mp.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/include/_inttypes.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/include/_limits.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/include/_stdint.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/include/_types.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/include/cpufunc.h#5 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/include/hwfunc.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/include/sf_buf.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/mips/mp_machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/mips/uio_machdep.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/mips/vm_machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/rmi/xlr_machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/mips/sibyte/sb_scd.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/modules/ath/Makefile#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/modules/cc/Makefile#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/modules/cc/cc_chd/Makefile#1 branch
.. //depot/projects/soc2010/extfs/src/sys/modules/cc/cc_hd/Makefile#1 branch
.. //depot/projects/soc2010/extfs/src/sys/modules/cc/cc_vegas/Makefile#1 branch
.. //depot/projects/soc2010/extfs/src/sys/net/if.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/net/netisr.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/net/vnet.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/cc.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/cc/cc_chd.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/netinet/cc/cc_hd.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/netinet/cc/cc_newreno.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/cc/cc_vegas.c#1 branch
.. //depot/projects/soc2010/extfs/src/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_dn_io.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_auth.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_auth.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_bsd_addr.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_cc_functions.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_constants.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_crc32.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_crc32.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_dtrace_declare.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_dtrace_define.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_header.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_indata.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_input.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_pcb.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_peeloff.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_peeloff.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_ss_functions.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_structs.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_uio.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/nfsserver/nfs_serv.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/trap.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/include/fdt.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/include/openpicvar.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/mambo/mambo_openpic.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/mpc85xx/atpic.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/mpc85xx/isa.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/mpc85xx/nexus.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/mpc85xx/openpic_fdt.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/mpc85xx/pci_fdt.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/ofw/ofw_pcibus.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/cpcht.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/grackle.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/macgpio.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/openpic_macio.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/uninorth.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powermac/uninorthpci.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powerpc/exec_machdep.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powerpc/pic_if.m#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/ps3/ps3pic.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/powerpc/psim/openpic_iobus.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/sparc64/sparc64/machdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/sparc64/sparc64/uio_machdep.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/diskmbr.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/gpt.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/linker.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/param.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/ptrace.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/sysctl.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/sysent.h#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/uio.h#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/sys/vnode.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/soc2010/extfs/src/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/uma_core.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/vm_object.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/vm_object.h#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/vm_page.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/vm_phys.c#4 integrate
.. //depot/projects/soc2010/extfs/src/sys/vm/vm_reserv.c#3 integrate
.. //depot/projects/soc2010/extfs/src/sys/x86/x86/mca.c#2 integrate
Differences ...
==== //depot/projects/soc2010/extfs/src/sys/amd64/amd64/machdep.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.739 2011/01/21 10:26:26 pluknet Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.741 2011/02/05 15:10:27 kib Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -331,6 +331,9 @@
fpstate_drop(td);
sf.sf_uc.uc_mcontext.mc_fsbase = pcb->pcb_fsbase;
sf.sf_uc.uc_mcontext.mc_gsbase = pcb->pcb_gsbase;
+ bzero(sf.sf_uc.uc_mcontext.mc_spare,
+ sizeof(sf.sf_uc.uc_mcontext.mc_spare));
+ bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
/* Allocate space for the signal handler context. */
if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
@@ -352,6 +355,7 @@
/* Build the argument list for the signal handler. */
regs->tf_rdi = sig; /* arg 1 in %rdi */
regs->tf_rdx = (register_t)&sfp->sf_uc; /* arg 3 in %rdx */
+ bzero(&sf.sf_si, sizeof(sf.sf_si));
if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
regs->tf_rsi = (register_t)&sfp->sf_si; /* arg 2 in %rsi */
@@ -1527,12 +1531,14 @@
struct nmi_pcpu *np;
u_int64_t msr;
char *env;
+ size_t kstack0_sz;
thread0.td_kstack = physfree + KERNBASE;
- bzero((void *)thread0.td_kstack, KSTACK_PAGES * PAGE_SIZE);
- physfree += KSTACK_PAGES * PAGE_SIZE;
- thread0.td_pcb = (struct pcb *)
- (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ thread0.td_kstack_pages = KSTACK_PAGES;
+ kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE;
+ bzero((void *)thread0.td_kstack, kstack0_sz);
+ physfree += kstack0_sz;
+ thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1;
/*
* This may be done better later if it gets more high level
@@ -1674,8 +1680,8 @@
initializecpucache();
/* make an initial tss so cpu can get interrupt stack on syscall! */
- common_tss[0].tss_rsp0 = thread0.td_kstack + \
- KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb);
+ common_tss[0].tss_rsp0 = thread0.td_kstack +
+ kstack0_sz - sizeof(struct pcb);
/* Ensure the stack is aligned to 16 bytes */
common_tss[0].tss_rsp0 &= ~0xFul;
PCPU_SET(rsp0, common_tss[0].tss_rsp0);
@@ -2041,6 +2047,7 @@
get_fpcontext(td, mcp);
mcp->mc_fsbase = pcb->pcb_fsbase;
mcp->mc_gsbase = pcb->pcb_gsbase;
+ bzero(mcp->mc_spare, sizeof(mcp->mc_spare));
return (0);
}
==== //depot/projects/soc2010/extfs/src/sys/amd64/amd64/uio_machdep.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.6 2005/01/05 20:17:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.7 2011/02/02 16:35:10 mdf Exp $");
#include
#include
@@ -88,8 +88,7 @@
page_offset;
switch (uio->uio_segflg) {
case UIO_USERSPACE:
- if (ticks - PCPU_GET(switchticks) >= hogticks)
- uio_yield();
+ maybe_yield();
if (uio->uio_rw == UIO_READ)
error = copyout(cp, iov->iov_base, cnt);
else
==== //depot/projects/soc2010/extfs/src/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.274 2010/12/22 00:18:42 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.275 2011/01/26 20:03:58 dchagin Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -445,7 +445,7 @@
cpu_thread_clean(td);
#ifdef COMPAT_FREEBSD32
- if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
+ if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
/*
* Set the trap frame to point at the beginning of the uts
* function.
@@ -498,7 +498,7 @@
pcb = td->td_pcb;
#ifdef COMPAT_FREEBSD32
- if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
+ if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
pcb->pcb_gsbase = (register_t)tls_base;
return (0);
}
==== //depot/projects/soc2010/extfs/src/sys/amd64/ia32/ia32_signal.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.36 2011/01/14 21:09:01 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.37 2011/02/05 15:10:27 kib Exp $");
#include "opt_compat.h"
@@ -167,6 +167,8 @@
ia32_get_fpcontext(td, mcp);
mcp->mc_fsbase = pcb->pcb_fsbase;
mcp->mc_gsbase = pcb->pcb_gsbase;
+ bzero(mcp->mc_spare1, sizeof(mcp->mc_spare1));
+ bzero(mcp->mc_spare2, sizeof(mcp->mc_spare2));
set_pcb_flags(pcb, PCB_FULL_IRET);
return (0);
}
@@ -233,6 +235,7 @@
PROC_LOCK(td->td_proc);
uc.uc_sigmask = td->td_sigmask;
PROC_UNLOCK(td->td_proc);
+ bzero(&uc.__spare__, sizeof(uc.__spare__));
ret = copyout(&uc, uap->ucp, UC_COPY_SIZE);
}
return (ret);
@@ -348,6 +351,11 @@
sf.sf_uc.uc_mcontext.mc_es = regs->tf_es;
sf.sf_uc.uc_mcontext.mc_fs = regs->tf_fs;
sf.sf_uc.uc_mcontext.mc_gs = regs->tf_gs;
+ bzero(sf.sf_uc.uc_mcontext.mc_fpregs,
+ sizeof(sf.sf_uc.uc_mcontext.mc_fpregs));
+ bzero(sf.sf_uc.uc_mcontext.__spare__,
+ sizeof(sf.sf_uc.uc_mcontext.__spare__));
+ bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
/* Allocate space for the signal handler context. */
if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
@@ -365,6 +373,7 @@
/* Build the argument list for the signal handler. */
sf.sf_signum = sig;
sf.sf_ucontext = (register_t)&sfp->sf_uc;
+ bzero(&sf.sf_si, sizeof(sf.sf_si));
if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si;
@@ -468,6 +477,7 @@
fpstate_drop(td);
sf.sf_uc.uc_mcontext.mc_fsbase = td->td_pcb->pcb_fsbase;
sf.sf_uc.uc_mcontext.mc_gsbase = td->td_pcb->pcb_gsbase;
+ bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
/* Allocate space for the signal handler context. */
if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
@@ -487,6 +497,7 @@
/* Build the argument list for the signal handler. */
sf.sf_signum = sig;
sf.sf_ucontext = (register_t)&sfp->sf_uc;
+ bzero(&sf.sf_si, sizeof(sf.sf_si));
if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si;
==== //depot/projects/soc2010/extfs/src/sys/amd64/linux32/linux.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.30 2010/03/28 13:13:22 ed Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.31 2011/01/27 21:45:38 kib Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -370,28 +370,28 @@
/* The Linux sigcontext, pretty much a standard 386 trapframe. */
struct l_sigcontext {
- l_int sc_gs;
- l_int sc_fs;
- l_int sc_es;
- l_int sc_ds;
- l_int sc_edi;
- l_int sc_esi;
- l_int sc_ebp;
- l_int sc_esp;
- l_int sc_ebx;
- l_int sc_edx;
- l_int sc_ecx;
- l_int sc_eax;
- l_int sc_trapno;
- l_int sc_err;
- l_int sc_eip;
- l_int sc_cs;
- l_int sc_eflags;
- l_int sc_esp_at_signal;
- l_int sc_ss;
- l_int sc_387;
- l_int sc_mask;
- l_int sc_cr2;
+ l_uint sc_gs;
+ l_uint sc_fs;
+ l_uint sc_es;
+ l_uint sc_ds;
+ l_uint sc_edi;
+ l_uint sc_esi;
+ l_uint sc_ebp;
+ l_uint sc_esp;
+ l_uint sc_ebx;
+ l_uint sc_edx;
+ l_uint sc_ecx;
+ l_uint sc_eax;
+ l_uint sc_trapno;
+ l_uint sc_err;
+ l_uint sc_eip;
+ l_uint sc_cs;
+ l_uint sc_eflags;
+ l_uint sc_esp_at_signal;
+ l_uint sc_ss;
+ l_uint sc_387;
+ l_uint sc_mask;
+ l_uint sc_cr2;
} __packed;
struct l_ucontext {
==== //depot/projects/soc2010/extfs/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.59 2010/12/22 00:18:42 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.64 2011/01/30 18:17:38 dchagin Exp $");
#include
#include
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#include
#include
@@ -66,6 +67,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -106,6 +108,30 @@
return (lsa);
}
+static void
+bsd_to_linux_rusage(struct rusage *ru, struct l_rusage *lru)
+{
+
+ lru->ru_utime.tv_sec = ru->ru_utime.tv_sec;
+ lru->ru_utime.tv_usec = ru->ru_utime.tv_usec;
+ lru->ru_stime.tv_sec = ru->ru_stime.tv_sec;
+ lru->ru_stime.tv_usec = ru->ru_stime.tv_usec;
+ lru->ru_maxrss = ru->ru_maxrss;
+ lru->ru_ixrss = ru->ru_ixrss;
+ lru->ru_idrss = ru->ru_idrss;
+ lru->ru_isrss = ru->ru_isrss;
+ lru->ru_minflt = ru->ru_minflt;
+ lru->ru_majflt = ru->ru_majflt;
+ lru->ru_nswap = ru->ru_nswap;
+ lru->ru_inblock = ru->ru_inblock;
+ lru->ru_oublock = ru->ru_oublock;
+ lru->ru_msgsnd = ru->ru_msgsnd;
+ lru->ru_msgrcv = ru->ru_msgrcv;
+ lru->ru_nsignals = ru->ru_nsignals;
+ lru->ru_nvcsw = ru->ru_nvcsw;
+ lru->ru_nivcsw = ru->ru_nivcsw;
+}
+
int
linux_execve(struct thread *td, struct linux_execve_args *args)
{
@@ -131,7 +157,7 @@
* linux_proc_init, this leads to a panic on KASSERT
* because such process has p->p_emuldata == NULL.
*/
- if (td->td_proc->p_sysent == &elf_linux_sysvec)
+ if (SV_PROC_ABI(td->td_proc) == SV_ABI_LINUX)
error = linux_proc_init(td, 0, 0);
return (error);
}
@@ -1126,24 +1152,7 @@
if (error != 0)
return (error);
if (uap->rusage != NULL) {
- s32.ru_utime.tv_sec = s.ru_utime.tv_sec;
- s32.ru_utime.tv_usec = s.ru_utime.tv_usec;
- s32.ru_stime.tv_sec = s.ru_stime.tv_sec;
- s32.ru_stime.tv_usec = s.ru_stime.tv_usec;
- s32.ru_maxrss = s.ru_maxrss;
- s32.ru_ixrss = s.ru_ixrss;
- s32.ru_idrss = s.ru_idrss;
- s32.ru_isrss = s.ru_isrss;
- s32.ru_minflt = s.ru_minflt;
- s32.ru_majflt = s.ru_majflt;
- s32.ru_nswap = s.ru_nswap;
- s32.ru_inblock = s.ru_inblock;
- s32.ru_oublock = s.ru_oublock;
- s32.ru_msgsnd = s.ru_msgsnd;
- s32.ru_msgrcv = s.ru_msgrcv;
- s32.ru_nsignals = s.ru_nsignals;
- s32.ru_nvcsw = s.ru_nvcsw;
- s32.ru_nivcsw = s.ru_nivcsw;
+ bsd_to_linux_rusage(&s, &s32);
error = copyout(&s32, uap->rusage, sizeof(s32));
}
return (error);
@@ -1267,3 +1276,37 @@
return (0);
}
+
+int
+linux_wait4(struct thread *td, struct linux_wait4_args *args)
+{
+ int error, options;
+ struct rusage ru, *rup;
+ struct l_rusage lru;
+
+#ifdef DEBUG
+ if (ldebug(wait4))
+ printf(ARGS(wait4, "%d, %p, %d, %p"),
+ args->pid, (void *)args->status, args->options,
+ (void *)args->rusage);
+#endif
+
+ options = (args->options & (WNOHANG | WUNTRACED));
+ /* WLINUXCLONE should be equal to __WCLONE, but we make sure */
+ if (args->options & __WCLONE)
+ options |= WLINUXCLONE;
+
+ if (args->rusage != NULL)
+ rup = &ru;
+ else
+ rup = NULL;
+ error = linux_common_wait(td, args->pid, args->status, options, rup);
+ if (error)
+ return (error);
+ if (args->rusage != NULL) {
+ bsd_to_linux_rusage(rup, &lru);
+ error = copyout(&lru, args->rusage, sizeof(lru));
+ }
+
+ return (error);
+}
==== //depot/projects/soc2010/extfs/src/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ====
@@ -2,7 +2,7 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.42 2010/10/08 07:19:05 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.43 2011/01/30 20:38:26 dchagin Exp $
* created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib
*/
@@ -734,10 +734,10 @@
struct linux_sys_futex_args {
char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
- char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)];
+ char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
- char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
- char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)];
+ char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
+ char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_sched_setaffinity_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
==== //depot/projects/soc2010/extfs/src/sys/amd64/linux32/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.38 2010/10/08 07:18:44 kib Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.39 2011/01/30 20:31:43 dchagin Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -405,8 +405,8 @@
237 AUE_NULL STD { int linux_fremovexattr(void); }
238 AUE_NULL STD { int linux_tkill(int tid, int sig); }
239 AUE_SENDFILE UNIMPL linux_sendfile64
-240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \
- struct l_timespec *timeout, void *uaddr2, int val3); }
+240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, uint32_t val, \
+ struct l_timespec *timeout, uint32_t *uaddr2, uint32_t val3); }
241 AUE_NULL STD { int linux_sched_setaffinity(l_pid_t pid, l_uint len, \
l_ulong *user_mask_ptr); }
242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \
==== //depot/projects/soc2010/extfs/src/sys/arm/arm/locore.S#2 (text+ko) ====
@@ -37,7 +37,7 @@
#include
#include
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.23 2009/06/09 17:21:47 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.24 2011/02/03 17:35:16 marcel Exp $");
/* What size should this really be ? It is only used by initarm() */
#define INIT_ARM_STACK_SIZE 2048
@@ -65,14 +65,20 @@
ENTRY_NP(btext)
-ASENTRY_NP(_start)
-
/*
- * Move metadata ptr to r12 (ip)
+ * On entry:
+ * r0 - metadata pointer or 0
+ * r1 - if (r0 == 0) then metadata pointer
*/
+ASENTRY_NP(_start)
+ /* Move metadata ptr to r12 (ip) */
mov ip, r0
-
+ ldr r0, =0
+ cmp ip, r0
+ bne 1f
+ mov ip, r1
+1:
/* Make sure interrupts are disabled. */
mrs r7, cpsr
orr r7, r7, #(I32_bit|F32_bit)
==== //depot/projects/soc2010/extfs/src/sys/arm/arm/sys_machdep.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.5 2007/02/14 01:25:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.6 2011/02/05 03:30:29 imp Exp $");
#include
#include
@@ -85,7 +85,7 @@
arm32_set_tp(struct thread *td, void *args)
{
- td->td_md.md_tp = args;
+ td->td_md.md_tp = (register_t)args;
return (0);
}
@@ -93,7 +93,7 @@
arm32_get_tp(struct thread *td, void *args)
{
- td->td_retval[0] = (uint32_t)td->td_md.md_tp;
+ td->td_retval[0] = td->td_md.md_tp;
return (0);
}
==== //depot/projects/soc2010/extfs/src/sys/arm/arm/uio_machdep.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.6 2008/03/06 22:27:35 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.7 2011/02/02 16:35:10 mdf Exp $");
#include
#include
@@ -94,8 +94,7 @@
cp = (char*)sf_buf_kva(sf) + page_offset;
switch (uio->uio_segflg) {
case UIO_USERSPACE:
- if (ticks - PCPU_GET(switchticks) >= hogticks)
- uio_yield();
+ maybe_yield();
if (uio->uio_rw == UIO_READ)
error = copyout(cp, iov->iov_base, cnt);
else
==== //depot/projects/soc2010/extfs/src/sys/arm/arm/vm_machdep.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.46 2011/01/18 21:57:02 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.47 2011/02/05 03:30:29 imp Exp $");
#include
#include
@@ -146,7 +146,7 @@
/* Setup to release spin count in fork_exit(). */
td2->td_md.md_spinlock_count = 1;
td2->td_md.md_saved_cspr = 0;
- td2->td_md.md_tp = *(uint32_t **)ARM_TP_ADDRESS;
+ td2->td_md.md_tp = *(register_t *)ARM_TP_ADDRESS;
}
void
@@ -370,10 +370,10 @@
{
if (td != curthread)
- td->td_md.md_tp = tls_base;
+ td->td_md.md_tp = (register_t)tls_base;
else {
critical_enter();
- *(void **)ARM_TP_ADDRESS = tls_base;
+ *(register_t *)ARM_TP_ADDRESS = (register_t)tls_base;
critical_exit();
}
return (0);
==== //depot/projects/soc2010/extfs/src/sys/arm/at91/if_ate.c#3 (text) ====
@@ -31,7 +31,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.49 2010/10/15 15:16:36 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.50 2011/02/07 01:13:57 ticso Exp $");
#include
#include
@@ -433,6 +433,16 @@
bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTWRITE);
}
+static uint32_t
+ate_mac_hash(const uint8_t *buf)
+{
+ uint32_t index = 0;
+ for (int i = 0; i < 48; i++) {
+ index ^= ((buf[i >> 3] >> (i & 7)) & 1) << (i % 6);
+ }
+ return (index);
+}
+
/*
* Compute the multicast filter for this device.
*/
@@ -462,8 +472,8 @@
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
- index = ether_crc32_be(LLADDR((struct sockaddr_dl *)
- ifma->ifma_addr), ETHER_ADDR_LEN) >> 26;
+ index = ate_mac_hash(LLADDR((struct sockaddr_dl *)
+ ifma->ifma_addr));
af[index >> 3] |= 1 << (index & 7);
}
if_maddr_runlock(ifp);
==== //depot/projects/soc2010/extfs/src/sys/arm/include/fdt.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From lz at FreeBSD.org Sat Feb 12 08:33:47 2011
From: lz at FreeBSD.org (Zheng Liu)
Date: Sat Feb 12 08:33:51 2011
Subject: PERFORCE change 188744 for review
Message-ID: <201102120833.p1C8XhPN087587@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188744?ac=10
Change 188744 by lz@gnehzuil-freebsd on 2011/02/12 08:33:31
IFC.
Affected files ...
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/sys_machdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/at91/if_ate.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/include/fdt.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/include/pmap.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/include/proc.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/gpio.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/ic.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/mv_pci.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/timer.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/arm/s3c2xx0/std.ln2410sbc#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/boot/fdt/dts/db78100.dts#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/boot/pc98/Makefile#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/boot/pc98/pc98boot/Makefile#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/cam/ata/ata_xpt.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_futex.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_futex.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/conf/files#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/conf/options#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/changes.txt#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslbtypes.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslmessages.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslpredef.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/aslwalks.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtcompile.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtexpress.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtfield.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtio.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dttable.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbdisply.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbinput.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbmethod.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbnames.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dsargs.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dscontrol.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/dispatcher/dswload2.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/events/evgpe.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/events/evregion.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/events/evxfregn.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/executer/exfldio.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acdebug.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acdisasm.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acdispat.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acglobal.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/aclocal.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acoutput.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/actbl.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/tables/tbfadt.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/utilities/utdecode.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/aac/aacvar.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ahci/ahci.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/alc/if_alc.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_debug.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285v2.ini#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/tx_schedules.h#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_debug.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_debug.h#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_misc.h#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx.h#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx_ht.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx_ht.h#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athioctl.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/bce/if_bcereg.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/cs/if_cs.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/cs/if_csreg.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/cs/if_csvar.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82540.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82541.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82542.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82543.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82571.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82575.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_82575.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_api.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_api.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_defines.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_hw.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_mac.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_mac.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_manage.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_manage.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_mbx.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_nvm.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_nvm.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_osdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_phy.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_phy.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_regs.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_vf.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/e1000_vf.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/if_igb.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/if_igb.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/fdt/fdt_common.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/fdt/fdt_pci.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/fdt/fdtbus.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/flash/mx25l.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/ichwd/ichwd.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/miidevs#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/rlphy.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/tsec/if_tsec_fdt.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/controller/ehci_mv.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/controller/usb_controller.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/u3g.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/umodem.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_pf.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_pf.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_run.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_runvar.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/dev/xen/netfront/netfront.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_alloc.c#10 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_mount.h#6 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#18 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#16 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_fpregs.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/fs/procfs/procfs_regs.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_ebr.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_mbr.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_pc98.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/imgact_linux.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_context.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_sysctl.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_lock.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_module.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_smp.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_uio.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/sys_process.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/if_octm.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/octe/ethernet-common.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/octeon_mp.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_inttypes.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_limits.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_stdint.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_types.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/include/cpufunc.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/include/hwfunc.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/include/sf_buf.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/mp_machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/uio_machdep.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/vm_machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/rmi/xlr_machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/mips/sibyte/sb_scd.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/modules/ath/Makefile#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/Makefile#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/cc_chd/Makefile#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/cc_hd/Makefile#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/modules/cc/cc_vegas/Makefile#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/net/if.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/net/netisr.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/net/vnet.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_chd.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_hd.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_newreno.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/cc/cc_vegas.c#1 branch
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_dn_io.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_auth.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_auth.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_bsd_addr.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_cc_functions.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_constants.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_crc32.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_crc32.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_dtrace_declare.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_dtrace_define.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_header.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_indata.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_input.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_pcb.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_peeloff.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_peeloff.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_ss_functions.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_structs.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_uio.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/nfsserver/nfs_serv.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/trap.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/include/fdt.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/include/openpicvar.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mambo/mambo_openpic.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/atpic.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/isa.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/nexus.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/openpic_fdt.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/mpc85xx/pci_fdt.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/ofw/ofw_pcibus.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/cpcht.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/grackle.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/macgpio.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/openpic_macio.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/uninorth.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powermac/uninorthpci.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/exec_machdep.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/pic_if.m#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/ps3/ps3pic.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/powerpc/psim/openpic_iobus.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sparc64/sparc64/machdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sparc64/sparc64/uio_machdep.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/diskmbr.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/gpt.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/linker.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/param.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/ptrace.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/sysctl.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/sysent.h#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/uio.h#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/sys/vnode.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/uma_core.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_object.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_object.h#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_page.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_phys.c#4 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/vm/vm_reserv.c#3 integrate
.. //depot/projects/soc2010/ext4fs/src/sys/x86/x86/mca.c#2 integrate
Differences ...
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/machdep.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.739 2011/01/21 10:26:26 pluknet Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.741 2011/02/05 15:10:27 kib Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -331,6 +331,9 @@
fpstate_drop(td);
sf.sf_uc.uc_mcontext.mc_fsbase = pcb->pcb_fsbase;
sf.sf_uc.uc_mcontext.mc_gsbase = pcb->pcb_gsbase;
+ bzero(sf.sf_uc.uc_mcontext.mc_spare,
+ sizeof(sf.sf_uc.uc_mcontext.mc_spare));
+ bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
/* Allocate space for the signal handler context. */
if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
@@ -352,6 +355,7 @@
/* Build the argument list for the signal handler. */
regs->tf_rdi = sig; /* arg 1 in %rdi */
regs->tf_rdx = (register_t)&sfp->sf_uc; /* arg 3 in %rdx */
+ bzero(&sf.sf_si, sizeof(sf.sf_si));
if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
regs->tf_rsi = (register_t)&sfp->sf_si; /* arg 2 in %rsi */
@@ -1527,12 +1531,14 @@
struct nmi_pcpu *np;
u_int64_t msr;
char *env;
+ size_t kstack0_sz;
thread0.td_kstack = physfree + KERNBASE;
- bzero((void *)thread0.td_kstack, KSTACK_PAGES * PAGE_SIZE);
- physfree += KSTACK_PAGES * PAGE_SIZE;
- thread0.td_pcb = (struct pcb *)
- (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ thread0.td_kstack_pages = KSTACK_PAGES;
+ kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE;
+ bzero((void *)thread0.td_kstack, kstack0_sz);
+ physfree += kstack0_sz;
+ thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1;
/*
* This may be done better later if it gets more high level
@@ -1674,8 +1680,8 @@
initializecpucache();
/* make an initial tss so cpu can get interrupt stack on syscall! */
- common_tss[0].tss_rsp0 = thread0.td_kstack + \
- KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb);
+ common_tss[0].tss_rsp0 = thread0.td_kstack +
+ kstack0_sz - sizeof(struct pcb);
/* Ensure the stack is aligned to 16 bytes */
common_tss[0].tss_rsp0 &= ~0xFul;
PCPU_SET(rsp0, common_tss[0].tss_rsp0);
@@ -2041,6 +2047,7 @@
get_fpcontext(td, mcp);
mcp->mc_fsbase = pcb->pcb_fsbase;
mcp->mc_gsbase = pcb->pcb_gsbase;
+ bzero(mcp->mc_spare, sizeof(mcp->mc_spare));
return (0);
}
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/uio_machdep.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.6 2005/01/05 20:17:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/uio_machdep.c,v 1.7 2011/02/02 16:35:10 mdf Exp $");
#include
#include
@@ -88,8 +88,7 @@
page_offset;
switch (uio->uio_segflg) {
case UIO_USERSPACE:
- if (ticks - PCPU_GET(switchticks) >= hogticks)
- uio_yield();
+ maybe_yield();
if (uio->uio_rw == UIO_READ)
error = copyout(cp, iov->iov_base, cnt);
else
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.274 2010/12/22 00:18:42 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.275 2011/01/26 20:03:58 dchagin Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -445,7 +445,7 @@
cpu_thread_clean(td);
#ifdef COMPAT_FREEBSD32
- if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
+ if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
/*
* Set the trap frame to point at the beginning of the uts
* function.
@@ -498,7 +498,7 @@
pcb = td->td_pcb;
#ifdef COMPAT_FREEBSD32
- if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
+ if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
pcb->pcb_gsbase = (register_t)tls_base;
return (0);
}
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/ia32/ia32_signal.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.36 2011/01/14 21:09:01 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.37 2011/02/05 15:10:27 kib Exp $");
#include "opt_compat.h"
@@ -167,6 +167,8 @@
ia32_get_fpcontext(td, mcp);
mcp->mc_fsbase = pcb->pcb_fsbase;
mcp->mc_gsbase = pcb->pcb_gsbase;
+ bzero(mcp->mc_spare1, sizeof(mcp->mc_spare1));
+ bzero(mcp->mc_spare2, sizeof(mcp->mc_spare2));
set_pcb_flags(pcb, PCB_FULL_IRET);
return (0);
}
@@ -233,6 +235,7 @@
PROC_LOCK(td->td_proc);
uc.uc_sigmask = td->td_sigmask;
PROC_UNLOCK(td->td_proc);
+ bzero(&uc.__spare__, sizeof(uc.__spare__));
ret = copyout(&uc, uap->ucp, UC_COPY_SIZE);
}
return (ret);
@@ -348,6 +351,11 @@
sf.sf_uc.uc_mcontext.mc_es = regs->tf_es;
sf.sf_uc.uc_mcontext.mc_fs = regs->tf_fs;
sf.sf_uc.uc_mcontext.mc_gs = regs->tf_gs;
+ bzero(sf.sf_uc.uc_mcontext.mc_fpregs,
+ sizeof(sf.sf_uc.uc_mcontext.mc_fpregs));
+ bzero(sf.sf_uc.uc_mcontext.__spare__,
+ sizeof(sf.sf_uc.uc_mcontext.__spare__));
+ bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
/* Allocate space for the signal handler context. */
if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
@@ -365,6 +373,7 @@
/* Build the argument list for the signal handler. */
sf.sf_signum = sig;
sf.sf_ucontext = (register_t)&sfp->sf_uc;
+ bzero(&sf.sf_si, sizeof(sf.sf_si));
if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si;
@@ -468,6 +477,7 @@
fpstate_drop(td);
sf.sf_uc.uc_mcontext.mc_fsbase = td->td_pcb->pcb_fsbase;
sf.sf_uc.uc_mcontext.mc_gsbase = td->td_pcb->pcb_gsbase;
+ bzero(sf.sf_uc.__spare__, sizeof(sf.sf_uc.__spare__));
/* Allocate space for the signal handler context. */
if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
@@ -487,6 +497,7 @@
/* Build the argument list for the signal handler. */
sf.sf_signum = sig;
sf.sf_ucontext = (register_t)&sfp->sf_uc;
+ bzero(&sf.sf_si, sizeof(sf.sf_si));
if (SIGISMEMBER(psp->ps_siginfo, sig)) {
/* Signal handler installed with SA_SIGINFO. */
sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si;
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.30 2010/03/28 13:13:22 ed Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.31 2011/01/27 21:45:38 kib Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -370,28 +370,28 @@
/* The Linux sigcontext, pretty much a standard 386 trapframe. */
struct l_sigcontext {
- l_int sc_gs;
- l_int sc_fs;
- l_int sc_es;
- l_int sc_ds;
- l_int sc_edi;
- l_int sc_esi;
- l_int sc_ebp;
- l_int sc_esp;
- l_int sc_ebx;
- l_int sc_edx;
- l_int sc_ecx;
- l_int sc_eax;
- l_int sc_trapno;
- l_int sc_err;
- l_int sc_eip;
- l_int sc_cs;
- l_int sc_eflags;
- l_int sc_esp_at_signal;
- l_int sc_ss;
- l_int sc_387;
- l_int sc_mask;
- l_int sc_cr2;
+ l_uint sc_gs;
+ l_uint sc_fs;
+ l_uint sc_es;
+ l_uint sc_ds;
+ l_uint sc_edi;
+ l_uint sc_esi;
+ l_uint sc_ebp;
+ l_uint sc_esp;
+ l_uint sc_ebx;
+ l_uint sc_edx;
+ l_uint sc_ecx;
+ l_uint sc_eax;
+ l_uint sc_trapno;
+ l_uint sc_err;
+ l_uint sc_eip;
+ l_uint sc_cs;
+ l_uint sc_eflags;
+ l_uint sc_esp_at_signal;
+ l_uint sc_ss;
+ l_uint sc_387;
+ l_uint sc_mask;
+ l_uint sc_cr2;
} __packed;
struct l_ucontext {
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.59 2010/12/22 00:18:42 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.64 2011/01/30 18:17:38 dchagin Exp $");
#include
#include
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#include
#include
@@ -66,6 +67,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -106,6 +108,30 @@
return (lsa);
}
+static void
+bsd_to_linux_rusage(struct rusage *ru, struct l_rusage *lru)
+{
+
+ lru->ru_utime.tv_sec = ru->ru_utime.tv_sec;
+ lru->ru_utime.tv_usec = ru->ru_utime.tv_usec;
+ lru->ru_stime.tv_sec = ru->ru_stime.tv_sec;
+ lru->ru_stime.tv_usec = ru->ru_stime.tv_usec;
+ lru->ru_maxrss = ru->ru_maxrss;
+ lru->ru_ixrss = ru->ru_ixrss;
+ lru->ru_idrss = ru->ru_idrss;
+ lru->ru_isrss = ru->ru_isrss;
+ lru->ru_minflt = ru->ru_minflt;
+ lru->ru_majflt = ru->ru_majflt;
+ lru->ru_nswap = ru->ru_nswap;
+ lru->ru_inblock = ru->ru_inblock;
+ lru->ru_oublock = ru->ru_oublock;
+ lru->ru_msgsnd = ru->ru_msgsnd;
+ lru->ru_msgrcv = ru->ru_msgrcv;
+ lru->ru_nsignals = ru->ru_nsignals;
+ lru->ru_nvcsw = ru->ru_nvcsw;
+ lru->ru_nivcsw = ru->ru_nivcsw;
+}
+
int
linux_execve(struct thread *td, struct linux_execve_args *args)
{
@@ -131,7 +157,7 @@
* linux_proc_init, this leads to a panic on KASSERT
* because such process has p->p_emuldata == NULL.
*/
- if (td->td_proc->p_sysent == &elf_linux_sysvec)
+ if (SV_PROC_ABI(td->td_proc) == SV_ABI_LINUX)
error = linux_proc_init(td, 0, 0);
return (error);
}
@@ -1126,24 +1152,7 @@
if (error != 0)
return (error);
if (uap->rusage != NULL) {
- s32.ru_utime.tv_sec = s.ru_utime.tv_sec;
- s32.ru_utime.tv_usec = s.ru_utime.tv_usec;
- s32.ru_stime.tv_sec = s.ru_stime.tv_sec;
- s32.ru_stime.tv_usec = s.ru_stime.tv_usec;
- s32.ru_maxrss = s.ru_maxrss;
- s32.ru_ixrss = s.ru_ixrss;
- s32.ru_idrss = s.ru_idrss;
- s32.ru_isrss = s.ru_isrss;
- s32.ru_minflt = s.ru_minflt;
- s32.ru_majflt = s.ru_majflt;
- s32.ru_nswap = s.ru_nswap;
- s32.ru_inblock = s.ru_inblock;
- s32.ru_oublock = s.ru_oublock;
- s32.ru_msgsnd = s.ru_msgsnd;
- s32.ru_msgrcv = s.ru_msgrcv;
- s32.ru_nsignals = s.ru_nsignals;
- s32.ru_nvcsw = s.ru_nvcsw;
- s32.ru_nivcsw = s.ru_nivcsw;
+ bsd_to_linux_rusage(&s, &s32);
error = copyout(&s32, uap->rusage, sizeof(s32));
}
return (error);
@@ -1267,3 +1276,37 @@
return (0);
}
+
+int
+linux_wait4(struct thread *td, struct linux_wait4_args *args)
+{
+ int error, options;
+ struct rusage ru, *rup;
+ struct l_rusage lru;
+
+#ifdef DEBUG
+ if (ldebug(wait4))
+ printf(ARGS(wait4, "%d, %p, %d, %p"),
+ args->pid, (void *)args->status, args->options,
+ (void *)args->rusage);
+#endif
+
+ options = (args->options & (WNOHANG | WUNTRACED));
+ /* WLINUXCLONE should be equal to __WCLONE, but we make sure */
+ if (args->options & __WCLONE)
+ options |= WLINUXCLONE;
+
+ if (args->rusage != NULL)
+ rup = &ru;
+ else
+ rup = NULL;
+ error = linux_common_wait(td, args->pid, args->status, options, rup);
+ if (error)
+ return (error);
+ if (args->rusage != NULL) {
+ bsd_to_linux_rusage(rup, &lru);
+ error = copyout(&lru, args->rusage, sizeof(lru));
+ }
+
+ return (error);
+}
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ====
@@ -2,7 +2,7 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.42 2010/10/08 07:19:05 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.43 2011/01/30 20:38:26 dchagin Exp $
* created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib
*/
@@ -734,10 +734,10 @@
struct linux_sys_futex_args {
char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
- char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)];
+ char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
- char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
- char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)];
+ char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
+ char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_sched_setaffinity_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
==== //depot/projects/soc2010/ext4fs/src/sys/amd64/linux32/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.38 2010/10/08 07:18:44 kib Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.39 2011/01/30 20:31:43 dchagin Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -405,8 +405,8 @@
237 AUE_NULL STD { int linux_fremovexattr(void); }
238 AUE_NULL STD { int linux_tkill(int tid, int sig); }
239 AUE_SENDFILE UNIMPL linux_sendfile64
-240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \
- struct l_timespec *timeout, void *uaddr2, int val3); }
+240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, uint32_t val, \
+ struct l_timespec *timeout, uint32_t *uaddr2, uint32_t val3); }
241 AUE_NULL STD { int linux_sched_setaffinity(l_pid_t pid, l_uint len, \
l_ulong *user_mask_ptr); }
242 AUE_NULL STD { int linux_sched_getaffinity(l_pid_t pid, l_uint len, \
==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/locore.S#2 (text+ko) ====
@@ -37,7 +37,7 @@
#include
#include
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.23 2009/06/09 17:21:47 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.24 2011/02/03 17:35:16 marcel Exp $");
/* What size should this really be ? It is only used by initarm() */
#define INIT_ARM_STACK_SIZE 2048
@@ -65,14 +65,20 @@
ENTRY_NP(btext)
-ASENTRY_NP(_start)
-
/*
- * Move metadata ptr to r12 (ip)
+ * On entry:
+ * r0 - metadata pointer or 0
+ * r1 - if (r0 == 0) then metadata pointer
*/
+ASENTRY_NP(_start)
+ /* Move metadata ptr to r12 (ip) */
mov ip, r0
-
+ ldr r0, =0
+ cmp ip, r0
+ bne 1f
+ mov ip, r1
+1:
/* Make sure interrupts are disabled. */
mrs r7, cpsr
orr r7, r7, #(I32_bit|F32_bit)
==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/sys_machdep.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.5 2007/02/14 01:25:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.6 2011/02/05 03:30:29 imp Exp $");
#include
#include
@@ -85,7 +85,7 @@
arm32_set_tp(struct thread *td, void *args)
{
- td->td_md.md_tp = args;
+ td->td_md.md_tp = (register_t)args;
return (0);
}
@@ -93,7 +93,7 @@
arm32_get_tp(struct thread *td, void *args)
{
- td->td_retval[0] = (uint32_t)td->td_md.md_tp;
+ td->td_retval[0] = td->td_md.md_tp;
return (0);
}
==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/uio_machdep.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.6 2008/03/06 22:27:35 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/uio_machdep.c,v 1.7 2011/02/02 16:35:10 mdf Exp $");
#include
#include
@@ -94,8 +94,7 @@
cp = (char*)sf_buf_kva(sf) + page_offset;
switch (uio->uio_segflg) {
case UIO_USERSPACE:
- if (ticks - PCPU_GET(switchticks) >= hogticks)
- uio_yield();
+ maybe_yield();
if (uio->uio_rw == UIO_READ)
error = copyout(cp, iov->iov_base, cnt);
else
==== //depot/projects/soc2010/ext4fs/src/sys/arm/arm/vm_machdep.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.46 2011/01/18 21:57:02 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.47 2011/02/05 03:30:29 imp Exp $");
#include
#include
@@ -146,7 +146,7 @@
/* Setup to release spin count in fork_exit(). */
td2->td_md.md_spinlock_count = 1;
td2->td_md.md_saved_cspr = 0;
- td2->td_md.md_tp = *(uint32_t **)ARM_TP_ADDRESS;
+ td2->td_md.md_tp = *(register_t *)ARM_TP_ADDRESS;
}
void
@@ -370,10 +370,10 @@
{
if (td != curthread)
- td->td_md.md_tp = tls_base;
+ td->td_md.md_tp = (register_t)tls_base;
else {
critical_enter();
- *(void **)ARM_TP_ADDRESS = tls_base;
+ *(register_t *)ARM_TP_ADDRESS = (register_t)tls_base;
critical_exit();
}
return (0);
==== //depot/projects/soc2010/ext4fs/src/sys/arm/at91/if_ate.c#3 (text) ====
@@ -31,7 +31,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.49 2010/10/15 15:16:36 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.50 2011/02/07 01:13:57 ticso Exp $");
#include
#include
@@ -433,6 +433,16 @@
bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTWRITE);
}
+static uint32_t
+ate_mac_hash(const uint8_t *buf)
+{
+ uint32_t index = 0;
+ for (int i = 0; i < 48; i++) {
+ index ^= ((buf[i >> 3] >> (i & 7)) & 1) << (i % 6);
+ }
+ return (index);
+}
+
/*
* Compute the multicast filter for this device.
*/
@@ -462,8 +472,8 @@
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
- index = ether_crc32_be(LLADDR((struct sockaddr_dl *)
- ifma->ifma_addr), ETHER_ADDR_LEN) >> 26;
+ index = ate_mac_hash(LLADDR((struct sockaddr_dl *)
+ ifma->ifma_addr));
af[index >> 3] |= 1 << (index & 7);
}
if_maddr_runlock(ifp);
==== //depot/projects/soc2010/ext4fs/src/sys/arm/include/fdt.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From trasz at FreeBSD.org Sat Feb 12 14:58:23 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sat Feb 12 14:58:25 2011
Subject: PERFORCE change 188750 for review
Message-ID: <201102121458.p1CEwMxF069068@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188750?ac=10
Change 188750 by trasz@trasz_victim on 2011/02/12 14:57:51
Replace the hacky mechanism used to send a signal or log a warning
only when the rule gets exceeded, and not at every subsequent resource
usage increase, with a proper one.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#30 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#30 (text+ko) ====
@@ -82,6 +82,7 @@
struct rctl_rule_link {
LIST_ENTRY(rctl_rule_link) rrl_next;
struct rctl_rule *rrl_rule;
+ int rrl_exceeded;
};
struct dict {
@@ -265,18 +266,6 @@
if (available >= amount)
return (0);
- /*
- * We've already exceeded that one.
- */
- if (available < 0) {
-#ifdef notyet
- KASSERT(rule->rr_action != RCTL_ACTION_DENY ||
- !rusage_is_deniable(rule->rr_resource),
- ("rctl_would_exceed: deny rule already exceeded"));
-#endif
- return (0);
- }
-
return (1);
}
@@ -291,7 +280,7 @@
struct rctl_rule *rule;
struct rctl_rule_link *link;
struct sbuf sb;
- int should_deny = 0;
+ int should_deny = 0, already_exceeded;
char *buf;
static int curtime = 0;
static struct timeval lasttime;
@@ -306,14 +295,22 @@
rule = link->rrl_rule;
if (rule->rr_resource != resource)
continue;
- if (!rctl_would_exceed(p, rule, amount))
+ if (!rctl_would_exceed(p, rule, amount)) {
+ link->rrl_exceeded = 0;
continue;
+ }
+ already_exceeded = link->rrl_exceeded;
+ link->rrl_exceeded = 1;
+
switch (rule->rr_action) {
case RCTL_ACTION_DENY:
should_deny = 1;
continue;
case RCTL_ACTION_LOG:
+ if (already_exceeded)
+ continue;
+
if (!ppsratecheck(&lasttime, &curtime, 10))
continue;
@@ -333,6 +330,9 @@
free(buf, M_RCTL);
continue;
default:
+ if (already_exceeded)
+ continue;
+
KASSERT(rule->rr_action > 0 &&
rule->rr_action <= RCTL_ACTION_SIGNAL_MAX,
("rctl_enforce: unknown action %d",
@@ -550,6 +550,7 @@
rctl_rule_acquire(rule);
link = uma_zalloc(rctl_rule_link_zone, M_WAITOK);
link->rrl_rule = rule;
+ link->rrl_exceeded = 0;
rw_wlock(&rctl_lock);
LIST_INSERT_HEAD(&container->c_rule_links, link, rrl_next);
@@ -569,6 +570,7 @@
return (ENOMEM);
rctl_rule_acquire(rule);
link->rrl_rule = rule;
+ link->rrl_exceeded = 0;
LIST_INSERT_HEAD(&container->c_rule_links, link, rrl_next);
return (0);
From trasz at FreeBSD.org Sun Feb 13 12:55:56 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 12:55:59 2011
Subject: PERFORCE change 188776 for review
Message-ID: <201102131255.p1DCtt0E049733@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188776?ac=10
Change 188776 by trasz@trasz_victim on 2011/02/13 12:55:32
When iterating over processes, we need to make sure the process
structure is fully initialized, i.e. if p_state == PRS_NORMAL.
Otherwise we may panic due to e.g. NULL thread lock pointer.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#74 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#27 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#74 (text+ko) ====
@@ -735,6 +735,8 @@
NULL);
FOREACH_PROC_IN_SYSTEM(p) {
+ if (p->p_state != PRS_NORMAL)
+ continue;
if (p->p_flag & P_SYSTEM)
continue;
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#27 (text+ko) ====
@@ -1284,6 +1284,10 @@
if (PROC_TRYLOCK(p) == 0)
continue;
+ if (p->p_state != PRS_NORMAL) {
+ PROC_UNLOCK(p);
+ continue;
+ }
/*
* If this is a system, protected or killed process, skip it.
*/
@@ -1662,6 +1666,10 @@
* looked at this process, skip it.
*/
PROC_LOCK(p);
+ if (p->p_state != PRS_NORMAL) {
+ PROC_UNLOCK(p);
+ continue;
+ }
if (p->p_flag & (P_INEXEC | P_SYSTEM | P_WEXIT)) {
PROC_UNLOCK(p);
continue;
From trasz at FreeBSD.org Sun Feb 13 13:17:55 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 13:17:57 2011
Subject: PERFORCE change 188777 for review
Message-ID: <201102131317.p1DDHsjR054481@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188777?ac=10
Change 188777 by trasz@trasz_victim on 2011/02/13 13:17:28
When enforcing an RSS limit, we don't want to skip processes stopped
with SIGSTOP or SIGTSTP.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#28 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#28 (text+ko) ====
@@ -1306,7 +1306,8 @@
thread_lock(td);
if (!TD_ON_RUNQ(td) &&
!TD_IS_RUNNING(td) &&
- !TD_IS_SLEEPING(td)) {
+ !TD_IS_SLEEPING(td) &&
+ !TD_IS_SUSPENDED(td)) {
thread_unlock(td);
breakout = 1;
break;
@@ -1683,7 +1684,8 @@
thread_lock(td);
if (!TD_ON_RUNQ(td) &&
!TD_IS_RUNNING(td) &&
- !TD_IS_SLEEPING(td)) {
+ !TD_IS_SLEEPING(td) &&
+ !TD_IS_SUSPENDED(td)) {
thread_unlock(td);
breakout = 1;
break;
From trasz at FreeBSD.org Sun Feb 13 13:53:02 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 13:53:04 2011
Subject: PERFORCE change 188779 for review
Message-ID: <201102131353.p1DDr1BV062386@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188779?ac=10
Change 188779 by trasz@trasz_victim on 2011/02/13 13:52:11
Fix logic error that could make vm_daemon() to loop indefinitely.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#29 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#29 (text+ko) ====
@@ -1636,7 +1636,7 @@
struct proc *p;
struct thread *td;
struct vmspace *vm;
- int breakout, swapout_flags, tryagain;
+ int breakout, swapout_flags, tryagain, attempts;
uint64_t rsize, ravailable;
while (TRUE) {
@@ -1657,7 +1657,9 @@
* process is swapped out -- deactivate pages
*/
tryagain = 0;
+ attempts = 0;
again:
+ attempts++;
sx_slock(&allproc_lock);
FOREACH_PROC_IN_SYSTEM(p) {
vm_pindex_t limit, size;
@@ -1732,8 +1734,6 @@
* been exceeded by some memory hog. Don't
* try to deactivate more than 1/4th of process'
* resident set size.
- *
- * XXX: Reconsider.
*/
if (ravailable < rsize - (rsize / 4))
ravailable = rsize - (rsize / 4);
@@ -1746,19 +1746,18 @@
rusage_set(p, RUSAGE_RSS, rsize);
PROC_UNLOCK(p);
if (rsize > ravailable)
- tryagain++;
- if (tryagain > 20) {
-#if 0
- printf("still too much: rsize = %ju, ravailable = %ju\n",
- (uintmax_t)rsize, (uintmax_t)ravailable);
+ tryagain = 1;
+ if (attempts == 10) {
+#if 1
+ printf("still too much: pid %d (%s), rsize = %ju, ravailable = %ju\n",
+ p->p_pid, p->p_comm, (uintmax_t)rsize, (uintmax_t)ravailable);
#endif
- tryagain = 0;
}
}
vmspace_free(vm);
}
sx_sunlock(&allproc_lock);
- if (tryagain != 0)
+ if (tryagain != 0 && attempts <= 10)
goto again;
}
}
From trasz at FreeBSD.org Sun Feb 13 14:08:25 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 14:08:26 2011
Subject: PERFORCE change 188781 for review
Message-ID: <201102131408.p1DE8OpS064362@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188781?ac=10
Change 188781 by trasz@trasz_victim on 2011/02/13 14:07:32
After few loops in vm_daemon(), try harder.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#30 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#30 (text+ko) ====
@@ -1735,8 +1735,10 @@
* try to deactivate more than 1/4th of process'
* resident set size.
*/
- if (ravailable < rsize - (rsize / 4))
- ravailable = rsize - (rsize / 4);
+ if (attempts <= 8) {
+ if (ravailable < rsize - (rsize / 4))
+ ravailable = rsize - (rsize / 4);
+ }
vm_pageout_map_deactivate_pages(
&vm->vm_map, OFF_TO_IDX(ravailable));
/* Update RSS usage after paging out. */
From trasz at FreeBSD.org Sun Feb 13 14:09:31 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 14:09:33 2011
Subject: PERFORCE change 188782 for review
Message-ID: <201102131409.p1DE9U35064383@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188782?ac=10
Change 188782 by trasz@trasz_victim on 2011/02/13 14:08:29
Comment out debug message.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#31 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#31 (text+ko) ====
@@ -1749,12 +1749,12 @@
PROC_UNLOCK(p);
if (rsize > ravailable)
tryagain = 1;
+#if 0
if (attempts == 10) {
-#if 1
printf("still too much: pid %d (%s), rsize = %ju, ravailable = %ju\n",
p->p_pid, p->p_comm, (uintmax_t)rsize, (uintmax_t)ravailable);
+ }
#endif
- }
}
vmspace_free(vm);
}
From trasz at FreeBSD.org Sun Feb 13 14:25:43 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 14:25:45 2011
Subject: PERFORCE change 188783 for review
Message-ID: <201102131425.p1DEPgFV069107@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188783?ac=10
Change 188783 by trasz@trasz_victim on 2011/02/13 14:25:10
Return proper error code (rusage_add() returns EDOOFUS).
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#33 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#33 (text+ko) ====
@@ -740,7 +740,7 @@
error = rusage_add(p1, RUSAGE_NPROC, 1);
PROC_UNLOCK(p1);
if (error != 0)
- return (error);
+ return (EAGAIN);
mem_charged = 0;
vm2 = NULL;
From trasz at FreeBSD.org Sun Feb 13 17:07:32 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 17:07:36 2011
Subject: PERFORCE change 188787 for review
Message-ID: <201102131707.p1DH7Vmf001650@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188787?ac=10
Change 188787 by trasz@trasz_victim on 2011/02/13 17:06:50
If warning couldn't be logged due to ppsratecheck(), don't mark link
as exceeded; this way we might log a warning later.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#31 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#31 (text+ko) ====
@@ -280,7 +280,7 @@
struct rctl_rule *rule;
struct rctl_rule_link *link;
struct sbuf sb;
- int should_deny = 0, already_exceeded;
+ int should_deny = 0;
char *buf;
static int curtime = 0;
static struct timeval lasttime;
@@ -300,15 +300,16 @@
continue;
}
- already_exceeded = link->rrl_exceeded;
- link->rrl_exceeded = 1;
-
switch (rule->rr_action) {
case RCTL_ACTION_DENY:
should_deny = 1;
continue;
case RCTL_ACTION_LOG:
- if (already_exceeded)
+ /*
+ * If rrl_exceeded != 0, it means we've already
+ * logged a warning for this process.
+ */
+ if (link->rrl_exceeded != 0)
continue;
if (!ppsratecheck(&lasttime, &curtime, 10))
@@ -328,9 +329,10 @@
p->p_ucred->cr_prison->pr_id);
sbuf_delete(&sb);
free(buf, M_RCTL);
+ link->rrl_exceeded = 1;
continue;
default:
- if (already_exceeded)
+ if (link->rrl_exceeded != 0)
continue;
KASSERT(rule->rr_action > 0 &&
@@ -343,6 +345,7 @@
* are equal to their counterparts from sys/signal.h.
*/
psignal(p, rule->rr_action);
+ link->rrl_exceeded = 1;
continue;
}
}
From trasz at FreeBSD.org Sun Feb 13 18:25:28 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 18:25:31 2011
Subject: PERFORCE change 188793 for review
Message-ID: <201102131825.p1DIPSra018614@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188793?ac=10
Change 188793 by trasz@trasz_victim on 2011/02/13 18:25:17
RSS is not really inheritable.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#75 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#75 (text+ko) ====
@@ -94,7 +94,7 @@
[RUSAGE_DATA] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE,
[RUSAGE_STACK] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE,
[RUSAGE_CORE] = RUSAGE_DENIABLE,
- [RUSAGE_RSS] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE,
+ [RUSAGE_RSS] = RUSAGE_RECLAIMABLE,
[RUSAGE_MEMLOCK] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE,
[RUSAGE_NPROC] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE,
[RUSAGE_NOFILE] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE,
From trasz at FreeBSD.org Sun Feb 13 19:14:57 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 19:15:01 2011
Subject: PERFORCE change 188800 for review
Message-ID: <201102131914.p1DJEo30029146@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188800?ac=10
Change 188800 by trasz@trasz_victim on 2011/02/13 19:14:28
IFC.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/Makefile#13 integrate
.. //depot/projects/soc2009/trasz_limits/Makefile.inc1#20 integrate
.. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#34 integrate
.. //depot/projects/soc2009/trasz_limits/UPDATING#33 integrate
.. //depot/projects/soc2009/trasz_limits/bin/ed/ed.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/bin/kill/kill.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/bin/pkill/pkill.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/TOUR#2 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/alias.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/alias.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/arith.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/arith.y#5 delete
.. //depot/projects/soc2009/trasz_limits/bin/sh/arith_lex.l#6 delete
.. //depot/projects/soc2009/trasz_limits/bin/sh/arith_yacc.c#1 branch
.. //depot/projects/soc2009/trasz_limits/bin/sh/arith_yacc.h#1 branch
.. //depot/projects/soc2009/trasz_limits/bin/sh/arith_yylex.c#1 branch
.. //depot/projects/soc2009/trasz_limits/bin/sh/error.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/exec.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/init.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/input.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/main.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/mkinit.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/options.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/redir.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#21 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/shell.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/trap.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/CHANGES#11 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/COPYRIGHT#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/README#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html#2 delete
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf#2 delete
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt#2 delete
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.html#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.pdf#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.txt#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dighost.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.1#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.docbook#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.html#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/builtin.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/client.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/control.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/globals.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/query.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/main.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/query.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/server.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/update.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/xfrout.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.1#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/config.h.in#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/config.threads.in#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/configure.in#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.pdf#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dig.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-keygen.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-signzone.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.host.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named-checkconf.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named-checkzone.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.nsupdate.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc-confgen.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc.conf.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc.html#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/options#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/api#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/check.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/Makefile.in#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/adb.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/api#9 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_api.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_internal.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gssapictx.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/diff.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/events.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/name.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ncache.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdataset.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/resolver.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/result.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/tsig.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/types.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/view.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/zone.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/dst.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/journal.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/message.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/name.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ncache.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/openssl_link.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbtdb.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdatalist.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdataset.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdataslab.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/resolver.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/result.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rootns.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/sdb.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/sdlz.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/time.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tkey.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tsig.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/validator.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/view.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/zone.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/Makefile.in#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/api#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/entropy.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/mem.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/task.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mem.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nothreads/Makefile.in#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/print.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/task.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/unix/socket.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/api#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isccfg/namedconf.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_buffer.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_config.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_context.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gabn.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gethostent.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getipnode.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_gnba.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_inetntop.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_noop.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_packet.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/man/lwres_resutil.html#6 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/lwres/print_p.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/release-notes.css#2 delete
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/version#11 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/oid-list#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/top/display.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/ssl/t1_lib.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/etc/namedb/named.conf#5 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/rpcbind#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/termcap.small#6 integrate
.. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes#13 integrate
.. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes-o.real#8 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/dlg_config.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libgcc/Makefile#14 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libgomp/Makefile#6 integrate
.. //depot/projects/soc2009/trasz_limits/include/pthread_np.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/bind/config.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/lib/bind/dns/code.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/bind/dns/dns/enumclass.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/bind/dns/dns/enumtype.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/bind/dns/dns/rdatastruct.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/bind/isc/isc/platform.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/mips/crt1.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/memmove.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/psignal.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/rfork_thread.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/siglist.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/sysconf.3#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/memcpy.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/memmove.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/include/namespace.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/include/un-namespace.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libdevinfo/devinfo.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libdevinfo/devinfo_var.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libkvm/kvm.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/lib/liblzma/config.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libpmc/Makefile#7 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/pthread.map#7 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/Makefile.inc#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_getthreadid_np.c#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libufs/libufs.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_llrint.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_llrintf.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/e_asin.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/e_expf.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/s_atan.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/s_cos.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/s_nexttoward.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/s_nexttowardf.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/s_sin.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/src/s_tan.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#20 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld_lock.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate
.. //depot/projects/soc2009/trasz_limits/release/picobsd/build/picobsd#8 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/fsck.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/setup.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/suj.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastctl/hastctl.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/control.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/primary.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_common.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_impl.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_socketpair.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_tcp4.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_uds.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/secondary.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/subr.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/mdconfig/mdconfig.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/tunefs/tunefs.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/share/examples/kld/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/examples/kld/khelp/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/share/examples/kld/khelp/README#1 branch
.. //depot/projects/soc2009/trasz_limits/share/examples/kld/khelp/h_example.c#1 branch
.. //depot/projects/soc2009/trasz_limits/share/examples/pf/pf.conf#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man3/Makefile#6 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man3/pthread_getthreadid_np.3#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man3/pthread_self.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/amdtemp.4#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/ath_hal.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/bwi.4#5 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man7/build.7#7 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/rman.9#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/misc/committers-ports.dot#17 integrate
.. //depot/projects/soc2009/trasz_limits/share/mk/bsd.own.mk#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#27 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/uio_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_signal.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_machdep.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_proto.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_syscall.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_sysent.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/syscalls.master#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/sys_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/uio_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/vm_machdep.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/at91/if_ate.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/pmap.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/proc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/mv/gpio.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/mv/ic.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/mv/mv_pci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/mv/timer.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/fdt/dts/db78100.dts#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/pc98boot/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#22 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_emul.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_emul.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_fork.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_stats.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#31 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#46 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#22 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#24 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.pc98#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/kern.pre.mk#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/options#29 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/changes.txt#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtable.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtbdump.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtbinfo.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslanalyze.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslbtypes.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompile.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.l#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.y#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmessages.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslpredef.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asltree.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslwalks.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtcompile.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtcompiler.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtexpress.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtfield.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtio.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dttable.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtutils.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbcmds.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbdisply.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbinput.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbmethod.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbnames.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsargs.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dscontrol.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsopcode.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswload.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswload2.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evgpe.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evregion.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evxfregn.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exfldio.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdebug.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdisasm.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdispat.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acglobal.h#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/aclocal.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acoutput.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpixf.h#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actbl.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbfadt.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utdecode.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utglobal.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/aac/aac.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/aac/aacvar.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#21 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alc.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-pci.h#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-intel.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_eeprom_v14.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_internal.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9280.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_rate/sample/sample.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_rate/sample/sample.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#22 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_tx.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_tx_ht.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_tx_ht.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athioctl.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athvar.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bce/if_bce.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bce/if_bcefw.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bce/if_bcereg.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_80003es2lan.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_80003es2lan.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_82540.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_82541.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_82542.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_82543.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_82571.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_82575.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_82575.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_api.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_api.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_defines.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_hw.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_ich8lan.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_ich8lan.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_mac.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_mac.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_manage.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_manage.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_mbx.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_nvm.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_nvm.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_osdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_phy.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_phy.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_regs.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_vf.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/e1000_vf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#27 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ichsmb/ichsmb_pci.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ichwd/ichwd.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ichwd/ichwd.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/md/md.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/re/if_re.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/emu10k1.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/emu10kx.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/hda/hdac.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_mv.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/usb_controller.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/u3g.c#21 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umodem.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_pf.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_pf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#33 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_run.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_runvar.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/ext2fs/ext2_alloc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/ext2fs/ext2_mount.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/ext2fs/ext2fs.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdport.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/tmpfs/tmpfs.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/tmpfs/tmpfs_subr.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part_pc98.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/machdep.c#25 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/uio_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/imgact_linux.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_machdep.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_proto.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_sysent.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/conf/GENERIC#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/uio_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#25 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_context.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_synch.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sysctl.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_module.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_smp.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_turnstile.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_uio.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_bio.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_mount.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#26 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#23 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/if_octm.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octe/ethernet-common.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octeon_mp.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/_inttypes.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/_limits.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/_stdint.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/_types.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/cpufunc.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/hwfunc.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/mp_machdep.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/uio_machdep.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xlr_machdep.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/sibyte/sb_scd.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/ath/Makefile#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/cc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/cc/cc_chd/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/modules/cc/cc_hd/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/modules/cc/cc_vegas/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/modules/linux/Makefile#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/if.c#27 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/netisr.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/rtsock.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/vnet.h#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/cc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/cc/cc_chd.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/netinet/cc/cc_hd.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/netinet/cc/cc_newreno.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/cc/cc_vegas.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_dn_io.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_asconf.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_auth.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_auth.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_bsd_addr.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_bsd_addr.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_cc_functions.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_constants.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_crc32.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_crc32.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_dtrace_declare.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_dtrace_define.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_header.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_indata.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_indata.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_input.c#20 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_input.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_os.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_os_bsd.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#25 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#21 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_peeloff.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_peeloff.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_ss_functions.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_structs.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_timer.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_uio.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_usrreq.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctputil.c#23 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctputil.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_usrreq.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/udp_usrreq.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet6/sctp6_usrreq.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_serv.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pc98/pc98/machdep.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/intr_machdep.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/pci_fdt.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/ofw/ofw_pcibus.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/cpcht.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/grackle.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/macgpio.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/uninorth.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/uninorthpci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/intr_machdep.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/uio_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/machdep.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/pmap.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/uio_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/uio_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/linker.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#31 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#33 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/taskqueue.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/uio.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/vnode.h#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_rawread.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_snapshot.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_softdep.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/fs.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_acl.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_vnops.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#33 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_meter.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#27 integrate
.. //depot/projects/soc2009/trasz_limits/sys/x86/x86/mca.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/command6.0#3 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/command6.0.stdout#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/command7.0#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/errors/bad-binary1.126#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/hash1.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/redir5.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/shellproc1.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/expansion/arith10.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/expansion/arith11.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/expansion/arith9.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/FlashDevice.sub#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/parsedata.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/paskha.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/gzip/zmore.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/killall/killall.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/rs/rs.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/stat/stat.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/truss/main.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/acpi/acpidb/Makefile#10 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/acpi/iasl/Makefile#11 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/configvers.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/mkmakefile.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/diskinfo/diskinfo.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/bundle.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/command.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/iface.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/iface.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/log.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/log.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/main.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/ppp.8.m4#5 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/pw/pw_user.c#4 integrate
Differences ...
==== //depot/projects/soc2009/trasz_limits/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.383 2011/01/31 15:17:47 imp Exp $
+# $FreeBSD: src/Makefile,v 1.385 2011/02/10 18:54:52 jhb Exp $
#
# The user-driven targets are:
#
@@ -30,6 +30,7 @@
# delete-old-libs - Delete obsolete libraries.
# targets - Print a list of supported TARGET/TARGET_ARCH pairs
# for world and kernel targets.
+# toolchains - Build a toolchain for all world and kernel targets.
#
# This makefile is simple by design. The FreeBSD make automatically reads
# the /usr/share/mk/sys.mk unless the -m argument is specified on the
@@ -124,7 +125,7 @@
BINMAKE= \
`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
-m ${.CURDIR}/share/mk
-_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1
+_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
# Guess machine architecture from machine type, and vice versa.
.if !defined(TARGET_ARCH) && defined(TARGET)
@@ -205,7 +206,7 @@
#
${TGTS}:
- ${_+_}cd ${.CURDIR}; ${_MAKE} TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} ${.TARGET}
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
# Set a reasonable default
.MAIN: all
@@ -307,8 +308,10 @@
${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
tinderbox:
- @cd ${.CURDIR} && \
- DOING_TINDERBOX=YES ${MAKE} JFLAG=${JFLAG} universe
+ @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
+
+toolchains:
+ @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
#
# universe
@@ -328,6 +331,12 @@
TARGET_ARCHES_${target}?= ${target}
.endfor
+.if defined(UNIVERSE_TARGET)
+MAKE_JUST_WORLDS= YES
+.else
+UNIVERSE_TARGET?= buildworld
+.endif
+
targets:
@echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
.for target in ${TARGETS}
@@ -361,16 +370,16 @@
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch}
universe_${target}_${target_arch}: universe_${target}_prologue
- @echo ">> ${target}.${target_arch} buildworld started on `LC_ALL=C date`"
+ @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
- ${MAKE} ${JFLAG} buildworld \
+ ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
TARGET=${target} \
TARGET_ARCH=${target_arch} \
- > _.${target}.${target_arch}.buildworld 2>&1 || \
- (echo "${target}.${target_arch} world failed," \
- "check _.${target}.${target_arch}.buildworld for details" | \
+ > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
+ (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \
+ "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
${MAKEFAIL}))
- @echo ">> ${target}.${target_arch} buildworld completed on `LC_ALL=C date`"
+ @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
.endfor
.endif
.if !defined(MAKE_JUST_WORLDS)
==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#20 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.677 2011/01/31 15:17:47 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.680 2011/02/11 04:03:39 imp Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -28,6 +28,17 @@
# /usr/share/mk. These include:
# obj depend all install clean cleandepend cleanobj
+# You are supposed to define both of these when calling Makefile.inc1
+# directly. However, some old scripts don't. Cope for the moment, but
+# issue a new warning for a transition period.
+.if defined(TARGET) && !defined(TARGET_ARCH)
+.warning "You must pass both TARGET and TARGET_ARCH to Makefile.inc1. Setting TARGET_ARCH=${TARGET}."
+TARGET_ARCH=${TARGET}
+.endif
+.if !defined(TARGET) || !defined(TARGET_ARCH)
+.error "Both TARGET and TARGET_ARCH must be defined."
+.endif
+
.include
.include
@@ -1378,19 +1389,63 @@
showconfig:
@${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort
+.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
+DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
+.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
+.if exists(${KERNCONFDIR}/${KERNCONF})
+FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
+ ${KERNCONFDIR}/${KERNCONF}
+.endif
+.endif
+
+.endif
+
+.if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
+DTBOUTPUTPATH= ${.CURDIR}
+.endif
+
+#
+# Build 'standalone' Device Tree Blob
+#
+builddtb:
+ @if [ "${FDT_DTS_FILE}" = "" ]; then \
+ echo "ERROR: FDT_DTS_FILE must be specified!"; \
+ exit 1; \
+ fi; \
+ if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
+ echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
+ exist!"; \
+ exit 1; \
+ fi; \
+ if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then \
+ echo "WARNING: DTB will be placed in the current working \
+ directory"; \
+ fi
+ @PATH=${TMPPATH} \
+ dtc -O dtb -o \
+ ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
+ -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
+
###############
.if defined(XDEV) && defined(XDEV_ARCH)
+.if ${XDEV} == ${MACHINE} && ${XDEV_ARCH} == ${MACHINE_ARCH}
+XDEV_CPUTYPE?=${CPUTYPE}
+.else
+XDEV_CPUTYPE?=${TARGET_CPUTYPE}
+.endif
+
NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
- -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS
+ -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
+ TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+ CPUTYPE=${XDEV_CPUTYPE}
-XDDIR=${XDEV}-freebsd
+XDDIR=${XDEV_ARCH}-freebsd
XDTP=/usr/${XDDIR}
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
- TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH}
+CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
CDENV= ${CDBENV} \
_SHLIBDIRPREFIX=${XDTP} \
TOOLS_PREFIX=${XDTP}
@@ -1412,7 +1467,7 @@
xdev-build: _xb-build-tools _xb-cross-tools
_xb-build-tools:
- ${_+_}cd ${.CURDIR}; \
+ ${_+_}@cd ${.CURDIR}; \
${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
_xb-cross-tools:
@@ -1466,41 +1521,3 @@
../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
done
.endif
-
-.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
-DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
-
-.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
-.if exists(${KERNCONFDIR}/${KERNCONF})
-FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
- ${KERNCONFDIR}/${KERNCONF}
-.endif
-.endif
-
-.endif
-
-.if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
-DTBOUTPUTPATH= ${.CURDIR}
-.endif
-
-#
-# Build 'standalone' Device Tree Blob
-#
-builddtb:
- @if [ "${FDT_DTS_FILE}" = "" ]; then \
- echo "ERROR: FDT_DTS_FILE must be specified!"; \
- exit 1; \
- fi; \
- if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
- echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
- exist!"; \
- exit 1; \
- fi; \
- if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then \
- echo "WARNING: DTB will be placed in the current working \
- directory"; \
- fi
- @PATH=${TMPPATH} \
- dtc -O dtb -o \
- ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
- -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#34 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.259 2011/01/12 14:55:02 nwhitehorn Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.260 2011/02/02 21:09:30 uqs Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -38,6 +38,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20110119: Remove SYSCTL_*X* sysctl additions.
+OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \
+ usr/share/man/man9/SYSCTL_XLONG.9.gz
+
# 20110112: Update dialog to new version, rename old libdialog to libodialog,
# removing associated man pages and header files.
OLD_FILES+=usr/share/man/man3/draw_shadow.3.gz \
@@ -100,6 +104,8 @@
.endif
# 20101020: catch up with vm_page_sleep_if_busy rename
OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz
+# 20101018: taskqueue(9) updates
+OLD_FILES+=usr/share/man/man9/taskqueue_find.9.gz
# 20101011: removed subblock.h from liblzma
OLD_FILES+=usr/include/lzma/subblock.h
# 20101002: removed manpath.config
==== //depot/projects/soc2009/trasz_limits/UPDATING#33 (text+ko) ====
@@ -22,6 +22,13 @@
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20110207:
+ Remove the uio_yield prototype and symbol. This function has
+ been misnamed since it was introduced and should not be
+ globally exposed with this name. The equivalent functionality
+ is now available using kern_yield(curthread->td_user_pri).
+ The function remains undocumented.
+
20110112:
A SYSCTL_[ADD_]UQUAD was added for unsigned uint64_t pointers,
symmetric with the existing SYSCTL_[ADD_]QUAD. Type checking
@@ -1309,4 +1316,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.677 2011/01/12 19:28:52 brucec Exp $
+$FreeBSD: src/UPDATING,v 1.678 2011/02/08 00:36:46 mdf Exp $
==== //depot/projects/soc2009/trasz_limits/bin/ed/ed.1#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/bin/ed/ed.1,v 1.35 2005/01/16 16:41:56 ru Exp $
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.36 2011/02/12 20:28:15 brucec Exp $
.Dd July 3, 2004
.Dt ED 1
.Os
@@ -231,7 +231,7 @@
The last line in the buffer.
.It n
The
-.Em n Ns th,
+.Em n Ns th
line in the buffer
where
.Em n
@@ -649,7 +649,7 @@
deleted or otherwise modified.
.It (.,.)l
Print the addressed lines unambiguously.
-If a single line fills for than one screen (as might be the case
+If a single line fills more than one screen (as might be the case
when viewing a binary file, for instance), a
.Dq Li --More--
prompt is printed on the last line.
==== //depot/projects/soc2009/trasz_limits/bin/kill/kill.c#5 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include
-__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.23 2010/12/21 22:47:34 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.24 2011/02/04 16:40:50 jilles Exp $");
#include
#include
@@ -152,7 +152,7 @@
{
int n;
- if (!strncasecmp(sig, "sig", (size_t)3))
+ if (!strncasecmp(sig, "SIG", (size_t)3))
sig += 3;
for (n = 1; n < sys_nsig; n++) {
if (!strcasecmp(sys_signame[n], sig))
==== //depot/projects/soc2009/trasz_limits/bin/pkill/pkill.c#7 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.11 2010/06/20 08:48:30 brian Exp $");
+__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.12 2011/02/04 16:40:50 jilles Exp $");
#include
#include
@@ -156,7 +156,7 @@
argv++;
argc--;
} else {
- if (strncasecmp(p, "sig", 3) == 0)
+ if (strncasecmp(p, "SIG", 3) == 0)
p += 3;
for (i = 1; i < NSIG; i++)
if (strcasecmp(sys_signame[i], p) == 0)
==== //depot/projects/soc2009/trasz_limits/bin/sh/Makefile#5 (text+ko) ====
@@ -1,24 +1,24 @@
# @(#)Makefile 8.4 (Berkeley) 5/5/95
-# $FreeBSD: src/bin/sh/Makefile,v 1.55 2010/12/21 22:47:34 jilles Exp $
+# $FreeBSD: src/bin/sh/Makefile,v 1.56 2011/02/08 23:18:06 jilles Exp $
PROG= sh
INSTALLFLAGS= -S
-SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \
+SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \
+ exec.c expand.c \
histedit.c input.c jobs.c kill.c mail.c main.c memalloc.c miscbltin.c \
mystring.c options.c output.c parser.c printf.c redir.c show.c \
test.c trap.c var.c
GENSRCS= builtins.c init.c nodes.c syntax.c
GENHDRS= builtins.h nodes.h syntax.h token.h
-SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} y.tab.h
+SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
# MLINKS for Shell built in commands for which there are no userland
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From trasz at FreeBSD.org Sun Feb 13 19:22:37 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 19:22:38 2011
Subject: PERFORCE change 188801 for review
Message-ID: <201102131922.p1DJMa52031066@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188801?ac=10
Change 188801 by trasz@trasz_victim on 2011/02/13 19:22:01
Make the message just a little shorter, so it can fit in a single line.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#32 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#32 (text+ko) ====
@@ -323,7 +323,7 @@
sbuf_new(&sb, buf, RCTL_LOG_BUFSIZE, SBUF_FIXEDLEN);
rctl_rule_to_sbuf(&sb, rule);
sbuf_finish(&sb);
- printf("rctl: rule \"%s\" matched by process %d "
+ printf("rctl: rule \"%s\" matched by pid %d "
"(%s), uid %d, jid %d\n", sbuf_data(&sb), p->p_pid,
p->p_comm, p->p_ucred->cr_uid,
p->p_ucred->cr_prison->pr_id);
From trasz at FreeBSD.org Sun Feb 13 19:24:49 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 13 19:24:51 2011
Subject: PERFORCE change 188802 for review
Message-ID: <201102131924.p1DJOmF7031190@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188802?ac=10
Change 188802 by trasz@trasz_victim on 2011/02/13 19:24:25
Drop unneeded diff.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#13 integrate
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#13 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.116 2010/06/28 18:17:21 kib Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 209579 2010-06-28 18:06:46Z kib
*/
#ifndef _FREEBSD32_SYSPROTO_H_
From trasz at FreeBSD.org Mon Feb 14 17:22:54 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Mon Feb 14 17:22:56 2011
Subject: PERFORCE change 188824 for review
Message-ID: <201102141722.p1EHMrPo026601@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188824?ac=10
Change 188824 by trasz@trasz_victim on 2011/02/14 17:22:49
Minor manual page improvements.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#8 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#8 (text+ko) ====
@@ -30,7 +30,7 @@
.Os
.Sh NAME
.Nm rctl
-.Nd display and update RCTL database
+.Nd display and update resource limits database
.Sh SYNOPSIS
.Nm
.Op Fl h
@@ -90,7 +90,7 @@
It can be either process, user, login class, or jail.
.Pp
Subject ID identifies the subject. It can be user name,
-numerical user ID, login class name, or numerical jail ID.
+numerical user ID, login class name, jail name, or numerical jail ID.
.Pp
Resource identifies the resource the rule controls.
.Pp
@@ -117,8 +117,8 @@
For example, a filter that matches every rule could be written as ":::=/",
or, in short, ":".
A filter that matches all the login classes would be "loginclass:".
-A filter that matches all defined rules for maxprocesses resource would be
-"::maxprocesses".
+A filter that matches all defined rules for nproc resource would be
+"::nproc".
.Pp
.Sh RESOURCES
.Bl -column -offset 3n "msgqqueued"
From rene at FreeBSD.org Mon Feb 14 21:48:26 2011
From: rene at FreeBSD.org (Rene Ladan)
Date: Mon Feb 14 21:48:31 2011
Subject: PERFORCE change 188832 for review
Message-ID: <201102142148.p1ELmPGY081423@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188832?ac=10
Change 188832 by rene@rene_acer on 2011/02/14 21:48:13
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#85 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/Makefile#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/diff.txt#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/init.txt#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#99 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#34 integrate
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#29 integrate
.. //depot/projects/docproj_nl/www/en/docs/books.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/internal/new-account.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/java/dists/16.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/java/news.xml#6 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.4R/schedule.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releases/8.2R/schedule.sgml#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#22 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#37 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#100 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#33 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#21 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.61 2009/09/01 18:01:01 danger Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.62 2011/02/13 17:53:26 manolis Exp $
SUBDIR =
SUBDIR+= 5-roadmap
@@ -25,6 +25,7 @@
SUBDIR+= fonts
SUBDIR+= formatting-media
SUBDIR+= freebsd-questions
+SUBDIR+= freebsd-update-server
SUBDIR+= geom-class
SUBDIR+= gjournal-desktop
SUBDIR+= hats
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#85 (text+ko) ====
@@ -1,4 +1,4 @@
-
+
@@ -1401,6 +1401,15 @@
&prompt.root; cd /usr/ports/x11/gnome2
&prompt.root; make install clean
+ For proper operation, GNOME requires
+ the /proc filesystem to be mounted. Add
+
+ proc /proc procfs rw 0 0
+
+ to /etc/fstab to mount
+ procfs automatically during
+ startup.
+
Once GNOME is installed,
the X server must be told to start
GNOME instead of a default window
@@ -1409,17 +1418,22 @@
The easiest way to start
GNOME is with
GDM, the GNOME Display Manager.
- GDM, which is installed as a part
- of the GNOME desktop (but is
- disabled by default), can be enabled by adding
- gdm_enable="YES" to
- /etc/rc.conf. Once you have rebooted,
+ GDM is installed as part
+ of the GNOME desktop, although
+ it is disabled by default. It can be enabled by adding this
+ line to /etc/rc.conf:
+
+ gdm_enable="YES"
+
+ Once you have rebooted,
GDM will start automatically.
- Additionally, to enable all GNOME
- services when GDM starts, add
- gnome_enable="YES" to
- /etc/rc.conf.
+ It is often desirable to start all
+ GNOME services together with
+ GDM. To achieve this, add the
+ following line to /etc/rc.conf:
+
+ gnome_enable="YES"GNOME may also be started
from the command-line by properly configuring a file named
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#99 (text+ko) ====
@@ -1,7 +1,7 @@
2008
20092010
+ 2011The FreeBSD Documentation
Project
@@ -6179,8 +6180,8 @@
JAVA_VENDORList of space-separated suitable JDK port vendors for
- the port (allowed values: freebsd bsdjava sun ibm
- blackdown).
+ the port (allowed values: freebsd bsdjava sun
+ blackdown openjdk).
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#34 (text+ko) ====
@@ -1,9 +1,9 @@
@@ -1495,6 +1495,17 @@
&prompt.root; cd /usr/ports/x11/gnome2
&prompt.root; make install clean
+ Voor een correcte werking, vereist
+ GNOME dat het
+ /proc bestandssysteem gekoppeld is.
+ Voeg
+
+ proc /proc procfs rw 0 0
+
+ toe aan /etc/fstab om
+ procfs automatisch te koppelen
+ tijdens het opstarten.
+
Zodra GNOME geïnstalleerd
is, moet de X server verteld worden dat in plaats van de
standaard window manager GNOME
@@ -1506,14 +1517,21 @@
GDM wordt meegeïnstalleerd
met de GNOME bureaubladomgeving,
maar staat standaard uitgeschakeld. Dit programma kan
- ingeschakeld worden door gdm_enable="YES"
- toe te voegen aan /etc/rc.conf. Na
- herstarten start GDM automatisch.
+ ingeschakeld worden door het volgende toe te voegen aan
+ /etc/rc.conf:
+
+ gdm_enable="YES"
+
+ Na een herstart zal GDM
+ automatisch gestart worden.
+
+ Meestal is het gewenst om alle
+ GNOME applicaties tegelijkertijd
+ met GDM te starten. Om dit te
+ bereiken moet de volgende regel worden toegevoegd aan
+ /etc/rc.conf:
- Verder kan gnome_enable="YES" aan
- /etc/rc.conf worden toegevoegd om alle diensten
- van GNOME aan te zetten wanneer
- GDM start.
+ gnome_enable="YES"GNOME kan ook gestart worden
vanaf de commandoregel door het bestand
==== //depot/projects/docproj_nl/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.507 2010/07/23 21:30:57 hrs Exp $
+ $FreeBSD: doc/share/sgml/man-refs.ent,v 1.511 2011/02/11 16:15:44 hrs Exp $
-->
@@ -157,6 +157,7 @@
+
@@ -3272,6 +3273,7 @@
+
@@ -3286,6 +3288,7 @@
+
@@ -3294,6 +3297,7 @@
+
@@ -3559,6 +3563,7 @@
+
@@ -3585,6 +3590,7 @@
+
@@ -3605,6 +3611,7 @@
+
@@ -3675,6 +3682,7 @@
+
@@ -3709,6 +3717,7 @@
+
@@ -3787,6 +3796,7 @@
+
@@ -3869,6 +3879,7 @@
+
@@ -5222,6 +5233,7 @@
+
==== //depot/projects/docproj_nl/www/en/docs/books.sgml#4 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
@@ -206,6 +206,13 @@
Tips and tricks to help you maximize the chances of getting
useful information from the -questions mailing list.
+
Build
+ Your Own FreeBSD Update Server
+ (freebsd-update-server)
+ Using a FreeBSD Update server allows a system
+ administrator to perform fast updates for a number of
+ machines from a local mirror.
+
Writing
a GEOM Class (geom-class)
A guide to GEOM internals, and writing your own class.
Information on what established (FreeBSD) track record the
- nominee has. This is not optional; it has become
- standard practice over the last couple of years.
+ nominee has. This is not optional.
Who has volunteered to become the mentor for the new
committer.
The email address of the nominee (remarkably often this
==== //depot/projects/docproj_nl/www/en/java/dists/16.sgml#4 (text+ko) ====
@@ -1,6 +1,6 @@
-
+
]>
@@ -12,6 +12,27 @@
+July 10, 2010:Greg
+Lewis' update to Build 20 of the
+&openjdk; 6 port is committed.
+
+January 16, 2010:Brian
+Gardner's update to Build 17 of the
+&openjdk; 6 port is committed.
+This update adds support for building a 'fastdebug' version of
+&openjdk; 6, updates the cacerts
+file and fixes font rendering.
+
+
+
May 5, 2009:Brian
Gardner's update to Build 16 of the
&openjdk; 6 port is committed.
==== //depot/projects/docproj_nl/www/en/java/news.xml#6 (text+ko) ====
@@ -20,11 +20,74 @@
- $FreeBSD: www/en/java/news.xml,v 1.10 2010/01/09 15:55:30 glewis Exp $
+ $FreeBSD: www/en/java/news.xml,v 1.11 2011/02/13 06:21:04 glewis Exp $
+ 2010
+
+
+ July
+
+
+ 10
+
+
+ &openjdk; 6 updated
+ to Build 20.
+
+
==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#22 (text+ko) ====
@@ -1,12 +1,12 @@
-
+
- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.62 2011/01/04 19:05:02 jkois Exp $
+ $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.64 2011/02/06 00:20:24 cperciva Exp $
@@ -1000,6 +1000,23 @@
+
+ Rokabear Hosting Services
+ http://rokabear.com/
+
+ Rokabear.com offers VMWare VPS and Dedicated servers that run
+ FreeBSD 8.1-RELEASE i386 and amd64. Rokabear has focused their
+ services towards knowledgeable users who know what they want,
+ and know how to run their systems their way. With VPS, Dedicated
+ and Colocation offerings, Rokabear.com knows how to take your
+ experience to the next level. Rokabear values its reputation for
+ uptime, reliability and performance as much as you do. That is
+ why we offer and use redundant power and network connections.
+ With packages starting at $35 a month, let Rokabear setup your
+ FreeBSD host today!
+
+
+
RootBSDhttp://www.rootbsd.net
@@ -1118,4 +1135,15 @@
energy consumption is remarkably low but retain performance.
+
+
+ Tarsnap
+ http://www.tarsnap.com/
+
+ Tarsnap is a secure online backup service for FreeBSD and other
+ unix-like operating systems. Tarsnap is owned and operated by a
+ FreeBSD developer (&a.cperciva;) and is proud to support FreeBSD
+ via donations to the FreeBSD Foundation.
+
+
==== //depot/projects/docproj_nl/www/share/sgml/events.xml#37 (text+ko) ====
@@ -10,7 +10,7 @@
- $FreeBSD: www/share/sgml/events.xml,v 1.93 2010/12/21 05:01:02 hrs Exp $
+ $FreeBSD: www/share/sgml/events.xml,v 1.94 2011/02/04 11:57:42 jkois Exp $
@@ -116,6 +116,34 @@
from commercial vendors.
+
+ Indiana LinuxFest 2011
+ http://www.indianalinux.org/cms/
+
+ 2011
+ 3
+ 25
+
+
+ 2011
+ 3
+ 27
+
+
+ USA
+ Indianapolis
+ Wyndam Indianapolis West Hotel
+
+
+ The Indiana LinuxFest is a community F/OSS conference, which is
+ showcasing the best the community has to offer in the way of
+ Free and Open Source Software, Open Hardware, and Free Culture.
+ We are also highlighting the best and brightest from all of
+ these communities from the hobbyist to professional level.
+ During the LinuxFest The BSD Certification Group will offer the
+ possibility to take their BSDA certification exam.
+
+
AsiaBSDCon 2011http://2011.asiabsdcon.org/
==== //depot/projects/docproj_nl/www/share/sgml/news.xml#100 (text+ko) ====
@@ -25,13 +25,36 @@
- $FreeBSD: www/share/sgml/news.xml,v 1.361 2011/01/25 13:17:22 danger Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.362 2011/02/04 11:03:18 jkois Exp $
2011
+
+ 2
+
+
+ 3
+
+
+ &os; 7.4/8.2-RC3 Available
+
+
The third (and probably last) Release Candidate builds
+ for the &os;-7.4/8.2 release cycles are now available. For
+ 8.2-RC3 the amd64, i386, ia64, pc98, powerpc, and sparc64
+ architectures are available. For 7.4-RC3 the amd64, i386,
+ pc98, and sparc64 architectures are available. ISO images
+ for these architectures can be downloaded from most of the
+ &os;
+ mirror sites. Please see the official announcement
+ for further details about these releases.
+
+
+
+
1
==== //depot/projects/docproj_nl/www/share/sgml/release.ent#33 (text+ko) ====
@@ -1,4 +1,4 @@
-
+
@@ -631,35 +631,87 @@
- Prepare the Memory Stick
+ Write The Image File to the Memory Stick
+
+
+ Using FreeBSD To Write the Image
+
+
+ The example below
+ lists /dev/da0 as the
+ target device from which you will be booting. Be very careful
+ that you have the correct device as the output target, or you
+ may destroy your existing data.
+
+
+ Set the kern.geom.debugflags sysctl to be
+ able to write a master boot record to the target device.
+
+
+ The example below
+ lists /dev/da0 as the
+ target device where the image will be written. Be very careful
+ that you have the correct device as the output target, or you
+ may destroy your existing data.
+
+
+
+ Writing the Image with &man.dd.1;
+
+ Set the kern.geom.debugflags sysctl to
+ be able to write a master boot record to the target
+ device.
+
+ &prompt.root; sysctl kern.geom.debugflags=16
+
+ The .img file
+ is not a regular file you copy to the
+ memory stick. It is an image of the complete contents of the
+ disk. This means that you cannot simply
+ copy files from one disk to another. Instead, you must use
+ &man.dd.1; to write the image directly to the disk:
+
+ &prompt.root; dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/da0 bs=64k
+
+
-
- The example below lists
- /dev/da0 as the target device from
- which you will be booting. Be very careful that you
- have the correct device as the output target, or you may
- destroy your existing data.
-
+
+ Using &windows; To Write the Image
- Set the kern.geom.debugflags sysctl
- to be able to write a master boot record to the target
- device.
+
+ The example below
+ lists H: as the drive
+ letter of the device where the image will be written. Be very
+ careful that you have the correct device as the output target,
+ or you may destroy existing data.
+
- &prompt.root; sysctl kern.geom.debugflags=16
-
+
+ Obtaining Image Writer for Windows
-
- Write the Image File to the Memory Stick
+ Image Writer for Windows is a
+ free application that can correctly write an image file to a
+ memory stick. Download it
+ from
+ and extract it into a folder.
+
- The .img file is
- not a regular file you copy to the
- memory stick. It is an image of the complete contents of
- the disk. This means that you cannot
- simply copy files from one disk to another. Instead, you
- must use &man.dd.1; to write the image directly to the
- disk:
+
+ Writing The Image with Image Writer
- &prompt.root; dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/da0 bs=64k
+ Double-click
+ the Win32DiskImager icon to start
+ the program. Verify that the drive letter shown
+ under Device is the drive
+ with the memory stick. Click the folder icon and select the
+ image to be written to the memory stick.
+ Click Save to accept the image file
+ name. Verify that everything is correct, and that no folders
+ on the memory stick are open in other windows. Finally,
+ click Write to write the image file to
+ the drive.
+
+
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#20 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -1407,7 +1407,7 @@
proc /proc procfs rw 0 0to /etc/fstab to mount
- procfs automatically during
+ &man.procfs.5; automatically during
startup.Once GNOME is installed,
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#35 (text+ko) ====
@@ -1,9 +1,9 @@
@@ -1503,8 +1503,7 @@
proc /proc procfs rw 0 0toe aan /etc/fstab om
- procfs automatisch te koppelen
- tijdens het opstarten.
+ &man.procfs.5; automatisch te koppelen tijdens het opstarten.Zodra GNOME geïnstalleerd
is, moet de X server verteld worden dat in plaats van de
==== //depot/projects/docproj_nl/www/en/gnome/news.xml#8 (text+ko) ====
@@ -19,7 +19,7 @@
- $FreeBSD: www/en/gnome/news.xml,v 1.154 2010/11/20 23:23:37 ryusuke Exp $
+ $FreeBSD: www/en/gnome/news.xml,v 1.155 2011/02/16 13:04:43 bland Exp $
@@ -34,7 +34,7 @@
Announcing GNOME 2.32.1 for FreeBSD!
-
Presenting GNOME 2.32.1 for FreeBSD. The offical release
+
The FreeBSD GNOME Team would like to thank Anders F Bjorklund for
- doing the initual packagekit porting.
+ doing the initial packagekit porting.
And the following contributors and testers for there help with this
release:
@@ -548,7 +548,7 @@
and ports and
packages
- are available for everyone's faorite operating system. This
+ are available for everyone's favorite operating system. This
release is a polishing of 2.18.0, so expect a more stable,
nicer looking desktop experience. On top of that, some of our
users have also submitted
From trasz at FreeBSD.org Sun Feb 20 16:57:15 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 20 16:57:17 2011
Subject: PERFORCE change 188975 for review
Message-ID: <201102201657.p1KGvEj8036490@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188975?ac=10
Change 188975 by trasz@trasz_victim on 2011/02/20 16:56:30
Fix copyinstr(9) error handling.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#29 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#29 (text+ko) ====
@@ -195,8 +195,8 @@
if (error != 0)
return (error);
error = copyinstr(uap->namebuf, lcname, sizeof(lcname), NULL);
- if (error == ENAMETOOLONG)
- return (EINVAL);
+ if (error != 0)
+ return (error);
newcred = crget();
newlc = loginclass_find(lcname);
From trasz at FreeBSD.org Sun Feb 20 17:01:38 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 20 17:01:41 2011
Subject: PERFORCE change 188976 for review
Message-ID: <201102201701.p1KH1bYU037557@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188976?ac=10
Change 188976 by trasz@trasz_victim on 2011/02/20 17:00:33
Prevent root from crashing the system by adding a rule with too long
loginclass name.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#30 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#33 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#30 (text+ko) ====
@@ -113,8 +113,8 @@
{
struct loginclass *lc, *newlc;
- KASSERT(strlen(name) <= MAXLOGNAME - 1,
- ("loginclass_find: got too long name"));
+ if (strlen(name) > MAXLOGNAME - 1)
+ return (NULL);
newlc = malloc(sizeof(*newlc), M_LOGINCLASS, M_ZERO | M_WAITOK);
container_create(&newlc->lc_container);
@@ -200,6 +200,7 @@
newcred = crget();
newlc = loginclass_find(lcname);
+ KASSERT(newlc != NULL, ("loginclass_find() failed"));
PROC_LOCK(p);
oldcred = crcopysafe(p, newcred);
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#33 (text+ko) ====
@@ -837,6 +837,10 @@
case RCTL_SUBJECT_TYPE_LOGINCLASS:
rule->rr_subject.hr_loginclass =
loginclass_find(subject_idstr);
+ if (rule->rr_subject.hr_loginclass == NULL) {
+ error = ENAMETOOLONG;
+ goto out;
+ }
break;
case RCTL_SUBJECT_TYPE_JAIL:
rule->rr_subject.rs_prison =
From trasz at FreeBSD.org Sun Feb 20 17:20:17 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 20 17:20:19 2011
Subject: PERFORCE change 188977 for review
Message-ID: <201102201720.p1KHKGW9041421@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188977?ac=10
Change 188977 by trasz@trasz_victim on 2011/02/20 17:19:36
Properly pass error from rctl_string_to_rule().
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#34 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#34 (text+ko) ====
@@ -780,8 +780,8 @@
return (1);
}
-static struct rctl_rule *
-rctl_rule_from_string(char *rulestr)
+static int
+rctl_string_to_rule(char *rulestr, struct rctl_rule **rulep)
{
int error = 0;
char *subjectstr, *subject_idstr, *resourcestr, *actionstr,
@@ -862,7 +862,7 @@
mtx_unlock(&rule->rr_subject.rs_prison->pr_mtx);
break;
default:
- panic("rctl_rule_from_string: unknown subject type %d",
+ panic("rctl_string_to_rule: unknown subject type %d",
rule->rr_subject_type);
}
}
@@ -903,12 +903,12 @@
}
out:
- if (error != 0) {
+ if (error == 0)
+ *rulep = rule;
+ else
rctl_rule_release(rule);
- return (NULL);
- }
- return (rule);
+ return (error);
}
/*
@@ -1230,12 +1230,12 @@
sx_slock(&allproc_lock);
sx_slock(&allprison_lock);
- filter = rctl_rule_from_string(inputstr);
+ error = rctl_string_to_rule(inputstr, &filter);
free(inputstr, M_RCTL);
- if (filter == NULL) {
+ if (error != 0) {
sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
- return (EINVAL);
+ return (error);
}
switch (filter->rr_subject_type) {
@@ -1328,12 +1328,12 @@
sx_slock(&allproc_lock);
sx_slock(&allprison_lock);
- filter = rctl_rule_from_string(inputstr);
+ error = rctl_string_to_rule(inputstr, &filter);
free(inputstr, M_RCTL);
- if (filter == NULL) {
+ if (error != 0) {
sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
- return (EINVAL);
+ return (error);
}
again:
@@ -1404,12 +1404,12 @@
sx_slock(&allproc_lock);
sx_slock(&allprison_lock);
- filter = rctl_rule_from_string(inputstr);
+ error = rctl_string_to_rule(inputstr, &filter);
free(inputstr, M_RCTL);
- if (filter == NULL) {
+ if (error != 0) {
sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
- return (EINVAL);
+ return (error);
}
if (filter->rr_subject_type == RCTL_SUBJECT_TYPE_UNDEFINED) {
@@ -1480,12 +1480,12 @@
sx_slock(&allproc_lock);
sx_slock(&allprison_lock);
- rule = rctl_rule_from_string(inputstr);
+ error = rctl_string_to_rule(inputstr, &rule);
free(inputstr, M_RCTL);
- if (rule == NULL) {
+ if (error != 0) {
sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
- return (EINVAL);
+ return (error);
}
/*
* The 'per' part of a rule is optional.
@@ -1525,12 +1525,12 @@
sx_slock(&allproc_lock);
sx_slock(&allprison_lock);
- filter = rctl_rule_from_string(inputstr);
+ error = rctl_string_to_rule(inputstr, &filter);
free(inputstr, M_RCTL);
- if (filter == NULL) {
+ if (error != 0) {
sx_sunlock(&allprison_lock);
sx_sunlock(&allproc_lock);
- return (EINVAL);
+ return (error);
}
error = rctl_rule_remove(filter);
From trasz at FreeBSD.org Sun Feb 20 18:05:14 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Feb 20 18:05:16 2011
Subject: PERFORCE change 188979 for review
Message-ID: <201102201805.p1KI5DAL050850@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188979?ac=10
Change 188979 by trasz@trasz_victim on 2011/02/20 18:04:39
Improve errno usage.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#35 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#35 (text+ko) ====
@@ -937,11 +937,11 @@
if (rule->rr_action == RCTL_ACTION_DENY &&
(rule->rr_resource == RUSAGE_CPU ||
rule->rr_resource == RUSAGE_WALLCLOCK))
- return (EINVAL);
+ return (EOPNOTSUPP);
if (rule->rr_per == RCTL_SUBJECT_TYPE_PROCESS &&
rusage_is_sloppy(rule->rr_resource))
- return (EINVAL);
+ return (EOPNOTSUPP);
/*
* Make sure there are no duplicated rules. Also, for the "deny"
@@ -963,7 +963,7 @@
* No resource limits for system processes.
*/
if (p->p_flag & P_SYSTEM)
- return (EINVAL);
+ return (EPERM);
rctl_container_add_rule(p->p_container, rule);
/*
@@ -1783,35 +1783,35 @@
rctl_get_usage(struct thread *td, struct rctl_get_usage_args *uap)
{
- return (EOPNOTSUPP);
+ return (ENOSYS);
}
int
rctl_get_rules(struct thread *td, struct rctl_get_rules_args *uap)
{
- return (EOPNOTSUPP);
+ return (ENOSYS);
}
int
rctl_get_limits(struct thread *td, struct rctl_get_limits_args *uap)
{
- return (EOPNOTSUPP);
+ return (ENOSYS);
}
int
rctl_add_rule(struct thread *td, struct rctl_add_rule_args *uap)
{
- return (EOPNOTSUPP);
+ return (ENOSYS);
}
int
rctl_remove_rule(struct thread *td, struct rctl_remove_rule_args *uap)
{
- return (EOPNOTSUPP);
+ return (ENOSYS);
}
#endif /* !RCTL */
From rene at FreeBSD.org Sun Feb 20 21:36:00 2011
From: rene at FreeBSD.org (Rene Ladan)
Date: Sun Feb 20 21:36:03 2011
Subject: PERFORCE change 188984 for review
Message-ID: <201102202135.p1KLZxu9096235@skunkworks.freebsd.org>
http://p4web.freebsd.org/@@188984?ac=10
Change 188984 by rene@rene_acer on 2011/02/20 21:35:14
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#34 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#28 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#100 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#51 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#54 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#21 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/eadler.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#51 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#48 integrate
.. //depot/projects/docproj_nl/www/en/java/news.xml#7 integrate
.. //depot/projects/docproj_nl/www/nl/administration.sgml#26 integrate
.. //depot/projects/docproj_nl/www/nl/index.xsl#15 integrate
.. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#15 integrate
.. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#17 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#101 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#34 (text+ko) ====
@@ -9,7 +9,7 @@
The &os; Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.291 2011/02/17 15:43:01 ryusuke Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.292 2011/02/19 09:34:25 linimon Exp $1999
@@ -1052,7 +1052,9 @@
Conventions and TraditionsAs a new developer there are a number of things you should do
- first. The first set is specific to committers only.
+ first. The first set is specific to committers only. (If you are
+ not a committer, e.g. have GNATS-only access, then your mentor needs
+ to do these things for you.)Guidelines For Committers
@@ -1142,16 +1144,19 @@
- If you subscribe to &a.svn-src-all.name; or the &a.cvsall;,
+ (For committers only:)
+ If you subscribe to &a.svn-src-all.name; or the &a.cvsall;,
you will probably want to unsubscribe to avoid receiving duplicate
copies of commit messages and their followups.
+ All src commits should go to
&os.current; first before being merged to &os.stable;. No major
new features or high-risk modifications should be made to the
&os.stable; branch.
+
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#28 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -5662,10 +5662,17 @@
here.
To enable support for CARP, the &os;
- kernel must be rebuilt with the following option:
+ kernel must be rebuilt as described in with the following option:
device carp
+ Alternatively, the if_carp.ko module can
+ be loaded at boot time. Add the following line to the
+ /boot/loader.conf:
+
+ if_carp_load="YES"
+
CARP functionality should now be available
and may be tuned via several sysctl
OIDs:
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#100 (text+ko) ====
@@ -1,7 +1,7 @@
9.0-CURRENT after the addition of log2 to
libm.
+
+ 900028
+ December 21, 2010
+ 9.0-CURRENT after the addition of the Hhook (Helper
+ Hook), Khelp (Kernel Helpers) and Object Specific Data
+ (OSD) KPIs.
+
+
+ 900029
+ December 28, 2010
+ 9.0-CURRENT after the modification of the TCP stack
+ to allow Khelp modules to interact with it via helper
+ hook points and store per-connection data in the TCP
+ control block.
+
+
+ 900030
+ January 12, 2011
+ 9.0-CURRENT after the update of libdialog to version
+ 20100428.
+
+
+ 900031
+ February 7, 2011
+ 9.0-CURRENT after the addition of
+ pthread_getthreadid_np(3).
+
+
+ 900032
+ February 8, 2011
+ 9.0-CURRENT after the removal of the uio_yield
+ prototype and symbol.
+
+
+ 900033
+ February 18, 2011
+ 9.0-CURRENT after the update of binutils to version
+ 2.17.50.
+
==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#51 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.532 2010/12/07 23:00:16 flo Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.533 2011/02/18 04:33:48 linimon Exp $
-->
aaron@FreeBSD.org">
@@ -332,6 +332,8 @@
dwmalone@FreeBSD.org">
+eadler@FreeBSD.org">
+
ed@FreeBSD.org">
edwin@FreeBSD.org">
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#54 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -6190,11 +6190,18 @@
zoals in het voorbeeld dat hier is gegeven.
Om ondersteuning voor CARP aan te zetten,
- dient de &os;-kernel herbouwd te worden met de volgende
+ dient de &os;-kernel herbouwd zoals beschreven in
+ met de volgende
optie:device carp
+ Als alternatief kan de if_carp.ko
+ module geladen worden tijdens het opstarten. Voeg de volgende
+ regel toe aan /boot/loader.conf:
+
+ if_carp_load="YES"
+
De functionaliteit van CARP zou nu
beschikbaar moeten zijn en kan met verschillende
sysctl-OIDs worden
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#21 (text+ko) ====
@@ -1,10 +1,10 @@
@@ -678,36 +678,88 @@
- Maak de geheugenstick klaar voor gebruik
+ Schrijf het beeldbestand naar de geheugenstick
+
+
+ &os; gebruiken om het beeldbestand te schrijven
+
+
+ Het onderstaande voorbeeld vermeldt
+ /dev/da0 als het
+ doelapparaat van waar af u zal opstarten. Zorg er voor dat u het
+ juiste apparaat als het uitvoerapparaat opgeeft om te voorkomen
+ dat u uw bestaande gegevens vernietigd.
+
+
+ Stel de sysctl kern.geom.debugflags in om
+ een master boot record naar het doelapparaat te kunnen
+ schrijven.
+
+
+ Het onderstaande voorbeeld vermeldt
+ /dev/da0 als het
+ doelapparaat van waar af u zal opstarten. Zorg er voor dat u het
+ juiste apparaat als het uitvoerapparaat opgeeft om te voorkomen
+ dat u uw bestaande gegevens vernietigd.
+
+
+
+ Het beeldbestand schrijven door middel van &man.dd.1;
+
+ Stel de sysctl kern.geom.debugflags in om
+ een master boot record naar het doelapparaat te kunnen
+ schrijven.
+
+ &prompt.root; sysctl kern.geom.debugflags=16
+
+ Het .img-bestand is
+ geen gewoon bestand dat u naar de geheugenstick
+ kopieert. Het is een afbeelding van de complete inhoud van de
+ stick. Dit betekent dat u de bestanden niet
+ op de gewone manier van de ene schijf naar de andere kopieëren.
+ U dient in plaats hiervan &man.dd.1; gebruiken om de afbeelding
+ direct naar de schijf te schrijven:
-
- Het onderstaande voorbeeld vermeldt
- /dev/da0 als het
- doelapparaat van waar af u zal opstarten. Zorg er voor dat u het
- juiste apparaat als het uitvoerapparaat opgeeft om te voorkomen
- dat u uw bestaande gegevens vernietigd.
-
+ &prompt.root; dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/da0 bs=64k
+
+
- Stel de sysctl kern.geom.debugflags in om
- een master boot record naar het doelapparaat te kunnen
- schrijven.
+
+ &windows; gebruiken om het beeldbestand te schrijven
- &prompt.root; sysctl kern.geom.debugflags=16
-
+
+ Het onderstaande voorbeeld vermeldt
+ H: als de schijfletter
+ van het apparaat waar het bestand op wordt geschreven. Zorg er
+ voor dat u het juiste apparaat alshet uitvoerapparaat opgeeft om
+ te voorkomen dat u uw bestaande gegevens vernietigd.
+
+
+ Image Writer for Windows verkrijgen
-
- Schrijf het imagebestand naar de geheugenstick
+ Image Writer for Windows
+ is een gratis applicatie die een beeld bestand correct naar
+ een geheugen-stick kan schrijven. Download deze van
+
+ en pak deze uit in een map.
+
- Het .img-bestand is
- geen gewoon bestand dat u naar de geheugenstick
- kopieert. Het is een afbeelding van de complete inhoud van de
- stick. Dit betekent dat u de bestanden niet
- op de gewone manier van de ene schijf naar de andere kopieëren.
- U dient in plaats hiervan &man.dd.1; gebruiken om de afbeelding
- direct naar de schijf te schrijven:
+
+ Writing The Image with Image Writer
- &prompt.root; dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/da0 bs=64k
+ Dubbelklik op het Win23DiskImager
+ icoon om het programma te starten. Controleer of de schijf
+ letter welke getoond is onder Device
+ de schijf is van de geheugen-stick. Klik op het map icoon
+ en selecteer het bestand welke naar de geheugen-stick
+ geschreven moet worden. Klik op Save
+ om het bestand te accepteren. Controleer of alles correct is
+ en dat er geen bestanden en dergelijke open zijn in andere
+ windows. Klik als laatste op Write
+ om het bestand te schrijven naar de schijf.
+
+
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#51 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -14,6 +14,11 @@
&pgpkey.tabthorpe;
+
+ &a.eadler;
+ &pgpkey.eadler;
+
+
&a.shaun;
&pgpkey.shaun;
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#48 (text+ko) ====
@@ -1,5 +1,5 @@
-
+
@@ -95,6 +95,7 @@
+
==== //depot/projects/docproj_nl/www/en/java/news.xml#7 (text+ko) ====
@@ -20,7 +20,7 @@
- $FreeBSD: www/en/java/news.xml,v 1.11 2011/02/13 06:21:04 glewis Exp $
+ $FreeBSD: www/en/java/news.xml,v 1.12 2011/02/19 03:55:41 ryusuke Exp $
@@ -1301,7 +1301,7 @@
December
- . 21
+ 21jdk1.1.7.V98-12-21.tar.gz
==== //depot/projects/docproj_nl/www/nl/administration.sgml#26 (text+ko) ====
@@ -1,5 +1,5 @@
+
%developers;
@@ -7,7 +7,7 @@
&header;
@@ -68,7 +68,6 @@
Coördinatoren
De Referentiesysteem Beheerders zijn verantwoordelijk voor het beheren,
- bijwerken en onderhouden van de referentiesystemen in het &os;-cluster.
- Deze systemen zijn beschikbaar voor alle &os;-committers.