From julian at FreeBSD.org Wed Oct 1 00:00:34 2008 From: julian at FreeBSD.org (Julian Elischer) Date: Wed Oct 1 00:00:41 2008 Subject: PERFORCE change 150734 for review Message-ID: <200810010000.m9100Xxh007419@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150734 Change 150734 by julian@julian_trafmon1 on 2008/09/30 23:59:56 slight mismerges and ommisions Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#18 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#47 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#18 (text+ko) ==== @@ -564,6 +564,34 @@ */ #ifdef _KERNEL +/* + * Data structure to cache our ucred related + * information. This structure only gets used if + * the user specified UID/GID based constraints in + * a firewall rule. + */ +struct ip_fw_ugid { + gid_t fw_groups[NGROUPS]; + int fw_ngroups; + uid_t fw_uid; + int fw_prid; +}; + +#define IPFW_TABLES_MAX 128 +struct ip_fw_chain { + struct ip_fw *rules; /* list of rules */ + struct ip_fw *reap; /* list of rules to reap */ + LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ + struct radix_node_head *tables[IPFW_TABLES_MAX]; + struct rwlock rwmtx; +}; + +struct table_entry { + struct radix_node rn[2]; + struct sockaddr_in addr, mask; + u_int32_t value; +}; + /* Return values from ipfw_chk() */ enum { IP_FW_PASS = 0, @@ -648,14 +676,6 @@ extern ip_fw_chk_t *ip_fw_chk_ptr; #define IPFW_LOADED (ip_fw_chk_ptr != NULL) -struct ip_fw_chain { - struct ip_fw *rules; /* list of rules */ - struct ip_fw *reap; /* list of rules to reap */ - LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ - struct radix_node_head *tables[IPFW_TABLES_MAX]; - struct rwlock rwmtx; -}; - #ifdef IPFW_INTERNAL #define IPFW_LOCK_INIT(_chain) \ @@ -714,6 +734,7 @@ u_int64_t _norule_counter; struct callout _ipfw_timeout; eventhandler_tag _ifaddr_event_tag; + struct ip_fw_ugid _fw_ugid_cache; }; #endif @@ -753,7 +774,9 @@ #define V_dyn_max VNET_IPFW(dyn_max) #define V_norule_counter VNET_IPFW(norule_counter) #define V_ipfw_timeout VNET_IPFW(ipfw_timeout) +#define V_ipfw_timeout VNET_IPFW(ipfw_timeout) #define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) +#define V_fw_ugid_cache VNET_IPFW(fw_ugid_cache) #endif /* _KERNEL */ #endif /* _IPFW2_H */ ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#47 (text+ko) ==== @@ -74,7 +74,6 @@ #define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */ -#include #include #include #include @@ -94,6 +93,7 @@ #include #include #include +#include #include #include @@ -2162,7 +2162,7 @@ * these types of constraints, as well as decrease contention * on pcb related locks. */ -#if 0 +#ifndef VIMAGE struct ip_fw_ugid fw_ugid_cache; /* XXX Marko revisit this */ #endif int ugid_lookup = 0; @@ -2623,7 +2623,8 @@ (ipfw_insn_u32 *)cmd, proto, oif, dst_ip, dst_port, - src_ip, src_port, &fw_ugid_cache, + src_ip, src_port, + &V_fw_ugid_cache, &ugid_lookup, args->inp); break; From rfrench at FreeBSD.org Wed Oct 1 01:37:13 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Wed Oct 1 01:37:18 2008 Subject: PERFORCE change 150736 for review Message-ID: <200810010137.m911bCnu022791@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150736 Change 150736 by rfrench@rfrench_mpls on 2008/10/01 01:36:30 Added socket.h so I can add a AF_MPLS family. Added a route structure type to mpls.h. Will probably just add static routes to the initialisation as I have to start writing up a dissertation paper for this in the next 2 weeks. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#6 edit .. //depot/projects/soc2008/rfrench_mpls/sys/socket.h#1 add Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#6 (text+ko) ==== @@ -99,6 +99,11 @@ //#endif }; +struct route_mpls { + struct rtentry *ro_rt; + struct sockaddr_mpls ro_dst; +}; + #define MPLS_OP_POP 1 #define MPLS_OP_PUSH 2 #define MPLS_OP_SWAP 3 From rfrench at FreeBSD.org Wed Oct 1 03:10:48 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Wed Oct 1 03:10:54 2008 Subject: PERFORCE change 150737 for review Message-ID: <200810010310.m913Al3n085181@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150737 Change 150737 by rfrench@rfrench_mpls on 2008/10/01 03:10:33 Added the AF_MPLS type to socket.h I replaced AF_VENDOR00, which I hope was the right thing to do. Changed code to use this value as well as cleaned up the domain code. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#8 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#7 edit .. //depot/projects/soc2008/rfrench_mpls/sys/socket.h#2 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#8 (text+ko) ==== @@ -125,7 +125,7 @@ for (i = 0; i < mpls_inkloop; i++) { bzero(&sa_mpls, sizeof(sa_mpls)); smpls = &sa_mpls; - smpls->smpls_family = NETISR_MPLS; + smpls->smpls_family = AF_MPLS; smpls->smpls_len = sizeof(*smpls); smpls->smpls_in_ifindex = ifp->if_index; smpls->smpls_in_label = shim->shim_label & MPLS_LABEL_MASK; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#7 (text+ko) ==== @@ -75,11 +75,12 @@ }; struct domain mplsdomain = { - NETISR_MPLS, "mpls", mpls_init, 0, 0, - mplssw, - &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, - rn_inithead, - offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, + .dom_family = AF_MPLS, + .dom_name = "mpls", + .dom_protosw = mplssw, + .dom_protoswNPROTOSW = &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, + .dom_rtattach = rn_inithead, + .dom_rtoffset = offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3, sizeof(struct sockaddr_mpls) }; ==== //depot/projects/soc2008/rfrench_mpls/sys/socket.h#2 (text+ko) ==== @@ -215,7 +215,7 @@ * even numbered constants for FreeBSD until 134 as odd numbered AF_ * constants 39-133 are now reserved for vendors. */ -#define AF_VENDOR00 39 +#define AF_MPLS 39 /* MPLS protocol family */ #define AF_VENDOR01 41 #define AF_VENDOR02 43 #define AF_VENDOR03 45 From pgj at FreeBSD.org Wed Oct 1 07:25:07 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Wed Oct 1 07:25:13 2008 Subject: PERFORCE change 150740 for review Message-ID: <200810010725.m917P6nl062808@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150740 Change 150740 by pgj@kolbasz on 2008/10/01 07:24:49 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile#2 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#6 integrate .. //depot/projects/docproj_hu/www/hu/search/search.sgml#15 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/hu_HU.ISO8859-2/articles/Makefile,v 1.6 2008/06/25 11:28:03 gabor Exp $ +# $FreeBSD: doc/hu_HU.ISO8859-2/articles/Makefile,v 1.7 2008/09/30 21:02:25 pgj Exp $ # # The FreeBSD Hungarian Documentation Project ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#7 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#6 (text+ko) ==== @@ -8,7 +8,7 @@ Please keep this file sorted. - $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent,v 1.3 2008/06/25 11:28:10 gabor Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent,v 1.4 2008/09/30 20:47:33 pgj Exp $ --> - In versies voor &os; 5.3 bestond de parameter - add niet. In die gevallen dient in - plaats daarvan set gebruikt te worden - als in het onderstaande voorbeeld. - - Dit is een slecht idee, omdat het voorkomt dat alle gebruikers ook maar het meest eenvoudige commando kunnen uitvoeren, zoals ls. Een betere lijst met @@ -1534,7 +1527,7 @@ instellingen zijn. De meest onwaarschijnlijke plaats zou een persoonlijk werkstation met slechts twee of drie gebruikers zijn. - + @@ -1865,7 +1858,7 @@ /dev biba/equal /dev/* biba/equal -/var biba/equal +/var biba/equal /var/spool biba/equal /var/spool/* biba/equal @@ -1999,8 +1992,8 @@ met &man.mac.seeotheruids.4; naast elkaar bestaan en zowel toegang tot systeemobjecten als tot gebruikersprocessen ontzeggen. - Begin door de volgende regels aan - /boot/loader.conf toe te voegen: + Begin door de volgende regel aan + /boot/loader.conf toe te voegen: mac_seeotheruids_enabled="YES" @@ -2142,7 +2135,7 @@ Bij het wisselen van root naar een andere gebruiker in het systeem, verschijnt de foutmelding - _secure_path: unable to state .login_conf. + _secure_path: unable to state .login_conf. Deze melding komt meestal voor als de gebruiker een hogere labelinstelling heeft dan de gebruiker waarnaar wordt From rene at FreeBSD.org Thu Oct 2 21:08:13 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Oct 2 21:08:20 2008 Subject: PERFORCE change 150817 for review Message-ID: <200810022108.m92L8CYx067637@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150817 Change 150817 by rene@rene_self on 2008/10/02 21:08:02 MFen basics/chapter.sgml 1.153 -> 1.154 Checked build, spelling (diff only), whitespace Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#5 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.17 2008/09/14 22:32:27 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml - %SRCID% 1.153 + %SRCID% 1.154 --> @@ -760,6 +760,150 @@ Meer informatie voor beheerders staat in &man.chflags.1; en &man.chflags.2;. + + + + + + Tom + Rhodes + Bijgedragen door + + + + + De setuid-, setgid-, en klevende toestemmingen + + Buiten de toestemmingen die reeds besproken zijn, zijn er + nog drie specifieke instellingen waarvan alle beheerders kennis + dienen te hebben. Dit zijn de setuid-, + setgid-, en sticky + toestemmingen. + + Deze instellingen zijn belangrijk voor sommige + &unix;-bewerkingen omdat ze functionaliteit bieden die + normaliter niet aan normale gebruikers wordt gegeven. Om ze te + begrijpen, dient ook het verschil tussen de echte gebruikers-ID + en de effectieve gebruikers-ID opgemerkt te worden. + + De echte gebruikers-ID is de UID die het + proces start of bezit. De effectieve UID is + de gebruikers-ID waaronder het proces draait. Bijvoorbeeld, het + gereedschap &man.passwd.1; draait met de echte gebruikers-ID van + de gebruiker die het wachtwoord verandert; echter, om de + database met wachtwoorden te manipuleren, draait het met de + effectieve ID van de gebruiker root. Dit + is wat normale gebruikers in staat stelt om hun wachtwoorden te + veranderen zonder een fout Permission + Denied te zien. + + + De &man.mount.8;-optie nosuid zorgt + ervoor dat deze binairen zwijgend falen. Dit houdt in dat ze + niet worden uitgevoerd zonder ooit de gebruiker op de hoogte + te stellen. Deze optie is ook niet geheel betrouwbaar + aangezien een nosuid-wrapper dit volgens de + handleidingpagina &man.mount.8; kan omzeilen. + + + De setuid-toestemming kan aangezet worden door het cijfer + vier (4) voor een toestemmingenverzameling te plaatsen zoals te + zien is in het volgende voorbeeld: + + &prompt.root; chmod 4755 suidvoorbeeld.sh + + De toestemmingen op het bestand + suidvoorbeeld.sh dienen er nu als volgt uit + te zien: + + -rwsr-xr-x 1 trhodes trhodes 63 Aug 29 06:36 suidvoorbeeld.sh + + Het zou in dit voorbeeld te zien moeten zijn dat een + s nu deel is van de toestemmingenverzameling + bestemd voor de bestandseigenaar, en de uitvoerbare bit + vervangt. Dit staat gereedschappen toe die verhoogde + toestemmingen nodig hebben, zoals passwd. + + Open twee terminals om dit in real-time te zien. Start op + het ene het proces passwd als een normale + gebruiker. Controleer de procestabel terwijl het op een nieuw + wachtwoord wacht en kijk naar de gebruikersinformatie van het + commando passwd. + + In terminal A: + + Changing local password for trhodes +Old Password: + + In terminal B: + + &prompt.root; ps aux | grep passwd + + trhodes 5232 0.0 0.2 3420 1608 0 R+ 2:10AM 0:00.00 grep passwd +root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 + + Zoals boven vermeld, wordt passwd door + een normale gebruiker gedraaid, maar gebruikt het de effectieve + UID van root. + + De setgid-toestemming voert dezelfde + functie uit als de setuid-toestemming; + behalve dat het de groepsinstellingen verandert. Wanneer een + applicatie of gereedschap met deze instelling wordt gedraaid, + krijgt het de toestemmingen gebaseerd op de groep die het + bestand bezit, niet op de gebruiker die het proces startte. + + Om de setgid-toestemming op een bestand + aan te zetten, dient een voorlopende twee (2) aan het commando + chmod gegeven te worden zoals in het volgende + voorbeeld: + + &prompt.root; chmod 2755 suidvoorbeeld.sh + + De nieuwe instelling kan zoals hierboven bekeken worden, + merk op dat de s nu in het veld bestemd voor + de instellingen van de groepstoestemmingen staat: + + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidvoorbeeld.sh + + + In deze voorbeelden zal het shellscript niet met een + andere EUID of effectief gebruikers-ID + draaien, zelfs al is het shellscript uitvoerbaar. Dit is + omdat shellscripts geen toegang hebben tot de + &man.setuid.2;-systeemaanroepen. + + + De eerste twee speciale toestemmingsbits die we besproken + hebben (de toestemmingsbits setuid en + setgid) kunnen de systeemveiligheid verlagen, + door verhoogde toestemmingen toe te staan. Er is een derde bit + voor speciale toestemmingen die de veiligheid van een systeem + kan verhogen: de klevende bit. + + De klevende bit, wanneer deze op een map + is ingesteld, staat alleen het verwijderen van bestanden toe + door de eigenaar van die bestanden. Deze + toestemmingenverzameling is nuttig om het verwijderen van + bestanden in publieke mappen, zoals /tmp, door gebruikers die het + bestand niet bezitten te voorkomen. Zet een één + (1) voor de toestemming om deze toestemming te gebruiken. + Bijvoorbeeld: + + &prompt.root; chmod 1777 /tmp + + Het effect kan nu met het commando ls + bekeken worden: + + &prompt.root; ls -al / | grep tmp + + drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp + + De toestemming klevende bit is te + onderscheiden met de t aan het einde van de + verzameling. + @@ -1400,7 +1544,7 @@ d Partitie d had vroeger een - speciale betekenis, maar die is verdwenen. + speciale betekenis, maar die is verdwenen. d zou nu kunnen werken als een normale partitie. From rene at FreeBSD.org Thu Oct 2 21:12:17 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Thu Oct 2 21:12:23 2008 Subject: PERFORCE change 150818 for review Message-ID: <200810022112.m92LCHRY068493@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150818 Change 150818 by rene@rene_self on 2008/10/02 21:12:09 Propose a small change (suidexample.sh -> sgidexample.sh when setting the setgid permission). Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 (text+ko) ==== @@ -748,13 +748,13 @@ file, provide the chmod command with a leading two (2) as in the following example: - &prompt.root; chmod 2755 suidexample.sh + &prompt.root; chmod 2755 sgidexample.sh The new setting may be viewed as before, notice the s is now in the field designated for the group permission settings: - -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidexample.sh + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 sgidexample.sh In these examples, even though the shell script in ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#6 (text+ko) ==== @@ -858,13 +858,13 @@ chmod gegeven te worden zoals in het volgende voorbeeld: - &prompt.root; chmod 2755 suidvoorbeeld.sh + &prompt.root; chmod 2755 sgidvoorbeeld.sh De nieuwe instelling kan zoals hierboven bekeken worden, merk op dat de s nu in het veld bestemd voor de instellingen van de groepstoestemmingen staat: - -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 suidvoorbeeld.sh + -rwxr-sr-x 1 trhodes trhodes 44 Aug 31 01:49 sgidvoorbeeld.sh In deze voorbeelden zal het shellscript niet met een From rfrench at FreeBSD.org Thu Oct 2 23:44:53 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Thu Oct 2 23:44:59 2008 Subject: PERFORCE change 150822 for review Message-ID: <200810022344.m92Niqt4086133@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150822 Change 150822 by rfrench@rfrench_mpls on 2008/10/02 23:44:34 Made a few more changes to the psuedo routing entry creater. Managed to stop the kernel from page faulting when an MPLS packet is received, but the interface is now saying it cannot handle to af type. I will be hopefully getting this working by the end of the day. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#11 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#11 (text+ko) ==== @@ -159,13 +159,13 @@ #ifdef MPLS_DEBUG printf("smpls af %d len %d in_label %d in_ifindex %d\n", smpls->smpls_family, smpls->smpls_len, - MPLS_LABEL_GET(smpls->smpls_in_label), + MPLS_LABEL_GET(smpls->smpls_in_label), smpls->smpls_in_ifindex); #endif - - rt = rtalloc1(smplstosa(smpls),1, 0); +/* uncomment below once routing is implemented */ + //rt = rtalloc1(smplstosa(smpls),1, 0); -//Uncoment this section when routing has been setup +//Uncomment this section when routing has been setup // if (rt == NULL) { // /* no entry for this label */ // #ifdef MPLS_DEBUG @@ -174,12 +174,12 @@ // m_freem(m); // goto done; // } - - rt->rt_use++; - smpls = satosmpls(rt_key(rt)); +// +// rt->rt_use++; +// smpls = satosmpls(rt_key(rt)); #ifdef MPLS_DEBUG /* Remove this once routing has been setup */ - create_fake_entry(smpls); + create_fake_entry(smpls); #endif #ifdef MPLS_DEBUG @@ -219,13 +219,15 @@ /* refetch label */ shim = mtod(m, struct shim_hdr *); - ifp = rt->rt_ifp; + + /* Remove once routing is implemented */ + // ifp = rt->rt_ifp; if (smpls->smpls_out_ifindex) break; - - RTFREE(rt); - rt = NULL; +/* Remove comments when routing has been implemented */ +// RTFREE(rt); +// rt = NULL; } /* write back TTL */ @@ -239,7 +241,8 @@ #endif (*ifp->if_output)(ifp, m, smplstosa(smpls), rt); + done: - if (rt) - RTFREE(rt); + if (rt) + RTFREE(rt); } From thompsa at FreeBSD.org Fri Oct 3 04:27:45 2008 From: thompsa at FreeBSD.org (Andrew Thompson) Date: Fri Oct 3 04:27:51 2008 Subject: PERFORCE change 150829 for review Message-ID: <200810030427.m934Rifq028623@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150829 Change 150829 by thompsa@thompsa_burger on 2008/10/03 04:26:56 Update comment on ng_tty and set the outq to a reasonable size. Affected files ... .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#8 edit Differences ... ==== //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#8 (text+ko) ==== @@ -42,16 +42,19 @@ */ /* - * This file implements a terminal line discipline that is also a - * netgraph node. Installing this line discipline on a terminal device - * instantiates a new netgraph node of this type, which allows access - * to the device via the "hook" hook of the node. + * This file implements TTY hooks to link in to the netgraph system. The node + * is created and then passed the callers opened TTY file descriptor number to + * NGM_TTY_SET_TTY, this will hook the tty via ttyhook_register(). + * + * Incoming data is delivered directly to ng_tty via the TTY bypass hook as a + * buffer pointer and length, this is converted to a mbuf and passed to the + * peer. * - * Incoming characters are delievered to the hook one at a time, each - * in its own mbuf. You may optionally define a ``hotchar,'' which causes - * incoming characters to be buffered up until either the hotchar is - * seen or the mbuf is full (MHLEN bytes). Then all buffered characters - * are immediately delivered. + * If the TTY device does not support bypass then incoming characters are + * delivered to the hook one at a time, each in its own mbuf. You may + * optionally define a ``hotchar,'' which causes incoming characters to be + * buffered up until either the hotchar is seen or the mbuf is full (MHLEN + * bytes). Then all buffered characters are immediately delivered. */ #include @@ -76,10 +79,6 @@ #include #include -/* Misc defs */ -#define MAX_MBUFQ 3 /* Max number of queued mbufs */ -#define NGT_HIWATER 400 /* High water mark on output */ - /* Per-node private info */ struct ngt_softc { struct tty *tp; /* Terminal device */ @@ -167,7 +166,7 @@ sc->node = node; mtx_init(&sc->outq.ifq_mtx, "ng_tty node+queue", NULL, MTX_DEF); - IFQ_SET_MAXLEN(&sc->outq, MAX_MBUFQ); + IFQ_SET_MAXLEN(&sc->outq, IFQ_MAXLEN); atomic_add_int(&ngt_unit, 1); snprintf(name, sizeof(name), "%s%d", typestruct.name, ngt_unit); From sam at FreeBSD.org Fri Oct 3 04:32:02 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 04:32:10 2008 Subject: PERFORCE change 150830 for review Message-ID: <200810030431.m934Vnbm028921@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150830 Change 150830 by sam@sam_ebb on 2008/10/03 04:30:51 IFC @ 150825 Affected files ... .. //depot/projects/vap/ObsoleteFiles.inc#20 integrate .. //depot/projects/vap/bin/pkill/pkill.1#2 integrate .. //depot/projects/vap/bin/pkill/pkill.c#2 integrate .. //depot/projects/vap/crypto/openssh/moduli.5#2 integrate .. //depot/projects/vap/crypto/openssh/scp.1#4 integrate .. //depot/projects/vap/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/vap/crypto/openssh/sftp.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-add.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/vap/crypto/openssh/ssh.1#4 integrate .. //depot/projects/vap/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/vap/crypto/openssh/sshd.8#4 integrate .. //depot/projects/vap/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/vap/etc/network.subr#14 integrate .. //depot/projects/vap/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_private.h#7 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#16 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/vap/lib/libarchive/config_freebsd.h#9 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#13 integrate .. //depot/projects/vap/lib/libarchive/test/test_entry.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/vap/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/vap/lib/libc/gen/getosreldate.3#4 integrate .. //depot/projects/vap/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/vap/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/vap/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/vap/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#12 integrate .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#8 integrate .. //depot/projects/vap/sbin/setkey/setkey.8#3 integrate .. //depot/projects/vap/share/examples/FreeBSD_version/FreeBSD_version.c#3 integrate .. //depot/projects/vap/share/man/man3/Makefile#6 integrate .. //depot/projects/vap/share/man/man3/makedev.3#1 branch .. //depot/projects/vap/share/man/man4/nfe.4#4 integrate .. //depot/projects/vap/share/man/man4/wpi.4#5 integrate .. //depot/projects/vap/share/man/man9/Makefile#15 integrate .. //depot/projects/vap/share/man/man9/device_ids.9#3 delete .. //depot/projects/vap/share/man/man9/make_dev.9#5 integrate .. //depot/projects/vap/share/man/man9/spl.9#3 integrate .. //depot/projects/vap/share/zoneinfo/southamerica#8 integrate .. //depot/projects/vap/sys/amd64/amd64/dump_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/vap/sys/amd64/include/param.h#9 integrate .. //depot/projects/vap/sys/amd64/include/smp.h#7 integrate .. //depot/projects/vap/sys/arm/arm/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/vap/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/vap/sys/conf/files.sparc64#12 integrate .. //depot/projects/vap/sys/conf/kmod.mk#7 integrate .. //depot/projects/vap/sys/conf/newvers.sh#8 integrate .. //depot/projects/vap/sys/conf/options.sparc64#7 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#8 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/vap/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/vap/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/vap/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vap/sys/dev/agp/agpreg.h#3 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/vap/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#13 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#11 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/vap/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/vap/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/vap/sys/dev/fatm/if_fatm.c#7 integrate .. //depot/projects/vap/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/vap/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/vap/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#14 integrate .. //depot/projects/vap/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/vap/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/vap/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/vap/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#11 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#9 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/vap/sys/i386/i386/dump_machdep.c#8 integrate .. //depot/projects/vap/sys/i386/i386/minidump_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/vap/sys/i386/include/param.h#7 integrate .. //depot/projects/vap/sys/i386/include/smp.h#8 integrate .. //depot/projects/vap/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/vap/sys/ia64/ia64/dump_machdep.c#7 integrate .. //depot/projects/vap/sys/ia64/ia64/interrupt.c#11 integrate .. //depot/projects/vap/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/vap/sys/ia64/ia64/sal.c#6 integrate .. //depot/projects/vap/sys/ia64/include/smp.h#5 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#14 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#12 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/vap/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/vap/sys/kern/kern_xxx.c#7 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/vap/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/vap/sys/mips/include/param.h#2 integrate .. //depot/projects/vap/sys/mips/include/smp.h#2 integrate .. //depot/projects/vap/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/vap/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/vap/sys/mips/mips/trap.c#3 integrate .. //depot/projects/vap/sys/net/bridgestp.c#5 integrate .. //depot/projects/vap/sys/net/if.c#17 integrate .. //depot/projects/vap/sys/net/if_bridge.c#9 integrate .. //depot/projects/vap/sys/net/if_ef.c#8 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/vap/sys/net/if_faith.c#10 integrate .. //depot/projects/vap/sys/net/if_gif.c#11 integrate .. //depot/projects/vap/sys/net/if_gif.h#6 integrate .. //depot/projects/vap/sys/net/if_gre.c#13 integrate .. //depot/projects/vap/sys/net/if_lagg.c#9 integrate .. //depot/projects/vap/sys/net/if_loop.c#14 integrate .. //depot/projects/vap/sys/net/if_mib.c#7 integrate .. //depot/projects/vap/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/vap/sys/net/if_stf.c#12 integrate .. //depot/projects/vap/sys/net/if_tun.c#9 integrate .. //depot/projects/vap/sys/net/if_var.h#12 integrate .. //depot/projects/vap/sys/net/if_vlan.c#12 integrate .. //depot/projects/vap/sys/net/raw_cb.c#10 integrate .. //depot/projects/vap/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/vap/sys/net/route.c#14 integrate .. //depot/projects/vap/sys/net/rtsock.c#12 integrate .. //depot/projects/vap/sys/net/vnet.h#1 branch .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#29 integrate .. //depot/projects/vap/sys/netgraph/atm/ng_atm.c#7 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/vap/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/vap/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#13 integrate .. //depot/projects/vap/sys/netinet/igmp.c#7 integrate .. //depot/projects/vap/sys/netinet/in.c#9 integrate .. //depot/projects/vap/sys/netinet/in.h#8 integrate .. //depot/projects/vap/sys/netinet/in_gif.c#7 integrate .. //depot/projects/vap/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/vap/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/vap/sys/netinet/ip6.h#6 integrate .. //depot/projects/vap/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/vap/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/vap/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#12 integrate .. //depot/projects/vap/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/vap/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/vap/sys/netinet/ip_options.c#8 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/vap/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/vap/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/vap/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/vap/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/vap/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/vap/sys/netinet/vinet.h#1 branch .. //depot/projects/vap/sys/netinet6/dest6.c#7 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#8 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/vap/sys/netinet6/in6.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6.h#6 integrate .. //depot/projects/vap/sys/netinet6/in6_gif.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/vap/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#13 integrate .. //depot/projects/vap/sys/netinet6/mld6.c#10 integrate .. //depot/projects/vap/sys/netinet6/nd6.c#8 integrate .. //depot/projects/vap/sys/netinet6/nd6.h#7 integrate .. //depot/projects/vap/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/vap/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/vap/sys/netinet6/route6.c#7 integrate .. //depot/projects/vap/sys/netinet6/scope6.c#7 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/vap/sys/netinet6/vinet6.h#1 branch .. //depot/projects/vap/sys/netipsec/ipsec.c#11 integrate .. //depot/projects/vap/sys/netipsec/ipsec.h#9 integrate .. //depot/projects/vap/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/vap/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/vap/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/vap/sys/netipsec/key.c#11 integrate .. //depot/projects/vap/sys/netipsec/keysock.c#7 integrate .. //depot/projects/vap/sys/netipsec/vipsec.h#1 branch .. //depot/projects/vap/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/vap/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_diskless.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/vap/sys/powerpc/include/smp.h#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#10 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/vap/sys/powerpc/powerpc/mp_machdep.c#9 integrate .. //depot/projects/vap/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/vap/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/vap/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/vap/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/vap/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/vap/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/vap/sys/sys/conf.h#13 integrate .. //depot/projects/vap/sys/sys/kerneldump.h#6 integrate .. //depot/projects/vap/sys/sys/pmc.h#6 integrate .. //depot/projects/vap/sys/sys/protosw.h#6 integrate .. //depot/projects/vap/sys/sys/sysctl.h#11 integrate .. //depot/projects/vap/sys/sys/vimage.h#2 integrate .. //depot/projects/vap/sys/vm/swap_pager.c#11 integrate .. //depot/projects/vap/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/vap/sys/vm/vm_pageout.h#5 integrate .. //depot/projects/vap/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/vap/usr.bin/make/job.c#5 integrate .. //depot/projects/vap/usr.bin/top/machine.c#8 integrate .. //depot/projects/vap/usr.sbin/Makefile#15 integrate .. //depot/projects/vap/usr.sbin/boot0cfg/boot0cfg.c#4 integrate .. //depot/projects/vap/usr.sbin/bsnmpd/modules/Makefile#3 integrate Differences ... ==== //depot/projects/vap/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/vap/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/vap/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/vap/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/scp.1#4 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sftp-server.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sftp.1#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-add.1#4 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-agent.1#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keygen.1#4 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keyscan.1#4 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh-keysign.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh.1#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/ssh_config.5#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sshd.8#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/vap/crypto/openssh/sshd_config.5#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/vap/etc/network.subr#14 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/vap/gnu/lib/csu/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -D_OSRELDATE_H -include osreldate.h +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/vap/lib/libarchive/archive_entry.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.54 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -461,6 +461,24 @@ } time_t +archive_entry_birthtime(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime); +} + +long +archive_entry_birthtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime_nsec); +} + +int +archive_entry_birthtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_BIRTHTIME); +} + +time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); @@ -838,6 +856,22 @@ } void +archive_entry_set_birthtime(struct archive_entry *entry, time_t m, long ns) +{ + entry->stat_valid = 0; + entry->ae_set |= AE_SET_BIRTHTIME; + entry->ae_stat.aest_birthtime = m; + entry->ae_stat.aest_birthtime_nsec = ns; +} + +void +archive_entry_unset_birthtime(struct archive_entry *entry) +{ + archive_entry_set_birthtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_BIRTHTIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; ==== //depot/projects/vap/lib/libarchive/archive_entry.h#8 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -174,6 +174,9 @@ __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); __LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); @@ -224,6 +227,8 @@ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_atime(struct archive_entry *); +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); __LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_ctime(struct archive_entry *); __LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); ==== //depot/projects/vap/lib/libarchive/archive_entry_copy_stat.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -47,6 +47,12 @@ archive_entry_set_atime(entry, st->st_atime, 0); archive_entry_set_ctime(entry, st->st_ctime, 0); archive_entry_set_mtime(entry, st->st_mtime, 0); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + archive_entry_set_birthtime(entry, st->st_birthtime, 0); +#endif +#endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + archive_entry_set_birthtime(entry, st->st_birthtime, st->st_birthtimespec.tv_nsec); #endif archive_entry_set_dev(entry, st->st_dev); archive_entry_set_gid(entry, st->st_gid); ==== //depot/projects/vap/lib/libarchive/archive_entry_private.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.5 2008/09/01 04:54:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.6 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -112,6 +112,8 @@ uint32_t aest_ctime_nsec; int64_t aest_mtime; uint32_t aest_mtime_nsec; + int64_t aest_birthtime; + uint32_t aest_birthtime_nsec; gid_t aest_gid; ino_t aest_ino; mode_t aest_mode; @@ -142,6 +144,7 @@ #define AE_SET_ATIME 4 #define AE_SET_CTIME 8 #define AE_SET_MTIME 16 +#define AE_SET_BIRTHTIME 32 #define AE_SET_SIZE 64 /* ==== //depot/projects/vap/lib/libarchive/archive_entry_stat.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -64,6 +64,9 @@ * the appropriate conversions get invoked. */ st->st_atime = archive_entry_atime(entry); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + st->st_birthtime = archive_entry_birthtime(entry); +#endif st->st_ctime = archive_entry_ctime(entry); st->st_mtime = archive_entry_mtime(entry); st->st_dev = archive_entry_dev(entry); @@ -88,6 +91,9 @@ st->st_ctim.tv_nsec = archive_entry_ctime_nsec(entry); st->st_mtim.tv_nsec = archive_entry_mtime_nsec(entry); #endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + st->st_birthtimespec.tv_nsec = archive_entry_birthtime_nsec(entry); +#endif /* * TODO: On Linux, store 32 or 64 here depending on whether ==== //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.70 2008/07/10 09:50:55 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.71 2008/09/30 03:57:07 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1451,6 +1451,10 @@ if (strcmp(key, "LIBARCHIVE.xxxxxxx")==0) archive_entry_set_xxxxxx(entry, value); */ + if (strcmp(key, "LIBARCHIVE.creationtime")==0) { + pax_time(value, &s, &n); + archive_entry_set_birthtime(entry, s, n); + } if (strncmp(key, "LIBARCHIVE.xattr.", 17)==0) pax_attribute_xattr(entry, key, value); break; ==== //depot/projects/vap/lib/libarchive/archive_write_disk.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.39 2008/09/14 05:51:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -96,10 +96,12 @@ struct fixup_entry { struct fixup_entry *next; mode_t mode; + int64_t atime; + int64_t birthtime; int64_t mtime; - int64_t atime; + unsigned long atime_nanos; + unsigned long birthtime_nanos; unsigned long mtime_nanos; - unsigned long atime_nanos; unsigned long fflags_set; int fixup; /* bitmask of what needs fixing */ char *name; @@ -227,7 +229,8 @@ unsigned long fflags_set, unsigned long fflags_clear); static int set_ownership(struct archive_write_disk *); static int set_mode(struct archive_write_disk *, int mode); -static int set_time(struct archive_write_disk *); +static int set_time(int, int, const char *, time_t, long, time_t, long); +static int set_times(struct archive_write_disk *); static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); @@ -448,19 +451,29 @@ || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; + if (archive_entry_atime_is_set(entry)) { + fe->atime = archive_entry_atime(entry); + fe->atime_nanos = archive_entry_atime_nsec(entry); + } else { + /* If atime is unset, use start time. */ + fe->atime = a->start_time; + fe->atime_nanos = 0; + } if (archive_entry_mtime_is_set(entry)) { fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); } else { + /* If mtime is unset, use start time. */ fe->mtime = a->start_time; fe->mtime_nanos = 0; } - if (archive_entry_atime_is_set(entry)) { - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); + if (archive_entry_birthtime_is_set(entry)) { + fe->birthtime = archive_entry_birthtime(entry); + fe->birthtime_nanos = archive_entry_birthtime_nsec(entry); } else { - fe->atime = a->start_time; - fe->atime_nanos = 0; + /* If birthtime is unset, use mtime. */ + fe->birthtime = fe->mtime; + fe->birthtime_nanos = fe->mtime_nanos; } } @@ -698,7 +711,7 @@ if (r2 < ret) ret = r2; } if (a->todo & TODO_TIMES) { - int r2 = set_time(a); + int r2 = set_times(a); if (r2 < ret) ret = r2; } if (a->todo & TODO_ACLS) { @@ -1170,10 +1183,19 @@ #ifdef HAVE_UTIMES /* {f,l,}utimes() are preferred, when available. */ struct timeval times[2]; + times[0].tv_sec = p->atime; + times[0].tv_usec = p->atime_nanos / 1000; +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + /* if it's valid and not mtime, push the birthtime first */ + if (((times[1].tv_sec = p->birthtime) < p->mtime) && + (p->birthtime > 0)) + { + times[1].tv_usec = p->birthtime_nanos / 1000; + utimes(p->name, times); + } +#endif times[1].tv_sec = p->mtime; times[1].tv_usec = p->mtime_nanos / 1000; - times[0].tv_sec = p->atime; - times[0].tv_usec = p->atime_nanos / 1000; #ifdef HAVE_LUTIMES lutimes(p->name, times); #else @@ -1687,61 +1709,31 @@ * when they're available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) { struct timeval times[2]; - /* If no time was provided, we're done. */ - if (!archive_entry_atime_is_set(a->entry) - && !archive_entry_mtime_is_set(a->entry)) - return (ARCHIVE_OK); - - /* We know at least one is set, so... */ - if (archive_entry_mtime_is_set(a->entry)) { - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; - } else { - times[1].tv_sec = a->start_time; - times[1].tv_usec = 0; - } + times[0].tv_sec = atime; + times[0].tv_usec = atime_nsec / 1000; + times[1].tv_sec = mtime; + times[1].tv_usec = mtime_nsec / 1000; - /* If no atime was specified, use start time instead. */ - /* In theory, it would be marginally more correct to use - * time(NULL) here, but that would cost us an extra syscall - * for little gain. */ - if (archive_entry_atime_is_set(a->entry)) { - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; - } else { - times[0].tv_sec = a->start_time; - times[0].tv_usec = 0; - } - #ifdef HAVE_FUTIMES - if (a->fd >= 0 && futimes(a->fd, times) == 0) { - return (ARCHIVE_OK); - } + if (fd >= 0) + return (futimes(fd, times)); +#else + (void)fd; /* UNUSED */ #endif - #ifdef HAVE_LUTIMES - if (lutimes(a->name, times) != 0) + (void)mode; /* UNUSED */ + return (lutimes(name, times)); #else - if (!S_ISLNK(a->mode) && utimes(a->name, times) != 0) + if (S_ISLNK(mode)) + return (0); + return (utimes(name, times)); #endif - { - archive_set_error(&a->archive, errno, "Can't update time for %s", - a->name); - return (ARCHIVE_WARN); - } - - /* - * Note: POSIX does not provide a portable way to restore ctime. - * (Apart from resetting the system clock, which is distasteful.) - * So, any restoration of ctime will necessarily be OS-specific. - */ - - /* XXX TODO: Can FreeBSD restore ctime? XXX */ - return (ARCHIVE_OK); } #elif defined(HAVE_UTIME) /* @@ -1749,47 +1741,93 @@ * if utimes() isn't available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, >>> TRUNCATED FOR MAIL (1000 lines) <<< From sam at FreeBSD.org Fri Oct 3 04:33:03 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 04:33:09 2008 Subject: PERFORCE change 150831 for review Message-ID: <200810030433.m934X2lQ029023@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150831 Change 150831 by sam@sam_ebb on 2008/10/03 04:32:22 IFC Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 integrate Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.10 2008/04/20 20:35:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.11 2008/09/27 21:18:40 sam Exp $"); /* * IEEE 802.11 station scanning support. @@ -1392,9 +1392,12 @@ */ if (vap->iv_des_chan == IEEE80211_CHAN_ANYC || IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) { - chan = ieee80211_ht_adjust_channel(vap->iv_ic, - adhoc_pick_channel(ss, 0), - vap->iv_flags_ext); + struct ieee80211com *ic = vap->iv_ic; + + chan = adhoc_pick_channel(ss, 0); + if (chan != NULL) + chan = ieee80211_ht_adjust_channel(ic, + chan, vap->iv_flags_ext); } else chan = vap->iv_des_chan; if (chan != NULL) { From sam at FreeBSD.org Fri Oct 3 04:34:04 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 04:34:11 2008 Subject: PERFORCE change 150832 for review Message-ID: <200810030434.m934Y4oR029116@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150832 Change 150832 by sam@sam_ebb on 2008/10/03 04:34:01 IFC Affected files ... .. //depot/projects/vap/sys/conf/options#28 edit Differences ... ==== //depot/projects/vap/sys/conf/options#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.641 2008/08/27 01:31:42 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ # # On the handling of kernel options # @@ -754,9 +754,6 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# VFS options -LOOKUP_SHARED opt_vfs.h - # HWPMC options HWPMC_HOOKS From ed at FreeBSD.org Fri Oct 3 07:48:35 2008 From: ed at FreeBSD.org (Ed Schouten) Date: Fri Oct 3 07:48:43 2008 Subject: PERFORCE change 150837 for review Message-ID: <200810030748.m937mYs9056560@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150837 Change 150837 by ed@ed_dull on 2008/10/03 07:48:09 IFC. Affected files ... .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/mpsafetty/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/mpsafetty/sys/conf/kmod.mk#2 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/mpsafetty/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_jail.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mib.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/mpsafetty/sys/net/bridgestp.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if.c#7 integrate .. //depot/projects/mpsafetty/sys/net/if_bridge.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_ef.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_faith.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.h#2 integrate .. //depot/projects/mpsafetty/sys/net/if_gre.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_loop.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_mib.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_stf.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_var.h#3 integrate .. //depot/projects/mpsafetty/sys/net/if_vlan.c#5 integrate .. //depot/projects/mpsafetty/sys/net/raw_cb.c#4 integrate .. //depot/projects/mpsafetty/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/net/route.c#7 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#4 integrate .. //depot/projects/mpsafetty/sys/net/vnet.h#1 branch .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#9 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/igmp.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_gif.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip6.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_options.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet/vinet.h#1 branch .. //depot/projects/mpsafetty/sys/netinet6/dest6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/frag6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/mld6.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/route6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/scope6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/vinet6.h#1 branch .. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/key.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/keysock.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/vipsec.h#1 branch .. //depot/projects/mpsafetty/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/rpc/authunix_prot.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/protosw.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/sysctl.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/vimage.h#4 integrate .. //depot/projects/mpsafetty/usr.sbin/bsnmpd/modules/Makefile#2 integrate Differences ... ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/mpsafetty/lib/libpmc/pmc.k8.3#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.k8.3,v 1.2 2008/09/16 16:53:26 svn Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.k8.3,v 1.3 2008/10/02 08:53:06 jkoshy Exp $ .\" -.Dd September 17, 2008 +.Dd October 2, 2008 .Os .Dt PMC.K8 3 .Sh NAME @@ -110,9 +110,11 @@ The event specifiers supported on AMD K8 PMCs are: .Bl -tag -width indent .It Li k8-bu-cpu-clk-unhalted +.Pq Event 76H Count the number of clock cycles when the CPU is not in the HLT or STPCLK states. .It Li k8-bu-fill-request-l2-miss Op Li ,mask= Ns Ar qualifier +.Pq Event 7EH Count fill requests that missed in the L2 cache. This event may be further qualified using .Ar qualifier , @@ -130,7 +132,24 @@ .El .Pp The default is to count all types of requests. +.It Li k8-bu-fill-into-l2 Op Li ,mask= Ns Ar qualifier +.Pq Event 7FH +The number of lines written to and from the L2 cache. +The event may be further qualified by using +.Ar qualifier , +which is a +.Ql + +separated set of the following keywords: +.Pp +.Bl -tag -width indent -compact +.It Li dirty-l2-victim +Count lines written into L2 cache due to victim writebacks from the +Icache or Dcache, TLB page table walks or hardware data prefetches. +.It Li victim-from-l2 +Count writebacks of dirty lines from L2 to the system. +.El .It Li k8-bu-internal-l2-request Op Li ,mask= Ns Ar qualifier +.Pq Event 7DH Count internally generated requests to the L2 cache. This event may be further qualified using .Ar qualifier , @@ -153,8 +172,10 @@ .Pp The default is to count all types of requests. .It Li k8-dc-access +.Pq Event 40H Count data cache accesses including microcode scratchpad accesses. .It Li k8-dc-copyback Op Li ,mask= Ns Ar qualifier +.Pq Event 44H Count data cache copyback operations. This event may be further qualified using .Ar qualifier , @@ -188,6 +209,7 @@ The default is to count operations for lines in all the above states. .It Li k8-dc-dcache-accesses-by-locks Op Li ,mask= Ns Ar qualifier +.Pq Event 4CH Count data cache accesses by lock instructions. This event is only available on processors of revision C or later vintage. @@ -206,6 +228,7 @@ .Pp The default is to count all accesses. .It Li k8-dc-dispatched-prefetch-instructions Op Li ,mask= Ns Ar qualifier +.Pq Event 4BH Count the number of dispatched prefetch instructions. This event may be further qualified using .Ar qualifier , @@ -224,18 +247,25 @@ .Pp The default is to count all operations. .It Li k8-dc-l1-dtlb-miss-and-l2-dtlb-hit +.Pq Event 45H Count L1 DTLB misses that are L2 DTLB hits. .It Li k8-dc-l1-dtlb-miss-and-l2-dtlb-miss +.Pq Event 46H Count L1 DTLB misses that are also misses in the L2 DTLB. .It Li k8-dc-microarchitectural-early-cancel-of-an-access +.Pq Event 49H Count microarchitectural early cancels of data cache accesses. .It Li k8-dc-microarchitectural-late-cancel-of-an-access +.Pq Event 48H Count microarchitectural late cancels of data cache accesses. .It Li k8-dc-misaligned-data-reference +.Pq Event 47H Count misaligned data references. .It Li k8-dc-miss +.Pq Event 41H Count data cache misses. .It Li k8-dc-one-bit-ecc-error Op Li ,mask= Ns Ar qualifier +.Pq Event 4AH Count one bit ECC errors found by the scrubber. This event may be further qualified using .Ar qualifier , @@ -252,6 +282,7 @@ .Pp The default is to count both kinds of errors. .It Li k8-dc-refill-from-l2 Op Li ,mask= Ns Ar qualifier +.Pq Event 42H Count data cache refills from L2 cache. This event may be further qualified using .Ar qualifier , @@ -285,6 +316,7 @@ The default is to count operations for lines in all the above states. .It Li k8-dc-refill-from-system Op Li ,mask= Ns Ar qualifier +.Pq Event 43H Count data cache refills from system memory. This event may be further qualified using .Ar qualifier , @@ -317,7 +349,16 @@ .Pp The default is to count operations for lines in all the above states. +.It Li k8-fp-cycles-with-no-fpu-ops-retired +.Pq Event 01H +Count cycles when no FPU ops were retired. +This event is supported in revision B and later CPUs. +.It Li k8-fp-dispatched-fpu-fast-flag-ops +.Pq Event 02H +Count dispatched FPU ops that use the fast flag interface. +This event is supported in revision B and later CPUs. .It Li k8-fp-dispatched-fpu-ops Op Li ,mask= Ns Ar qualifier +.Pq Event 00H Count the number of dispatched FPU ops. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -342,38 +383,44 @@ .El .Pp The default is to count all types of ops. -.It Li k8-fp-cycles-with-no-fpu-ops-retired -Count cycles when no FPU ops were retired. -This event is supported in revision B and later CPUs. -.It Li k8-fp-dispatched-fpu-fast-flag-ops -Count dispatched FPU ops that use the fast flag interface. -This event is supported in revision B and later CPUs. .It Li k8-fr-decoder-empty +.Pq Event D0H Count cycles when there was nothing to dispatch (i.e., the decoder was empty). -.It Li k8-fr-dispatch-stalls -Count all dispatch stalls. .It Li k8-fr-dispatch-stall-for-segment-load +.Pq Event D4H Count dispatch stalls for segment loads. .It Li k8-fr-dispatch-stall-for-serialization +.Pq Event D3H Count dispatch stalls for serialization. .It Li k8-fr-dispatch-stall-from-branch-abort-to-retire +.Pq Event D2H Count dispatch stalls from branch abort to retiral. .It Li k8-fr-dispatch-stall-when-fpu-is-full +.Pq Event D7H Count dispatch stalls when the FPU is full. .It Li k8-fr-dispatch-stall-when-ls-is-full +.Pq Event D8H Count dispatch stalls when the load/store unit is full. .It Li k8-fr-dispatch-stall-when-reorder-buffer-is-full +.Pq Event D5H Count dispatch stalls when the reorder buffer is full. .It Li k8-fr-dispatch-stall-when-reservation-stations-are-full +.Pq Event D6H Count dispatch stalls when reservation stations are full. +.It Li k8-fr-dispatch-stall-when-waiting-far-xfer-or-resync-branch-pending +.Pq Event DAH +Count dispatch stalls when a far control transfer or a resync branch +is pending. .It Li k8-fr-dispatch-stall-when-waiting-for-all-to-be-quiet +.Pq Event D9H Count dispatch stalls when waiting for all to be quiet. .\" XXX What does "waiting for all to be quiet" mean? -.It Li k8-fr-dispatch-stall-when-waiting-far-xfer-or-resync-branch-pending -Count dispatch stalls when a far control transfer or a resync branch -is pending. +.It Li k8-fr-dispatch-stalls +.Pq Event D1H +Count all dispatch stalls. .It Li k8-fr-fpu-exceptions Op Li ,mask= Ns Ar qualifier +.Pq Event DBH Count FPU exceptions. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -395,25 +442,35 @@ .Pp The default is to count all types of exceptions. .It Li k8-fr-interrupts-masked-cycles +.Pq Event CDH Count cycles when interrupts were masked (by CPU RFLAGS field IF was zero). .It Li k8-fr-interrupts-masked-while-pending-cycles +.Pq Event CEH Count cycles while interrupts were masked while pending (i.e., cycles when INTR was asserted while CPU RFLAGS field IF was zero). .It Li k8-fr-number-of-breakpoints-for-dr0 +.Pq Event DCH Count the number of breakpoints for DR0. .It Li k8-fr-number-of-breakpoints-for-dr1 +.Pq Event DDH Count the number of breakpoints for DR1. .It Li k8-fr-number-of-breakpoints-for-dr2 +.Pq Event DEH Count the number of breakpoints for DR2. .It Li k8-fr-number-of-breakpoints-for-dr3 +.Pq Event DFH Count the number of breakpoints for DR3. .It Li k8-fr-retired-branches +.Pq Event C2H Count retired branches including exceptions and interrupts. .It Li k8-fr-retired-branches-mispredicted +.Pq Event C3H Count mispredicted retired branches. .It Li k8-fr-retired-far-control-transfers +.Pq Event C6H Count retired far control transfers (which are always mispredicted). .It Li k8-fr-retired-fastpath-double-op-instructions Op Li ,mask= Ns Ar qualifier +.Pq Event CCH Count retired fastpath double op instructions. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -433,6 +490,7 @@ .Pp The default is to count all types of instructions. .It Li k8-fr-retired-fpu-instructions Op Li ,mask= Ns Ar qualifier +.Pq Event CBH Count retired FPU instructions. This event is supported in revision B and later CPUs. This event may be further qualified using @@ -454,47 +512,68 @@ .Pp The default is to count all types of instructions. .It Li k8-fr-retired-near-returns +.Pq Event C8H Count retired near returns. .It Li k8-fr-retired-near-returns-mispredicted +.Pq Event C9H Count mispredicted near returns. .It Li k8-fr-retired-resyncs +.Pq Event C7H Count retired resyncs (non-control transfer branches). -.It Li k8-fr-retired-taken-hardware-interrupts -Count retired taken hardware interrupts. .It Li k8-fr-retired-taken-branches +.Pq Event C4H Count retired taken branches. .It Li k8-fr-retired-taken-branches-mispredicted +.Pq Event C5H Count retired taken branches that were mispredicted. .It Li k8-fr-retired-taken-branches-mispredicted-by-addr-miscompare +.Pq Event CAH Count retired taken branches that were mispredicted only due to an address miscompare. +.It Li k8-fr-retired-taken-hardware-interrupts +.Pq Event CFH +Count retired taken hardware interrupts. .It Li k8-fr-retired-uops +.Pq Event C1H Count retired uops. .It Li k8-fr-retired-x86-instructions +.Pq Event C0H Count retired x86 instructions including exceptions and interrupts. .It Li k8-ic-fetch +.Pq Event 80H Count instruction cache fetches. .It Li k8-ic-instruction-fetch-stall +.Pq Event 87H Count cycles in stalls due to instruction fetch. .It Li k8-ic-l1-itlb-miss-and-l2-itlb-hit +.Pq Event 84H Count L1 ITLB misses that are L2 ITLB hits. .It Li k8-ic-l1-itlb-miss-and-l2-itlb-miss +.Pq Event 85H Count ITLB misses that miss in both L1 and L2 ITLBs. .It Li k8-ic-microarchitectural-resync-by-snoop +.Pq Event 86H Count microarchitectural resyncs caused by snoops. .It Li k8-ic-miss +.Pq Event 81H Count instruction cache misses. .It Li k8-ic-refill-from-l2 +.Pq Event 82H Count instruction cache refills from L2 cache. .It Li k8-ic-refill-from-system +.Pq Event 83H Count instruction cache refills from system memory. .It Li k8-ic-return-stack-hits +.Pq Event 88H Count hits to the return stack. .It Li k8-ic-return-stack-overflow +.Pq Event 89H Count overflows of the return stack. .It Li k8-ls-buffer2-full +.Pq Event 23H Count load/store buffer2 full events. .It Li k8-ls-locked-operation Op Li ,mask= Ns Ar qualifier +.Pq Event 24H Count locked operations. For revision C and later CPUs, the following qualifiers are supported: .Pp @@ -510,17 +589,23 @@ .Pp The default is to count the number of lock instructions executed. .It Li k8-ls-microarchitectural-late-cancel +.Pq Event 25H Count microarchitectural late cancels of operations in the load/store unit. .It Li k8-ls-microarchitectural-resync-by-self-modifying-code +.Pq Event 21H Count microarchitectural resyncs caused by self-modifying code. .It Li k8-ls-microarchitectural-resync-by-snoop +.Pq Event 22H Count microarchitectural resyncs caused by snoops. .It Li k8-ls-retired-cflush-instructions +.Pq Event 26H Count retired CFLUSH instructions. .It Li k8-ls-retired-cpuid-instructions +.Pq Event 27H Count retired CPUID instructions. .It Li k8-ls-segment-register-load Op Li ,mask= Ns Ar qualifier +.Pq Event 20H Count segment register loads. This event may be further qualified using .Ar qualifier , @@ -546,7 +631,31 @@ .El .Pp The default is to count all types of loads. +.It Li k8-nb-ht-bus0-bandwidth Op Li ,mask= Ns Ar qualifier +.It Li k8-nb-ht-bus1-bandwidth Op Li ,mask= Ns Ar qualifier +.It Li k8-nb-ht-bus2-bandwidth Op Li ,mask= Ns Ar qualifier +.Pq Events F6H, F7H and F8H respectively +Count events on the HyperTransport(tm) buses. +These events may be further qualified using +.Ar qualifier , +which is a +.Ql + +separated set of the following keywords: +.Pp +.Bl -tag -width indent -compact +.It Li buffer-release +Count buffer release messages sent. +.It Li command +Count command messages sent. +.It Li data +Count data messages sent. +.It Li nop +Count nop messages sent. +.El +.Pp +The default is to count all types of messages. .It Li k8-nb-memory-controller-bypass-saturation Op Li ,mask= Ns Ar qualifier +.Pq Event E4H Count memory controller bypass counter saturation events. This event may be further qualified using .Ar qualifier , @@ -566,8 +675,10 @@ .El .Pp .It Li k8-nb-memory-controller-dram-slots-missed +.Pq Event E2H Count memory controller DRAM command slots missed (in MemClks). .It Li k8-nb-memory-controller-page-access-event Op Li ,mask= Ns Ar qualifier +.Pq Event E0H Count memory controller page access events. This event may be further qualified using .Ar qualifier , @@ -586,8 +697,30 @@ .Pp The default is to count all types of events. .It Li k8-nb-memory-controller-page-table-overflow +.Pq Event E1H Count memory control page table overflow events. +.It Li k8-nb-memory-controller-turnaround Op Li ,mask= Ns Ar qualifier +.Pq Event E3H +Count memory control turnaround events. +This event may be further qualified using +.Ar qualifier , +which is a +.Ql + +separated set of the following keywords: +.Pp +.Bl -tag -width indent -compact +.\" XXX doc is unclear whether these are cycle counts or event counts +.It Li dimm-turnaround +Count DIMM turnarounds. +.It Li read-to-write-turnaround +Count read to write turnarounds. +.It Li write-to-read-turnaround +Count write to read turnarounds. +.El +.Pp +The default is to count all types of events. .It Li k8-nb-probe-result Op Li ,mask= Ns Ar qualifier +.Pq Event ECH Count probe events. This event may be further qualified using .Ar qualifier , @@ -606,6 +739,7 @@ Count probe misses. .El .It Li k8-nb-sized-commands Op Li ,mask= Ns Ar qualifier +.Pq Event EBH Count sized commands issued. This event may be further qualified using .Ar qualifier , @@ -624,47 +758,6 @@ .El .Pp The default is to count all types of commands. -.It Li k8-nb-memory-controller-turnaround Op Li ,mask= Ns Ar qualifier -Count memory control turnaround events. -This event may be further qualified using -.Ar qualifier , -which is a -.Ql + -separated set of the following keywords: -.Pp -.Bl -tag -width indent -compact -.\" XXX doc is unclear whether these are cycle counts or event counts -.It Li dimm-turnaround -Count DIMM turnarounds. -.It Li read-to-write-turnaround -Count read to write turnarounds. -.It Li write-to-read-turnaround -Count write to read turnarounds. -.El -.Pp -The default is to count all types of events. -.It Li k8-nb-ht-bus0-bandwidth Op Li ,mask= Ns Ar qualifier -.It Li k8-nb-ht-bus1-bandwidth Op Li ,mask= Ns Ar qualifier -.It Li k8-nb-ht-bus2-bandwidth Op Li ,mask= Ns Ar qualifier -Count events on the HyperTransport(tm) buses. -These events may be further qualified using -.Ar qualifier , -which is a -.Ql + -separated set of the following keywords: -.Pp -.Bl -tag -width indent -compact -.It Li buffer-release -Count buffer release messages sent. -.It Li command -Count command messages sent. -.It Li data -Count data messages sent. -.It Li nop -Count nop messages sent. -.El -.Pp -The default is to count all types of messages. .El .Ss Event Name Aliases The following table shows the mapping between the PMC-independent ==== //depot/projects/mpsafetty/sbin/ifconfig/ifvlan.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.14 2008/08/28 22:13:44 jfv Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.15 2008/10/02 20:03:41 sam Exp $"; #endif #define NOTAG ((u_short) -1) @@ -174,6 +174,9 @@ static struct cmd vlan_cmds[] = { DEF_CLONE_CMD_ARG("vlan", setvlantag), DEF_CLONE_CMD_ARG("vlandev", setvlandev), + /* NB: non-clone cmds */ + DEF_CMD_ARG("vlan", setvlantag), + DEF_CMD_ARG("vlandev", setvlandev), /* XXX For compatibility. Should become DEF_CMD() some day. */ DEF_CMD_OPTARG("-vlandev", unsetvlandev), DEF_CMD("vlanmtu", IFCAP_VLAN_MTU, setifcap), ==== //depot/projects/mpsafetty/share/man/man4/ng_tty.4#2 (text+ko) ==== @@ -32,15 +32,15 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.17 2005/02/05 11:31:31 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.18 2008/10/03 05:14:54 thompsa Exp $ .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $ .\" -.Dd January 19, 1999 +.Dd October 2, 2008 .Dt NG_TTY 4 .Os .Sh NAME .Nm ng_tty -.Nd netgraph node type that is also a line discipline +.Nd netgraph node type that is also a TTY hook .Sh SYNOPSIS .In sys/types.h .In sys/ttycom.h @@ -48,11 +48,7 @@ .Sh DESCRIPTION The .Nm tty -node type is both a netgraph node type and a line discipline. -A new node is created when the corresponding line discipline, -.Dv NETGRAPHDISC , -is registered on a tty device (see -.Xr tty 4 ) . +node type is both a netgraph node type and a TTY hook. .Pp The node has a single hook called .Dv hook . @@ -61,13 +57,18 @@ .Dv hook are transmitted out on the tty device. No modification to the data is performed in either direction. -While the line discipline is installed on a tty, the normal -read and write operations are unavailable, returning +While the hook is installed on a tty, the normal read and write +operations are unavailable, returning .Er EIO . .Pp +Incoming data is delivered directly to ng_tty via the tty bypass hook as a +buffer pointer and length, this is converted to a mbuf and passed to the peer. +.Pp The node supports an optional .Dq hot character . -If set to non-zero, incoming +If the driver can not deliver data directly to the tty bypass hook then each +character is input one at a time. +If set to non-zero and bypass mode is unavailable, incoming data from the tty device is queued until this character is seen. This avoids sending lots of mbufs containing a small number of bytes, but introduces potentially infinite latency. @@ -110,14 +111,12 @@ .It Dv NGM_TTY_GET_HOTCHAR Returns an integer containing the current hot character in the lower eight bits. +.It Dv NGM_TTY_SET_TTY +This command takes an integer pointer to the open file descriptor of the tty +and registers the tty hooks. .El .Sh SHUTDOWN -This node shuts down when the corresponding device is closed -(or the line discipline is uninstalled on the device). -The -.Dv NGM_SHUTDOWN -control message is not valid, and always returns the error -.Er EOPNOTSUPP . +This node shuts down when the corresponding device is closed. .Sh SEE ALSO .Xr ioctl 2 , .Xr netgraph 4 , @@ -131,6 +130,7 @@ .Fx 4.0 . .Sh AUTHORS .An Archie Cobbs Aq archie@FreeBSD.org +.An Andrew Thompson Aq thompsa@FreeBSD.org .Sh BUGS The serial driver code also has a notion of a .Dq hot character . ==== //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.11 2008/07/18 06:14:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.12 2008/10/02 22:31:30 bms Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -480,6 +480,11 @@ init_param1(); init_param2(physmem); kdb_init(); + + /* use static kernel environment if so configured */ + if (envmode == 1) + kern_envp = static_env; + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.124 2008/10/02 15:37:58 zec Exp $"); #include #include @@ -1001,6 +1001,7 @@ static int linprocfs_donetdev(PFS_FILL_ARGS) { + INIT_VNET_NET(TD_TO_VNET(curthread)); char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; ==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); #include #include @@ -2051,6 +2051,7 @@ int linux_ifname(struct ifnet *ifp, char *buffer, size_t buflen) { + INIT_VNET_NET(ifp->if_vnet); struct ifnet *ifscan; int ethno; @@ -2084,6 +2085,7 @@ static struct ifnet * ifname_linux_to_bsd(const char *lxname, char *bsdname) { + INIT_VNET_NET(TD_TO_VNET(curthread)); struct ifnet *ifp; int len, unit; char *ep; @@ -2124,6 +2126,7 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { + INIT_VNET_NET(TD_TO_VNET(td)); #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else ==== //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.228 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -707,6 +707,7 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { + INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; ==== //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -546,6 +546,9 @@ static int linux_socket(struct thread *td, struct linux_socket_args *args) { +#ifdef INET6 + INIT_VNET_INET6(curvnet); +#endif struct socket_args /* { int domain; int type; ==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.21 2008/10/02 15:37:58 zec Exp $"); #include #include @@ -88,6 +88,7 @@ switch (cmd) { case SVR4_SIOCGIFNUM: { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; int ifnum = 0; ==== //depot/projects/mpsafetty/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.222 2008/03/04 16:54:31 jhb Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.223 2008/10/02 14:45:29 bms Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -331,7 +331,8 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ + kern/bus_if.m kern/clock_if.m \ + kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m ==== //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $ */ /* * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij. @@ -70,6 +70,11 @@ #include #include #include +#if !defined(_KERNEL) && defined(__FreeBSD_version) && \ + __FreeBSD_version >= 800049 +# define V_ip_do_randomid ip_do_randomid +# define V_ip_id ip_id +#endif #if !defined(_KERNEL) && !defined(__osf__) && !defined(__sgi) # define KERNEL # define _KERNEL @@ -120,7 +125,7 @@ /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $"; /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */ #endif ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.57 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ @@ -1759,6 +1759,7 @@ u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, u_int16_t rtag, struct ether_header *eh, struct ifnet *ifp) { + INIT_VNET_INET(curvnet); struct mbuf *m; int len, tlen; #ifdef INET @@ -2922,6 +2923,7 @@ pf_socket_lookup(int direction, struct pf_pdesc *pd) #endif { + INIT_VNET_INET(curvnet); struct pf_addr *saddr, *daddr; u_int16_t sport, dport; #ifdef __FreeBSD__ @@ -3101,6 +3103,7 @@ u_int16_t pf_get_mss(struct mbuf *m, int off, u_int16_t th_off, sa_family_t af) { + INIT_VNET_INET(curvnet); int hlen; u_int8_t hdr[60]; u_int8_t *opt, optlen; @@ -3140,6 +3143,7 @@ pf_calc_mss(struct pf_addr *addr, sa_family_t af, u_int16_t offer) { #ifdef INET + INIT_VNET_INET(curvnet); struct sockaddr_in *dst; struct route ro; #endif /* INET */ @@ -3242,6 +3246,7 @@ struct ifqueue *ifq) #endif { + INIT_VNET_INET(curvnet); struct pf_rule *nr = NULL; struct pf_addr *saddr = pd->src, *daddr = pd->dst; struct tcphdr *th = pd->hdr.tcp; @@ -6096,6 +6101,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, struct pf_state *s, struct pf_pdesc *pd) { + INIT_VNET_INET(curvnet); struct mbuf *m0, *m1; struct route iproute; struct route *ro = NULL; @@ -6633,18 +6639,30 @@ if (sum) { switch (p) { case IPPROTO_TCP: + { >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Fri Oct 3 10:01:04 2008 From: zec at FreeBSD.org (Marko Zec) Date: Fri Oct 3 10:01:12 2008 Subject: PERFORCE change 150849 for review Message-ID: <200810031000.m93A0ok7084798@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150849 Change 150849 by zec@zec_tpx32 on 2008/10/03 10:00:45 IFC @ 150847 (effectively making this branch equal to head) Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/param.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/protosw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#20 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -105,27 +105,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -326,7 +305,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#11 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -81,27 +81,6 @@ return (0); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - #define PG2MB(pgs) (((pgs) + (1 << 8) - 1) >> 8) static int @@ -284,7 +263,7 @@ mdhdr.dmapbase = DMAP_MIN_ADDRESS; mdhdr.dmapend = DMAP_MAX_ADDRESS; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576); printf("Dumping %llu MB:", (long long)dumpsize >> 20); ==== //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.23 2008/08/01 04:55:38 alc Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ */ /* @@ -80,7 +80,7 @@ #endif #if defined(SMP) || defined(KLD_MODULE) -#define MAXCPU 16 +#define MAXCPU 32 #else #define MAXCPU 1 #endif ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -103,27 +103,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -325,7 +304,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.11 2008/07/18 06:14:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.12 2008/10/02 22:31:30 bms Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -480,6 +480,11 @@ init_param1(); init_param2(physmem); kdb_init(); + + /* use static kernel environment if so configured */ + if (envmode == 1) + kern_envp = static_env; + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.124 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.228 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.21 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.222 2008/03/04 16:54:31 jhb Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.223 2008/10/02 14:45:29 bms Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -331,7 +331,8 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ + kern/bus_if.m kern/clock_if.m \ + kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m ==== //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#3 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.76 2008/07/13 20:08:38 dougb Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.77 2008/10/01 22:52:20 peter Exp $ TYPE="FreeBSD" REVISION="8.0" @@ -97,7 +97,7 @@ done if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then - svn=" r`cd $SRCDIR && $svnversion`" + svn=" r`cd $SRCDIR/sys && $svnversion`" else svn="" fi ==== //depot/projects/vimage-commit2/src/sys/conf/options#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.641 2008/08/27 01:31:42 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ # # On the handling of kernel options # @@ -741,9 +741,6 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# VFS options -LOOKUP_SHARED opt_vfs.h - # HWPMC options HWPMC_HOOKS ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $ */ /* * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij. @@ -125,7 +125,7 @@ /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $"; /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */ #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.57 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.17 2008/10/02 15:37:58 zec Exp $"); #endif #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.37 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.6 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.17 2008/03/29 00:24:36 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.18 2008/10/02 15:37:58 zec Exp $ */ /* $OpenBSD: pfvar.h,v 1.244 2007/02/23 21:31:51 deraadt Exp $ */ /* ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.3 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#8 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include "opt_config.h" @@ -177,30 +177,6 @@ static struct kerneldumpheader kdh; /* - * Text dumps are prefixed with a normal kernel dump header but with a - * different magic number to allow them to be uniquely identified. - */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, - uint64_t dumplen, uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - -/* * Calculate and fill in the checksum for a ustar header. */ static void @@ -468,7 +444,7 @@ */ textdump_offset = di->mediasize - sizeof(kdh); textdump_saveoff(&trailer_offset); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); /* @@ -493,7 +469,7 @@ * size. */ dumplen = trailer_offset - (textdump_offset + TEXTDUMP_BLOCKSIZE); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, dumplen, + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, dumplen, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); textdump_restoreoff(trailer_offset); ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.47 2008/08/01 13:11:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.48 2008/10/02 20:29:45 rnoland Exp $"); #include "opt_bus.h" @@ -70,6 +70,7 @@ CHIP_I915, /* 915G/915GM */ CHIP_I965, /* G965 */ CHIP_G33, /* G33/Q33/Q35 */ + CHIP_G4X, /* G45/Q45 */ }; /* The i810 through i855 have the registers at BAR 1, and the GATT gets @@ -133,7 +134,7 @@ {0x25628086, CHIP_I830, 0x00020000, "Intel 82845M (845M GMCH) SVGA controller"}, {0x35828086, CHIP_I855, 0x00020000, - "Intel 82852/5"}, + "Intel 82852/855GM SVGA controller"}, {0x25728086, CHIP_I855, 0x00020000, "Intel 82865G (865G GMCH) SVGA controller"}, {0x25828086, CHIP_I915, 0x00020000, @@ -154,18 +155,26 @@ "Intel G965 SVGA controller"}, {0x29928086, CHIP_I965, 0x00020000, "Intel Q965 SVGA controller"}, - {0x29a28086, CHIP_I965, 0x00020000, + {0x29A28086, CHIP_I965, 0x00020000, "Intel G965 SVGA controller"}, - {0x29b28086, CHIP_G33, 0x00020000, + {0x29B28086, CHIP_G33, 0x00020000, "Intel Q35 SVGA controller"}, - {0x29c28086, CHIP_G33, 0x00020000, + {0x29C28086, CHIP_G33, 0x00020000, "Intel G33 SVGA controller"}, - {0x29d28086, CHIP_G33, 0x00020000, + {0x29D28086, CHIP_G33, 0x00020000, "Intel Q33 SVGA controller"}, - {0x2a028086, CHIP_I965, 0x00020000, + {0x2A028086, CHIP_I965, 0x00020000, "Intel GM965 SVGA controller"}, - {0x2a128086, CHIP_I965, 0x00020000, + {0x2A128086, CHIP_I965, 0x00020000, "Intel GME965 SVGA controller"}, + {0x2A428086, CHIP_I965, 0x00020000, + "Intel GM45 SVGA controller"}, + {0x2E028086, CHIP_G4X, 0x00020000, + "Intel 4 Series SVGA controller"}, + {0x2E128086, CHIP_G4X, 0x00020000, + "Intel Q45 SVGA controller"}, + {0x2E228086, CHIP_G4X, 0x00020000, + "Intel G45 SVGA controller"}, {0, 0, 0, NULL} }; @@ -377,6 +386,7 @@ agp_set_aperture_resource(dev, AGP_I915_GMADR); break; case CHIP_I965: + case CHIP_G4X: sc->sc_res_spec = agp_i965_res_spec; agp_set_aperture_resource(dev, AGP_I915_GMADR); break; @@ -476,7 +486,8 @@ gatt->ag_physical = pgtblctl & ~1; } else if (sc->chiptype == CHIP_I855 || sc->chiptype == CHIP_I915 || - sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33) { + sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { unsigned int gcc1, pgtblctl, stolen, gtt_size; /* Stolen memory is set up at the beginning of the aperture by @@ -491,7 +502,6 @@ gtt_size = 256; break; case CHIP_I965: - case CHIP_G33: switch (bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL) & AGP_I810_PGTBL_SIZE_MASK) { case AGP_I810_PGTBL_SIZE_128KB: @@ -503,6 +513,15 @@ case AGP_I810_PGTBL_SIZE_512KB: gtt_size = 512; break; + case AGP_I965_PGTBL_SIZE_1MB: + gtt_size = 1024; + break; + case AGP_I965_PGTBL_SIZE_2MB: + gtt_size = 2048; + break; + case AGP_I965_PGTBL_SIZE_1_5MB: + gtt_size = 1024 + 512; + break; default: device_printf(dev, "Bad PGTBL size\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -512,6 +531,27 @@ return EINVAL; } break; + case CHIP_G33: + gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 2); + switch (gcc1 & AGP_G33_MGGC_GGMS_MASK) { + case AGP_G33_MGGC_GGMS_SIZE_1M: + gtt_size = 1024; + break; + case AGP_G33_MGGC_GGMS_SIZE_2M: + gtt_size = 2048; + break; + default: + device_printf(dev, "Bad PGTBL size\n"); + bus_release_resources(dev, sc->sc_res_spec, + sc->sc_res); + free(gatt, M_AGP); + agp_generic_detach(dev); + return EINVAL; + } + break; + case CHIP_G4X: + gtt_size = 0; + break; default: device_printf(dev, "Bad chiptype\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -528,28 +568,86 @@ stolen = 1024; break; case AGP_I855_GCC1_GMS_STOLEN_4M: - stolen = 4096; + stolen = 4 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_8M: - stolen = 8192; + stolen = 8 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_16M: - stolen = 16384; + stolen = 16 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_32M: - stolen = 32768; + stolen = 32 * 1024; break; case AGP_I915_GCC1_GMS_STOLEN_48M: - stolen = 49152; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 48 * 1024; + } else { + stolen = 0; + } break; case AGP_I915_GCC1_GMS_STOLEN_64M: - stolen = 65536; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 64 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_128M: - stolen = 128 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 128 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_256M: - stolen = 256 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 256 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_96M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 96 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_160M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 160 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_224M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 224 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_352M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 352 * 1024; + } else { + stolen = 0; + } break; default: device_printf(dev, "unknown memory configuration, " @@ -560,7 +658,11 @@ agp_generic_detach(dev); return EINVAL; } - sc->stolen = (stolen - gtt_size - 4) * 1024 / 4096; + + if (sc->chiptype != CHIP_G4X) + gtt_size += 4; + + sc->stolen = (stolen - gtt_size) * 1024 / 4096; if (sc->stolen > 0) device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4); device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agpreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.19 2007/07/13 16:28:12 anholt Exp $ + * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.20 2008/10/02 20:29:45 rnoland Exp $ */ #ifndef _PCI_AGPREG_H_ @@ -215,7 +215,7 @@ #define AGP_I855_GCC1_DEV2 0x08 #define AGP_I855_GCC1_DEV2_ENABLED 0x00 #define AGP_I855_GCC1_DEV2_DISABLED 0x08 -#define AGP_I855_GCC1_GMS 0x70 +#define AGP_I855_GCC1_GMS 0xf0 /* Top bit reserved pre-G33 */ #define AGP_I855_GCC1_GMS_STOLEN_0M 0x00 #define AGP_I855_GCC1_GMS_STOLEN_1M 0x10 #define AGP_I855_GCC1_GMS_STOLEN_4M 0x20 @@ -259,14 +259,28 @@ #define AGP_I965_MSAC_GMASIZE_128 0x00 #define AGP_I965_MSAC_GMASIZE_256 0x02 #define AGP_I965_MSAC_GMASIZE_512 0x06 +#define AGP_I965_PGTBL_SIZE_1MB (3 << 1) +#define AGP_I965_PGTBL_SIZE_2MB (4 << 1) +#define AGP_I965_PGTBL_SIZE_1_5MB (5 << 1) /* * G33 registers */ +#define AGP_G33_MGGC_GGMS_MASK (3 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_1M (1 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_2M (2 << 8) #define AGP_G33_GCC1_GMS_STOLEN_128M 0x80 #define AGP_G33_GCC1_GMS_STOLEN_256M 0x90 /* + * G4X registers + */ +#define AGP_G4X_GCC1_GMS_STOLEN_96M 0xa0 +#define AGP_G4X_GCC1_GMS_STOLEN_160M 0xb0 +#define AGP_G4X_GCC1_GMS_STOLEN_224M 0xc0 +#define AGP_G4X_GCC1_GMS_STOLEN_352M 0xd0 + +/* * NVIDIA nForce/nForce2 registers */ #define AGP_NVIDIA_0_APBASE 0x10 ==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.229 2008/10/02 19:18:28 sos Exp $"); #include "opt_ata.h" #include @@ -2124,59 +2124,66 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); static struct ata_chip_id ids[] = - {{ ATA_I82371FB, 0, 0, 0x00, ATA_WDMA2, "PIIX" }, - { ATA_I82371SB, 0, 0, 0x00, ATA_WDMA2, "PIIX3" }, - { ATA_I82371AB, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82443MX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82451NX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82801AB, 0, 0, 0x00, ATA_UDMA2, "ICH0" }, - { ATA_I82801AA, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82372FB, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82801BA, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801BA_1, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801DB_1, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "ICH5" }, - { ATA_I82801EB_S1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I82801EB_R1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I6300ESB, 0, 0, 0x00, ATA_UDMA5, "6300ESB" }, - { ATA_I6300ESB_S1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I6300ESB_R1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I82801FB, 0, 0, 0x00, ATA_UDMA5, "ICH6" }, - { ATA_I82801FB_S1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FB_R1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FBM, 0, AHCI, 0x00, ATA_SA150, "ICH6M" }, - { ATA_I82801GB, 0, 0, 0x00, ATA_UDMA5, "ICH7" }, - { ATA_I82801GB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GBM_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I63XXESB2, 0, 0, 0x00, ATA_UDMA5, "63XXESB2" }, - { ATA_I63XXESB2_S1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_S2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I82801HB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_R1, 2, AHCI, 0x00, ATA_SA300, "ICH9R" }, - { ATA_I82801HB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HBM, 0, 0, 0x00, ATA_UDMA5, "ICH8M" }, - { ATA_I82801HBM_S1, 0, 0, 0x00, ATA_SA150, "ICH8M" }, - { ATA_I82801HBM_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, - { ATA_I82801HBM_S3, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, - { ATA_I82801IB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH2, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I31244, 0, 0, 0x00, ATA_SA150, "31244" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Fri Oct 3 10:10:15 2008 From: zec at FreeBSD.org (Marko Zec) Date: Fri Oct 3 10:10:21 2008 Subject: PERFORCE change 150851 for review Message-ID: <200810031010.m93AADUm086643@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150851 Change 150851 by zec@zec_tca51 on 2008/10/03 10:09:14 Fix misintegrations. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#6 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NET_VNET_H_ ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/netinet/vinet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NETINET_VINET_H_ ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NETINET6_VINET6_H_ ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NETIPSEC_VIPSEC_H_ From zec at FreeBSD.org Fri Oct 3 10:24:40 2008 From: zec at FreeBSD.org (Marko Zec) Date: Fri Oct 3 10:24:50 2008 Subject: PERFORCE change 150853 for review Message-ID: <200810031024.m93AORJN087703@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150853 Change 150853 by zec@zec_tpx32 on 2008/10/03 10:23:38 IFC @ 150847, temporarily causing messa nd havoc... Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#14 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#25 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#12 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#8 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/vimage/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/vimage/src/sys/conf/options#33 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#16 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#11 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#18 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#9 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#8 integrate .. //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#5 integrate .. //depot/projects/vimage/src/sys/ddb/db_textdump.c#7 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/vimage/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#19 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#17 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#15 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#17 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#7 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfevar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#9 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/include/param.h#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_xxx.c#12 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#15 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#14 integrate .. //depot/projects/vimage/src/sys/net/if.c#41 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#19 integrate .. //depot/projects/vimage/src/sys/net/if_ef.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/vimage/src/sys/net/if_faith.c#6 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#17 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#7 integrate .. //depot/projects/vimage/src/sys/net/if_gre.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#26 integrate .. //depot/projects/vimage/src/sys/net/if_mib.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#18 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#12 integrate .. //depot/projects/vimage/src/sys/net/raw_cb.c#10 integrate .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/vimage/src/sys/net/route.c#28 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#17 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#12 integrate .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#39 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#16 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#13 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#33 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/ip6.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#48 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#36 integrate .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#52 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#30 integrate .. //depot/projects/vimage/src/sys/netinet6/dest6.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#19 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#8 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#17 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#16 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#32 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#8 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#19 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/route6.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#17 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#21 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#27 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.h#10 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#17 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#18 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#23 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#14 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#14 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#16 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#16 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#13 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#17 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/rpc/authunix_prot.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#13 integrate .. //depot/projects/vimage/src/sys/sys/kerneldump.h#3 integrate .. //depot/projects/vimage/src/sys/sys/protosw.h#6 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#27 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#66 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -105,27 +105,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -326,7 +305,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#12 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -81,27 +81,6 @@ return (0); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - #define PG2MB(pgs) (((pgs) + (1 << 8) - 1) >> 8) static int @@ -284,7 +263,7 @@ mdhdr.dmapbase = DMAP_MIN_ADDRESS; mdhdr.dmapend = DMAP_MAX_ADDRESS; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576); printf("Dumping %llu MB:", (long long)dumpsize >> 20); ==== //depot/projects/vimage/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.23 2008/08/01 04:55:38 alc Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ */ /* @@ -80,7 +80,7 @@ #endif #if defined(SMP) || defined(KLD_MODULE) -#define MAXCPU 16 +#define MAXCPU 32 #else #define MAXCPU 1 #endif ==== //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include #include @@ -103,27 +103,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -325,7 +304,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.11 2008/07/18 06:14:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.12 2008/10/02 22:31:30 bms Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -480,6 +480,11 @@ init_param1(); init_param2(physmem); kdb_init(); + + /* use static kernel environment if so configured */ + if (envmode == 1) + kern_envp = static_env; + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#24 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.124 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.228 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.21 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage/src/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.222 2008/03/04 16:54:31 jhb Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.223 2008/10/02 14:45:29 bms Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -331,7 +331,8 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ + kern/bus_if.m kern/clock_if.m \ + kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m ==== //depot/projects/vimage/src/sys/conf/newvers.sh#5 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.76 2008/07/13 20:08:38 dougb Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.77 2008/10/01 22:52:20 peter Exp $ TYPE="FreeBSD" REVISION="8.0" @@ -97,7 +97,7 @@ done if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then - svn=" r`cd $SRCDIR && $svnversion`" + svn=" r`cd $SRCDIR/sys && $svnversion`" else svn="" fi ==== //depot/projects/vimage/src/sys/conf/options#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.641 2008/08/27 01:31:42 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ # # On the handling of kernel options # @@ -743,9 +743,6 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# VFS options -LOOKUP_SHARED opt_vfs.h - # HWPMC options HWPMC_HOOKS ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $ */ /* * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij. @@ -70,6 +70,11 @@ #include #include #include +#if !defined(_KERNEL) && defined(__FreeBSD_version) && \ + __FreeBSD_version >= 800049 +# define V_ip_do_randomid ip_do_randomid +# define V_ip_id ip_id +#endif #if !defined(_KERNEL) && !defined(__osf__) && !defined(__sgi) # define KERNEL # define _KERNEL @@ -120,7 +125,7 @@ /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $"; /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */ #endif ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#16 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.57 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.17 2008/10/02 15:37:58 zec Exp $"); #endif #include ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#18 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.37 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.6 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.17 2008/03/29 00:24:36 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.18 2008/10/02 15:37:58 zec Exp $ */ /* $OpenBSD: pfvar.h,v 1.244 2007/02/23 21:31:51 deraadt Exp $ */ /* ==== //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.3 2008/10/02 15:37:58 zec Exp $"); #include #include ==== //depot/projects/vimage/src/sys/ddb/db_textdump.c#7 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include "opt_config.h" @@ -177,30 +177,6 @@ static struct kerneldumpheader kdh; /* - * Text dumps are prefixed with a normal kernel dump header but with a - * different magic number to allow them to be uniquely identified. - */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, - uint64_t dumplen, uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - -/* * Calculate and fill in the checksum for a ustar header. */ static void @@ -468,7 +444,7 @@ */ textdump_offset = di->mediasize - sizeof(kdh); textdump_saveoff(&trailer_offset); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); /* @@ -493,7 +469,7 @@ * size. */ dumplen = trailer_offset - (textdump_offset + TEXTDUMP_BLOCKSIZE); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, dumplen, + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, dumplen, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); textdump_restoreoff(trailer_offset); ==== //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.47 2008/08/01 13:11:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.48 2008/10/02 20:29:45 rnoland Exp $"); #include "opt_bus.h" @@ -70,6 +70,7 @@ CHIP_I915, /* 915G/915GM */ CHIP_I965, /* G965 */ CHIP_G33, /* G33/Q33/Q35 */ + CHIP_G4X, /* G45/Q45 */ }; /* The i810 through i855 have the registers at BAR 1, and the GATT gets @@ -133,7 +134,7 @@ {0x25628086, CHIP_I830, 0x00020000, "Intel 82845M (845M GMCH) SVGA controller"}, {0x35828086, CHIP_I855, 0x00020000, - "Intel 82852/5"}, + "Intel 82852/855GM SVGA controller"}, {0x25728086, CHIP_I855, 0x00020000, "Intel 82865G (865G GMCH) SVGA controller"}, {0x25828086, CHIP_I915, 0x00020000, @@ -154,18 +155,26 @@ "Intel G965 SVGA controller"}, {0x29928086, CHIP_I965, 0x00020000, "Intel Q965 SVGA controller"}, - {0x29a28086, CHIP_I965, 0x00020000, + {0x29A28086, CHIP_I965, 0x00020000, "Intel G965 SVGA controller"}, - {0x29b28086, CHIP_G33, 0x00020000, + {0x29B28086, CHIP_G33, 0x00020000, "Intel Q35 SVGA controller"}, - {0x29c28086, CHIP_G33, 0x00020000, + {0x29C28086, CHIP_G33, 0x00020000, "Intel G33 SVGA controller"}, - {0x29d28086, CHIP_G33, 0x00020000, + {0x29D28086, CHIP_G33, 0x00020000, "Intel Q33 SVGA controller"}, - {0x2a028086, CHIP_I965, 0x00020000, + {0x2A028086, CHIP_I965, 0x00020000, "Intel GM965 SVGA controller"}, - {0x2a128086, CHIP_I965, 0x00020000, + {0x2A128086, CHIP_I965, 0x00020000, "Intel GME965 SVGA controller"}, + {0x2A428086, CHIP_I965, 0x00020000, + "Intel GM45 SVGA controller"}, + {0x2E028086, CHIP_G4X, 0x00020000, + "Intel 4 Series SVGA controller"}, + {0x2E128086, CHIP_G4X, 0x00020000, + "Intel Q45 SVGA controller"}, + {0x2E228086, CHIP_G4X, 0x00020000, + "Intel G45 SVGA controller"}, {0, 0, 0, NULL} }; @@ -377,6 +386,7 @@ agp_set_aperture_resource(dev, AGP_I915_GMADR); break; case CHIP_I965: + case CHIP_G4X: sc->sc_res_spec = agp_i965_res_spec; agp_set_aperture_resource(dev, AGP_I915_GMADR); break; @@ -476,7 +486,8 @@ gatt->ag_physical = pgtblctl & ~1; } else if (sc->chiptype == CHIP_I855 || sc->chiptype == CHIP_I915 || - sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33) { + sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { unsigned int gcc1, pgtblctl, stolen, gtt_size; /* Stolen memory is set up at the beginning of the aperture by @@ -491,7 +502,6 @@ gtt_size = 256; break; case CHIP_I965: - case CHIP_G33: switch (bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL) & AGP_I810_PGTBL_SIZE_MASK) { case AGP_I810_PGTBL_SIZE_128KB: @@ -503,6 +513,15 @@ case AGP_I810_PGTBL_SIZE_512KB: gtt_size = 512; break; + case AGP_I965_PGTBL_SIZE_1MB: + gtt_size = 1024; + break; + case AGP_I965_PGTBL_SIZE_2MB: + gtt_size = 2048; + break; + case AGP_I965_PGTBL_SIZE_1_5MB: + gtt_size = 1024 + 512; + break; default: device_printf(dev, "Bad PGTBL size\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -512,6 +531,27 @@ return EINVAL; } break; + case CHIP_G33: + gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 2); + switch (gcc1 & AGP_G33_MGGC_GGMS_MASK) { + case AGP_G33_MGGC_GGMS_SIZE_1M: + gtt_size = 1024; + break; + case AGP_G33_MGGC_GGMS_SIZE_2M: + gtt_size = 2048; + break; + default: + device_printf(dev, "Bad PGTBL size\n"); + bus_release_resources(dev, sc->sc_res_spec, + sc->sc_res); + free(gatt, M_AGP); + agp_generic_detach(dev); + return EINVAL; + } + break; + case CHIP_G4X: + gtt_size = 0; + break; default: device_printf(dev, "Bad chiptype\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -528,28 +568,86 @@ stolen = 1024; break; case AGP_I855_GCC1_GMS_STOLEN_4M: - stolen = 4096; + stolen = 4 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_8M: - stolen = 8192; + stolen = 8 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_16M: - stolen = 16384; + stolen = 16 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_32M: - stolen = 32768; + stolen = 32 * 1024; break; case AGP_I915_GCC1_GMS_STOLEN_48M: - stolen = 49152; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 48 * 1024; + } else { + stolen = 0; + } break; case AGP_I915_GCC1_GMS_STOLEN_64M: - stolen = 65536; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 64 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_128M: - stolen = 128 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 128 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_256M: - stolen = 256 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 256 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_96M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 96 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_160M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 160 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_224M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 224 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_352M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 352 * 1024; + } else { + stolen = 0; + } break; default: device_printf(dev, "unknown memory configuration, " @@ -560,7 +658,11 @@ agp_generic_detach(dev); return EINVAL; } - sc->stolen = (stolen - gtt_size - 4) * 1024 / 4096; + + if (sc->chiptype != CHIP_G4X) + gtt_size += 4; + + sc->stolen = (stolen - gtt_size) * 1024 / 4096; if (sc->stolen > 0) device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4); device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); ==== //depot/projects/vimage/src/sys/dev/agp/agpreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.19 2007/07/13 16:28:12 anholt Exp $ + * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.20 2008/10/02 20:29:45 rnoland Exp $ */ #ifndef _PCI_AGPREG_H_ @@ -215,7 +215,7 @@ #define AGP_I855_GCC1_DEV2 0x08 #define AGP_I855_GCC1_DEV2_ENABLED 0x00 #define AGP_I855_GCC1_DEV2_DISABLED 0x08 -#define AGP_I855_GCC1_GMS 0x70 +#define AGP_I855_GCC1_GMS 0xf0 /* Top bit reserved pre-G33 */ #define AGP_I855_GCC1_GMS_STOLEN_0M 0x00 #define AGP_I855_GCC1_GMS_STOLEN_1M 0x10 #define AGP_I855_GCC1_GMS_STOLEN_4M 0x20 @@ -259,14 +259,28 @@ #define AGP_I965_MSAC_GMASIZE_128 0x00 #define AGP_I965_MSAC_GMASIZE_256 0x02 #define AGP_I965_MSAC_GMASIZE_512 0x06 +#define AGP_I965_PGTBL_SIZE_1MB (3 << 1) +#define AGP_I965_PGTBL_SIZE_2MB (4 << 1) +#define AGP_I965_PGTBL_SIZE_1_5MB (5 << 1) /* * G33 registers */ +#define AGP_G33_MGGC_GGMS_MASK (3 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_1M (1 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_2M (2 << 8) #define AGP_G33_GCC1_GMS_STOLEN_128M 0x80 #define AGP_G33_GCC1_GMS_STOLEN_256M 0x90 /* + * G4X registers + */ +#define AGP_G4X_GCC1_GMS_STOLEN_96M 0xa0 +#define AGP_G4X_GCC1_GMS_STOLEN_160M 0xb0 +#define AGP_G4X_GCC1_GMS_STOLEN_224M 0xc0 +#define AGP_G4X_GCC1_GMS_STOLEN_352M 0xd0 + +/* * NVIDIA nForce/nForce2 registers */ #define AGP_NVIDIA_0_APBASE 0x10 ==== //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.229 2008/10/02 19:18:28 sos Exp $"); #include "opt_ata.h" #include @@ -2124,59 +2124,66 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); static struct ata_chip_id ids[] = - {{ ATA_I82371FB, 0, 0, 0x00, ATA_WDMA2, "PIIX" }, - { ATA_I82371SB, 0, 0, 0x00, ATA_WDMA2, "PIIX3" }, - { ATA_I82371AB, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82443MX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82451NX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82801AB, 0, 0, 0x00, ATA_UDMA2, "ICH0" }, - { ATA_I82801AA, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82372FB, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82801BA, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801BA_1, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801DB_1, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "ICH5" }, - { ATA_I82801EB_S1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I82801EB_R1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I6300ESB, 0, 0, 0x00, ATA_UDMA5, "6300ESB" }, - { ATA_I6300ESB_S1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I6300ESB_R1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I82801FB, 0, 0, 0x00, ATA_UDMA5, "ICH6" }, - { ATA_I82801FB_S1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FB_R1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FBM, 0, AHCI, 0x00, ATA_SA150, "ICH6M" }, - { ATA_I82801GB, 0, 0, 0x00, ATA_UDMA5, "ICH7" }, - { ATA_I82801GB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GBM_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I63XXESB2, 0, 0, 0x00, ATA_UDMA5, "63XXESB2" }, - { ATA_I63XXESB2_S1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_S2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I82801HB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_R1, 2, AHCI, 0x00, ATA_SA300, "ICH9R" }, - { ATA_I82801HB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From pgj at FreeBSD.org Fri Oct 3 17:40:33 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Fri Oct 3 17:40:40 2008 Subject: PERFORCE change 150872 for review Message-ID: <200810031740.m93HeTkx056778@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150872 Change 150872 by pgj@kolbasz on 2008/10/03 17:40:18 Add Hungarian translation of DTrace chapter from Handbook Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#2 (text+ko) ==== @@ -14,258 +14,359 @@ Tom Rhodes - Written by + Írta: DTrace - DTrace, also known as Dynamic Tracing, was developed by - &sun; as a tool for locating performance bottlenecks - in production and pre-production systems. It is not, in any way, - a debugging tool, but a tool for real time system analysis to - locate performance and other issues. + A DTrace, vagy más néven Dynamic Tracing + technológiát a &sun; dolgozta ki szerverek + teljesítményében jelentkezõ szûk + keresztmetszetek felderítésének + megkönnyítésére. Ez nem egy + nyomkövetésre szolgáló megoldást + takar, hanem inkább a rendszer valós idejû + elemzését és + teljesítményének vizsgálatát + elõsegítõ eszközt. - DTrace is a remarkable profiling tool, with an impressive - array of features for diagnosing system issues. It may also be - used to run pre-written scripts to take advantage of its - capabilities. Users may even author their own utilities using - the DTrace D Language, allowing them to customize their profiling - based on specific needs. + A DTrace figyelemre méltó elemzõeszköz, + rengeteg rendkívül hasznos képességgel + rendelkezik a rendszerben felbukkanó problémák + diagnosztizálására. Elõre programozott + szkriptek segítségével pedig ezen + képességek további elõnyeit tudjuk + kihasználni, ugyanis a DTrace programozható egy + ún. D nyelven, amelynek révén a + különbözõ vizsgálatokat könnyen a + saját igényeink szerint tudjuk + alakítani. - Synopsis + Áttekintés DTrace - DTrace support + DTrace támogatás DTrace - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - What DTrace is and what features it provides. + mi is az a DTrace és milyen lehetõségei + vannak; - Differences between the &solaris; DTrace implementation - and the one provided by &os;. + a &solaris; és &os; operációs + rendszereken megtalálható DTrace + implementációk közti + eltéréseket; - How to enable and use DTrace on &os;. + a DTrace &os; alatt hogyan engedélyezhetõ + és használható. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand &unix; and &os; basics - (). + a &unix; és &os; alapvetõ ismerete (); - Be familiar with - the basics of kernel configuration/compilation - (). + a rendszermag konfigurációjának + és fordításának alapvetõ + ismerete (); - Have some familiarity with security and how it - pertains to &os; (). + az operációs rendszerek és azon + belül a &os; biztonsági fogalmainak minimális + ismerete (); - Understand how to obtain and rebuild the &os; sources + a &os; forrásainak megszerzésének + és azok lefordításának ismerete (). - - - This feature is considered experimental. Some options - may be lacking in functionality, other parts may not work - at all. In time, this feature will be considered production - ready and this documentation will be altered to fit that - situation. + + Ez a funkció még folyamatos tesztelés + alatt áll. Bizonyos részei még + egyáltalán nem, vagy csak korlátozottan + érhetõek el. A dokumentáció annak + megfelelõen fog majd változni, hogy ezek az elemek + fokozatosan elérik az éles + felhasználáshoz szükséges + szintet. - Implementation Differences + Eltérések az + implementációban - While the DTrace in &os; is very similar to that found - in &solaris;, differences exist that should be explained before - continuing. The primary difference users will notice is that - on &os;, DTrace needs to be specifically enabled. There are - kernel options and modules which must be enabled for DTrace to - work properly. These will be explained later. + Noha a &os; alatt megtalálható DTrace + implementáció nagyon hasonló az eredeti, + &solaris; alatt futó változathoz, tartalmaz bizonyos + különbségeket, amelyeket a + továbblépés elõtt mindenképpen + érdemes megemlítenünk. Az egyik legfontosabb + ilyen szembetûnõ különbség, hogy a &os; + esetén a DTrace használatát külön + engedélyezni kell. A DTrace megfelelõ + mûködéséhez tehát a rendszermag + konfigurációs állományában meg + kell adnunk bizonyos beállításokat és + modulokat kell betöltenünk. Ezekrõl hamarosan + szó lesz. - There is a DDB_CTF kernel option which - is used to enable support for loading the CTF - data from kernel modules and the kernel itself. - CTF is the &solaris; Compressed C Type format - which encapsulates a reduced form of debugging information - similar to DWARF and the venerable stabs. - This CTF data is added to the binaries by the - ctfconvert and ctfmerge - build tools. The ctfconvert utility parses - DWARF debug ELF sections - created by the compiler and ctfmerge merges - CTF ELF sections from - objects into either executables or shared libraries. More on - how to enable this for the kernel and &os; build is - forthcoming. + A rendszermag konfigurációs + állományában a DDB_CTF + opció segítségével tudjuk + engedélyezni ún. CTF adatok + betöltését mind a rendszermag + moduljaiból, mind pedig magából a + rendszermagból egyaránt. A CTF a + &solaris; Compressed Type Format + elnevezésû formátumára utal, amellyel + például a DWARF + megoldásához hasonló módon + tárolhatunk tömörített alakban + különbözõ típusú + nyomkövetési információkat. Ilyen + CTF adatok többek közt a + ctfconvert és a + ctfmerge használatával + rendelhetõek hozzá bináris + állományokhoz. A ctfconvert + segédprogram a fordítóprogram által az + ELF állományokban szereplõ + DWARF típusú szakaszokban + tárolt információkat képes beolvasni, + és a ctfmerge a + tárgykódban található + CTF típusú ELF + szakaszokat tudja végrehajtható + állományokká vagy osztott + könyvtárakka összefûzni. Röviden + beszélni fogunk arról, hogyan lehet mindezeket a + &os; alaprendszerébe és rendszermagjába is + beépíteni. - Some different providers exist for &os; than for &solaris;. - Most notable is the dtmalloc provider, which - allows tracing malloc() by type in the - &os; kernel. + &os; és &solaris; esetén elõfordulhat, hogy + más fajta providerek állnak + rendelkezésünkre. Ezek közül talán a + legfontosabb a dtmalloc, amely a &os; + rendszermagjában típus szerint teszi + lehetõvé a malloc() + függvény követését. - Only root may use DTrace on &os;. - This is related to security differences, &solaris; has a few - low level security checks which do not yet exist in &os;. As - such, the /dev/dtrace/dtrace is strictly - limited to root users only. + &os; alatt kizárólag csak a + root tudja használni a DTrace-t. Ennek + oka a két operációs rendszer + biztonsági megoldásai közti + különbségekben keresendõ, mivel a &solaris; + esetén létezik néhány olyan + alacsonyszintû ellenõrzés, amely a + &os;-nél még nincs. Ezért + például a /dev/dtrace/dtrace + eszköz szigorúan csak a root + számára érhetõ el. - Finally, the DTrace software falls under &sun;'s - CDDL license. The Common Development - and Distribution License comes with &os;, see the + Végezetül megemlítjük, hogy a DTrace + felhasználására a &sun; CDDL + licence vonatkozik. A Common Development and + Distribution License &os; a /usr/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE - or view it online at - - http://www.opensolaris.org/os/licensing. + állományban található, vagy interneten + keresztül a + címen. - This license means that a &os; kernel with the DTrace options - is still BSD licensed; however the - CDDL kicks in when the modules are distributed - in binary form, or the binaries are loaded. + Ezen licenc értelmében a DTrace + támogatással készített &os; + rendszermagok továbbra is BSD + licencûek maradnak, azonban a rendszerrel terjesztett + binárisok futtatásakor vagy a modulok + betöltésekor már a CDDL + érvényesül. - Enabling DTrace Support + A DTrace támogatásának + engedélyezése - To enable support for DTrace, add the following lines to - the kernel configuration file: + A DTrace által felkínált + lehetõségeket a következõ sorok + hozzáadásával tudjuk engedélyezni a + rendszermag konfigurációs + állományában: options KDTRACE_HOOKS options DDB_CTF - Users of the AMD64 architecture will want to add the - following line to their kernel configuration file: + AMD64 architektúrán ezeken kívül + még az alábbi sor is kelleni fog: options KDTRACE_FRAME - This option provides support for the FBT - feature. DTrace will work without this option; however, there - will be limited support for function boundary tracing. + Ezzel a beállítással az + FBT (function boundary tracing) + részére nyújtunk támogatást. + A DTrace ugyan enélkül is képes lesz + mûködni, de akkor csak korlátozott + mértékben tudunk ilyen típusú + vizsgálatokat végezni. - All sources must be rebuilt and installed with CTF options. - To accomplish this task, rebuild the &os; sources using: + Az egész rendszert újra kell fordítanunk + a CTF használatával. Ennek + elvégzéséhez a következõ + parancsokat kell kiadnunk: &prompt.root; cd /usr/src - &prompt.root; make WITH_CTF=1 buildworld - &prompt.root; make WITH_CFT=1 kernel - &prompt.root; make WITH_CFT=1 installworld - &prompt.root; mergemaster -Ui +&prompt.root; make WITH_CTF=1 buildworld +&prompt.root; make WITH_CFT=1 kernel +&prompt.root; make WITH_CFT=1 installworld +&prompt.root; mergemaster -Ui - The system will need to be restarted. + A fordítás befejezõdése után + indítsuk újra a rendszerünket. - After rebooting and allowing the new kernel to be loaded - into memory, support for the Korn shell should be added. This - is needed as the DTrace toolkit has several utilities written - in ksh. Install the - shells/ksh93. It is also - possible to run these tools under - shells/pdksh or - shells/mksh. + A rendszer újraindulása és az új + rendszermag betöltõdése után + szükségünk lesz egy Korn-féle + parancsértelmezõre is, mivel a DTrace + eszköztárában rengeteg, a + ksh programra épülõ + eszközt fogunk találni. Ezért tehát + telepítsük a shells/ksh93 csomagot, de + megjegyezzük, hogy ugyanezen eszközök + számára a shells/pdksh vagy shells/mksh csomagok is + megfelelnek. - Finally, obtain the current DTrace toolkit. The current - version is available at - - http://www.opensolaris.org/os/community/dtrace/dtracetoolkit/. - There is an install mechanism included; however, installation - is not required to make use of the bundled utilities. + Végül töltsük le a DTrace + eszköztárának legfrissebb + változatát. Az aktuális verzió a + címen érhetõ el. Képes + önmagát telepíteni, de a benne + található eszközök + használatához nem kötelezõ ezt + elvégezni. - Using DTrace + A DTrace használata - Before making use of DTrace functionality, the DTrace device - must exist. To load the device, issue the following - command: + A DTrace funkcióinak alkalmazásához + léteznie kell egy DTrace eszköznek. Ennek + létrehozásához be kell töltenünk a + megfelelõ modult: &prompt.root; kldload dtraceall - DTrace support should now be available. To view all probes - the administrator may now execute the following command: + Innentõl már mûködésre + kész a DTrace. Rendszeradminisztrátorként a + következõ módon kérdezhetjük le a + rendelkezésre álló + vizsgálatokat: &prompt.root; dtrace -l | more - All output is passed to the more - utility as it will quickly overflow the screen buffer. At - this point, DTrace should be considered working. It is now - time to review the toolkit. + Mivel lekérdezés eredménye pillanatok + alatt betöltené az egész képernyõt, + ezért az egészet még + átirányítjuk a more + parancshoz. Ha ez rendesen lefut, akkor a DTrace + ténylegesen használhatónak tekinthetõ. + Ezt követõen tekintsük át a + hozzátartozó eszközkészletet. - The toolkit is a collection of ready-made scripts to run - with DTrace to collect system information. There are scripts - to check open files, memory, CPU usage and - a lot more. Extract the scripts with the following - command: + Ez a mellékelt eszközkészlet + lényegében a rendszerrel kapcsolatos + információk összegyûjtésére + alkalmas szkripteket tartalmaz. Vannak szkriptek, amelyekkel a + megnyitott állományokat, a memóriát, a + processzorhasználatot és még sok minden + mást kérdezhetünk le. A szkriptek a + következõ parancs segítségével + tömöríthetõek ki: &prompt.root; gunzip -c DTraceToolkit* | tar xvf - - Change into that directory with the cd - and change the execution permissions on all files, designated - as those files with lower case names, to - 755. + A cd parancs + segítségével lépjünk be az + így keletkezõ könyvtárba, és a + kisbetûs névvel rendelkezõ + állományok engedélyeit állítsuk + be a 755 módra. - All of these scripts will need modifications to their - contents. The ones which refer to - /usr/bin/ksh need that changed to - /usr/local/bin/ksh, the others which - use /usr/bin/sh need to be altered to use - /bin/sh, and finally the ones which - use /usr/bin/perl will need altered to - use /usr/local/bin/perl. + Mindegyik szkriptben el kell végeznünk némi + módosítást: a /usr/bin/ksh + hivatkozásokat írjuk át mindenhol a + /usr/local/bin/ksh névre, illetve a + /usr/bin/sh hivatkozásokat + /bin/sh névre, majd + végezetül pedig a /usr/bin/perl + hivatkozásokat a /usr/local/bin/perl + névre. - At this point it is prudent to remind the reader that - DTrace support in &os; is incomplete - and experimental. Many of these scripts - will not work as they are either too &solaris;-specific or - use probes which are unsupported at this time. + Itt még egyszer kiemelnénk, hogy a &os;-ben + jelenleg megtalálható DTrace támogatás + még nem teljes és + kísérleti jelleggel szerepel. + Ezért bizonyos szkriptek nem fognak mûködni, + vagy azért, mert túlságosan &solaris; + lehetõségeihez igazodnak, vagy pedig azért, + mert a jelenlegi implementáció által + még nem ismert vizsgálatokra + támaszkodnak. - At the time of this writing only two of the scripts of the - DTrace Toolkit are fully supported in &os;: - the hotkernel - and procsystime scripts. These are the two - we will explore in the following parts of this section. + Jelenlegi ismereteink szerint a &os; egyelõre csak + két szkriptet támogat teljes mértékben, + ezek a hotkernel és a + procsystime. A szakasz további + részében ezzel a kettõvel fogunk + részletesebben foglalkozni. - The hotkernel is designed to identify - which function is using the most kernel time. Run normally, it - will produce output similar to the following: + A hotkernel feladata segíteni + beazonosítani azokat a függvényeket, amelyek a + legtöbb idõt veszik igénybe a rendszermagon + belül. A szkript futtatásakor nagyjából + a következõt csinálja: &prompt.root; ./hotkernel -localhost# ./hotkernel Sampling... Hit Ctrl-C to end. - The system administrator must use the - CtrlC - key combination to stop the process. Upon - termination, the script will display a list of kernel functions and - timing information, sorting the output in increasing order of - time: + A folyamat CtrlC + billentyûkombináció hatására + állítható meg. A szkript + futásának befejezõdésekor + különbözõ rendszermagbeli + függvények és a hozzájuk tartozó + idõk jelennek meg, az utóbbi szerint növekvõ + sorrendben: kernel`_thread_lock_flags 2 0.0% 0xc1097063 2 0.0% @@ -294,16 +395,11 @@ kernel`sched_idletd 137 0.3% 0xc10981a5 42139 99.3% - + Ez a szkript modulok esetén is alkalmazható. + Ezt a módját a kapcsoló + megadásával aktiválhatjuk: - This script will also work with kernel modules. To use this - feature, run the script with the flag: - - &prompt.root; ./hotkernel -m - - localhost# ./hotkernel -m + &prompt.root; ./hotkernel -m Sampling... Hit Ctrl-C to end. ^C MODULE COUNT PCNT @@ -320,19 +416,19 @@ kernel 874 0.4% 0xc10981a5 213781 99.6% - + A procsystime szkript egy adott + azonosítóval vagy névvel rendelkezõ + programhoz tudja megadni az általa kezdeményezett + rendszerhívások által felhasznált + idõt. A most következõ példában + elindítjuk a /bin/csh egy újabb + példányát. A + procsystime elindul, majd megvárja, + amíg kiadunk néhány parancsot a + csh frissen indított + másolatában. A teszt eredményei tehát + a következõk lesznek: - The procsystime script captures and - prints the system call time usage for a given - PID or process name. In the following - example, a new instance of /bin/csh - was spawned. The procsystime was executed - and remained waiting while a few commands were typed on the - other incarnation of csh. These are the - results of this test: - &prompt.root; ./procsystime -n csh Tracing... Hit Ctrl-C to end... ^C @@ -359,24 +455,25 @@ sigsuspend 6985124 read 3988049784 - As shown, the read system call seems to use the - most time in nanoseconds with the getpid() - system call used the least amount of time. + Jól megfigyelhetõ, hogy (nanomásodpercekben + mérve) a legtöbb idõt a + read(), a legkevesebb idõt pedig a + getpid() rendszerhívás vette + igénybe. - The D Language + A D nyelv - The DTrace Toolkit includes many scripts in the special language of - DTrace. This language is called the D language by &sun; - documentation, and it is very similar to C++. An in depth - discussion of the language is beyond the scope of this document. It is - extensively discussed - at . + A DTrace eszköztárában + megtalálható számos szkript a DTrace + saját programozási nyelvén + íródott. Ezt a nyelvet nevezik a &sun; + implementációjában a D + nyelvnek. Ennek ismertetésére itt most + külön nem térünk ki, azonban a + címen igen részletesen olvashatunk + róla. - - From sam at FreeBSD.org Fri Oct 3 21:18:58 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 21:19:04 2008 Subject: PERFORCE change 150896 for review Message-ID: <200810032118.m93LIvNi090017@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150896 Change 150896 by sam@sam_ebb on 2008/10/03 21:18:56 expand the ie blob before calling match_bss so it can potentially use the enumerated ie's Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#26 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#26 (text+ko) ==== @@ -107,16 +107,16 @@ * contents explains why. The following flags are or'd to to this * mask and can be used to figure out why the entry was rejected. */ -#define MATCH_CHANNEL 0x001 /* channel mismatch */ -#define MATCH_CAPINFO 0x002 /* capabilities mismatch, e.g. no ess */ -#define MATCH_PRIVACY 0x004 /* privacy mismatch */ -#define MATCH_RATE 0x008 /* rate set mismatch */ -#define MATCH_SSID 0x010 /* ssid mismatch */ -#define MATCH_BSSID 0x020 /* bssid mismatch */ -#define MATCH_FAILS 0x040 /* too many failed auth attempts */ -#define MATCH_NOTSEEN 0x080 /* not seen in recent scans */ -#define MATCH_RSSI 0x100 /* rssi deemed too low to use */ -#define MATCH_CC 0x200 /* country code mismatch */ +#define MATCH_CHANNEL 0x0001 /* channel mismatch */ +#define MATCH_CAPINFO 0x0002 /* capabilities mismatch, e.g. no ess */ +#define MATCH_PRIVACY 0x0004 /* privacy mismatch */ +#define MATCH_RATE 0x0008 /* rate set mismatch */ +#define MATCH_SSID 0x0010 /* ssid mismatch */ +#define MATCH_BSSID 0x0020 /* bssid mismatch */ +#define MATCH_FAILS 0x0040 /* too many failed auth attempts */ +#define MATCH_NOTSEEN 0x0080 /* not seen in recent scans */ +#define MATCH_RSSI 0x0100 /* rssi deemed too low to use */ +#define MATCH_CC 0x0200 /* country code mismatch */ static int match_bss(struct ieee80211vap *, const struct ieee80211_scan_state *, struct sta_entry *, int); static void adhoc_age(struct ieee80211_scan_state *); @@ -992,8 +992,8 @@ "macaddr bssid chan rssi rate flag wep essid"); mtx_lock(&st->st_lock); TAILQ_FOREACH(se, &st->st_entry, se_list) { + ieee80211_ies_expand(&se->base.se_ies); if (match_bss(vap, ss, se, debug) == 0) { - ieee80211_ies_expand(&se->base.se_ies); if (selbs == NULL) selbs = se; else if (sta_compare(se, selbs) > 0) From sam at FreeBSD.org Fri Oct 3 21:21:04 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 21:21:17 2008 Subject: PERFORCE change 150897 for review Message-ID: <200810032121.m93LL335090243@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150897 Change 150897 by sam@sam_ebb on 2008/10/03 21:20:04 improve debug support for station inactivity processing Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_node.c#48 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#48 (text+ko) ==== @@ -135,6 +135,11 @@ vap->iv_inact_auth = IEEE80211_INACT_AUTH; vap->iv_inact_run = IEEE80211_INACT_RUN; vap->iv_inact_probe = IEEE80211_INACT_PROBE; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_INACT, + "%s: init %u auth %u run %u probe %u\n", __func__, + vap->iv_inact_init, vap->iv_inact_auth, + vap->iv_inact_run, vap->iv_inact_probe); } void @@ -187,18 +192,29 @@ void ieee80211_node_authorize(struct ieee80211_node *ni) { + struct ieee80211vap *vap = ni->ni_vap; + ni->ni_flags |= IEEE80211_NODE_AUTH; - ni->ni_inact_reload = ni->ni_vap->iv_inact_run; + ni->ni_inact_reload = vap->iv_inact_run; ni->ni_inact = ni->ni_inact_reload; + + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact_reload %u", __func__, ni->ni_inact_reload); } void ieee80211_node_unauthorize(struct ieee80211_node *ni) { + struct ieee80211vap *vap = ni->ni_vap; + ni->ni_flags &= ~IEEE80211_NODE_AUTH; - ni->ni_inact_reload = ni->ni_vap->iv_inact_auth; + ni->ni_inact_reload = vap->iv_inact_auth; if (ni->ni_inact > ni->ni_inact_reload) ni->ni_inact = ni->ni_inact_reload; + + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact_reload %u inact %u", __func__, + ni->ni_inact_reload, ni->ni_inact); } /* @@ -1022,6 +1038,9 @@ ni->ni_ic = ic; IEEE80211_NODE_UNLOCK(nt); + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact_reload %u", __func__, ni->ni_inact_reload); + return ni; } @@ -1902,8 +1921,13 @@ m_freem(ni->ni_rxfrag[0]); ni->ni_rxfrag[0] = NULL; } - if (ni->ni_inact > 0) + if (ni->ni_inact > 0) { ni->ni_inact--; + IEEE80211_NOTE(vap, IEEE80211_MSG_INACT, ni, + "%s: inact %u inact_reload %u nrates %u", + __func__, ni->ni_inact, ni->ni_inact_reload, + ni->ni_rates.rs_nrates); + } /* * Special case ourself; we may be idle for extended periods * of time and regardless reclaiming our state is wrong. @@ -2118,8 +2142,8 @@ ether_sprintf(ni->ni_bssid), ni->ni_esslen, ni->ni_essid, ni->ni_chan->ic_freq, ni->ni_chan->ic_flags); - printf("\tinact %u txrate %u\n", - ni->ni_inact, ni->ni_txrate); + printf("\tinact %u inact_reload %u txrate %u\n", + ni->ni_inact, ni->ni_inact_reload, ni->ni_txrate); printf("\thtcap %x htparam %x htctlchan %u ht2ndchan %u\n", ni->ni_htcap, ni->ni_htparam, ni->ni_htctlchan, ni->ni_ht2ndchan); From sam at FreeBSD.org Fri Oct 3 21:21:05 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 21:21:17 2008 Subject: PERFORCE change 150898 for review Message-ID: <200810032121.m93LL3ZB090248@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150898 Change 150898 by sam@sam_ebb on 2008/10/03 21:20:51 add IEEE80211_ELEMID_PWRCNSTR to the set of ie's explicitly ignored so it doesn't get flagged as an unknown ie in wlanstats Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#33 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#33 (text+ko) ==== @@ -603,6 +603,7 @@ break; case IEEE80211_ELEMID_IBSSPARMS: case IEEE80211_ELEMID_CFPARMS: + case IEEE80211_ELEMID_PWRCNSTR: /* NB: avoid debugging complaints */ break; case IEEE80211_ELEMID_XRATES: From sam at FreeBSD.org Fri Oct 3 21:22:05 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 21:22:12 2008 Subject: PERFORCE change 150899 for review Message-ID: <200810032122.m93LM4cf090325@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150899 Change 150899 by sam@sam_ebb on 2008/10/03 21:21:28 honor IEEE80211_CLONE_NOBEACONS for any vap, not just sta vaps Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#51 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#51 (text+ko) ==== @@ -350,11 +350,6 @@ vap->iv_opmode = opmode; vap->iv_caps |= ieee80211_opcap[opmode]; switch (opmode) { - case IEEE80211_M_STA: - /* auto-enable s/w beacon miss support */ - if (flags & IEEE80211_CLONE_NOBEACONS) - vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS; - break; case IEEE80211_M_WDS: /* * WDS links must specify the bssid of the far end. @@ -370,6 +365,9 @@ vap->iv_flags_ext |= IEEE80211_FEXT_WDSLEGACY; break; } + /* auto-enable s/w beacon miss support */ + if (flags & IEEE80211_CLONE_NOBEACONS) + vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS; /* * Enable various functionality by default if we're * capable; the driver can override us if it knows better. From sam at FreeBSD.org Fri Oct 3 21:24:08 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 21:24:14 2008 Subject: PERFORCE change 150900 for review Message-ID: <200810032124.m93LO77b090450@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150900 Change 150900 by sam@sam_ebb on 2008/10/03 21:23:19 o add ahdemo vap mgt frame handler instead of using inline code so it's possible to override o add debug msgs for frame discard cases Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#16 (text+ko) ==== @@ -66,6 +66,8 @@ int rssi, int noise, uint32_t rstamp); static void adhoc_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, int rssi, int noise, uint32_t rstamp); +static void ahdemo_recv_mgmt(struct ieee80211_node *, struct mbuf *, + int subtype, int rssi, int noise, uint32_t rstamp); void ieee80211_adhoc_attach(struct ieee80211com *ic) @@ -89,7 +91,10 @@ { vap->iv_newstate = adhoc_newstate; vap->iv_input = adhoc_input; - vap->iv_recv_mgmt = adhoc_recv_mgmt; + if (vap->iv_opmode == IEEE80211_M_IBSS) + vap->iv_recv_mgmt = adhoc_recv_mgmt; + else + vap->iv_recv_mgmt = ahdemo_recv_mgmt; vap->iv_opdetach = adhoc_vdetach; } @@ -609,9 +614,7 @@ } if (bpf_peers_present(vap->iv_rawbpf)) bpf_mtap(vap->iv_rawbpf, m); - /* NB: only IBSS mode gets mgt frames */ - if (vap->iv_opmode == IEEE80211_M_IBSS) - vap->iv_recv_mgmt(ni, m, subtype, rssi, noise, rstamp); + vap->iv_recv_mgmt(ni, m, subtype, rssi, noise, rstamp); m_freem(m); return IEEE80211_FC0_TYPE_MGT; @@ -735,11 +738,16 @@ case IEEE80211_FC0_SUBTYPE_PROBE_REQ: if (vap->iv_state != IEEE80211_S_RUN) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; return; } if (IEEE80211_IS_MULTICAST(wh->i_addr2)) { /* frame must be directed */ + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not unicast"); vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */ return; } @@ -798,6 +806,9 @@ const struct ieee80211_action *ia; if (vap->iv_state != IEEE80211_S_RUN) { + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "wrong state %s", + ieee80211_state_name[vap->iv_state]); vap->iv_stats.is_rx_mgtdiscard++; return; } @@ -857,6 +868,8 @@ case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: case IEEE80211_FC0_SUBTYPE_DEAUTH: case IEEE80211_FC0_SUBTYPE_DISASSOC: + IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "not handled"); vap->iv_stats.is_rx_mgtdiscard++; return; @@ -869,3 +882,20 @@ } #undef IEEE80211_VERIFY_LENGTH #undef IEEE80211_VERIFY_ELEMENT + +static void +ahdemo_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, + int subtype, int rssi, int noise, uint32_t rstamp) +{ + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; + + /* + * Process management frames when scanning; useful for doing + * a site-survey. + */ + if (ic->ic_flags & IEEE80211_F_SCAN) + adhoc_recv_mgmt(ni, m0, subtype, rssi, noise, rstamp); + else + vap->iv_stats.is_rx_mgtdiscard++; +} From sam at FreeBSD.org Fri Oct 3 21:26:10 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Fri Oct 3 21:26:17 2008 Subject: PERFORCE change 150901 for review Message-ID: <200810032126.m93LQ9fD090638@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150901 Change 150901 by sam@sam_ebb on 2008/10/03 21:25:09 make ieee80211_send_nulldata send a QoS null data frame when a station is setup w/ QoS; the spec says we should not be sending non-QoS frames Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#61 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#61 (text+ko) ==== @@ -406,15 +406,14 @@ /* * Set the direction field and address fields of an outgoing - * non-QoS frame. Note this should be called early on in - * constructing a frame as it sets i_fc[1]; other bits can - * then be or'd in. + * frame. Note this should be called early on in constructing + * a frame as it sets i_fc[1]; other bits can then be or'd in. */ static void ieee80211_send_setup( struct ieee80211_node *ni, struct ieee80211_frame *wh, - int type, + int type, int tid, const uint8_t sa[IEEE80211_ADDR_LEN], const uint8_t da[IEEE80211_ADDR_LEN], const uint8_t bssid[IEEE80211_ADDR_LEN]) @@ -462,11 +461,9 @@ IEEE80211_ADDR_COPY(wh->i_addr3, bssid); } *(uint16_t *)&wh->i_dur[0] = 0; - /* XXX probe response use per-vap seq#? */ - /* NB: use non-QoS tid */ *(uint16_t *)&wh->i_seq[0] = - htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); - ni->ni_txseqs[IEEE80211_NONQOS_TID]++; + htole16(ni->ni_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT); + ni->ni_txseqs[tid]++; #undef WH4 } @@ -507,9 +504,9 @@ } wh = mtod(m, struct ieee80211_frame *); - ieee80211_send_setup(ni, wh, - IEEE80211_FC0_TYPE_MGT | type, - vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + ieee80211_send_setup(ni, wh, + IEEE80211_FC0_TYPE_MGT | type, IEEE80211_NONQOS_TID, + vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); if (params->ibp_flags & IEEE80211_BPF_CRYPTO) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH, wh->i_addr1, "encrypting frame (%s)", __func__); @@ -538,7 +535,9 @@ } /* - * Send a null data frame to the specified node. + * Send a null data frame to the specified node. If the station + * is setup for QoS then a QoS Null Data frame is constructed. + * If this is a WDS station then a 4-address frame is constructed. * * NB: the caller is assumed to have setup a node reference * for use; this is necessary to deal with a race condition @@ -565,10 +564,16 @@ return EIO; /* XXX */ } - if (vap->iv_opmode == IEEE80211_M_WDS) - hdrlen = sizeof(struct ieee80211_frame_addr4); + if (ni->ni_flags & (IEEE80211_NODE_QOS|IEEE80211_NODE_HT)) + hdrlen = sizeof(struct ieee80211_qosframe); else hdrlen = sizeof(struct ieee80211_frame); + /* NB: only WDS vap's get 4-address frames */ + if (vap->iv_opmode == IEEE80211_M_WDS) + hdrlen += IEEE80211_ADDR_LEN; + if (ic->ic_flags & IEEE80211_F_DATAPAD) + hdrlen = roundup(hdrlen, sizeof(uint32_t)); + m = ieee80211_getmgtframe(&frm, ic->ic_headroom + hdrlen, 0); if (m == NULL) { /* XXX debug msg */ @@ -586,9 +591,28 @@ } wh = mtod(m, struct ieee80211_frame *); /* NB: a little lie */ - ieee80211_send_setup(ni, wh, - IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA, - vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + if (ni->ni_flags & IEEE80211_NODE_QOS) { + const int tid = WME_AC_TO_TID(WME_AC_BE); + uint8_t *qos; + + ieee80211_send_setup(ni, wh, + IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS_NULL, + tid, vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + + if (vap->iv_opmode == IEEE80211_M_WDS) + qos = ((struct ieee80211_qosframe_addr4 *) wh)->i_qos; + else + qos = ((struct ieee80211_qosframe *) wh)->i_qos; + qos[0] = tid & IEEE80211_QOS_TID; + if (ic->ic_wme.wme_wmeChanParams.cap_wmeParams[WME_AC_BE].wmep_noackPolicy) + qos[0] |= IEEE80211_QOS_ACKPOLICY_NOACK; + qos[1] = 0; + } else { + ieee80211_send_setup(ni, wh, + IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA, + IEEE80211_NONQOS_TID, + vap->iv_myaddr, ni->ni_macaddr, ni->ni_bssid); + } if (vap->iv_opmode != IEEE80211_M_WDS) { /* NB: power management bit is never sent by an AP */ if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) && @@ -603,7 +627,8 @@ IEEE80211_NODE_STAT(ni, tx_data); IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_DUMPPKTS, ni, - "send null data frame on channel %u, pwr mgt %s", + "send %snull data frame on channel %u, pwr mgt %s", + ni->ni_flags & IEEE80211_NODE_QOS ? "QoS " : "", ieee80211_chan2ieee(ic, ic->ic_curchan), wh->i_fc[1] & IEEE80211_FC1_PWR_MGT ? "ena" : "dis"); @@ -1751,8 +1776,8 @@ wh = mtod(m, struct ieee80211_frame *); ieee80211_send_setup(ni, wh, - IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ, - sa, da, bssid); + IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ, + IEEE80211_NONQOS_TID, sa, da, bssid); /* XXX power management? */ m->m_flags |= M_ENCAP; /* mark encapsulated */ @@ -2341,8 +2366,8 @@ wh = mtod(m, struct ieee80211_frame *); ieee80211_send_setup(bss, wh, - IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP, - vap->iv_myaddr, da, bss->ni_bssid); + IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP, + IEEE80211_NONQOS_TID, vap->iv_myaddr, da, bss->ni_bssid); /* XXX power management? */ m->m_flags |= M_ENCAP; /* mark encapsulated */ From gonzo at FreeBSD.org Fri Oct 3 21:40:24 2008 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Fri Oct 3 21:40:31 2008 Subject: PERFORCE change 150902 for review Message-ID: <200810032140.m93LeNcc091884@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150902 Change 150902 by gonzo@gonzo_jeeves on 2008/10/03 21:40:09 Print all the noisy messages only if debugging has been requested Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/nexus.c#14 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/nexus.c#14 (text+ko) ==== @@ -58,6 +58,12 @@ #include #include +#ifdef NEXUS_DEBUG +#define dprintf printf +#else +#define dprintf(x, arg...) +#endif /* NEXUS_DEBUG */ + static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); struct nexus_device { @@ -253,7 +259,7 @@ resource_long_value(dname, dunit, "maddr", &maddr); resource_int_value(dname, dunit, "msize", &msize); - printf("%s: discovered hinted child %s at maddr %p(%d)\n", + dprintf("%s: discovered hinted child %s at maddr %p(%d)\n", __func__, device_get_nameunit(child), (void *)(intptr_t)maddr, msize); @@ -298,10 +304,10 @@ struct rman *rm; int isdefault, needactivate, passthrough; - printf("%s: entry (%p, %p, %d, %p, %p, %p, %ld, %d)\n", + dprintf("%s: entry (%p, %p, %d, %p, %p, %p, %ld, %d)\n", __func__, bus, child, type, rid, (void *)(intptr_t)start, (void *)(intptr_t)end, count, flags); - printf("%s: requested rid is %d\n", __func__, *rid); + dprintf("%s: requested rid is %d\n", __func__, *rid); isdefault = (start == 0UL && end == ~0UL && count == 1); needactivate = flags & RF_ACTIVE; @@ -408,7 +414,7 @@ struct resource_list *rl = &ndev->nx_resources; struct resource_list_entry *rle; - printf("%s: entry (%p, %p, %d, %d, %p, %ld)\n", + dprintf("%s: entry (%p, %p, %d, %d, %p, %ld)\n", __func__, dev, child, type, rid, (void *)(intptr_t)start, count); rle = resource_list_add(rl, type, rid, start, start + count - 1, @@ -443,7 +449,7 @@ struct nexus_device *ndev = DEVTONX(child); struct resource_list *rl = &ndev->nx_resources; - printf("%s: entry\n", __func__); + dprintf("%s: entry\n", __func__); resource_list_delete(rl, type, rid); } @@ -452,7 +458,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { - printf("%s: entry\n", __func__); + dprintf("%s: entry\n", __func__); if (rman_get_flags(r) & RF_ACTIVE) { int error = bus_deactivate_resource(child, type, rid, r); From gonzo at FreeBSD.org Fri Oct 3 21:42:27 2008 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Fri Oct 3 21:42:32 2008 Subject: PERFORCE change 150904 for review Message-ID: <200810032142.m93LgQKf092032@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150904 Change 150904 by gonzo@gonzo_jeeves on 2008/10/03 21:42:02 Hide debug output under condition Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#10 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#10 (text+ko) ==== @@ -44,6 +44,12 @@ #include #include +#ifdef INTR_DEBUG +#define dprintf printf +#else +#define dprintf(x, arg...) +#endif /* INTR_DEBUG */ + static struct intr_event *hardintr_events[NHARD_IRQS]; static struct intr_event *softintr_events[NSOFT_IRQS]; @@ -72,7 +78,7 @@ struct intr_event *event; int error; - printf("Establish HARD IRQ %d: filt %p handler %p arg %p\n", + dprintf("Establishing HARD IRQ %d: filt %p handler %p arg %p\n", irq, filt, handler, arg); /* * We have 6 levels, but thats 0 - 5 (not including 6) @@ -112,7 +118,7 @@ struct intr_event *event; int error; - printf("Establish SOFT IRQ %d: filt %p handler %p arg %p\n", + dprintf("Establishing SOFT IRQ %d: filt %p handler %p arg %p\n", irq, filt, handler, arg); if (irq < 0 || irq > NSOFT_IRQS) panic("%s called for unknown hard intr %d", __func__, irq); From gonzo at FreeBSD.org Fri Oct 3 21:43:28 2008 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Fri Oct 3 21:43:35 2008 Subject: PERFORCE change 150905 for review Message-ID: <200810032143.m93LhRbD092095@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150905 Change 150905 by gonzo@gonzo_jeeves on 2008/10/03 21:43:01 Set root to whole device. This way it's easier to work with md devices. Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/MALTA#22 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/MALTA#22 (text+ko) ==== @@ -52,7 +52,7 @@ options SOFTUPDATES #Enable FFS soft updates support options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories -options ROOTDEVNAME=\"ufs:ad0s1a\" +options ROOTDEVNAME=\"ufs:ad0\" # Debugging for use in -current From nwhitehorn at FreeBSD.org Sat Oct 4 00:54:08 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 00:54:15 2008 Subject: PERFORCE change 150915 for review Message-ID: <200810040054.m940s71A022627@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150915 Change 150915 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:53:24 Make PCI buses into OFW buses. This fixes the weird interrupt problems with Apple ATA controllers, and decreases the general level of hackery. Changes should be harmless. MFP4 after: 2 weeks Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pci.c#3 delete .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pci.h#2 delete .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#1 add .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#4 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/aim/ofw_machdep.c,v 1.20 2008/02/12 20:55:51 marcel Exp $"); +__FBSDID("$FreeBSD: head/sys/powerpc/aim/ofw_machdep.c 176222 2008-02-12 20:55:51Z marcel $"); #include #include @@ -47,6 +47,7 @@ #include #include +#include #include #include @@ -56,7 +57,6 @@ #include #include #include -#include #define OFMEM_REGIONS 32 static struct mem_region OFmem[OFMEM_REGIONS + 1], OFavail[OFMEM_REGIONS + 3]; @@ -310,7 +310,7 @@ { phandle_t node; - node = ofw_pci_find_node(dev); + node = ofw_bus_get_node(dev); OF_getprop(node, "local-mac-address", addr, ETHER_ADDR_LEN); } ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/ofw/ofw_pcib_pci.c,v 1.5 2006/01/06 19:22:19 jhb Exp $ + * $FreeBSD: head/sys/powerpc/ofw/ofw_pcib_pci.c 154079 2006-01-06 19:22:19Z jhb $ */ #include @@ -35,8 +35,7 @@ #include #include - -#include +#include #include #include @@ -46,6 +45,7 @@ static int ofw_pcib_pci_probe(device_t bus); static int ofw_pcib_pci_attach(device_t bus); +static phandle_t ofw_pcib_pci_get_node(device_t bus, device_t dev); static device_method_t ofw_pcib_pci_methods[] = { /* Device interface */ @@ -72,6 +72,9 @@ DEVMETHOD(pcib_write_config, pcib_write_config), DEVMETHOD(pcib_route_interrupt, pcib_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, ofw_pcib_pci_get_node), + {0, 0} }; @@ -89,29 +92,29 @@ (pci_get_subclass(dev) != PCIS_BRIDGE_PCI)) { return (ENXIO); } - if (ofw_pci_find_node(dev) == 0) { + + if (ofw_bus_get_node(dev) == 0) return (ENXIO); - } - device_set_desc(dev, "Open Firmware PCI-PCI bridge"); - return (-1000); + device_set_desc(dev, "OFW PCI-PCI bridge"); + return (0); } static int ofw_pcib_pci_attach(device_t dev) { - phandle_t node; - uint32_t busrange[2]; - - node = ofw_pci_find_node(dev); - if (OF_getprop(node, "bus-range", busrange, sizeof(busrange)) != 8) - return (ENXIO); - pcib_attach_common(dev); - ofw_pci_fixup(dev, busrange[0], node); - device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); } + +phandle_t +ofw_pcib_pci_get_node(device_t bridge, device_t dev) +{ + /* We have only one child, the PCI bus, so pass it our node */ + + return (ofw_bus_get_node(bridge)); +} + ==== //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.15 2008/09/27 15:13:44 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: head/sys/powerpc/powermac/ata_kauai.c 183409 2008-09-27 15:13:44Z nwhitehorn $"); /* * Mac 'Kauai' PCI ATA controller @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include @@ -194,11 +194,10 @@ { struct ata_channel *ch; struct ata_kauai_softc *sc; - u_long startp, countp; u_int32_t devid; phandle_t node; char *compatstring = NULL; - int i, found, rid, status; + int i, found, rid; found = 0; devid = pci_get_devid(dev); @@ -212,60 +211,15 @@ if (!found) return (ENXIO); - node = ofw_pci_find_node(dev); + node = ofw_bus_get_node(dev); sc = device_get_softc(dev); bzero(sc, sizeof(struct ata_kauai_softc)); ch = &sc->sc_ch.sc_ch; - OF_getprop_alloc(node, "compatible", 1, (void **)&compatstring); - if (strcmp(compatstring,"shasta-ata") == 0) + compatstring = ofw_bus_get_compatible(node); + if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0) sc->shasta = 1; - free(compatstring, M_OFWPROP); - - - /* - * This device seems to ignore writes to the interrupt - * config register, resulting in interrupt resources - * not being attached. If this is the case, use - * Open Firmware to determine the irq, and then attach - * the resource. This allows the ATA common code to - * allocate the irq. - */ - status = bus_get_resource(dev, SYS_RES_IRQ, 0, &startp, &countp); - if (status == ENOENT) { - int *irq; - phandle_t iparent; - int icells, nintr, i; - - /* - * Horrible hack to handle Kauai devices that have their IRQs - * set up in an utterly wrong way - */ - if (!sc->shasta) - bus_set_resource(dev, SYS_RES_IRQ, 0, 39, 1); - - /* - * For the rest of the interrupts, and the main Shasta - * interrupt, get the IRQs from firmware. - */ - if (OF_getprop(node, "interrupt-parent", &iparent, - sizeof(iparent)) == sizeof(iparent)) { - OF_getprop(iparent, "#interrupt-cells", &icells, - sizeof(icells)) ; - } - - nintr = OF_getprop_alloc(node, "interrupts", sizeof(*irq), - (void **)&irq); - - for (i = 0; i < nintr; i += icells) - bus_set_resource(dev, SYS_RES_IRQ, - i/icells + !sc->shasta, irq[i], 1); - - free(irq, M_OFWPROP); - } - - rid = PCIR_BARS; sc->sc_memr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2002 Benno Rice. + * Copyright (C) 2008 Nathan Whitehorn * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,6 @@ #include -#include #include #include #include @@ -194,6 +193,12 @@ static int cpcpci_route_interrupt(device_t, device_t, int); /* + * ofw_bus interface + */ + +static phandle_t cpcpci_get_node(device_t bus, device_t child); + +/* * Driver methods. */ static device_method_t cpcpci_methods[] = { @@ -215,6 +220,8 @@ DEVMETHOD(pcib_write_config, cpcpci_write_config), DEVMETHOD(pcib_route_interrupt, cpcpci_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, cpcpci_get_node), { 0, 0 } }; @@ -345,13 +352,16 @@ } } +#if 0 /* * Write out the correct PIC interrupt values to config space * of all devices on the bus. */ ofw_pci_fixup(dev, sc->sc_bus, node); +#endif device_add_child(dev, "pci", device_get_unit(dev)); + return (bus_generic_attach(dev)); } @@ -413,13 +423,6 @@ } static int -cpcpci_route_interrupt(device_t bus, device_t dev, int pin) -{ - - return (0); -} - -static int cpcpci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct cpcpci_softc *sc; @@ -533,4 +536,19 @@ return (rman_activate_resource(res)); } +static phandle_t +cpcpci_get_node(device_t bus, device_t dev) +{ + struct cpcpci_softc *sc; + + sc = device_get_softc(bus); + /* We only have one child, the PCI bus, which needs our own node. */ + return (sc->sc_node); +} + +static int +cpcpci_route_interrupt(device_t bus, device_t dev, int pin) +{ + return (0); +} ==== //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/grackle.c,v 1.13 2008/06/12 02:28:58 kevlo Exp $ + * $FreeBSD: head/sys/powerpc/powermac/grackle.c 179746 2008-06-12 02:28:58Z kevlo $ */ #include @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -48,7 +49,6 @@ #include -#include #include #include @@ -92,6 +92,11 @@ static int grackle_route_interrupt(device_t, device_t, int); /* + * ofw_bus interface + */ +static phandle_t grackle_get_node(device_t bus, device_t dev); + +/* * Local routines. */ static int grackle_enable_config(struct grackle_softc *, u_int, @@ -122,6 +127,9 @@ DEVMETHOD(pcib_write_config, grackle_write_config), DEVMETHOD(pcib_route_interrupt, grackle_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, grackle_get_node), + { 0, 0 } }; @@ -244,12 +252,6 @@ } } - /* - * Write out the correct PIC interrupt values to config space - * of all devices on the bus. - */ - ofw_pci_fixup(dev, sc->sc_bus, sc->sc_node); - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -511,6 +513,17 @@ out32rb(sc->sc_addr, 0); } +static phandle_t +grackle_get_node(device_t bus, device_t dev) +{ + struct grackle_softc *sc; + + sc = device_get_softc(bus); + /* We only have one child, the PCI bus, which needs our own node. */ + + return sc->sc_node; +} + /* * Driver to swallow Grackle host bridges from the PCI bus side. */ ==== //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/macio.c,v 1.25 2008/06/12 02:28:58 kevlo Exp $ + * $FreeBSD: head/sys/powerpc/powermac/macio.c 179746 2008-06-12 02:28:58Z kevlo $ */ /* @@ -272,7 +272,7 @@ int error, quirks; sc = device_get_softc(dev); - root = sc->sc_node = OF_finddevice("mac-io"); + root = sc->sc_node = ofw_bus_get_node(dev); /* * Locate the device node and it's base address ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/uninorth.c,v 1.20 2008/06/12 02:28:58 kevlo Exp $ + * $FreeBSD: head/sys/powerpc/powermac/uninorth.c 179746 2008-06-12 02:28:58Z kevlo $ */ #include @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -46,7 +47,6 @@ #include -#include #include #include @@ -84,6 +84,12 @@ static int uninorth_route_interrupt(device_t, device_t, int); /* + * OFW Bus interface + */ + +static phandle_t uninorth_get_node(device_t bus, device_t dev); + +/* * Local routines. */ static int uninorth_enable_config(struct uninorth_softc *, u_int, @@ -112,6 +118,9 @@ DEVMETHOD(pcib_write_config, uninorth_write_config), DEVMETHOD(pcib_route_interrupt, uninorth_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, uninorth_get_node), + { 0, 0 } }; @@ -154,12 +163,12 @@ uninorth_attach(device_t dev) { struct uninorth_softc *sc; + char *compatible; phandle_t node; phandle_t child; u_int32_t reg[2], busrange[2]; struct uninorth_range *rp, *io, *mem[2]; int nmem, i, error; - u_int32_t cells; node = nexus_get_node(dev); sc = device_get_softc(dev); @@ -170,18 +179,24 @@ if (OF_getprop(node, "bus-range", busrange, sizeof(busrange)) != 8) return (ENXIO); - cells = 1; - OF_getprop(node,"#size-cells",&cells,sizeof(cells)); - cells--; + sc->sc_agp = 0; + compatible = nexus_get_compatible(dev); + if (strcmp(compatible,"u3-agp") == 0) + sc->sc_agp = 1; sc->sc_dev = dev; sc->sc_node = node; - sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[cells] + 0x800000, PAGE_SIZE); - sc->sc_data = (vm_offset_t)pmap_mapdev(reg[cells] + 0xc00000, PAGE_SIZE); + if (sc->sc_agp) { + sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[1] + 0x800000, PAGE_SIZE); + sc->sc_data = (vm_offset_t)pmap_mapdev(reg[1] + 0xc00000, PAGE_SIZE); + } else { + sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[0] + 0x800000, PAGE_SIZE); + sc->sc_data = (vm_offset_t)pmap_mapdev(reg[0] + 0xc00000, PAGE_SIZE); + } sc->sc_bus = busrange[0]; bzero(sc->sc_range, sizeof(sc->sc_range)); - if (cells > 0) { + if (sc->sc_agp) { /* * On Apple U3 systems, we have an otherwise standard * Uninorth controller driving AGP. The one difference @@ -245,13 +260,6 @@ panic("uninorth_attach: failed to set up I/O rman"); } -#if 0 - printf("I/O Size: %d bytes\n",io->size_lo); - printf("I/O Mapped at: %#x\n",io->pci_lo); - printf("I/O Start: %#x\n",io->host); - panic("Observe!"); -#endif - if (nmem == 0) { device_printf(dev, "can't find mem ranges\n"); return (ENXIO); @@ -287,13 +295,6 @@ } } - /* - * Write out the correct PIC interrupt values to config space - * of all devices on the bus. This has to be done after the GEM - * cell is enabled above. - */ - ofw_pci_fixup(dev, sc->sc_bus, node); - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -317,7 +318,7 @@ if (uninorth_enable_config(sc, bus, slot, func, reg) != 0) { switch (width) { - case 1: + case 1: return (in8rb(caoff)); break; case 2: @@ -509,6 +510,17 @@ return (1); } +static phandle_t +uninorth_get_node(device_t bus, device_t dev) +{ + struct uninorth_softc *sc; + + sc = device_get_softc(bus); + /* We only have one child, the PCI bus, which needs our own node. */ + + return sc->sc_node; +} + /* * Driver to swallow UniNorth host bridges from the PCI bus side. */ ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/uninorthvar.h,v 1.4 2005/01/07 02:29:20 imp Exp $ + * $FreeBSD: head/sys/powerpc/powermac/uninorthvar.h 139825 2005-01-07 02:29:27Z imp $ */ #ifndef _POWERPC_POWERMAC_UNINORTHVAR_H_ @@ -61,6 +61,8 @@ bus_space_tag_t sc_iot; bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; + + int sc_agp; }; struct unin_chip_softc { From nwhitehorn at FreeBSD.org Sat Oct 4 00:55:08 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 00:55:15 2008 Subject: PERFORCE change 150916 for review Message-ID: <200810040055.m940t8ZF022737@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150916 Change 150916 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:54:43 Fix K2 SATA to actually work. Should be harmless to other Serverworks controllers, will ask for review. Affected files ... .. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); +__FBSDID("$FreeBSD: head/sys/dev/ata/ata-chipset.c 183380 2008-09-26 07:29:48Z sos $"); #include "opt_ata.h" #include @@ -4806,6 +4806,16 @@ } static int +ata_serverworks_k2status(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + + ATA_IDX_INL(ch,ATA_STATUS); + + return ata_pci_status(dev); +} + +static int ata_serverworks_chipinit(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); @@ -4894,6 +4904,10 @@ /* chip does not reliably do 64K DMA transfers */ ch->dma.max_iosize = 126 * DEV_BSIZE; + /* For K2, we need to do a 4-byte read on the status reg */ + if (ctlr->chip->chipid == ATA_K2) + ch->hw.status = ata_serverworks_k2status; + return 0; } From nwhitehorn at FreeBSD.org Sat Oct 4 00:56:10 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 00:56:16 2008 Subject: PERFORCE change 150917 for review Message-ID: <200810040056.m940u95O022828@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150917 Change 150917 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:55:52 Change mmu_oea64 to pass around vsids instead of srs. This is in preparation for a future 64-bit port. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#5 (text+ko) ==== @@ -166,10 +166,10 @@ return b; } -static __inline int -va_to_sr(u_int *sr, vm_offset_t va) +static __inline uint64_t +va_to_vsid(pmap_t pm, vm_offset_t va) { - return (sr[(uintptr_t)va >> ADDR_SR_SHFT]); + return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); } #define TLBSYNC() __asm __volatile("tlbsync; ptesync"); @@ -201,8 +201,7 @@ vpn = (uint64_t)(va & ADDR_PIDX); if (pmap != NULL) - vpn |= ((uint64_t)(va_to_sr(pmap->pm_sr,va) & SR_VSID_MASK) - << 28); + vpn |= (va_to_vsid(pmap,va) << 28); #else vpn = va; #endif @@ -466,11 +465,11 @@ MMU_DEF(oea64_bridge_mmu); static __inline u_int -va_to_pteg(u_int sr, vm_offset_t addr) +va_to_pteg(uint64_t vsid, vm_offset_t addr) { u_int hash; - hash = (sr & SR_VSID_MASK) ^ (((u_int)addr & ADDR_PIDX) >> + hash = vsid ^ (((uint64_t)addr & ADDR_PIDX) >> ADDR_PIDX_SHFT); return (hash & moea64_pteg_mask); } @@ -531,15 +530,16 @@ } static __inline int -moea64_pte_match(struct lpte *pt, u_int sr, vm_offset_t va, int which) +moea64_pte_match(struct lpte *pt, uint64_t vsid, vm_offset_t va, int which) { return (pt->pte_hi & ~LPTE_VALID) == - (((uint64_t)(sr & SR_VSID_MASK) << LPTE_VSID_SHIFT) | + ((vsid << LPTE_VSID_SHIFT) | ((uint64_t)(va >> ADDR_API_SHFT64) & LPTE_API) | which); } static __inline void -moea64_pte_create(struct lpte *pt, u_int sr, vm_offset_t va, uint64_t pte_lo) +moea64_pte_create(struct lpte *pt, uint64_t vsid, vm_offset_t va, + uint64_t pte_lo) { ASSERT_TABLE_LOCK(); @@ -549,7 +549,7 @@ * * Note: Don't set the valid bit for correct operation of tlb update. */ - pt->pte_hi = ((uint64_t)(sr & SR_VSID_MASK) << LPTE_VSID_SHIFT) | + pt->pte_hi = (vsid << LPTE_VSID_SHIFT) | (((uint64_t)(va & ADDR_PIDX) >> ADDR_API_SHFT64) & LPTE_API); pt->pte_lo = pte_lo; @@ -1990,12 +1990,12 @@ moea64_pvo_enter(pmap_t pm, uma_zone_t zone, struct pvo_head *pvo_head, vm_offset_t va, vm_offset_t pa, uint64_t pte_lo, int flags, int recurse) { - struct pvo_entry *pvo; - u_int sr; - int first; - u_int ptegidx; - int i; - int bootstrap; + struct pvo_entry *pvo; + uint64_t vsid; + int first; + u_int ptegidx; + int i; + int bootstrap; /* * One nasty thing that can happen here is that the UMA calls to @@ -2017,8 +2017,8 @@ * Compute the PTE Group index. */ va &= ~ADDR_POFF; - sr = va_to_sr(pm->pm_sr, va); - ptegidx = va_to_pteg(sr, va); + vsid = va_to_vsid(pm, va); + ptegidx = va_to_pteg(vsid, va); /* * Remove any existing mapping for this page. Reuse the pvo entry if @@ -2080,7 +2080,8 @@ if (flags & PVO_FAKE) pvo->pvo_vaddr |= PVO_FAKE; - moea64_pte_create(&pvo->pvo_pte.lpte, sr, va, (uint64_t)(pa) | pte_lo); + moea64_pte_create(&pvo->pvo_pte.lpte, vsid, va, + (uint64_t)(pa) | pte_lo); /* * Remember if the list was empty and therefore will be the first @@ -2188,13 +2189,13 @@ static struct pvo_entry * moea64_pvo_find_va(pmap_t pm, vm_offset_t va, int *pteidx_p) { - struct pvo_entry *pvo; - int ptegidx; - u_int sr; + struct pvo_entry *pvo; + int ptegidx; + uint64_t vsid; va &= ~ADDR_POFF; - sr = va_to_sr(pm->pm_sr, va); - ptegidx = va_to_pteg(sr, va); + vsid = va_to_vsid(pm, va); + ptegidx = va_to_pteg(vsid, va); LOCK_TABLE(); LIST_FOREACH(pvo, &moea64_pvo_table[ptegidx], pvo_olink) { @@ -2218,11 +2219,11 @@ * If we haven't been supplied the ptegidx, calculate it. */ if (pteidx == -1) { - int ptegidx; - u_int sr; + int ptegidx; + uint64_t vsid; - sr = va_to_sr(pvo->pvo_pmap->pm_sr, pvo->pvo_vaddr); - ptegidx = va_to_pteg(sr, pvo->pvo_vaddr); + vsid = va_to_vsid(pvo->pvo_pmap, pvo->pvo_vaddr); + ptegidx = va_to_pteg(vsid, pvo->pvo_vaddr); pteidx = moea64_pvo_pte_index(pvo, ptegidx); } From nwhitehorn at FreeBSD.org Sat Oct 4 00:57:11 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 00:57:17 2008 Subject: PERFORCE change 150918 for review Message-ID: <200810040057.m940vAVc022893@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150918 Change 150918 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 00:57:03 Missed files.powerpc changes corresponding to the OFW PCI import. Obtained from: sparc64 Affected files ... .. //depot/projects/ppc-g5/sys/conf/files.powerpc#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/conf/files.powerpc#4 (text+ko) ==== @@ -105,7 +105,7 @@ powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/opic.c optional mpc85xx powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx -powerpc/ofw/ofw_pci.c optional pci aim +powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata From nwhitehorn at FreeBSD.org Sat Oct 4 01:36:51 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 01:36:58 2008 Subject: PERFORCE change 150920 for review Message-ID: <200810040136.m941aovq027007@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150920 Change 150920 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 01:35:58 Remove an #if 0 that I missed. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#3 (text+ko) ==== @@ -352,14 +352,6 @@ } } -#if 0 - /* - * Write out the correct PIC interrupt values to config space - * of all devices on the bus. - */ - ofw_pci_fixup(dev, sc->sc_bus, node); -#endif - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); From nwhitehorn at FreeBSD.org Sat Oct 4 02:10:38 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 02:10:46 2008 Subject: PERFORCE change 150921 for review Message-ID: <200810040210.m942AOaE030780@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150921 Change 150921 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 02:10:18 IFC Affected files ... .. //depot/projects/ppc-g5/ObsoleteFiles.inc#4 integrate .. //depot/projects/ppc-g5/bin/pkill/pkill.1#2 integrate .. //depot/projects/ppc-g5/bin/pkill/pkill.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/moduli.5#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/scp.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sftp.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh.1#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sshd.8#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/ppc-g5/etc/network.subr#2 integrate .. //depot/projects/ppc-g5/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/ppc-g5/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/ppc-g5/lib/libc/sys/cpuset.2#2 integrate .. //depot/projects/ppc-g5/lib/libc/sys/cpuset_getaffinity.2#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/ppc-g5/lib/libutil/pty.c#2 integrate .. //depot/projects/ppc-g5/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/ppc-g5/sbin/fdisk/fdisk.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/ppc-g5/sbin/setkey/setkey.8#2 integrate .. //depot/projects/ppc-g5/share/examples/FreeBSD_version/FreeBSD_version.c#2 integrate .. //depot/projects/ppc-g5/share/man/man3/Makefile#2 integrate .. //depot/projects/ppc-g5/share/man/man3/makedev.3#1 branch .. //depot/projects/ppc-g5/share/man/man4/ata.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/nfe.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/ppc-g5/share/man/man4/wpi.4#2 integrate .. //depot/projects/ppc-g5/share/man/man9/Makefile#4 integrate .. //depot/projects/ppc-g5/share/man/man9/device_ids.9#2 delete .. //depot/projects/ppc-g5/share/man/man9/make_dev.9#4 integrate .. //depot/projects/ppc-g5/share/zoneinfo/southamerica#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/param.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/ppc-g5/sys/conf/NOTES#3 integrate .. //depot/projects/ppc-g5/sys/conf/files#3 integrate .. //depot/projects/ppc-g5/sys/conf/kmod.mk#2 integrate .. //depot/projects/ppc-g5/sys/conf/newvers.sh#2 integrate .. //depot/projects/ppc-g5/sys/conf/options#3 integrate .. //depot/projects/ppc-g5/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/ppc-g5/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mii/miidevs#3 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/param.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/smp.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_mib.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_witness.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/include/param.h#2 integrate .. //depot/projects/ppc-g5/sys/mips/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/ae/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/bridgestp.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_bridge.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_ef.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_faith.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_gif.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if_gre.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_lagg.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_loop.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_mib.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_stf.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_tun.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_var.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if_vlan.c#3 integrate .. //depot/projects/ppc-g5/sys/net/raw_cb.c#2 integrate .. //depot/projects/ppc-g5/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/net/route.c#4 integrate .. //depot/projects/ppc-g5/sys/net/rtsock.c#2 integrate .. //depot/projects/ppc-g5/sys/net/vnet.h#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/if_ether.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/igmp.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_input.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_options.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/vinet.h#1 branch .. //depot/projects/ppc-g5/sys/netinet6/dest6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/frag6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/mld6.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/route6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/scope6.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/vinet6.h#1 branch .. //depot/projects/ppc-g5/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/key.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/keysock.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/vipsec.h#1 branch .. //depot/projects/ppc-g5/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sys/conf.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/kerneldump.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/protosw.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysctl.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/un.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/vimage.h#2 integrate .. //depot/projects/ppc-g5/sys/vm/swap_pager.c#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/ppc-g5/usr.bin/make/job.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/top/machine.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/bsnmpd/modules/Makefile#2 integrate Differences ... ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/ppc-g5/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/ppc-g5/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/ppc-g5/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/scp.1#2 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sftp-server.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sftp.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-add.1#2 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-agent.1#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-keygen.1#2 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-keyscan.1#2 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh-keysign.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh.1#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/ssh_config.5#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sshd.8#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/ppc-g5/crypto/openssh/sshd_config.5#2 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/ppc-g5/etc/network.subr#2 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/ppc-g5/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -D_OSRELDATE_H -include osreldate.h +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.54 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -461,6 +461,24 @@ } time_t +archive_entry_birthtime(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime); +} + +long +archive_entry_birthtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime_nsec); +} + +int +archive_entry_birthtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_BIRTHTIME); +} + +time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); @@ -838,6 +856,22 @@ } void +archive_entry_set_birthtime(struct archive_entry *entry, time_t m, long ns) +{ + entry->stat_valid = 0; + entry->ae_set |= AE_SET_BIRTHTIME; + entry->ae_stat.aest_birthtime = m; + entry->ae_stat.aest_birthtime_nsec = ns; +} + +void +archive_entry_unset_birthtime(struct archive_entry *entry) +{ + archive_entry_set_birthtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_BIRTHTIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -174,6 +174,9 @@ __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); __LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); @@ -224,6 +227,8 @@ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_atime(struct archive_entry *); +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); __LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_ctime(struct archive_entry *); __LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry_copy_stat.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -47,6 +47,12 @@ archive_entry_set_atime(entry, st->st_atime, 0); archive_entry_set_ctime(entry, st->st_ctime, 0); archive_entry_set_mtime(entry, st->st_mtime, 0); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + archive_entry_set_birthtime(entry, st->st_birthtime, 0); +#endif +#endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + archive_entry_set_birthtime(entry, st->st_birthtime, st->st_birthtimespec.tv_nsec); #endif archive_entry_set_dev(entry, st->st_dev); archive_entry_set_gid(entry, st->st_gid); ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry_private.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.5 2008/09/01 04:54:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.6 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED @@ -112,6 +112,8 @@ uint32_t aest_ctime_nsec; int64_t aest_mtime; uint32_t aest_mtime_nsec; + int64_t aest_birthtime; + uint32_t aest_birthtime_nsec; gid_t aest_gid; ino_t aest_ino; mode_t aest_mode; @@ -142,6 +144,7 @@ #define AE_SET_ATIME 4 #define AE_SET_CTIME 8 #define AE_SET_MTIME 16 +#define AE_SET_BIRTHTIME 32 #define AE_SET_SIZE 64 /* ==== //depot/projects/ppc-g5/lib/libarchive/archive_entry_stat.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.1 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.2 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -64,6 +64,9 @@ * the appropriate conversions get invoked. */ st->st_atime = archive_entry_atime(entry); +#if HAVE_STRUCT_STAT_ST_BIRTHTIME + st->st_birthtime = archive_entry_birthtime(entry); +#endif st->st_ctime = archive_entry_ctime(entry); st->st_mtime = archive_entry_mtime(entry); st->st_dev = archive_entry_dev(entry); @@ -88,6 +91,9 @@ st->st_ctim.tv_nsec = archive_entry_ctime_nsec(entry); st->st_mtim.tv_nsec = archive_entry_mtime_nsec(entry); #endif +#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC + st->st_birthtimespec.tv_nsec = archive_entry_birthtime_nsec(entry); +#endif /* * TODO: On Linux, store 32 or 64 here depending on whether ==== //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_tar.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.70 2008/07/10 09:50:55 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.71 2008/09/30 03:57:07 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1451,6 +1451,10 @@ if (strcmp(key, "LIBARCHIVE.xxxxxxx")==0) archive_entry_set_xxxxxx(entry, value); */ + if (strcmp(key, "LIBARCHIVE.creationtime")==0) { + pax_time(value, &s, &n); + archive_entry_set_birthtime(entry, s, n); + } if (strncmp(key, "LIBARCHIVE.xattr.", 17)==0) pax_attribute_xattr(entry, key, value); break; ==== //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.39 2008/09/14 05:51:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -96,10 +96,12 @@ struct fixup_entry { struct fixup_entry *next; mode_t mode; + int64_t atime; + int64_t birthtime; int64_t mtime; - int64_t atime; + unsigned long atime_nanos; + unsigned long birthtime_nanos; unsigned long mtime_nanos; - unsigned long atime_nanos; unsigned long fflags_set; int fixup; /* bitmask of what needs fixing */ char *name; @@ -227,7 +229,8 @@ unsigned long fflags_set, unsigned long fflags_clear); static int set_ownership(struct archive_write_disk *); static int set_mode(struct archive_write_disk *, int mode); -static int set_time(struct archive_write_disk *); +static int set_time(int, int, const char *, time_t, long, time_t, long); +static int set_times(struct archive_write_disk *); static struct fixup_entry *sort_dir_list(struct fixup_entry *p); static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); @@ -448,19 +451,29 @@ || archive_entry_atime_is_set(entry))) { fe = current_fixup(a, archive_entry_pathname(entry)); fe->fixup |= TODO_TIMES; + if (archive_entry_atime_is_set(entry)) { + fe->atime = archive_entry_atime(entry); + fe->atime_nanos = archive_entry_atime_nsec(entry); + } else { + /* If atime is unset, use start time. */ + fe->atime = a->start_time; + fe->atime_nanos = 0; + } if (archive_entry_mtime_is_set(entry)) { fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); } else { + /* If mtime is unset, use start time. */ fe->mtime = a->start_time; fe->mtime_nanos = 0; } - if (archive_entry_atime_is_set(entry)) { - fe->atime = archive_entry_atime(entry); - fe->atime_nanos = archive_entry_atime_nsec(entry); + if (archive_entry_birthtime_is_set(entry)) { + fe->birthtime = archive_entry_birthtime(entry); + fe->birthtime_nanos = archive_entry_birthtime_nsec(entry); } else { - fe->atime = a->start_time; - fe->atime_nanos = 0; + /* If birthtime is unset, use mtime. */ + fe->birthtime = fe->mtime; + fe->birthtime_nanos = fe->mtime_nanos; } } @@ -698,7 +711,7 @@ if (r2 < ret) ret = r2; } if (a->todo & TODO_TIMES) { - int r2 = set_time(a); + int r2 = set_times(a); if (r2 < ret) ret = r2; } if (a->todo & TODO_ACLS) { @@ -1170,10 +1183,19 @@ #ifdef HAVE_UTIMES /* {f,l,}utimes() are preferred, when available. */ struct timeval times[2]; + times[0].tv_sec = p->atime; + times[0].tv_usec = p->atime_nanos / 1000; +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + /* if it's valid and not mtime, push the birthtime first */ + if (((times[1].tv_sec = p->birthtime) < p->mtime) && + (p->birthtime > 0)) + { + times[1].tv_usec = p->birthtime_nanos / 1000; + utimes(p->name, times); + } +#endif times[1].tv_sec = p->mtime; times[1].tv_usec = p->mtime_nanos / 1000; - times[0].tv_sec = p->atime; - times[0].tv_usec = p->atime_nanos / 1000; #ifdef HAVE_LUTIMES lutimes(p->name, times); #else @@ -1687,61 +1709,31 @@ * when they're available. */ static int -set_time(struct archive_write_disk *a) +set_time(int fd, int mode, const char *name, + time_t atime, long atime_nsec, + time_t mtime, long mtime_nsec) { struct timeval times[2]; - /* If no time was provided, we're done. */ - if (!archive_entry_atime_is_set(a->entry) - && !archive_entry_mtime_is_set(a->entry)) - return (ARCHIVE_OK); - - /* We know at least one is set, so... */ - if (archive_entry_mtime_is_set(a->entry)) { - times[1].tv_sec = archive_entry_mtime(a->entry); - times[1].tv_usec = archive_entry_mtime_nsec(a->entry) / 1000; - } else { - times[1].tv_sec = a->start_time; - times[1].tv_usec = 0; - } + times[0].tv_sec = atime; + times[0].tv_usec = atime_nsec / 1000; + times[1].tv_sec = mtime; + times[1].tv_usec = mtime_nsec / 1000; - /* If no atime was specified, use start time instead. */ - /* In theory, it would be marginally more correct to use - * time(NULL) here, but that would cost us an extra syscall - * for little gain. */ - if (archive_entry_atime_is_set(a->entry)) { - times[0].tv_sec = archive_entry_atime(a->entry); - times[0].tv_usec = archive_entry_atime_nsec(a->entry) / 1000; - } else { - times[0].tv_sec = a->start_time; - times[0].tv_usec = 0; - } - #ifdef HAVE_FUTIMES >>> TRUNCATED FOR MAIL (1000 lines) <<< From nwhitehorn at FreeBSD.org Sat Oct 4 03:24:54 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 03:25:03 2008 Subject: PERFORCE change 150922 for review Message-ID: <200810040324.m943OrJQ037703@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150922 Change 150922 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 03:23:58 Remove accidentally added junk. Affected files ... .. //depot/projects/ppc-g5/ports/CHANGES#2 delete .. //depot/projects/ppc-g5/ports/COPYRIGHT#2 delete .. //depot/projects/ppc-g5/ports/GIDs#2 delete .. //depot/projects/ppc-g5/ports/KNOBS#2 delete .. //depot/projects/ppc-g5/ports/LEGAL#2 delete .. //depot/projects/ppc-g5/ports/MOVED#2 delete .. //depot/projects/ppc-g5/ports/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.apache.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.autotools.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.cmake.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.commands.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.database.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.destdir.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.efl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.emacs.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.fpc.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gcc.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gecko.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gnome.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gnustep.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.gstreamer.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.java.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.kde.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.kde4.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.ldap.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.linux-rpm.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.local.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.lua.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.mail.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.ocaml.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.openssl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.perl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.php.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.options.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.post.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.pre.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.port.subdir.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.python.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.qt.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.ruby.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.scons.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.sdl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.sites.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.tcl.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.wx.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.xfce.mk#2 delete .. //depot/projects/ppc-g5/ports/Mk/bsd.xorg.mk#2 delete .. //depot/projects/ppc-g5/ports/README#2 delete .. //depot/projects/ppc-g5/ports/Templates/BSD.local.dist#2 delete .. //depot/projects/ppc-g5/ports/Templates/README.category#2 delete .. //depot/projects/ppc-g5/ports/Templates/README.port#2 delete .. //depot/projects/ppc-g5/ports/Templates/README.top#2 delete .. //depot/projects/ppc-g5/ports/Templates/config.guess#2 delete .. //depot/projects/ppc-g5/ports/Templates/config.sub#2 delete .. //depot/projects/ppc-g5/ports/Tools/make_index#2 delete .. //depot/projects/ppc-g5/ports/Tools/make_readmes#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/README#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/delete#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/dirlist#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/bindist/files/usr/bin/uname#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/4/mkbindist.conf#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/5/bindist/files/usr/bin/uname#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/5/mkbindist.conf#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/errorlogs/index.shtml#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/mlist#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/portbuild.conf#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/allgohans#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/bothlogs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/build#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildenv#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildfailure#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildproxy#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildproxy-client#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildscript#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/buildsuccess#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/checkmachines#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/checkmachines.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/chopindex#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/claim-chroot#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/clean-chroot#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/cleanup-chroots#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/client-metrics#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/comparelogs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/cpdistfiles#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/cppackages#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/docppackages#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dodistfiles#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dologs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackages#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackages.wrapper#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackages2#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dopackagestats#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/dosetupnode#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/flushsquid#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/getmachine#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/keeprestr#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeduds#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeindex#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeparallel#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makerestr#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/makeworld#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/mkbindist#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/packagebuild#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/pdispatch#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/pnohang.c#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/pollmachine#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/portbuild#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processfail#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processlogs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processlogs2#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/processonelog#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/prunebad#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/prunefailure#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/prunepkgs#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/ptimeout.c#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/releasemachine#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/reportload#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/reportload.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/setupnode#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/showrunning#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/stats#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/straslivy.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/updatesnap#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/zbackup#2 delete .. //depot/projects/ppc-g5/ports/Tools/portbuild/scripts/zexpire#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/MOVEDlint.awk#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/README#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/README.patchtool#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/README.portsearch#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/addport#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/ardiff#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/bad-pkgdescrs.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/bump_revision.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/check-latest-link#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checkcats.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checknewver.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checksize.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/checksum.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/chkdepschain.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/chkorigin.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/chkversion.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/close-pr#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/consistency-check#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/distclean.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/distinfochecker#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/domakedescribe#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/doportlint#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/explicit_lib_depends.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/getpr#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/gnomedepends.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mergebase.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpbuild#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpclean#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpextr#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpinstall#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpmerge#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkppackage#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/mkptools/mkpskel#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/buildmodules.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/modules.head#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/modules/update.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/neededlibs.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/parse-kdump.tcl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/patchtool.py#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/pkg-stash/pkg-list.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/pkg-stash/pkg-stash.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/plist#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/portsearch#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/portsvar.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/prdone#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/prpatch#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/README#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/checkdeps.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/config#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/doit.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/oneshot.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/scrubindex.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/release/setup.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/resolveportsfromlibs.sh#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/rmport#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/security-check.awk#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/splitpatch.pl#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/sunshar.rb#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/sunshar/Makefile#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/sunshar/sunshar.1#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/tindex#2 delete .. //depot/projects/ppc-g5/ports/Tools/scripts/update-patches#2 delete .. //depot/projects/ppc-g5/ports/UIDs#2 delete .. //depot/projects/ppc-g5/ports/UPDATING#2 delete .. //depot/projects/ppc-g5/src/COPYRIGHT#2 delete .. //depot/projects/ppc-g5/src/LOCKS#2 delete .. //depot/projects/ppc-g5/src/MAINTAINERS#2 delete .. //depot/projects/ppc-g5/src/Makefile#2 delete .. //depot/projects/ppc-g5/src/Makefile.inc1#2 delete .. //depot/projects/ppc-g5/src/ObsoleteFiles.inc#2 delete .. //depot/projects/ppc-g5/src/README#2 delete .. //depot/projects/ppc-g5/src/UPDATING#2 delete .. //depot/projects/ppc-g5/src/bin/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/Makefile.inc#2 delete .. //depot/projects/ppc-g5/src/bin/cat/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/cat/cat.1#2 delete .. //depot/projects/ppc-g5/src/bin/cat/cat.c#2 delete .. //depot/projects/ppc-g5/src/bin/chflags/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/chflags/chflags.1#2 delete .. //depot/projects/ppc-g5/src/bin/chflags/chflags.c#2 delete .. //depot/projects/ppc-g5/src/bin/chio/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/chio/chio.1#2 delete .. //depot/projects/ppc-g5/src/bin/chio/chio.c#2 delete .. //depot/projects/ppc-g5/src/bin/chio/defs.h#2 delete .. //depot/projects/ppc-g5/src/bin/chio/pathnames.h#2 delete .. //depot/projects/ppc-g5/src/bin/chmod/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/chmod/chmod.1#2 delete .. //depot/projects/ppc-g5/src/bin/chmod/chmod.c#2 delete .. //depot/projects/ppc-g5/src/bin/cp/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/cp/cp.1#2 delete .. //depot/projects/ppc-g5/src/bin/cp/cp.c#2 delete .. //depot/projects/ppc-g5/src/bin/cp/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/cp/utils.c#2 delete .. //depot/projects/ppc-g5/src/bin/csh/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.1#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.2#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.3#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.4#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.a#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/csh.g#2 delete .. //depot/projects/ppc-g5/src/bin/csh/USD.doc/tabs#2 delete .. //depot/projects/ppc-g5/src/bin/csh/config.h#2 delete .. //depot/projects/ppc-g5/src/bin/csh/config_p.h#2 delete .. //depot/projects/ppc-g5/src/bin/csh/host.defs#2 delete .. //depot/projects/ppc-g5/src/bin/csh/iconv.h#2 delete .. //depot/projects/ppc-g5/src/bin/csh/iconv_stub.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/date/date.1#2 delete .. //depot/projects/ppc-g5/src/bin/date/date.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/date/netdate.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/vary.c#2 delete .. //depot/projects/ppc-g5/src/bin/date/vary.h#2 delete .. //depot/projects/ppc-g5/src/bin/dd/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/dd/args.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/conv.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/conv_tab.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/dd.1#2 delete .. //depot/projects/ppc-g5/src/bin/dd/dd.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/dd.h#2 delete .. //depot/projects/ppc-g5/src/bin/dd/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/dd/gen.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/misc.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/position.c#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ascii#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ebcdic#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ibm#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.lcase#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.oldascii#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.oldebcdic#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.oldibm#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.pareven#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.parnone#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.parodd#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.parset#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.swab#2 delete .. //depot/projects/ppc-g5/src/bin/dd/ref.ucase#2 delete .. //depot/projects/ppc-g5/src/bin/df/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/df/df.1#2 delete .. //depot/projects/ppc-g5/src/bin/df/df.c#2 delete .. //depot/projects/ppc-g5/src/bin/domainname/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/domainname/domainname.1#2 delete .. //depot/projects/ppc-g5/src/bin/domainname/domainname.c#2 delete .. //depot/projects/ppc-g5/src/bin/echo/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/echo/echo.1#2 delete .. //depot/projects/ppc-g5/src/bin/echo/echo.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ed/POSIX#2 delete .. //depot/projects/ppc-g5/src/bin/ed/README#2 delete .. //depot/projects/ppc-g5/src/bin/ed/buf.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/cbc.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/ed.1#2 delete .. //depot/projects/ppc-g5/src/bin/ed/ed.h#2 delete .. //depot/projects/ppc-g5/src/bin/ed/glbl.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/io.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/main.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/re.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/sub.c#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/=.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/README#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/TODO#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/a2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/addr2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ascii.d.uu#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ascii.r.uu#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ascii.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/bang2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/c2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/ckscripts.sh#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/d.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e4.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e4.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/e4.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/f1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/f2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g4.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g4.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g4.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g5.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g5.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/g5.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/h.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/i3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/j.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/j.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/j.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/k4.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/l.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/l.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/l.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/m.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/mkscripts.sh#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/n.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/n.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/n.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/nl2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/p.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/p.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/p.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/q1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/r3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s10.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s3.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s4.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s5.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s6.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s7.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s8.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/s9.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t1.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/t2.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/u.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/v.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/v.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/v.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w.d#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w.r#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w.t#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w1.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w2.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/w3.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/x.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/test/z.err#2 delete .. //depot/projects/ppc-g5/src/bin/ed/undo.c#2 delete .. //depot/projects/ppc-g5/src/bin/expr/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/expr/expr.1#2 delete .. //depot/projects/ppc-g5/src/bin/expr/expr.y#2 delete .. //depot/projects/ppc-g5/src/bin/getfacl/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/getfacl/getfacl.1#2 delete .. //depot/projects/ppc-g5/src/bin/getfacl/getfacl.c#2 delete .. //depot/projects/ppc-g5/src/bin/hostname/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/hostname/hostname.1#2 delete .. //depot/projects/ppc-g5/src/bin/hostname/hostname.c#2 delete .. //depot/projects/ppc-g5/src/bin/kenv/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/kenv/kenv.1#2 delete .. //depot/projects/ppc-g5/src/bin/kenv/kenv.c#2 delete .. //depot/projects/ppc-g5/src/bin/kill/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/kill/kill.1#2 delete .. //depot/projects/ppc-g5/src/bin/kill/kill.c#2 delete .. //depot/projects/ppc-g5/src/bin/ln/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ln/ln.1#2 delete .. //depot/projects/ppc-g5/src/bin/ln/ln.c#2 delete .. //depot/projects/ppc-g5/src/bin/ln/symlink.7#2 delete .. //depot/projects/ppc-g5/src/bin/ls/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ls/cmp.c#2 delete .. //depot/projects/ppc-g5/src/bin/ls/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/ls/ls.1#2 delete .. //depot/projects/ppc-g5/src/bin/ls/ls.c#2 delete .. //depot/projects/ppc-g5/src/bin/ls/ls.h#2 delete .. //depot/projects/ppc-g5/src/bin/ls/print.c#2 delete .. //depot/projects/ppc-g5/src/bin/ls/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/mkdir/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/mkdir/mkdir.1#2 delete .. //depot/projects/ppc-g5/src/bin/mkdir/mkdir.c#2 delete .. //depot/projects/ppc-g5/src/bin/mv/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/mv/mv.1#2 delete .. //depot/projects/ppc-g5/src/bin/mv/mv.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ar_io.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ar_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/buf_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cache.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cache.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cpio.1#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cpio.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/cpio.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/file_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ftree.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/ftree.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/gen_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/getoldopt.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/options.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/options.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pat_rep.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pat_rep.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pax.1#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pax.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/pax.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/sel_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/sel_subs.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tables.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tables.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tar.1#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tar.c#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tar.h#2 delete .. //depot/projects/ppc-g5/src/bin/pax/tty_subs.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/ps/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/ps/fmt.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/keyword.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/nlist.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/print.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/ps.1#2 delete .. //depot/projects/ppc-g5/src/bin/ps/ps.c#2 delete .. //depot/projects/ppc-g5/src/bin/ps/ps.h#2 delete .. //depot/projects/ppc-g5/src/bin/pwd/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/pwd/pwd.1#2 delete .. //depot/projects/ppc-g5/src/bin/pwd/pwd.c#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/rcp.1#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/rcp.c#2 delete .. //depot/projects/ppc-g5/src/bin/rcp/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/realpath/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/realpath/realpath.1#2 delete .. //depot/projects/ppc-g5/src/bin/realpath/realpath.c#2 delete .. //depot/projects/ppc-g5/src/bin/rm/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rm/rm.1#2 delete .. //depot/projects/ppc-g5/src/bin/rm/rm.c#2 delete .. //depot/projects/ppc-g5/src/bin/rmail/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rmdir/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/rmdir/rmdir.1#2 delete .. //depot/projects/ppc-g5/src/bin/rmdir/rmdir.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/file.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/mask.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/merge.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/remove.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/setfacl.1#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/setfacl.c#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/setfacl.h#2 delete .. //depot/projects/ppc-g5/src/bin/setfacl/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/sh/TOUR#2 delete .. //depot/projects/ppc-g5/src/bin/sh/alias.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/alias.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/arith.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/arith.y#2 delete .. //depot/projects/ppc-g5/src/bin/sh/arith_lex.l#2 delete .. //depot/projects/ppc-g5/src/bin/sh/bltin/bltin.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/bltin/echo.1#2 delete .. //depot/projects/ppc-g5/src/bin/sh/bltin/echo.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/builtins.def#2 delete .. //depot/projects/ppc-g5/src/bin/sh/cd.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/cd.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/error.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/error.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/eval.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/eval.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/exec.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/exec.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/expand.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/expand.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/cmv#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/dirs#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/kill#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/login#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/newgrp#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/popd#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/pushd#2 delete .. //depot/projects/ppc-g5/src/bin/sh/funcs/suspend#2 delete .. //depot/projects/ppc-g5/src/bin/sh/histedit.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/init.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/input.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/input.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/jobs.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/jobs.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mail.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mail.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/main.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/main.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/memalloc.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/memalloc.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/miscbltin.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mkbuiltins#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mkinit.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mknodes.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mksyntax.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mktokens#2 delete .. //depot/projects/ppc-g5/src/bin/sh/myhistedit.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mystring.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/mystring.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/nodes.c.pat#2 delete .. //depot/projects/ppc-g5/src/bin/sh/nodetypes#2 delete .. //depot/projects/ppc-g5/src/bin/sh/options.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/options.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/output.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/output.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/parser.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/parser.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/redir.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/redir.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/sh.1#2 delete .. //depot/projects/ppc-g5/src/bin/sh/shell.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/show.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/show.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/trap.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/trap.h#2 delete .. //depot/projects/ppc-g5/src/bin/sh/var.c#2 delete .. //depot/projects/ppc-g5/src/bin/sh/var.h#2 delete .. //depot/projects/ppc-g5/src/bin/sleep/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/sleep/sleep.1#2 delete .. //depot/projects/ppc-g5/src/bin/sleep/sleep.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/stty/cchar.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/extern.h#2 delete .. //depot/projects/ppc-g5/src/bin/stty/gfmt.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/key.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/modes.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/print.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/stty.1#2 delete .. //depot/projects/ppc-g5/src/bin/stty/stty.c#2 delete .. //depot/projects/ppc-g5/src/bin/stty/stty.h#2 delete .. //depot/projects/ppc-g5/src/bin/stty/util.c#2 delete .. //depot/projects/ppc-g5/src/bin/sync/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/sync/sync.8#2 delete .. //depot/projects/ppc-g5/src/bin/sync/sync.c#2 delete .. //depot/projects/ppc-g5/src/bin/test/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/test/TEST.README#2 delete .. //depot/projects/ppc-g5/src/bin/test/TEST.csh#2 delete .. //depot/projects/ppc-g5/src/bin/test/TEST.sh#2 delete .. //depot/projects/ppc-g5/src/bin/test/test.1#2 delete .. //depot/projects/ppc-g5/src/bin/test/test.c#2 delete .. //depot/projects/ppc-g5/src/bin/uuidgen/Makefile#2 delete .. //depot/projects/ppc-g5/src/bin/uuidgen/uuidgen.1#2 delete .. //depot/projects/ppc-g5/src/bin/uuidgen/uuidgen.c#2 delete .. //depot/projects/ppc-g5/src/cddl/Makefile#2 delete .. //depot/projects/ppc-g5/src/cddl/Makefile.inc#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/devid.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/dtrace.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/libproc.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/fsshare.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/ppc-g5/src/cddl/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 delete .. //depot/projects/ppc-g5/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From nwhitehorn at FreeBSD.org Sat Oct 4 03:25:55 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 03:26:01 2008 Subject: PERFORCE change 150923 for review Message-ID: <200810040325.m943PsJY037812@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150923 Change 150923 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 03:25:04 And one more deletion. Affected files ... .. //depot/projects/ppc-g5/ports/.cvsignore#2 delete Differences ... From nwhitehorn at FreeBSD.org Sat Oct 4 03:58:28 2008 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Sat Oct 4 03:58:34 2008 Subject: PERFORCE change 150927 for review Message-ID: <200810040358.m943wSOS040398@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150927 Change 150927 by nwhitehorn@nwhitehorn_trantor on 2008/10/04 03:58:11 Fix miscellaneous mismerges and misimports. Affected files ... .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#5 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#3 (text+ko) ==== @@ -45,7 +45,6 @@ #include -#include #include #include ==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#5 (text+ko) ==== @@ -139,7 +139,6 @@ char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); -extern int cacheline_size; static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); ==== //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#5 (text+ko) ==== @@ -196,7 +196,7 @@ struct ata_kauai_softc *sc; u_int32_t devid; phandle_t node; - char *compatstring = NULL; + const char *compatstring = NULL; int i, found, rid; found = 0; @@ -216,7 +216,7 @@ bzero(sc, sizeof(struct ata_kauai_softc)); ch = &sc->sc_ch.sc_ch; - compatstring = ofw_bus_get_compatible(node); + compatstring = ofw_bus_get_compat(dev); if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0) sc->shasta = 1; From raj at FreeBSD.org Sat Oct 4 10:04:52 2008 From: raj at FreeBSD.org (Rafal Jaworowski) Date: Sat Oct 4 10:05:00 2008 Subject: PERFORCE change 150941 for review Message-ID: <200810041004.m94A4cpJ095080@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150941 Change 150941 by raj@raj_mimi on 2008/10/04 10:03:53 IFC @150939 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#42 integrate .. //depot/projects/arm/src/bin/pkill/pkill.1#2 integrate .. //depot/projects/arm/src/bin/pkill/pkill.c#2 integrate .. //depot/projects/arm/src/crypto/openssh/moduli.5#2 integrate .. //depot/projects/arm/src/crypto/openssh/scp.1#4 integrate .. //depot/projects/arm/src/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/arm/src/crypto/openssh/sftp.1#3 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-add.1#3 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/arm/src/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/arm/src/crypto/openssh/ssh.1#5 integrate .. //depot/projects/arm/src/crypto/openssh/ssh_config.5#6 integrate .. //depot/projects/arm/src/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/arm/src/crypto/openssh/sshd.8#4 integrate .. //depot/projects/arm/src/crypto/openssh/sshd_config.5#6 integrate .. //depot/projects/arm/src/etc/network.subr#13 integrate .. //depot/projects/arm/src/etc/rc.d/jail#7 integrate .. //depot/projects/arm/src/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kld.c#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#6 integrate .. //depot/projects/arm/src/include/Makefile#15 integrate .. //depot/projects/arm/src/include/unistd.h#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.c#15 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.h#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_private.h#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#18 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#18 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/arm/src/lib/libarchive/config_freebsd.h#9 integrate .. //depot/projects/arm/src/lib/libarchive/test/Makefile#13 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_entry.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/arm/src/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/arm/src/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/arm/src/lib/libutil/pty.c#4 integrate .. //depot/projects/arm/src/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/arm/src/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/arm/src/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/arm/src/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/arm/src/sbin/fdisk/Makefile#2 integrate .. //depot/projects/arm/src/sbin/fdisk/fdisk.c#6 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#16 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/arm/src/sbin/init/init.c#4 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#16 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#19 integrate .. //depot/projects/arm/src/sbin/setkey/setkey.8#4 integrate .. //depot/projects/arm/src/share/examples/FreeBSD_version/FreeBSD_version.c#2 integrate .. //depot/projects/arm/src/share/examples/drivers/make_pseudo_driver.sh#5 integrate .. //depot/projects/arm/src/share/man/man3/Makefile#7 integrate .. //depot/projects/arm/src/share/man/man3/makedev.3#1 branch .. //depot/projects/arm/src/share/man/man4/ata.4#11 integrate .. //depot/projects/arm/src/share/man/man4/nfe.4#8 integrate .. //depot/projects/arm/src/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_hda.4#14 integrate .. //depot/projects/arm/src/share/man/man4/wpi.4#3 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#24 integrate .. //depot/projects/arm/src/share/man/man5/src.conf.5#16 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#25 integrate .. //depot/projects/arm/src/share/man/man9/device_ids.9#2 delete .. //depot/projects/arm/src/share/man/man9/make_dev.9#5 integrate .. //depot/projects/arm/src/share/man/man9/spl.9#2 integrate .. //depot/projects/arm/src/share/misc/committers-src.dot#12 integrate .. //depot/projects/arm/src/share/zoneinfo/southamerica#10 integrate .. //depot/projects/arm/src/sys/amd64/amd64/dump_machdep.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#22 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#32 integrate .. //depot/projects/arm/src/sys/amd64/include/param.h#8 integrate .. //depot/projects/arm/src/sys/amd64/include/smp.h#11 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#21 integrate .. //depot/projects/arm/src/sys/arm/arm/dump_machdep.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/mem.c#6 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#43 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#34 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#18 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#9 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/arm/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#25 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#31 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_util.h#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#32 integrate .. //depot/projects/arm/src/sys/compat/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#27 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#37 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/arm/src/sys/conf/NOTES#67 integrate .. //depot/projects/arm/src/sys/conf/files#92 integrate .. //depot/projects/arm/src/sys/conf/files.i386#38 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#22 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#19 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#21 integrate .. //depot/projects/arm/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/arm/src/sys/conf/options#62 integrate .. //depot/projects/arm/src/sys/conf/options.sparc64#6 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#9 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#10 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#16 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#14 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pfvar.h#7 integrate .. //depot/projects/arm/src/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_command.c#14 integrate .. //depot/projects/arm/src/sys/ddb/db_command.h#3 integrate .. //depot/projects/arm/src/sys/ddb/db_main.c#4 integrate .. //depot/projects/arm/src/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/arm/src/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/arm/src/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/arm/src/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/arm/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/arm/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/arm/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#15 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#15 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#15 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#50 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#33 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.c#10 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#12 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/arm/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/arm/src/sys/dev/ce/if_ce.c#10 integrate .. //depot/projects/arm/src/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/arm/src/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#11 integrate .. //depot/projects/arm/src/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#12 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_common.h#10 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_mc5.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_vsc7323.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_xgmac.c#9 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_config.h#8 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_include.h#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#21 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.h#10 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_osdep.h#11 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#18 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/mvec.h#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/arm/src/sys/dev/dc/dcphy.c#5 integrate .. //depot/projects/arm/src/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm.h#7 integrate .. //depot/projects/arm/src/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_agpsupport.c#8 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_atomic.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#10 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drm.h#6 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.c#7 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drv.c#7 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.c#6 integrate .. //depot/projects/arm/src/sys/dev/fatm/if_fatm.c#7 integrate .. //depot/projects/arm/src/sys/dev/fb/fb.c#4 integrate .. //depot/projects/arm/src/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/arm/src/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/arm/src/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/arm/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/arm/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#34 integrate .. //depot/projects/arm/src/sys/dev/joy/joy.c#3 integrate .. //depot/projects/arm/src/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/arm/src/sys/dev/kbdmux/kbdmux.c#10 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_cbus.c#5 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_isa.c#4 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/arm/src/sys/dev/le/if_le_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/led/led.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/arm/src/sys/dev/mii/ciphy.c#9 integrate .. //depot/projects/arm/src/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#25 integrate .. //depot/projects/arm/src/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#9 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#26 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#18 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#15 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/mse/mse.c#6 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/arm/src/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/arm/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/mxge_mcp.h#9 integrate .. //depot/projects/arm/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/arm/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#16 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#9 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfevar.h#7 integrate .. //depot/projects/arm/src/sys/dev/pbio/pbio.c#4 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#13 integrate .. //depot/projects/arm/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/arm/src/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/arm/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/arm/src/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/arm/src/sys/dev/rp/rpvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/arm/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/arm/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/arm/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/arm/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/arm/src/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#19 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.c#10 integrate .. //depot/projects/arm/src/sys/dev/speaker/spkr.c#6 integrate .. //depot/projects/arm/src/sys/dev/streams/streams.c#6 integrate .. //depot/projects/arm/src/sys/dev/tdfx/tdfx_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/arm/src/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ucomvar.h#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/ulpt.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#22 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#16 integrate .. //depot/projects/arm/src/sys/dev/usb/urio.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#16 integrate .. //depot/projects/arm/src/sys/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/arm/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/arm/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/arm/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/arm/src/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/arm/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#14 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs.h#9 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_subr.c#10 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate .. //depot/projects/arm/src/sys/geom/geom_dev.c#11 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#14 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.h#5 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#11 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_rm.c#6 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_machdep.c#12 integrate .. //depot/projects/arm/src/sys/i386/bios/apm.c#8 integrate .. //depot/projects/arm/src/sys/i386/bios/apm.h#3 integrate .. //depot/projects/arm/src/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/arm/src/sys/i386/i386/bios.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/db_trace.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/dump_machdep.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/mem.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/minidump_machdep.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/arm/src/sys/i386/include/param.h#6 integrate .. //depot/projects/arm/src/sys/i386/include/smp.h#11 integrate .. //depot/projects/arm/src/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#17 integrate .. //depot/projects/arm/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/arm/src/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/elf_machdep.c#8 integrate .. //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#16 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#13 integrate .. //depot/projects/arm/src/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/arm/src/sys/ia64/include/smp.h#3 integrate .. //depot/projects/arm/src/sys/kern/imgact_aout.c#6 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#24 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#29 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#24 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_mib.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#30 integrate .. //depot/projects/arm/src/sys/kern/kern_uuid.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/arm/src/sys/kern/makesyscalls.sh#10 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#33 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#15 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#29 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#32 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#17 integrate .. //depot/projects/arm/src/sys/kern/tty.c#26 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#14 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#46 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#32 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#26 integrate .. //depot/projects/arm/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/arm/src/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/arm/src/sys/mips/include/param.h#2 integrate .. //depot/projects/arm/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/arm/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/arm/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/arm/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/arm/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/arm/src/sys/mips/mips/trap.c#3 integrate .. //depot/projects/arm/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/arm/src/sys/modules/Makefile#61 integrate .. //depot/projects/arm/src/sys/modules/ae/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/cxgb/Makefile#11 integrate .. //depot/projects/arm/src/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/cxgb/cxgb_t3fw/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#22 integrate .. //depot/projects/arm/src/sys/net/if.c#29 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#41 integrate .. //depot/projects/arm/src/sys/net/if_ef.c#7 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#34 integrate .. //depot/projects/arm/src/sys/net/if_faith.c#8 integrate .. //depot/projects/arm/src/sys/net/if_gif.c#15 integrate .. //depot/projects/arm/src/sys/net/if_gif.h#6 integrate .. //depot/projects/arm/src/sys/net/if_gre.c#13 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#16 integrate .. //depot/projects/arm/src/sys/net/if_loop.c#14 integrate .. //depot/projects/arm/src/sys/net/if_mib.c#6 integrate .. //depot/projects/arm/src/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/arm/src/sys/net/if_stf.c#12 integrate .. //depot/projects/arm/src/sys/net/if_tap.c#15 integrate .. //depot/projects/arm/src/sys/net/if_tun.c#12 integrate .. //depot/projects/arm/src/sys/net/if_var.h#14 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#25 integrate .. //depot/projects/arm/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/arm/src/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/arm/src/sys/net/route.c#15 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#15 integrate .. //depot/projects/arm/src/sys/net/vnet.h#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/netgraph.h#14 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/arm/src/sys/netgraph/ng_device.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_eiface.c#11 integrate .. //depot/projects/arm/src/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#24 integrate .. //depot/projects/arm/src/sys/netinet/igmp.c#9 integrate .. //depot/projects/arm/src/sys/netinet/in.c#14 integrate .. //depot/projects/arm/src/sys/netinet/in.h#12 integrate .. //depot/projects/arm/src/sys/netinet/in_gif.c#10 integrate .. //depot/projects/arm/src/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#18 integrate .. //depot/projects/arm/src/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/arm/src/sys/netinet/ip.h#6 integrate .. //depot/projects/arm/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw.h#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#48 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_icmp.c#15 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#27 integrate .. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#11 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_options.c#9 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#21 integrate .. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#10 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#45 integrate .. //depot/projects/arm/src/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#30 integrate .. //depot/projects/arm/src/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#40 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#33 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#23 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#28 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#29 integrate .. //depot/projects/arm/src/sys/netinet/vinet.h#1 branch .. //depot/projects/arm/src/sys/netinet6/dest6.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/frag6.c#10 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/arm/src/sys/netinet6/in6.c#16 integrate .. //depot/projects/arm/src/sys/netinet6/in6.h#9 integrate .. //depot/projects/arm/src/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/arm/src/sys/netinet6/in6_ifattach.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#21 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#16 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_forward.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_input.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/mld6.c#12 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#21 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.h#5 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/arm/src/sys/netinet6/route6.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/scope6.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#24 integrate .. //depot/projects/arm/src/sys/netinet6/vinet6.h#1 branch .. //depot/projects/arm/src/sys/netipsec/ipsec.c#15 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_input.c#10 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_mbuf.c#6 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_output.c#10 integrate .. //depot/projects/arm/src/sys/netipsec/key.c#11 integrate .. //depot/projects/arm/src/sys/netipsec/keysock.c#9 integrate .. //depot/projects/arm/src/sys/netipsec/vipsec.h#1 branch .. //depot/projects/arm/src/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/arm/src/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/arm/src/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#25 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/arm/src/sys/pc98/cbus/gdc.c#4 integrate .. //depot/projects/arm/src/sys/pc98/cbus/olpt.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/arm/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/arm/src/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/arm/src/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/arm/src/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/arm/src/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#8 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/intr_machdep.c#15 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mp_machdep.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/arm/src/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#12 integrate .. //depot/projects/arm/src/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/arm/src/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/arm/src/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/arm/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mem.c#6 integrate .. //depot/projects/arm/src/sys/sun4v/include/smp.h#6 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/dump_machdep.c#4 integrate .. //depot/projects/arm/src/sys/sys/conf.h#13 integrate .. //depot/projects/arm/src/sys/sys/kerneldump.h#4 integrate .. //depot/projects/arm/src/sys/sys/libkern.h#8 integrate .. //depot/projects/arm/src/sys/sys/pmc.h#5 integrate .. //depot/projects/arm/src/sys/sys/protosw.h#10 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#29 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#29 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#21 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#12 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#30 integrate .. //depot/projects/arm/src/sys/sys/systm.h#33 integrate .. //depot/projects/arm/src/sys/sys/tty.h#8 integrate .. //depot/projects/arm/src/sys/sys/types.h#8 integrate .. //depot/projects/arm/src/sys/sys/un.h#3 integrate .. //depot/projects/arm/src/sys/sys/vimage.h#2 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#35 integrate .. //depot/projects/arm/src/sys/vm/device_pager.c#8 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#20 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#39 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#17 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.h#3 integrate .. //depot/projects/arm/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/arm/src/sys/xen/gnttab.c#2 integrate .. //depot/projects/arm/src/sys/xen/gnttab.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/arm/src/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/callback.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/features.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/arm/src/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/arm/src/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/arm/src/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/memory.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/platform.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/trace.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/arm/src/sys/xen/interface/xen.h#2 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#16 integrate .. //depot/projects/arm/src/usr.bin/Makefile#17 integrate .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/arm/src/usr.bin/make/job.c#5 integrate .. //depot/projects/arm/src/usr.bin/top/machine.c#9 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#23 integrate .. //depot/projects/arm/src/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/syslogd/syslogd.8#3 integrate .. //depot/projects/arm/src/usr.sbin/syslogd/syslogd.c#6 integrate .. //depot/projects/arm/src/usr.sbin/timed/timed/globals.h#3 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/arm/src/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/arm/src/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/arm/src/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/scp.1#4 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sftp-server.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sftp.1#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-add.1#3 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-agent.1#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-keygen.1#3 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-keyscan.1#4 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh-keysign.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh.1#5 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/ssh_config.5#6 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sshconnect2.c#4 (text+ko) ==== @@ -386,8 +386,9 @@ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } ==== //depot/projects/arm/src/crypto/openssh/sshd.8#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/arm/src/crypto/openssh/sshd_config.5#6 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/arm/src/etc/network.subr#13 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/arm/src/etc/rc.d/jail#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.39 2008/09/16 20:18:25 thompsa Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.40 2008/09/24 15:18:27 ru Exp $ # # PROVIDE: jail @@ -39,6 +39,7 @@ _procdir="${_rootdir}/proc" eval _hostname=\"\$jail_${_j}_hostname\" eval _ip=\"\$jail_${_j}_ip\" + eval _netmask=\"\${jail_${_j}_netmask:-255.255.255.255}\" eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" eval _exec=\"\$jail_${_j}_exec\" eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" @@ -93,6 +94,7 @@ debug "$_j mount enable: $_mount" debug "$_j hostname: $_hostname" debug "$_j ip: $_ip" + debug "$_j netmask: $_netmask" debug "$_j interface: $_interface" debug "$_j fib: $_fib" debug "$_j root: $_rootdir" @@ -297,7 +299,7 @@ continue; fi if [ -n "${_interface}" ]; then - ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 + ifconfig ${_interface} alias ${_ip} netmask ${_netmask} fi if [ -n "${_fib}" ]; then _setfib="setfib -F '${_fib}'" ==== //depot/projects/arm/src/gnu/lib/csu/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs ==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kld.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.9 2008/04/29 20:32:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Sat Oct 4 10:05:53 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Sat Oct 4 10:05:59 2008 Subject: PERFORCE change 150942 for review Message-ID: <200810041005.m94A5qdR095278@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150942 Change 150942 by rene@rene_self on 2008/10/04 10:05:01 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 (text+ko) ==== @@ -1,4 +1,4 @@ - + 2004 2005 2006 + 2007 + 2008 DocEng - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $ - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $ &bookinfo.legalnotice; @@ -155,10 +157,9 @@ Manual page references. - Use - su - 1 - to change user names. + Use + &man.su.1; + to change user names. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -860,17 +860,18 @@ owned by that user as /mnt/username (replace username by the login name of - the actual user): + the actual user and usergroup by the + user's primary group): &prompt.root; mkdir /mnt/username -&prompt.root; chown user:user /mnt/user +&prompt.root; chown username:usergroup /mnt/username Suppose a USB thumbdrive is plugged in, and a device /dev/da0s1 appears. Since these devices usually come preformatted with a FAT file system, one can mount them like this: - &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/username + &prompt.user; mount -t msdosfs -o -m=644,-M=755 /dev/da0s1 /mnt/username If you unplug the device (the disk must be unmounted before), you should see, in the system message buffer, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -388,7 +388,7 @@ Note that the snapshot option will only capture a real file system, not a home directory or a file. The @ character is a delimiter used between - the file system name or the volume name. when a user's + the file system name or the volume name. When a user's home directory gets trashed, restore it with: &prompt.root; zfs rollback storage/home@08-30-08 @@ -564,7 +564,7 @@ period of time. There are many more options for the Z file system, - reading the &man.zfs.1; and &man.zpool.1; manual + see the &man.zfs.8; and &man.zpool.8; manual pages. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2648,8 +2648,8 @@ flags to dhclient, also include the following (editing as necessary): - dhcp_program="/sbin/dhclient" -dhcp_flags="" + dhclient_program="/sbin/dhclient" +dhclient_flags="" ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#6 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.468 2008/09/28 13:14:38 trhodes Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.469 2008/09/28 19:09:35 danger Exp $ --> @@ -3441,6 +3441,7 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#4 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.221 2008/09/03 20:16:30 simon Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.222 2008/10/02 00:41:02 cperciva Exp $ @@ -10,6 +10,18 @@ 2008 + 10 + + + 2 + + + FreeBSD-SA-08:10.nd6 + + + + + 9 From rene at FreeBSD.org Sat Oct 4 10:33:21 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Sat Oct 4 10:33:27 2008 Subject: PERFORCE change 150943 for review Message-ID: <200810041033.m94AXKtO097331@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150943 Change 150943 by rene@rene_self on 2008/10/04 10:32:32 MFen disks/chapter.sgml 1.286 -> 1.287 (plus local fixes). Checked build, whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.35 2006/01/05 21:21:23 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml - %SRCID% 1.286 + %SRCID% 1.287 --> @@ -221,7 +221,7 @@ /var/run/dmesg.boot bekeken te worden om er zeker van te zijn dat de nieuwe schijf is gevonden. Volgens het voorbeeld heet de nieuw toegevoegde schijf - da1 en die wordt gemount op + da1 en die wordt aangekoppeld op /1 (als er een IDE-schijf wordt toegevoegd, is de apparaatnaam ad1). @@ -342,18 +342,18 @@ Labelbewerker dient een enkel bestandssysteem te worden aangemaakt door op C te drukken. Kies FS wanneer gevraagd wordt of dit een FS - (file system) of swap wordt, en geef een mountpunt in + (file system) of swap wordt, en geef een koppelpunt in (bijvoorbeeld /mnt). Wanneer een schijf in post-installatie-modus wordt toegevoegd, maakt sysinstall geen ingangen aan in /etc/fstab, dus dan is het opgegeven - mountpunt niet van belang. + koppelpunt niet van belang. Nu kan het nieuwe label naar de schijf worden geschreven en er een bestandssysteem op aangemaakt worden. Dit kan gedaan worden door op W te drukken. Fouten van sysinstall - dat de nieuwe partitie niet gemount kon worden kunnen + dat de nieuwe partitie niet aankoppeld kon worden kunnen genegeerd worden. De Labelbewerker en sysinstall kunnen nu volledig verlaten worden. @@ -664,21 +664,21 @@ /etc/rc ccdconfig -C indien /etc/ccd.conf bestaat. Dit stelt automatisch de &man.ccd.4; in, zodat die kan worden - gemount. + aangekoppeld. Indien er in enkele-gebruiker-modus wordt opgestart, dient het volgende commando te worden uitgevoerd om de - rij in te stellen voordat de &man.ccd.4; gemount kan + rij in te stellen voordat de &man.ccd.4; aangekoppeld kan worden: ccdconfig -C - Om de &man.ccd.4; automatisch te mounten, kan er een - regel voor de &man.ccd.4; in + Om de &man.ccd.4; automatisch aan te koppelen, kan er + een regel voor de &man.ccd.4; in /etc/fstab geplaatst worden, zodat die - tijdens het opstarten gemount wordt: + tijdens het opstarten aangekoppeld wordt: /dev/ccd0c /media ufs rw 2 2 @@ -943,7 +943,7 @@ <Generic Traveling Disk 1.11> at scbus0 target 0 lun 0 (da0,pass0) Indien er een bestandssysteem op de schijf aanwezig is, kan - dat gemount worden. biedt + dat aangekoppeld worden. biedt indien nodig hulp bij het formatteren en aanmaken van partities op de USB-drive. @@ -992,29 +992,31 @@ start van het systeem. Als alternatief kan ook &man.sysctl.8; gebruikt worden om deze variabele te zetten. - De laatste stap is het creeeren van de directory waar het - bestandssysteem gekoppeld wordt. Deze directory moet eigendom - zijn van de gebruiker die het bestandssysteem gaat koppelen. - Een manier om dat te bewerkstelligen is door met de gebruiker - root een subdirectory aan te maken die - eigendom is van de gebruiker als + De laatste stap is het creëeren van de map waar het + bestandssysteem gekoppeld wordt. Deze map moet eigendom zijn + van de gebruiker die het bestandssysteem gaat koppelen. Een + manier om dat te bewerkstelligen is door met de gebruiker + root een submap aan te maken die eigendom + is van de gebruiker als /mntgebruikersnaam (verander gebruikersnaam door de - loginnaam van de daadwerkelijke gebruiker): + loginnaam van de daadwerkelijke gebruiker en + gebruikersgroep door de primaire + groep van de gebruiker): &prompt.root; mkdir /mnt/gebruikersnaam -&prompt.root; chown gebruiker:gebruiker /mnt/gebruiker +&prompt.root; chown gebruikersnaam:gebruikersgroep /mnt/gebruikersnaam - Stel dat er vervolgens een USB stick ingeplugged wordt - en er een /dev/da0s1 aangemaakt wordt. - Omdat deze apparaatjes meestal voorgeformatteerd met een - FAT bestandssysteem komen, kan deze als volgende gekoppeld + Stel dat er vervolgens een USB-stick ingeplugged wordt en er + een /dev/da0s1 aangemaakt wordt. Omdat + deze apparaten meestal voorgeformatteerd met een + FAT-bestandssysteem komen, kan deze als volgende gekoppeld worden: - &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/gebruikersnaam + &prompt.user; mount -t msdosfs -o -m=644,-M=755 /dev/da0s1 /mnt/gebruikersnaam Indien het apparaat losgekoppeld wordt (nadat de schijf - gedismount is), dient in de buffer voor systeemmeldingen iets + afgekoppeld is), dient in de buffer voor systeemmeldingen iets als het volgende te zien te zijn: umass0: at uhub0 port 1 (addr2) disconnected @@ -1029,8 +1031,8 @@ Naast de onderdelen Schijven toevoegen en Bestandssystemen mounten en - unmounten, kunnen de volgende hulppagina's ook nuttig + linkend="mount-unmount">Bestandssystemen aan- en + afkoppelen, kunnen de volgende hulppagina's ook nuttig zijn: &man.umass.4;, &man.camcontrol.8; en &man.usbdevs.8;. @@ -1427,23 +1429,23 @@ Gegevens-CD's gebruiken Nu er een standaard gegevens-CD-ROM is aangemaakt moet deze - waarschijnlijk gemount worden om de gegevens die er op staan te - lezen. Normaalgesproken neemt &man.mount.8; aan dat een - bestandssysteem van het soort ufs is. Als - zoiets als onderstaande geprobeerd wordt komt er een klacht - over Incorrect super block en geen - mount: + waarschijnlijk aangekoppeld worden om de gegevens die er op + staan te lezen. Normaalgesproken neemt &man.mount.8; aan dat + een bestandssysteem van het soort ufs is. + Als zoiets als onderstaande geprobeerd wordt komt er een klacht + over Incorrect super block en wordt er + niet aangekoppeld: &prompt.root; mount /dev/cd0 /mnt De CD-ROM bevat geen - UFS-bestandssysteem, dus pogingen om zo te - mounten mislukken. Er dient aan &man.mount.8; verteld te + UFS-bestandssysteem, dus pogingen om zo aan + te koppelen mislukken. Er dient aan &man.mount.8; verteld te worden dat het bestandssysteem van het soort ISO9660 is en dan werkt alles. Dit kan door de optie van &man.mount.8; op te geven. Het CD-ROM-apparaat /dev/cd0 - onder /mnt mounten kan zo: + onder /mnt aankoppelen kan zo: &prompt.root; mount -t cd9660 /dev/cd0 /mnt @@ -1482,11 +1484,11 @@ Zo nu en dan kan Device not configured verschijnen als geprobeerd wordt om een - CD-ROM te mounten. Dit betekent meestal dat het CD-ROM-station - denkt dat er geen schijf in de lade ligt of dat het station - niet zichtbaar is op de bus. Omdat het enkele seconden kan - duren voordat een CD-ROM-station doorheeft dat er een CD-ROM - in ligt, is geduld geboden. + CD-ROM aan te koppelen. Dit betekent meestal dat het + CD-ROM-station denkt dat er geen schijf in de lade ligt of dat + het station niet zichtbaar is op de bus. Omdat het enkele + seconden kan duren voordat een CD-ROM-station doorheeft dat er + een CD-ROM in ligt, is geduld geboden. Soms wordt een SCSI CD-ROM gemist omdat het station niet genoeg tijd had om antwoord te geven op de busreset. Indien er @@ -1518,12 +1520,12 @@ &prompt.root; tar xzvf /dev/acd1 - Het is niet mogelijk om deze schijf te mounten zoals dat - voor een normale CD-ROM gedaan wordt. Zo'n CD-ROM kan onder + Het is niet mogelijk om deze schijf aan te koppelen zoals + dat voor een normale CD-ROM gedaan wordt. Zo'n CD-ROM kan onder geen enkel besturingssysteem, behalve &os;, gelezen worden. - Om de CD te kunnen mounten of gegevens te delen met een ander - besturingssysteem, dient &man.mkisofs.8; gebruikt te worden, - zoals boven beschreven is. + Om de CD aan te kunnen koppelen of gegevens te delen met een + ander besturingssysteem, dient &man.mkisofs.8; gebruikt te + worden, zoals boven beschreven is. @@ -1591,7 +1593,7 @@ Het station is nu toegankelijk via de apparaatnaam /dev/cd0. Om bijvoorbeeld een CD-ROM op - /mnt te mounten: + /mnt aan te koppelen: &prompt.root; mount -t cd9660 /dev/cd0 /mnt @@ -2187,8 +2189,8 @@ Diskettes gebruiken Om de diskette te gebruiken kan &man.mount.msdosfs.8; - gebruikt worden om het medium te mounten. Ook kan emulators/mtools uit de + gebruikt worden om het medium aan te koppelen. Ook kan + emulators/mtools uit de Portscollectie worden gebruikt. @@ -2695,7 +2697,7 @@ Indien dump op een hoofdmap wordt gebruikt, wordt er geen back-up gemaakt van /home , /usr of van de vele andere - mappen, aangezien dit typisch mountpunten voor andere + mappen, aangezien dit typisch koppelpunten voor andere bestandssystemen of symbolische koppelingen binnen deze bestandssystemen zijn. @@ -2997,9 +2999,9 @@ In het andere geval dienen twee eigen opstartbare diskettes aangemaakt te worden die een kernel bevatten die - alle gewenste schijven kan mounten en toegang heeft tot het - bandstation. Deze diskettes dienen het volgende te bevatten: - fdisk, newfs, + alle gewenste schijven kan aankoppelen en toegang heeft tot + het bandstation. Deze diskettes dienen het volgende te + bevatten: fdisk, newfs, mount en het gebruikte back-upprogramma. Deze programma's dienen statisch gelinkt te worden. Als dump gebruikt wordt, moet de diskette @@ -3063,7 +3065,7 @@ newfs -t 2 -u 18 -l 1 -c 40 -i 5120 -m 5 -o space /dev/fd0a # -# mount de nieuwe diskette +# koppel de nieuwe diskette aan # mount /dev/fd0a /mnt @@ -3171,7 +3173,7 @@ /usr/sbin/pwd_mkdb -d/mnt/etc /mnt/etc/master.passwd # -# umount de diskette en informeer de gebruiker +# koppel de diskette af en informeer de gebruiker # /sbin/umount /mnt echo "De diskette is ontkoppeld en is nu klaar."]]> @@ -3219,21 +3221,21 @@ newfs - Probeer de rootpartitie van de eerste schijf te mounten - (bijvoorbeeld mount /dev/da0a /mnt). Als - het schijflabel beschadigd is, gebruik dan - bsdlabel om de schijf opnieuw te + Probeer de rootpartitie van de eerste schijf aan te + koppelen (bijvoorbeeld mount /dev/da0a + /mnt). Als het schijflabel beschadigd is, gebruik + dan bsdlabel om de schijf opnieuw te partitioneren en te labelen zodat deze overeenkomt met het afgedrukte en bewaarde label. Gebruik voor het opnieuw aanmaken van de bestandssystemen newfs. - Hermount de rootpartitie van de diskette voor lezen en - schrijven (mount -u -o rw /mnt). Gebruik - voor het herstellen van de gegevens van dit bestandssysteem - het back-upprogramma en de back-upbanden (bijvoorbeeld - restore vrf /dev/sa0). Dismount nu het - bestandssysteem (bijvoorbeeld umount - /mnt). Herhaal dit voor elk beschadigd - bestandssysteem. + Koppel de rootpartitie van de diskette opnieuw aan voor lezen + en schrijven (mount -u -o rw /mnt). + Gebruik voor het herstellen van de gegevens van dit + bestandssysteem het back-upprogramma en de back-upbanden + (bijvoorbeeld restore vrf /dev/sa0). + Koppel nu het bestandssysteem af (bijvoorbeeld + umount /mnt). Herhaal dit voor elk + beschadigd bestandssysteem. Back-up de gegevens naar nieuwe banden als het systeem weer draait. De omstandigheden die verantwoordelijk waren @@ -3326,16 +3328,16 @@ geheugen-gebaseerde virtuele schijven: geheugenschijven die met &man.malloc.9; toegewezen zijn, geheugenschijven die een bestand als basis gebruiken en geheugenschijven die swapruimte - als basis gebruiken. Een mogelijk gebruik is het mounten van - een beeld van een diskette of CD dat in een bestand bewaard + als basis gebruiken. Een mogelijk gebruik is het aankoppelen + van een beeld van een diskette of CD dat in een bestand bewaard wordt. - Om een bestaand beeld van een bestandssysteem te - mounten: + Om een bestaand beeld van een bestandssysteem aan te + koppelen: <command>mdconfig</command> gebruiken om een bestaand - beeld van een bestandssysteem te mounten + beeld van een bestandssysteem aan te koppelen &prompt.root; mdconfig -a -t vnode -f schijfbeeld -u 0 &prompt.root; mount /dev/md0 /mnt @@ -3372,19 +3374,18 @@ md4. Meer details staan in de hulppagina van &man.mdconfig.8;. - Het commando &man.mdconfig.8; is erg nuttig, hoewel het veel opdrachten vergt om een bestandsgebaseerd bestandssysteem aan te maken. &os; wordt met &man.mdmfs.8; geleverd. Dit - programma stelt een &man.md.4;-schijf in door gebruik te maken van - &man.mdconfig.8;, zet er een bestandssysteem op door gebruik te - maken van &man.newfs.8; en mount het door gebruik te maken van - &man.mount.8;. Om hetzelfde bestandssysteembeeld als hierboven - aan te maken en te mounten: + programma stelt een &man.md.4;-schijf in door gebruik te maken + van &man.mdconfig.8;, zet er een bestandssysteem op door gebruik + te maken van &man.newfs.8; en koppel het aan door gebruik te + maken van &man.mount.8;. Om hetzelfde bestandssysteembeeld als + hierboven aan te maken en aan te koppelen: - Instellen en mounten van een bestandsgebaseerde schijf - met <command>mdmfs</command> + Instellen en aankoppelen van een bestandsgebaseerde + schijf met <command>mdmfs</command> &prompt.root; dd if=/dev/zero of=nieuwbeeld bs=1k count=5k 5120+0 records in @@ -3460,10 +3461,9 @@ Als een geheugen- of bestandsgebaseerd bestandssysteem niet gebruikt wordt, dienen alle bronnen aan het systeem - vrijgegeven te worden. Dismount als eerste het - bestandssysteem, gebruikt daarna &man.mdconfig.8; om de schijf - van een systeem los te koppelen en de bronnen vrij te - geven. + vrijgegeven te worden. Koppel als eerste het bestandssysteem + af, gebruikt daarna &man.mdconfig.8; om de schijf van een + systeem los te koppelen en de bronnen vrij te geven. Om bijvoorbeeld alle bronnen die door /dev/md4 gebruikt worden los te koppelen @@ -3508,10 +3508,10 @@ bestandssysteem waarop de handeling wordt uitgevoerd en er mogen niet meer dan 20 snapshots per bestandssysteem worden aangemaakt. Actieve snapshots worden opgeslagen in het superblok zodat ze - persistent zijn met dismount- en hermountbewerkingen en met het - opnieuw opstarten van het systeem. Als een snapshot niet langer - nodig is, kan het met het standaardcommando &man.rm.1; worden - verwijderd. Snapshots kunnen in elke volgorde verwijderd + persistent zijn met afkoppel- en heraankoppelbewerkingen en met + het opnieuw opstarten van het systeem. Als een snapshot niet + langer nodig is, kan het met het standaardcommando &man.rm.1; + worden verwijderd. Snapshots kunnen in elke volgorde verwijderd worden, alhoewel misschien niet alle gebruikte ruimte teruggewonnen wordt omdat sommige vrijgegeven blokken mogelijk door een ander snapshot geclaimd worden. @@ -3552,7 +3552,7 @@ De bestandssysteem integriteit controle, &man.fsck.8; kan gebruikt worden op het snapshot. Ervan uitgaande dat het - bestandssysteem schoon was toen het werd gemount, zou dit + bestandssysteem schoon was toen het werd aangekoppeld, zou dit altijd een schoon (en onveranderlijk) resultaat moeten opleveren. Dit is in principe wat het &man.fsck.8;-achtergrondsproces doet; @@ -3570,8 +3570,8 @@ Het snapshot kan met &man.mount.8; als bevroren beeld van - het bestandssysteem worden gemount. Om het snapshot - /var/snapshot/snap te mounten: + het bestandssysteem worden aangekoppeld. Om het snapshot + /var/snapshot/snap aan te koppelen: &prompt.root; mdconfig -a -t vnode -f /var/snapshot/snap -u 4 &prompt.root; mount -r /dev/md4 /mnt @@ -3579,12 +3579,12 @@ Het is nu mogelijk om door de structuur van het bevroren - bestandssysteem /var te lopen dat gemount is - op /mnt. Alles zal initieel in dezelfde - toestand verkeren als op het moment dat het snapshot werd - aangemaakt. De enige uitzondering hierop is dat eerdere + bestandssysteem /var te lopen dat + aangekoppeld is op /mnt. Alles zal initieel + in dezelfde toestand verkeren als op het moment dat het snapshot + werd aangemaakt. De enige uitzondering hierop is dat eerdere snapshots als bestanden met lengte nul verschijnen. Als een - snapshot niet meer nodig is, kan het als volgt gedismount + snapshot niet meer nodig is, kan het als volgt afgekoppeld worden: &prompt.root; umount /mnt @@ -3978,7 +3978,7 @@ In het volgende voorbeeld wordt aangenomen dat er een nieuwe harde schijf aan het systeem wordt toegevoegd die een enkele versleutelde partitie zal bevatten. Deze partitie - wordt gemount als /private. + wordt aangekoppeld als /private. gbde kan ook gebruikt worden om /home en /var/mail te versleutelen, maar daarvoor zijn complexere instructies @@ -4130,7 +4130,7 @@ Mount de versleutelde partitie - Maak een mountpunt voor het versleutelde + Maak een koppelpunt voor het versleutelde bestandssysteem aan: &prompt.root; mkdir /private @@ -4160,7 +4160,7 @@ - Bestaande versleutelde bestandssystemen mounten + Bestaande versleutelde bestandssystemen aankoppelen Elke keer nadat het systeem is opgestart dient elk versleuteld bestandssysteem opnieuw aan de kernel gekoppeld @@ -4186,7 +4186,7 @@ Aangezien het nog niet mogelijk is om versleutelde bestandssystemen op te nemen in /etc/fstab voor automatische controle, - dienen de bestandssystemen voordat ze gemount worden + dienen de bestandssystemen voordat ze aangekoppeld worden handmatig op fouten gecontroleerd te worden door &man.fsck.8; uit te voeren: @@ -4204,11 +4204,11 @@ - Versleutelde partities automatisch mounten + Versleutelde partities automatisch aankoppelen Het is mogelijk om een script aan te maken om automatisch een versleutelde partitie aan te koppelen, op - fouten te controleren en te mounten, maar vanwege + fouten te controleren en aan te koppelen, maar vanwege veiligheidsredenen dient het script niet het wachtwoord voor &man.gbde.8; te bevatten. In plaats hiervan wordt het aangeraden om zulke scripts handmatig uit te voeren en het @@ -4226,8 +4226,8 @@ gbde bij het starten wordt ingegeven. Na het invoeren van de juiste wachtwoordzin wordt de met gbde versleutelde - partitie automatisch gemount. Dit kan erg handig zijn bij - het gebruik van gbde op + partitie automatisch aangekoppeld. Dit kan erg handig zijn + bij het gebruik van gbde op notebooks. @@ -4377,15 +4377,15 @@ Het volgende voorbeeld beschrijft hoe een sleutelbestand te maken, dat wordt gebruikt als onderdeel van de Master Key voor de versleutelde dienst die wordt - gemount onder /private. Het sleutelbestand zorgt voor wat willekeurige gegevens die worden gebruikt om de Master Key te versleutelen. De Master Key wordt ook door een wachtwoordzin beschermd. De sectorgrootte van de dienst wordt 4 kB. Ook wordt beschreven hoe de geli-dienst te koppelen, er een - bestandsysteem op te maken, dat te mounten, hoe ermee te - werken en tenslotte hoe te ontkoppelen. + bestandsysteem op te maken, dat aan te koppelen, hoe ermee + te werken en tenslotte hoe te ontkoppelen. Het wordt aangeraden een grotere sectorgrootte in te stellen (zoals 4 kB) voor betere prestaties. @@ -4448,14 +4448,14 @@ - De dienst unmounten en afkoppelen + De dienst afkoppelen Als het werk met de versleutelde partitie is afgehandeld en de /private-partitie is niet - langer nodig, dan is het verstandig te overwegen de met - geli versleutelde partitie te unmounten - en af te koppelen van de kernel. + class="directory">/private-partitie niet langer + nodig is, dan is het verstandig te overwegen de met + geli versleutelde partitie af te koppelen + van het bestandssysteem en de kernel. &prompt.root; umount /private &prompt.root; geli detach da2.eli From raj at FreeBSD.org Sat Oct 4 11:02:51 2008 From: raj at FreeBSD.org (Rafal Jaworowski) Date: Sat Oct 4 11:02:57 2008 Subject: PERFORCE change 150945 for review Message-ID: <200810041102.m94B2oAM099540@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150945 Change 150945 by raj@raj_mimi on 2008/10/04 11:02:11 U-Boot includes cosmetics. Affected files ... .. //depot/projects/arm/src/sys/arm/include/bootinfo.h#2 edit .. //depot/projects/arm/src/sys/arm/include/metadata.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/include/bootinfo.h#2 (text+ko) ==== @@ -10,8 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,7 +22,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/bootinfo.h,v 1.11 2008/03/12 16:32:07 raj Exp $ + * $FreeBSD$ */ #ifndef _MACHINE_BOOTINFO_H_ ==== //depot/projects/arm/src/sys/arm/include/metadata.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/metadata.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD$ */ #ifndef _MACHINE_METADATA_H_ From raj at FreeBSD.org Sat Oct 4 11:03:52 2008 From: raj at FreeBSD.org (Rafal Jaworowski) Date: Sat Oct 4 11:03:58 2008 Subject: PERFORCE change 150946 for review Message-ID: <200810041103.m94B3pkJ000842@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150946 Change 150946 by raj@raj_mimi on 2008/10/04 11:03:34 Adjust Marvell headers for better Discovery support. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/mvreg.h#4 edit .. //depot/projects/arm/src/sys/arm/mv/mvvar.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/mvreg.h#4 (text+ko) ==== @@ -98,11 +98,7 @@ #define MV_INTREGS_BASE (MV_MBUS_BRIDGE_BASE + 0x80) #define MV_CPU_CONTROL_BASE (MV_MBUS_BRIDGE_BASE + 0x100) #define MV_IC_BASE (MV_MBUS_BRIDGE_BASE + 0x200) -#if defined(SOC_MV_DISCOVERY) #define MV_IC_SIZE 0x3C -#else -#define MV_IC_SIZE 0x20 -#endif #define MV_TIMERS_BASE (MV_MBUS_BRIDGE_BASE + 0x300) #define MV_TIMERS_SIZE 0x30 #define MV_PCI_BASE (MV_BASE + 0x30000) @@ -444,11 +440,15 @@ /* * Decode windows definitions and macros */ -#define MV_WIN_CPU_CTRL(n) (0x10 * (n) + 0x0) -#define MV_WIN_CPU_BASE(n) (0x10 * (n) + 0x4) -#define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + 0x8) -#define MV_WIN_CPU_REMAP_HI(n) (0x10 * (n) + 0xc) +#define MV_WIN_CPU_CTRL(n) (0x10 * (n) + (((n) < 8) ? 0x000 : 0x880)) +#define MV_WIN_CPU_BASE(n) (0x10 * (n) + (((n) < 8) ? 0x004 : 0x884)) +#define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + (((n) < 8) ? 0x008 : 0x888)) +#define MV_WIN_CPU_REMAP_HI(n) (0x10 * (n) + (((n) < 8) ? 0x00C : 0x88C)) +#if defined(SOC_MV_DISCOVERY) +#define MV_WIN_CPU_MAX 14 +#else #define MV_WIN_CPU_MAX 8 +#endif #define MV_WIN_DDR_BASE(n) (0x8 * (n) + 0x0) #define MV_WIN_DDR_SIZE(n) (0x8 * (n) + 0x4) @@ -470,12 +470,12 @@ #define MV_WIN_IDMA_MAX 8 #define MV_IDMA_CHAN_MAX 4 -#define MV_WIN_PCIE_CTRL(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ - 0x1820) -#define MV_WIN_PCIE_BASE(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ - 0x1824) -#define MV_WIN_PCIE_REMAP(n) (0x10 * (((n) < 5) ? (n) : (n) + 1) + \ - 0x182C) +#define MV_WIN_PCIE_CTRL(n) (0x10 * (((n) < 5) ? (n) : \ + (n) + 1) + 0x1820) +#define MV_WIN_PCIE_BASE(n) (0x10 * (((n) < 5) ? (n) : \ + (n) + 1) + 0x1824) +#define MV_WIN_PCIE_REMAP(n) (0x10 * (((n) < 5) ? (n) : \ + (n) + 1) + 0x182C) #define MV_WIN_PCIE_MAX 6 #define MV_PCIE_BAR(n) (0x04 * (n) + 0x1804) ==== //depot/projects/arm/src/sys/arm/mv/mvvar.h#3 (text+ko) ==== @@ -84,7 +84,6 @@ uint8_t mv_gpio_in(uint32_t pin); int platform_pmap_init(void); -long platform_ramsize(void); int soc_decode_win(void); void soc_id(uint32_t *dev, uint32_t *rev); void soc_identify(void); From raj at FreeBSD.org Sat Oct 4 11:04:56 2008 From: raj at FreeBSD.org (Rafal Jaworowski) Date: Sat Oct 4 11:05:03 2008 Subject: PERFORCE change 150947 for review Message-ID: <200810041104.m94B4qVG000918@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150947 Change 150947 by raj@raj_mimi on 2008/10/04 11:04:46 Change linking addr range for DB-78XX system. Same reasons and comments apply as for the DB-88F6XXX systems. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/discovery/std.db78xxx#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/discovery/std.db78xxx#3 (text+ko) ==== @@ -3,11 +3,11 @@ include "../mv/std.mv" files "../mv/discovery/files.db78xxx" -makeoptions KERNPHYSADDR=0x00200000 -makeoptions KERNVIRTADDR=0xc0200000 +makeoptions KERNPHYSADDR=0x00900000 +makeoptions KERNVIRTADDR=0xc0900000 -options KERNPHYSADDR=0x00200000 -options KERNVIRTADDR=0xc0200000 +options KERNPHYSADDR=0x00900000 +options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 options PHYSMEM_SIZE=0x20000000 options STARTUP_PAGETABLE_ADDR=0x00100000 From raj at FreeBSD.org Sat Oct 4 11:06:55 2008 From: raj at FreeBSD.org (Rafal Jaworowski) Date: Sat Oct 4 11:07:02 2008 Subject: PERFORCE change 150948 for review Message-ID: <200810041106.m94B6tfe001127@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150948 Change 150948 by raj@raj_mimi on 2008/10/04 11:06:12 Fix Discovery IDMA decode window settings. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/discovery/discovery.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/discovery/discovery.c#3 (text+ko) ==== @@ -151,7 +151,7 @@ */ const struct decode_win idma_win_tbl[] = { /* PCIE MEM */ - { 4, 0x59, MV_PCIE_MEM_PHYS_BASE, -1 }, + { 4, 0x59, MV_PCIE_MEM_PHYS_BASE, MV_PCIE_MEM_SIZE, -1 }, }; const struct decode_win *idma_wins = idma_win_tbl; int idma_wins_no = sizeof(idma_win_tbl) / sizeof(struct decode_win); From pgj at FreeBSD.org Sat Oct 4 12:25:15 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Sat Oct 4 12:25:23 2008 Subject: PERFORCE change 150951 for review Message-ID: <200810041225.m94CPEWm008239@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150951 Change 150951 by pgj@kolbasz on 2008/10/04 12:25:03 Add Hungarian translation of chapter "File Systems Support" from Handbook Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#2 (text+ko) ==== @@ -4,8 +4,9 @@ --> @@ -14,460 +15,619 @@ Tom Rhodes - Written by + Írta: - File Systems Support + Támogatott állományrendszerek - Synopsis + Áttekintés - File Systems + állományrendszerek - File Systems Support - File Systems + támogatott + állományrendszerek + állományrendszerek - File systems are an integral part of any operating system. - They allow for users to upload and store files, provide access - to data, and of course, make hard drives useful. Different - operating systems usually have one major aspect in common, that - is their native file system. On &os; this file system is known - as the Fast File System or FFS which is built - on the original Unix™ File System, also known as - UFS. This is the native file system on &os; - which is placed on hard disks for access to data. + Az állományrendszerek szerves + részét képezik napjaink operációs + rendszereinek. Segítségükkel a + felhasználók adatokat tölthetnek fel és + tárolhatnak a számítógépen, + szabályozhatják a + hozzáférésüket, és + természetesen mûködtethetik a merevlemezeiket. A + különféle operációs rendszerekben + általában azért annyi közös, hogy + mindannyiukhoz tartozik egy natív, vagyis általuk + alapból ismert állományrendszer. A &os; + esetében ezt konkrétan a Fast File System vagy + röviden FFS, amely az eredeti Unix™ + File System, vagy más néven UFS + megoldásain alapszik. A &os; tehát a merevlemezeken + ebben a natív állományrendszerben + tárol adatokat. - &os; also supports a multitude of different file systems to - provide support for accessing data from other operating systems - locally, i.e. data stored on locally attached - USB storage devices, flash drives, and hard - disks. There is also support for some non-native file systems. - These are file systems developed on other - operating systems, like the &linux; Extended File System - (EXT), and the &sun; Z File System + A &os; természetesen ezen kívül még + ismer számos egyéb állományrendszert, + ezáltal képes adatokat olvasni más + operációs rendszerek részérõl is + kezelhetõ partíciókról, + például helyi + USB-eszközökrõl, + flashkártyákról és + merevlemezekrõl. Továbbá ismeri + néhány más operációs rendszer + natív állományrendszerét, mint + például a &linux; Extended File System + (EXT) vagy éppen a &sun; Z File System (ZFS). - There are different levels of support for the various file - systems in &os;. Some will require a kernel module to be loaded, - others may require a toolset to be installed. This chapter is - designed to help users of &os; access other file systems on their - systems, starting with the &sun; Z file - system. + &os; alatt az egyes állományrendszerek ismerete + változó. Bizonyos esetekben elegendõ + csupán egy megfelelõ modul betöltése, + máskor viszont egy komplett eszközkészlet + segítségével tudunk velük dolgozni. Ez + a fejezet igyekszik a &sun;-féle Z + állományrendszerrel kezdõdõen bemutatni a + &os; felhasználói számára más + állományrendszerek használatát. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - The difference between native and supported file systems. + a natív és támogatott + állományrendszerek közti + különbségeket; - What file systems are supported by &os;. + a &os; által ismert + állományrendszereket; - How to enable, configure, access and make use of - non-native file systems. + hogyan engedélyezzünk, állítsunk + be és érjünk el nem natív + állományrendszereket. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand &unix; and &os; basics - (). + a &unix; és &os; alapjainak ismerete (); - Be familiar with - the basics of kernel configuration/compilation - (). + a rendszermag konfigurációjának + és fordításának alapvetõ + fogásainak ismerete (); - Feel comfortable installing third party software - in &os; (). + a különbözõ külsõ + fejlesztésû szoftverek + telepítésének ismerete (); - Have some familiarity with disks, storage and - device names in &os; (). + a lemezek és egyéb + tárolóeszközök, valamint a &os; alatt az + eszközök elnevezésének + minimális ismerete (). - - The ZFS feature is considered - experimental. Some options may be lacking in functionality, - other parts may not work at all. In time, this feature will - be considered production ready and this documentation will be - altered to fit that situation. + Jelenleg a ZFS támogatása + még nem tekinthetõ hétköznapi + használatra alkalmasnak. Ennek + következményeképpen bizonyos funkciók + nem megfelelõen vagy egyáltalán nem + mûködnek. Ahogy ez a támogatás + megbízhatóvá válik, úgy + fogjuk tovább finomítani a + dokumentációt. - The Z File System + A Z állományrendszer - The Z file system, developed by &sun;, is a new - technology designed to use a pooled storage method. This means - that space is only used as it is needed for data storage. It - has also been designed for maximum data integrity, supporting - data snapshots, multiple copies, and data checksums. A new - data replication model, known as RAID-Z has - been added. The RAID-Z model is similar - to RAID5 but is designed to prevent data - write corruption. + A &sun; Z állományrendszere egy új, + közös tárolási módszeren + nyugvó technológia. Ez annyit jelent a + gyakorlatban, hogy mindig csak annyi helyet foglal, amennyire az + adatoknak közvetlenül szüksége van. + Emellett úgy alakították ki, hogy az adatok + épségét minél inkább + védje, ezért például + megtalálhatjuk benne a pillanatképek + készítését, a másolatok + létrehozását és az adatok + sértetlenségének + ellenõrzését. Továbbá egy + RAID-Z néven bemutatott új + replikációs modellt is támogat. A + RAID-Z alapvetõen a + RAID-5 megoldásához + hasonlít, azonban írás során + keletkezõ hibák ellen igyekszik védelmet + nyújtani. - ZFS Tuning + A ZFS finomhangolása - The ZFS subsystem utilizes much of - the system resources, so some tuning may be required to provide - maximum efficiency during every-day use. As an experimental - feature in &os; this may change in the near future; however, - at this time, the following steps are recommended. + A ZFS funkcióit + megvalósító alrendszer + alapértelmezés szerint meglehetõsen sok + erõforrást kíván, ezért nem + árt a legjobb hatékonyságra behangolnunk a + mindennapokban felmerülõ igények mentén. + Mivel ez még egy fejlesztés és + tesztelés alatt álló része a + &os;-nek, elképzelhetõ, hogy ez a jövõben + változik, viszont jelen pillanatban a következõ + lépéseket javasoljuk. - Memory + Memória - The total system memory should be at least one gigabyte, - with two gigabytes or more recommended. In all of the - examples here, the system has one gigabyte of memory with - several other tuning mechanisms in place. + Hasznos, ha a rendszerünkben legalább + 1 GB memória található, de + inkább 2 vagy több az ajánlott. Az itt + szereplõ példákban ehelyett azonban + mindenhol csupán 1 GB-ot + feltételezünk. - Some people have had luck using fewer than one gigabyte - of memory, but with such a limited amount of physical memory, - when the system is under heavy load, it is very plausible - that &os; will panic due to memory exhaustion. + Néhányaknak sikerült + 1 GB-nál kevesebb központi + memóriával is használni ezt az + állományrendszert, azonban ilyenkor nagyon + könnyen elõfordulhat, hogy komolyabb terhelés + esetén a &os; a memória elfogyása miatt + egyszerûen összeomlik. - Kernel Configuration + A rendszermag beállításai - It is recommended that unused drivers and options - be removed from the kernel configuration file. Since most - devices are available as modules, they may simply be loaded - using the /boot/loader.conf file. + A rendszermag konfigurációs + állományából javasolt + eltávolítani az összes nem használt + meghajtót és funkciót. A legtöbb + meghajtó egyébként is + elérhetõ modul formájában, és + a /boot/loader.conf + állományon keresztül minden gond + nélkül betölthetõek. - Users of the i386 architecture should add the following - option to their kernel configuration file, rebuild their - kernel, and reboot: + Az i386 architektúránál + szükségünk lesz az alábbi + konfigurációs beállítás + megadására, majd a rendszermag + újrafordítására, végül + a rendszer újraindítására: options KVA_PAGES=512 - This option will expand the kernel address space, thus - allowing the vm.kvm_size tunable to be - pushed beyond the currently imposed limit of 1 GB - (2 GB for PAE). To find the most - suitable value for this option, divide the desired address - space in megabytes by four (4). In this case, it is - 512 for 2 GB. + Ezzel az opcióval a rendszermag + címterét növeljük meg, aminek + eredményeképpen a vm.kvm_size + változót immáron az eredetileg + 1 GB-os (PAE használata + esetén pedig 2 GB-os) határ felé + tudjuk állítani. Az itt megadandó + értéket úgy tudjuk meghatározni, + ha a beállítani kívánt + méret MB-okban számolt + értékét elosztjuk néggyel. A + példában tehát az 512 + egy 2 GB nagyságú címteret ad + meg. - Loader Tunables + A rendszertöltõ + beállításai - The kmem address space should be - increased on all &os; architectures. On the test system with - one gigabyte of physical memory, success was achieved with the - following options which should be placed in - the /boot/loader.conf file and the system - restarted: + A kmem címterét az + összes &os; által ismert architektúra + esetében érdemes megnövelnünk. A + teszteléshez használt rendszeren 1 GB + fizikai memória állt rendelkezésre, itt a + /boot/loader.conf + állományban a következõ + értékek megadásával minden + remekül mûködött: vm.kmem_slze="330M" vm.kmem_size_max="330M" vfs.zfs.arc_max="40M" vfs.zfs.vdev.cache.size="5M" - For a more detailed list of recommendations for ZFS-related - tuning, see - . + A ZFS finomhangolásával kapcsolatos + további javasolatokat a + címen olvashatunk. - Using <acronym>ZFS</acronym> + A <acronym>ZFS</acronym> használata - There is a start up mechanism that allows &os; to - mount ZFS pools during system - initialization. To set it, issue the following - commands: + A Z állományrendszerhez létezik egy + olyan mechanizmus, amelyen keresztül már a &os; + indítása során el tudjuk végezni a + közös tárolók + csatlakoztatását: &prompt.root; echo 'zfs_enable="YES"' >> /etc/rc.conf &prompt.root; /etc/rc.d/zfs start - The remainder of this document assumes two - SCSI disks are available, and their device names - are da0 - and da1 - respectively. Users of IDE hardware may - use the ad - devices in place of SCSI hardware. + A leírás fennmaradó + részében feltételezzük, hogy + két SCSI-lemezünk van, + amelyeket rendre a + da0 + és + da1 + eszközök formájában tudunk + elérni. Az IDE lemezek + tulajdonosainak értelemszerûen itt majd az + ad + eszközneveket kell használniuk a + SCSI-eszközök hivatkozásai + helyett. - Single Disk Pool + Egyetlen közös tároló + használata - To create a ZFS over a single disk - device, use the zpool command: + A zpool kiadásával + egyetlen lemezen is létre tudunk hozni + ZFS partíciót: - &prompt.root; zpool create example /dev/da0 + &prompt.root; zpool create minta /dev/da0 - To view the new pool, review the output of the - df: + Az új közös tárterület a + df parancs + felhasználásával rögtön + láthatóvá válik: &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235230 1628718 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032846 48737598 2% /usr -example 17547136 0 17547136 0% /example +minta 17547136 0 17547136 0% /minta - This output clearly shows the example - pool has not only been created but - mounted as well. It is also accessible - just like a normal file system, files may be created on it - and users are able to browse it as in the - following example: + A parancs kimenetében tisztán + láthatjuk, hogy a minta nevû + tároló nem csak egyszerûen + elkészült, hanem egyúttal + csatolódott. Innentõl + már a többi állományrendszerhez + hasonlóan tetszõlegesen elérhetõ, az + alábbi példához hasonlóan + állományok hozhatóak rajta létre + vagy listázható a tartalma: - &prompt.root cd /example + &prompt.root cd /minta &prompt.root; ls -&prompt.root; touch testfile +&prompt.root; touch proba &prompt.root; ls -al total 4 drwxr-xr-x 2 root wheel 3 Aug 29 23:15 . drwxr-xr-x 21 root wheel 512 Aug 29 23:12 .. --rw-r--r-- 1 root wheel 0 Aug 29 23:15 testfile +-rw-r--r-- 1 root wheel 0 Aug 29 23:15 proba - Unfortunately this pool is not taking advantage of - any ZFS features. Create a file system - on this pool, and enable compression on it: + Sajnos azonban ez a tároló még ki sem + használja a ZFS által + felkínált lehetõségeket. + Ezért most hozzunk létre egy + állományrendszert ezen a tárolón + belül és engedélyezzük rajta a + tömörítést: - &prompt.root; zfs create example/compressed -&prompt.root; zfs set compression=gzip example/compressed + &prompt.root; zfs create minta/tomoritett +&prompt.root; zfs set compression=gzip minta/tomoritett - The example/compressed is now a - ZFS compressed file system. Try copying - some large files to it by copying them to - /example/compressed. + A minta/tomoritett most már egy + tömörített Z állományrendszer. + Próbáljuk ki mit tud, és másoljunk + néhány nagyobb méretû + állományt a /minta/tomoritett + könyvtárba. - The compression may now be disabled with: + Ezután a tömörítés + akár ki is kapcsolható: - &prompt.root; zfs set compression=off example/compressed + &prompt.root; zfs set compression=off minta/tomoritett - To unmount the file system, issue the following command - and then verify by using the df - utility: + Az állományrendszer + leválasztásához adjuk ki a lenti parancsot, + majd ellenõrizzük az eredményét a + df használatával: - &prompt.root; zfs umount example/compressed + &prompt.root; zfs umount minta/tomoritett &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235232 1628716 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032864 48737580 2% /usr -example 17547008 0 17547008 0% /example +minta 17547008 0 17547008 0% /minta - Re-mount the file system to make it accessible - again, and verify with df: + Tegyük ismét elérhetõvé + és csatlakoztassuk újra az + állományrendszert, majd nézzük meg + az eredményt a df paranccsal: - &prompt.root; zfs mount example/compressed + &prompt.root; zfs mount minta/tomoritett &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235234 1628714 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032864 48737580 2% /usr -example 17547008 0 17547008 0% /example -example/compressed 17547008 0 17547008 0% /example/compressed +minta 17547008 0 17547008 0% /minta +minta/tomoritett 17547008 0 17547008 0% /minta/tomoritett - The pool and file system may also be observed by viewing - the output from mount: + A közös terület és az + állományrendszer mellesleg a + mount parancs kimenetébõl is + megfigyelhetõ: &prompt.root; mount /dev/ad0s1a on / (ufs, local) devfs on /dev (devfs, local) /dev/ad0s1d on /usr (ufs, local, soft-updates) -example on /example (zfs, local) -example/data on /example/data (zfs, local) -example/compressed on /example/compressed (zfs, local) +minta on /minta (zfs, local) +minta/tomoritett on /minta/tomoritett (zfs, local) - As observed, ZFS file systems, after - creation, may be used like ordinary file systems; however, - many other features are also available. In the following - example, a new file system, data is - created. Important files will be stored here, so the file - system is set to keep two copies of each data block: + Látható, hogy a létrehozásuk + után a Z állományrendszerek teljesen + hétköznapi módon viselkednek, de + természetesen további lehetõségek is + elérhetõek hozzájuk. A következõ + példában adat néven + készítünk egy új + állományrendszert. Mivel ide majd nagyon fontos + állományokat akarunk elhelyezni, + állítsuk be, hogy minden adatblokkból + két példány legyen: - &prompt.root; zfs create example/data -&prompt.root; zfs set copies=2 example/data + &prompt.root; zfs create minta/adat +&prompt.root; zfs set copies=2 minta/adat - It is now possible to see the data and space utilization - by issuing the df again: + A df újbóli + kiadásával most már látható + is ez az állományrendszer és annak + tárfoglalása: &prompt.root; df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/ad0s1a 2026030 235234 1628714 13% / devfs 1 1 0 100% /dev /dev/ad0s1d 54098308 1032864 48737580 2% /usr -example 17547008 0 17547008 0% /example -example/compressed 17547008 0 17547008 0% /example/compressed -example/data 17547008 0 17547008 0% /example/data +minta 17547008 0 17547008 0% /minta +minta/tomoritett 17547008 0 17547008 0% /minta/tomoritett +minta/adat 17547008 0 17547008 0% /minta/adat - Notice that each file system on the pool has the same - amount of available space. This is the reason for using - the df through these examples, to show - that the file systems are using only the amount of space - they need and will all draw from the same pool. - The ZFS file system does away with concepts - such as volumes and partitions, and allows for several file - systems to occupy the same pool. Destroy the file systems, - and then destroy the pool as they are no longer - needed: + Vegyük észre, hogy a közös + területen levõ állományrendszerek + mindegyikén ugyanannyi szabad terület van. A + df segítségével a + késõbbiekben remekül megfigyelhetõ lesz, + hogy az egyes állományrendszerek mindig csak + annyi területet foglalnak el a közös + területbõl, amennyire abban a pillanatban + ténylegesen szükségünk van. A Z + állományrendszerek esetén megszûnik + a partíciók és kötetek fogalma, + és több állományrendszer + tárolódik egyazon közös + területen. Ha már nem akarjuk használni, + egyszerûen csak töröljük le az + állományrendszereket és ezt a + közös tárolót: - &prompt.root; zfs destroy example/compressed -&prompt.root; zfs destroy example/data -&prompt.root; zpool destroy example + &prompt.root; zfs destroy minta/tomoritett +&prompt.root; zfs destroy minta/adat +&prompt.root; zpool destroy minta - Disks go bad and fail, an unavoidable trait. When - this disk goes bad, the data will be lost. One method of - avoiding data loss due to a failed hard disk is to implement - a RAID. ZFS supports - this feature in its pool design which is covered in - the next section. + Nyilván tapasztalhattunk már, hogy a + lemezeink olykor menthetetlenül meghibásodnak. + Amikor egy lemezes meghajtó tönkremegy, a rajta + tárolt adatok általában elvesznek. Az + ilyen jellegû kellemetlenségek + elkerülésének egyik módja az + ún. RAID-tömbök + építése. A következõ + szakaszban bemutatjuk, hogy a Z + állományrendszerek esetén hogyan tudunk + ilyen tömböket készíteni. - <acronym>ZFS</acronym> RAID-Z + <acronym>RAID</acronym>-Z tömbök - As previously noted, this section will assume that - two SCSI exists as devices - da0 and - da1. To create a - RAID-Z pool, issue the following - command: + Korábban már utaltunk rá, hogy ebben + a szakaszban két SCSI-lemez, vagyis a + da0 és + da1 eszközök + használatát feltételezzük. Egy + RAID-Z formátumú + közös tároló + készítéséhez a következõ + parancsot kell kiadni: - &prompt.root; zpool create storage raidz da0 da1 + &prompt.root; zpool create tarolo raidz da0 da1 - The storage zpool should have been - created. This may be verified by using the &man.mount.8; and - &man.df.1; commands as before. More disk devices may have - been allocated by adding them to the end of the list above. - Make a new file system in the pool, called - home where user files will eventually be - placed: + Ennek hatására tehát keletkezik egy + tarolo nevû Z-tároló. + Ez a korábbiakhoz hasonló módon + ellenõrizhetõ is a &man.mount.8; és + &man.df.1; parancsokon keresztül. Természetesen + az iménti listába további + lemezeszközök tetszõlegesen felvehetõek. + Most hozzunk létre ezen a közös + területen egy felhasznalok nevû + állományrendszert, ahová majd a + felhasználók adatait fogjuk tenni: - &prompt.root; zfs create storage/home + &prompt.root; zfs create tarolo/felhasznalok - It is now possible to enable compression and keep extra - copies of the user's home directories and files. This may - be accomplished just as before using the following - commands: + Miután ezzel megvagyunk, az imént + létrehozott állományrendszerre nyugodtan + beállíthatunk tömörítést + és biztonsági másolatokat. Ebben az + alábbi parancsok lesznek a + segítségünkre: - &prompt.root; zfs set copies=2 storage/home -&prompt.root; zfs set compression=gzip storage/home + &prompt.root; zfs set copies=2 tarolo/felhasznalok +&prompt.root; zfs set compression=gzip tarolo/felhasznalok - To make this the new home directory for users, copy the - user data to this directory, and create the appropriate - symbolic links: + Ezt követõen költöztessük + át a felhasználókat, vagyis másoljuk + át az adataikat ide és hozzuk létre a + megfelelõ szimbolikus linkeket: - &prompt.root; cp -rp /home/* /storage/home + &prompt.root; cp -rp /home/* /tarolo/felhasznalok &prompt.root; rm -rf /home /usr/home -&prompt.root; ln -s /storage/home /home -&prompt.root; ln -s /storage/home /usr/home +&prompt.root; ln -s /tarolo/felhasznalok /home +&prompt.root; ln -s /tarolo/felhasznalok /usr/home - Users should now have their data stored on the freshly - created /storage/home - file system. Test by adding a new user and logging in as - that user. + A felhasználók adatai immáron a + frissen létrehozott /tarolo/felhasznalok + állományrendszeren tárolódnak. + Próbáljuk ki, hozzunk létre egy új + felhasználót és jelentkezzünk be + vele. - Try creating a snapshot which may be rolled back - later: + Készítsünk most egy + pillanatképet is, amelyet aztán késõbb + szükség esetén vissza tudunk + állítani: - &prompt.root; zfs snapshot storage/home@08-30-08 + &prompt.root; zfs snapshot tarolo/felhasznalok@08-08-30 - Note that the snapshot option will only capture a real - file system, not a home directory or a file. The - @ character is a delimiter used between - the file system name or the volume name. When a user's - home directory gets trashed, restore it with: + A snapshot csak valós + állományrendszerekkel mûködik, + könyvtárakra vagy állományokra nem. + A nevében a @ karakter + választja el egymástól a + hozzátartozó címkét az + állományrendszer vagy kötet + nevétõl. Ha netalán a + felhasználói könyvtárak + valamiért megsérültek volna, a + következõ paranccsal + állíthatóak vissza: - &prompt.root; zfs rollback storage/home@08-30-08 + &prompt.root; zfs rollback tarolo/felhasznalok@08-08-30 - To get a list of all available snapshots, run the - ls in the file system's + Az adott idõpontban aktív + pillanatképeket az adott állományrendszer .zfs/snapshot - directory. For example, to see the previously taken - snapshot, perform the following command: + könyvtárában találhatjuk meg. + Például az elõbb készített + pillanatkép az alábbi paranccsal + nézhetõ meg: - &prompt.root; ls /storage/home/.zfs/snapshot + &prompt.root; ls /tarolo/felhasznalok/.zfs/snapshot - It is possible to write a script to perform monthly - snapshots on user data; however, over time, snapshots - may consume a great deal of disk space. The previous - snapshot may be removed using the following command: + Ha ebbõl elindulunk, akkor pillanatok alatt + írható egy olyan szkript, amely a + felhasználók adatairól havonta + készít egy pillanatképet. Ilyenkor + azonban fontos számításba vennünk, + hogy az idõvel felgyülemlõ pillanatképek + rengeteg helyet el tudnak foglalni. A korábbi + pillanatkép így távolítható + el: - &prompt.root; zfs destroy storage/home@08-30-08 + &prompt.root; zfs destroy tarolo/felhasznalok@08-08-30 - There is no reason, after all of this testing, we should - keep /storage/home - around in its present state. Make it the real - /home file - system: + Miután alaposan kipróbáltuk a + /tarolo/felhasznalok + néven létrehozott + állományrendszerünket, + állítsuk be véglegesen ez eddigi + /home + állományrendszer helyére: - &prompt.root; zfs set mountpoint=/home storage/home + &prompt.root; zfs set mountpoint=/home tarolo/felhasznalok - Issuing the df and - mount commands will show that the system - now treats our file system as the real - /home: + Ekkor a df és + mount parancsok használatával + meggyõzõdhetünk róla, hogy ezt az + állományrendszert innentõl már + valóban a /home + könyvtárnak tekintjük: &prompt.root; mount /dev/ad0s1a on / (ufs, local) devfs on /dev (devfs, local) /dev/ad0s1d on /usr (ufs, local, soft-updates) -storage on /storage (zfs, local) -storage/home on /home (zfs, local) +tarolo on /tarolo (zfs, local) +tarolo/felhasznalok on /home (zfs, local) &prompt.root; df -Filesystem 1K-blocks Used Avail Capacity Mounted on -/dev/ad0s1a 2026030 235240 1628708 13% / -devfs 1 1 0 100% /dev -/dev/ad0s1d 54098308 1032826 48737618 2% /usr -storage 17547008 0 17547008 0% /storage -storage/home 17547008 0 17547008 0% /home +Filesystem 1K-blocks Used Avail Capacity Mounted on +/dev/ad0s1a 2026030 235240 1628708 13% / +devfs 1 1 0 100% /dev +/dev/ad0s1d 54098308 1032826 48737618 2% /usr +tarolo 17547008 0 17547008 0% /tarolo +tarolo/felhasznalok 17547008 0 17547008 0% /home - This completes the RAID-Z - configuration. To get status updates about the file systems - created during the nightly &man.periodic.8; runs, issue the - following command: + Ezzel lényegében befejeztük a + RAID-Z tömb + konfigurációját. Az + állományrendszerek állapotára + vonatkozóan a &man.periodic.8; + alkalmazásával akár naponta + kérhetünk ellenõrzést: &prompt.root; echo 'daily_status_zfs_enable="YES"' >> /etc/periodic.conf - Recovering <acronym>RAID</acronym>-Z + A <acronym>RAID</acronym>-Z + helyreállítása - Every software RAID has a method of - monitoring their state. - ZFS is no exception. The status of - RAID-Z devices may be viewed with the - following command: + Minden szoftveres RAID + implementáció kínál valamilyen + megoldást az állapotának + ellenõrzésére, ez alól + tulajdonképpen a ZFS sem + kivétel. A RAID-Z + eszközök állapota a következõ + paranccsal kérdezhetõ le: &prompt.root; zpool status -x - If all pools are healthy and everything is normal, the - following message will be returned: + Ezt az üzenetet láthatjuk, amikor minden + tároló kifogástalanul mûködik + és semmilyen probléma sincs: all pools are healthy - If there is an issue, perhaps a disk has gone offline, - the pool state will be returned and look similar to: + Ha viszont valamilyen gond lenne valamelyik lemezzel, + például leállt, akkor az elõbbi + parancs eredménye ehhez lesz hasonló: - pool: storage + pool: tarolo state: DEGRADED status: One or more devices has been taken offline by the administrator. Sufficient replicas exist for the pool to continue functioning in a @@ -478,147 +638,119 @@ config: NAME STATE READ WRITE CKSUM - storage DEGRADED 0 0 0 + tarolo DEGRADED 0 0 0 raidz1 DEGRADED 0 0 0 da0 ONLINE 0 0 0 da1 OFFLINE 0 0 0 errors: No known data errors - This states that the device was taken offline by the - administrator. This is true for this particular example. - To take the disk offline, the following command was - used: + A válasz szerint az eszközt az + adminisztrátor állította le. Ez + ennél a példánál valóban + igaz. Lemezeket a következõ módon lehet + leállítani: - &prompt.root; zpool offline storage da1 + &prompt.root; zpool offline tarolo da1 - It is now possible to replace the - da1 after the system has been - powered down. When the system is back online, the following - command may issued to replace the disk: + Így miután leállítottuk a + rendszert, a da1 eszköz + cserélhetõ. A rendszer soron következõ + indításakor ezzel a paranccsal tudjuk jelezni + logikailag is a lemez cseréjét: - &prompt.root; zpool replace storage da1 + &prompt.root; zpool replace tarolo da1 - From here, the status may be checked again, this time - without the flag to get state - information: + Nézzük meg újra a tömb + állapotát, de ezúttal a + kapcsoló megadása nélkül, mivel csak + így fogjuk látni: - &prompt.root; zpool status storage - pool: storage + &prompt.root; zpool status tarolo + pool: tarolo state: ONLINE scrub: resilver completed with 0 errors on Sat Aug 30 19:44:11 2008 config: NAME STATE READ WRITE CKSUM - storage ONLINE 0 0 0 + tarolo ONLINE 0 0 0 raidz1 ONLINE 0 0 0 da0 ONLINE 0 0 0 da1 ONLINE 0 0 0 errors: No known data errors - As shown from this example, everything appears to be - normal. + A példa szerint minden megfelelõen + mûködik. - Data Verification + Az adatok ellenõrzése - As previously mentioned, ZFS uses - checksums to verify the integrity of - stored data. They are enabled automatically upon creation - of file systems and may be disabled using the following - command: + Elõzetesen már szó esett róla, + hogy a ZFS képes a tárolt + adatok sértetlenségének + ellenõrzésére. Az új + állományrendszerek + létrehozásánál ez a >>> TRUNCATED FOR MAIL (1000 lines) <<< From raj at FreeBSD.org Sat Oct 4 13:26:13 2008 From: raj at FreeBSD.org (Rafal Jaworowski) Date: Sat Oct 4 13:26:19 2008 Subject: PERFORCE change 150959 for review Message-ID: <200810041326.m94DQCNs023684@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150959 Change 150959 by raj@raj_mimi on 2008/10/04 13:26:08 IFC @150957 Affected files ... .. //depot/projects/arm/src/lib/libpmc/Makefile#4 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.3#8 integrate .. //depot/projects/arm/src/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/arm/src/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/arm/src/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/arm/src/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/arm/src/sys/boot/forth/loader.conf#21 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#6 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/arm/src/sys/conf/files#93 integrate .. //depot/projects/arm/src/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/devices.c#9 integrate Differences ... ==== //depot/projects/arm/src/lib/libpmc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpmc/Makefile,v 1.11 2008/09/16 16:57:14 jkoshy Exp $ +# $FreeBSD: src/lib/libpmc/Makefile,v 1.12 2008/10/04 12:27:49 jkoshy Exp $ LIB= pmc @@ -24,6 +24,10 @@ MAN+= pmclog.3 # PMC-dependent manual pages +MAN+= pmc.atom.3 +MAN+= pmc.core.3 +MAN+= pmc.core2.3 +MAN+= pmc.iaf.3 MAN+= pmc.k7.3 MAN+= pmc.k8.3 MAN+= pmc.p4.3 ==== //depot/projects/arm/src/lib/libpmc/pmc.3#8 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.22 2008/09/22 14:31:24 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.23 2008/10/04 12:35:02 jkoshy Exp $ .\" .Dd September 16, 2008 .Os @@ -185,15 +185,15 @@ .Vt enum pmc_class enumeration. Supported PMC kinds include: -.Bl -tag -width "Li PMC_CLASS_IA_FIXED" -compact -.It Li PMC_CLASS_IA +.Bl -tag -width "Li PMC_CLASS_IAF" -compact +.It Li PMC_CLASS_IAF +Fixed function hardwre counters presents in CPUs conforming to the +.Tn Intel +performance measurement architecture version 2 and later. +.It Li PMC_CLASS_IAP Programmable hardware counters present in CPUs conforming to the .Tn Intel performance measurement architecture version 1 and later. -.It Li PMC_CLASS_IA_FIXED -Fixed function hardwre counters presents in CPUs conforming to the -.Tn Intel -performance measurement architecture version 2 and later. .It Li PMC_CLASS_K7 Programmable hardware counters present in .Tn "AMD Athlon" @@ -474,10 +474,12 @@ .El .Pp .Ss PMC Architecture Dependent Events -PMC architecture dependent event specifiers are described in their own -individual manual pages: +PMC architecture dependent event specifiers are described in the +following manual pages: .Bl -column " PMC_CLASS_TSC " "MANUAL PAGE " .It Em "PMC Class" Ta Em "Manual Page" +.It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 +.It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 .It Li PMC_CLASS_K7 Ta Xr pmc.k7 3 .It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 .It Li PMC_CLASS_P4 Ta Xr pmc.p4 3 @@ -503,6 +505,10 @@ API is .Ud .Sh SEE ALSO +.Xr pmc.atom 3 , +.Xr pmc.core 3 , +.Xr pmc.core2 3 , +.Xr pmc.iaf 3 , .Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.p4 3 , ==== //depot/projects/arm/src/sys/boot/forth/loader.conf#21 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.133 2008/09/10 18:36:58 jhb Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.134 2008/10/04 11:49:53 stas Exp $ ############################################################## ### Basic configuration options ############################ @@ -208,6 +208,7 @@ ############################################################## miibus_load="NO" # miibus support, needed for some drivers +if_ae_load="NO" # Attansic/Atheros L2 FastEthernet if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i ==== //depot/projects/arm/src/sys/boot/uboot/lib/api_public.h#3 (text+ko) ==== @@ -48,7 +48,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/uboot/lib/api_public.h,v 1.3 2008/03/13 17:54:21 obrien Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/api_public.h,v 1.5 2008/10/04 13:19:15 raj Exp $ * * This file needs to be kept in sync with U-Boot reference: * http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/api_public.h @@ -62,6 +62,7 @@ #define API_ENOMEM 3 /* no memory */ #define API_EBUSY 4 /* busy, occupied etc. */ #define API_EIO 5 /* I/O error */ +#define API_ESYSC 6 /* syscall error */ typedef int (*scp_t)(int, int *, ...); @@ -117,7 +118,7 @@ #undef CFG_64BIT_LBA #ifdef CFG_64BIT_LBA -typedef u_int64_t lbasize_t; +typedef uint64_t lbasize_t; #else typedef unsigned long lbasize_t; #endif ==== //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.5 2008/09/03 17:48:41 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.7 2008/10/04 13:19:15 raj Exp $"); #include #include "api_public.h" @@ -216,9 +216,7 @@ syscall(API_RESET, NULL); } - -#define MR_MAX 5 -static struct mem_region mr[MR_MAX]; +static struct mem_region mr[UB_MAX_MR]; static struct sys_info si; struct sys_info * @@ -228,7 +226,7 @@ memset(&si, 0, sizeof(struct sys_info)); si.mr = mr; - si.mr_no = MR_MAX; + si.mr_no = UB_MAX_MR; memset(&mr, 0, sizeof(mr)); if (!syscall(API_GET_SYS_INFO, &err, (u_int32_t)&si)) @@ -267,19 +265,17 @@ * * devices * - * Devices are identified by handles: numbers 0, 1, 2, ..., MAX_DEVS-1 + * Devices are identified by handles: numbers 0, 1, 2, ..., UB_MAX_DEV-1 * ***************************************************************************/ -#define MAX_DEVS 6 - -static struct device_info devices[MAX_DEVS]; +static struct device_info devices[UB_MAX_DEV]; struct device_info * ub_dev_get(int i) { - return ((i < 0 || i >= MAX_DEVS) ? NULL : &devices[i]); + return ((i < 0 || i >= UB_MAX_DEV) ? NULL : &devices[i]); } /* @@ -294,7 +290,7 @@ struct device_info *di; int n = 0; - memset(&devices, 0, sizeof(struct device_info) * MAX_DEVS); + memset(&devices, 0, sizeof(struct device_info) * UB_MAX_DEV); di = &devices[0]; if (!syscall(API_DEV_ENUM, NULL, di)) @@ -302,7 +298,7 @@ while (di->cookie != NULL) { - if (++n >= MAX_DEVS) + if (++n >= UB_MAX_DEV) break; /* take another device_info */ @@ -330,7 +326,7 @@ struct device_info *di; int err = 0; - if (handle < 0 || handle >= MAX_DEVS) + if (handle < 0 || handle >= UB_MAX_DEV) return (API_EINVAL); di = &devices[handle]; @@ -345,7 +341,7 @@ { struct device_info *di; - if (handle < 0 || handle >= MAX_DEVS) + if (handle < 0 || handle >= UB_MAX_DEV) return (API_EINVAL); di = &devices[handle]; @@ -367,7 +363,7 @@ dev_valid(int handle) { - if (handle < 0 || handle >= MAX_DEVS) + if (handle < 0 || handle >= UB_MAX_DEV) return (0); if (devices[handle].state != DEV_STA_OPEN) @@ -390,7 +386,8 @@ } int -ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start) +ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start, + lbasize_t *rlen) { struct device_info *di; lbasize_t act_len; @@ -401,15 +398,12 @@ di = &devices[handle]; if (!syscall(API_DEV_READ, &err, di, buf, &len, &start, &act_len)) - return (-1); + return (API_ESYSC); - if (err) - return (err); + if (!err && rlen) + *rlen = act_len; - if (act_len != len) - return (API_EIO); - - return (0); + return (err); } static int @@ -426,7 +420,7 @@ } int -ub_dev_recv(int handle, void *buf, int len) +ub_dev_recv(int handle, void *buf, int len, int *rlen) { struct device_info *di; int err = 0, act_len; @@ -436,12 +430,12 @@ di = &devices[handle]; if (!syscall(API_DEV_READ, &err, di, buf, &len, &act_len)) - return (-1); + return (API_ESYSC); - if (err) - return (-1); + if (!err) + *rlen = act_len; - return (act_len); + return (err); } int @@ -455,7 +449,7 @@ di = &devices[handle]; if (!syscall(API_DEV_WRITE, &err, di, buf, &len)) - return (-1); + return (API_ESYSC); return (err); } @@ -483,7 +477,7 @@ ub_mem_type(int flags) { - switch(flags & 0x000F) { + switch (flags & 0x000F) { case MR_ATTR_FLASH: return ("FLASH"); case MR_ATTR_DRAM: ==== //depot/projects/arm/src/sys/boot/uboot/lib/glue.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.4 2008/09/03 17:48:41 raj Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.6 2008/10/04 13:19:15 raj Exp $ */ /* @@ -40,6 +40,9 @@ int api_search_sig(struct api_signature **sig); +#define UB_MAX_MR 5 /* max mem regions number */ +#define UB_MAX_DEV 6 /* max devices number */ + /* * The ub_ library calls are part of the application, not U-Boot code! They * are front-end wrappers that are used by the consumer application: they @@ -50,8 +53,8 @@ /* console */ int ub_getc(void); int ub_tstc(void); -void ub_putc(char c); -void ub_puts(const char *s); +void ub_putc(char); +void ub_puts(const char *); /* system */ void ub_reset(void); @@ -62,19 +65,18 @@ unsigned long ub_get_timer(unsigned long); /* env vars */ -char *ub_env_get(const char *name); -void ub_env_set(const char *name, char *value); -const char *ub_env_enum(const char *last); +char *ub_env_get(const char *); +void ub_env_set(const char *, char *); +const char *ub_env_enum(const char *); /* devices */ int ub_dev_enum(void); -int ub_dev_open(int handle); -int ub_dev_close(int handle); -int ub_dev_read(int handle, void *buf, lbasize_t len, lbastart_t start); -int ub_dev_send(int handle, void *buf, int len); -int ub_dev_recv(int handle, void *buf, int len); - -struct device_info * ub_dev_get(int); +int ub_dev_open(int); +int ub_dev_close(int); +int ub_dev_read(int, void *, lbasize_t, lbastart_t, lbasize_t *); +int ub_dev_send(int, void *, int); +int ub_dev_recv(int, void *, int, int *); +struct device_info *ub_dev_get(int); void ub_dump_di(int); void ub_dump_si(struct sys_info *); ==== //depot/projects/arm/src/sys/boot/uboot/lib/net.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.4 2008/09/03 15:39:50 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.6 2008/10/04 13:19:15 raj Exp $"); #include #include @@ -59,8 +59,8 @@ static int net_put(struct iodesc *, void *, size_t); static void net_end(struct netif *); -extern int devs_no; -extern struct netif_stats net_stats[]; +extern int devs_no; +extern struct netif_stats net_stats[]; struct netif_dif net_ifs[] = { /* dif_unit dif_nsel dif_stats dif_private */ @@ -82,10 +82,10 @@ }; struct uboot_softc { - u_int32_t sc_pad; - u_int8_t sc_rxbuf[ETHER_MAX_LEN]; - u_int8_t sc_txbuf[ETHER_MAX_LEN + PKTALIGN]; - u_int8_t *sc_txbufp; + uint32_t sc_pad; + uint8_t sc_rxbuf[ETHER_MAX_LEN]; + uint8_t sc_txbuf[ETHER_MAX_LEN + PKTALIGN]; + uint8_t *sc_txbufp; int sc_handle; /* device handle for ub_dev_xxx */ }; @@ -170,38 +170,43 @@ static int net_get(struct iodesc *desc, void *pkt, size_t len, time_t timeout) { - struct netif *nif = desc->io_netif; - struct uboot_softc *sc = nif->nif_devdata; - time_t t; - int length; + struct netif *nif = desc->io_netif; + struct uboot_softc *sc = nif->nif_devdata; + time_t t; + int err, rlen; #if defined(NETIF_DEBUG) printf("net_get: pkt %x, len %d, timeout %d\n", pkt, len, timeout); #endif t = getsecs(); do { - length = ub_dev_recv(sc->sc_handle, sc->sc_rxbuf, len); - } while ((length == -1 || length == 0) && - (getsecs() - t < timeout)); + err = ub_dev_recv(sc->sc_handle, sc->sc_rxbuf, len, &rlen); + + if (err != 0) { + printf("net_get: ub_dev_recv() failed, error=%d\n", + err); + rlen = 0; + break; + } + } while ((rlen == -1 || rlen == 0) && (getsecs() - t < timeout)); #if defined(NETIF_DEBUG) - printf("net_get: received len %d (%x)\n", length, length); + printf("net_get: received len %d (%x)\n", rlen, rlen); #endif - if (length > 0) { - memcpy(pkt, sc->sc_rxbuf, MIN(len, length)); - if (length != len) { + if (rlen > 0) { + memcpy(pkt, sc->sc_rxbuf, MIN(len, rlen)); + if (rlen != len) { #if defined(NETIF_DEBUG) - printf("net_get: len %x, length %x\n", len, length); + printf("net_get: len %x, rlen %x\n", len, rlen); #endif } - return (length); + return (rlen); } return (-1); } - static void net_init(struct iodesc *desc, void *machdep_hint) { @@ -236,7 +241,6 @@ (unsigned long)sc->sc_txbufp % PKTALIGN; } - static void net_end(struct netif *nif) { ==== //depot/projects/arm/src/sys/conf/files#93 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1335 2008/10/03 10:31:31 stas Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1336 2008/10/04 10:39:31 antoine Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -697,7 +697,7 @@ dev/hme/if_hme.c optional hme dev/hme/if_hme_pci.c optional hme pci dev/hme/if_hme_sbus.c optional hme sbus -dev/hptiop/hptiop.c optional hptiop cam +dev/hptiop/hptiop.c optional hptiop scbus dev/hwpmc/hwpmc_logging.c optional hwpmc dev/hwpmc/hwpmc_mod.c optional hwpmc dev/ichsmb/ichsmb.c optional ichsmb ==== //depot/projects/arm/src/sys/dev/hptiop/hptiop.h#3 (text+ko) ==== @@ -27,13 +27,13 @@ #define _HPTIOP_H #include -__FBSDID("$FreeBSD: src/sys/dev/hptiop/hptiop.h,v 1.2 2008/02/03 16:07:12 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hptiop/hptiop.h,v 1.3 2008/10/04 10:39:31 antoine Exp $"); #define DBG 0 #ifdef DBG -int hpt_dbg_level = 0; -#define KdPrint(x) do { if (hpt_dbg_level) printf x; } while (0) +int hpt_iop_dbg_level = 0; +#define KdPrint(x) do { if (hpt_iop_dbg_level) printf x; } while (0) #define HPT_ASSERT(x) assert(x) #else #define KdPrint(x) ==== //depot/projects/arm/src/usr.sbin/sysinstall/devices.c#9 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/devices.c,v 1.177 2008/08/11 04:58:06 weongyo Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/devices.c,v 1.178 2008/10/04 11:49:26 stas Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -93,6 +93,7 @@ DISK("mfid%d", "LSI MegaRAID SAS array", 4), FLOPPY("fd%d", "floppy drive unit A", 4), SERIAL("cuad%d", "%s on device %s (COM%d)", 16), + NETWORK("ae", "Attansic/Atheros L2 FastEthernet"), NETWORK("age", "Attansic/Atheros L1 Gigabit Ethernet"), NETWORK("an", "Aironet 4500/4800 802.11 wireless adapter"), NETWORK("ath", "Atheros IEEE 802.11 wireless adapter"), From rwatson at FreeBSD.org Sat Oct 4 13:29:16 2008 From: rwatson at FreeBSD.org (Robert Watson) Date: Sat Oct 4 13:29:22 2008 Subject: PERFORCE change 150960 for review Message-ID: <200810041329.m94DTFxx023866@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150960 Change 150960 by rwatson@rwatson_cinnamon on 2008/10/04 13:28:52 Update and clean up audit.log(5) some: Synchronize definitions of in_addr and in_addr_ex tokens to our implementation. Comment out definition of expanded IP token as we don't support it currently. The BUGS entry likely applies only to in_addr_ex, where there's a confusion about type vs. length on addresses. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#17 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -176,29 +176,27 @@ .Ss in_addr Token The .Dq in_addr -token holds a network byte order IPv4 or IPv6 address. +token holds a network byte order IPv4 address. An .Dq in_addr token can be created using .Xr au_to_in_addr 3 -for an IPv4 address, or -.Xr au_to_in_addr_ex 3 -for an IPv6 address. -.Pp -See the -.Sx BUGS -section for information on the storage of this token. +for an IPv4 address. .Pp .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It "IP Address Type 1 byte Type of address" -.It "IP Address 4/16 bytes IPv4 or IPv6 address" +.It "IP Address 4 bytes IPv4 address" .El .Ss Expanded in_addr Token The -.Dq expanded in_addr -token ... +.Dq in_addr_ex +token holds a network byte order IPv4 or IPv6 address. +An +.Dq in_addr_ex +token can be created using +.Xr au_to_in_addr_ex 3 +for an IPv6 address. .Pp See the .Sx BUGS @@ -206,7 +204,8 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXX +.It "IP Address Type 1 byte Type of address" +.It "IP Address 4/16 bytes IPv4 or IPv6 address" .El .Ss ip Token The @@ -230,15 +229,15 @@ .It "Source Address 4 bytes IPv4 source address" .It "Destination Address 4 bytes IPv4 destination address" .El -.Ss Expanded ip Token -The -.Dq expanded ip -token ... -.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" -.It Sy "Field Bytes Description" -.It "Token ID 1 byte Token ID" -.It XXXX -.El +.\" .Ss Expanded ip Token +.\" The +.\" .Dq expanded ip +.\" token ... +.\" .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.\" .It Sy "Field Bytes Description" +.\" .It "Token ID 1 byte Token ID" +.\" .It XXXX +.\" .El .Ss iport Token The .Dq iport @@ -677,7 +676,5 @@ .Dq in_addr_ex token layout documented here appears to be in conflict with the .Xr libbsm 3 -implementations of -.Xr au_to_in_addr 3 -and +implementation of .Xr au_to_in_addr_ex 3 . From rwatson at FreeBSD.org Sat Oct 4 14:25:15 2008 From: rwatson at FreeBSD.org (Robert Watson) Date: Sat Oct 4 14:25:22 2008 Subject: PERFORCE change 150964 for review Message-ID: <200810041425.m94EPCjL029696@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150964 Change 150964 by rwatson@rwatson_fledge on 2008/10/04 14:24:43 Remove (and don't use) compatibility token constant names that were inherited from Darwin; always prefer the BSM token names (AUT_*). Synchronize our token type list to the BSM token type list -- add one or two we didn't have, replace one that was in conflict, remove one or two Trusted Solaris ones that don't appear to be mainstream (and that we didn't implement anyway). Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#14 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#70 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#7 (text+ko) ==== @@ -15,6 +15,8 @@ Submitted by Stacey Son. - Various strcpy()'s/strcat()'s have been changed to strlcpy()'s/strlcat()'s or asprintf(). Added compat/strlcpy.h for Linux. +- Remove compatibility defines for old Darwin token constant names; now only + BSM token names are provided and used. OpenBSM 1.1 alpha 1 @@ -339,4 +341,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#6 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#7 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Apple Inc. + * Copyright (c) 2004-2008 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#27 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 $ */ /* @@ -514,62 +514,39 @@ * selection criteria. */ switch(tok.id) { - case AU_HEADER_32_TOKEN: + case AUT_HEADER32: selected = select_hdr32(tok, &optchkd); bcopy(&tok, &tok_hdr32_copy, sizeof(tok)); break; - case AU_PROCESS_32_TOKEN: + case AUT_PROCESS32: selected = select_proc32(tok, &optchkd); break; - case AU_SUBJECT_32_TOKEN: + case AUT_SUBJECT32: selected = select_subj32(tok, &optchkd); break; - case AU_IPC_TOKEN: + case AUT_IPC: selected = select_ipcobj( tok.tt.ipc.type, tok.tt.ipc.id, &optchkd); break; - case AU_FILE_TOKEN: - selected = select_filepath( - tok.tt.file.name, &optchkd); - break; - - case AU_PATH_TOKEN: + case AUT_PATH: selected = select_filepath( tok.tt.path.path, &optchkd); break; - case AU_RETURN_32_TOKEN: + case AUT_RETURN32: selected = select_return32(tok, tok_hdr32_copy, &optchkd); break; - /* - * The following tokens dont have any relevant - * attributes that we can select upon. - */ - case AU_TRAILER_TOKEN: - case AU_ARG32_TOKEN: - case AU_ATTR32_TOKEN: - case AU_EXIT_TOKEN: - case AU_NEWGROUPS_TOKEN: - case AU_IN_ADDR_TOKEN: - case AU_IP_TOKEN: - case AU_IPCPERM_TOKEN: - case AU_IPORT_TOKEN: - case AU_OPAQUE_TOKEN: - case AU_SEQ_TOKEN: - case AU_TEXT_TOKEN: - case AU_ARB_TOKEN: - case AU_SOCK_TOKEN: default: break; } ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004 Apple Inc. + * Copyright (c) 2004-2008 Apple Inc. * Copyright (c) 2006 Martin Voros * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#14 $ */ /* @@ -80,7 +80,7 @@ /* Record must begin with a header token. */ do { type = fgetc(fp); - } while(type != AU_HEADER_32_TOKEN); + } while(type != AUT_HEADER32); ungetc(type, fp); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#70 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#69 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#70 $ */ #include @@ -912,7 +912,7 @@ if (t == NULL) return (NULL); - ADD_U_CHAR(dptr, AU_SOCK_UNIX_TOKEN); + ADD_U_CHAR(dptr, AUT_SOCKUNIX); /* BSM token has two bytes for family */ ADD_U_CHAR(dptr, 0); ADD_U_CHAR(dptr, so->sun_family); ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2008 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#2 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -47,7 +47,7 @@ #define AUT_IPC 0x22 #define AUT_PATH 0x23 #define AUT_SUBJECT32 0x24 -#define AUT_SERVER32 0x25 +#define AUT_XATPATH 0x25 #define AUT_PROCESS32 0x26 #define AUT_RETURN32 0x27 #define AUT_TEXT 0x28 @@ -63,9 +63,7 @@ #define AUT_IPC_PERM 0x32 #define AUT_LABEL 0x33 #define AUT_GROUPS 0x34 -#define AUT_ILABEL 0x35 -#define AUT_SLABEL 0x36 -#define AUT_CLEAR 0x37 +#define AUT_ACE 0x35 #define AUT_PRIV 0x38 #define AUT_UPRIV 0x39 #define AUT_LIAISON 0x3a @@ -73,22 +71,28 @@ #define AUT_EXEC_ARGS 0x3c #define AUT_EXEC_ENV 0x3d #define AUT_ATTR32 0x3e -/* #define AUT_???? 0x3f */ +#define AUT_UNAUTH 0x3f #define AUT_XATOM 0x40 #define AUT_XOBJ 0x41 #define AUT_XPROTO 0x42 #define AUT_XSELECT 0x43 -/* XXXRW: Additional X11 tokens not defined? */ +#define AUT_XCOLORMAP 0x44 +#define AUT_XCURSOR 0x45 +#define AUT_XFONT 0x46 +#define AUT_XGC 0x47 +#define AUT_XPIXMAP 0x48 +#define AUT_XPROPERTY 0x49 +#define AUT_XWINDOW 0x4a +#define AUT_XCLIENT 0x4b #define AUT_CMD 0x51 #define AUT_EXIT 0x52 #define AUT_ZONENAME 0x60 -/* XXXRW: OpenBSM AUT_HOST 0x70? */ +#define AUT_HOST 0x70 #define AUT_ARG64 0x71 #define AUT_RETURN64 0x72 #define AUT_ATTR64 0x73 #define AUT_HEADER64 0x74 #define AUT_SUBJECT64 0x75 -#define AUT_SERVER64 0x76 #define AUT_PROCESS64 0x77 #define AUT_OTHER_FILE64 0x78 #define AUT_HEADER64_EX 0x79 @@ -107,55 +111,10 @@ #define AUT_ARG AUT_ARG32 #define AUT_RETURN AUT_RETURN32 #define AUT_SUBJECT AUT_SUBJECT32 -#define AUT_SERVER AUT_SERVER32 #define AUT_PROCESS AUT_PROCESS32 #define AUT_OTHER_FILE AUT_OTHER_FILE32 /* - * Darwin's bsm distribution uses the following non-BSM token name defines. - * We provide them for a single OpenBSM release for compatibility reasons. - */ -#define AU_FILE_TOKEN AUT_OTHER_FILE32 -#define AU_TRAILER_TOKEN AUT_TRAILER -#define AU_HEADER_32_TOKEN AUT_HEADER32 -#define AU_DATA_TOKEN AUT_DATA -#define AU_ARB_TOKEN AUT_DATA -#define AU_IPC_TOKEN AUT_IPC -#define AU_PATH_TOKEN AUT_PATH -#define AU_SUBJECT_32_TOKEN AUT_SUBJECT32 -#define AU_PROCESS_32_TOKEN AUT_PROCESS32 -#define AU_RETURN_32_TOKEN AUT_RETURN32 -#define AU_TEXT_TOKEN AUT_TEXT -#define AU_OPAQUE_TOKEN AUT_OPAQUE -#define AU_IN_ADDR_TOKEN AUT_IN_ADDR -#define AU_IP_TOKEN AUT_IP -#define AU_IPORT_TOKEN AUT_IPORT -#define AU_ARG32_TOKEN AUT_ARG32 -#define AU_SOCK_TOKEN AUT_SOCKET -#define AU_SEQ_TOKEN AUT_SEQ -#define AU_ATTR_TOKEN AUT_ATTR -#define AU_IPCPERM_TOKEN AUT_IPC_PERM -#define AU_NEWGROUPS_TOKEN AUT_NEWGROUPS -#define AU_EXEC_ARG_TOKEN AUT_EXEC_ARGS -#define AU_EXEC_ENV_TOKEN AUT_EXEC_ENV -#define AU_ATTR32_TOKEN AUT_ATTR32 -#define AU_CMD_TOKEN AUT_CMD -#define AU_EXIT_TOKEN AUT_EXIT -#define AU_ARG64_TOKEN AUT_ARG64 -#define AU_RETURN_64_TOKEN AUT_RETURN64 -#define AU_ATTR64_TOKEN AUT_ATTR64 -#define AU_HEADER_64_TOKEN AUT_HEADER64 -#define AU_SUBJECT_64_TOKEN AUT_SUBJECT64 -#define AU_PROCESS_64_TOKEN AUT_PROCESS64 -#define AU_HEADER_64_EX_TOKEN AUT_HEADER64_EX -#define AU_SUBJECT_32_EX_TOKEN AUT_SUBJECT32_EX -#define AU_PROCESS_32_EX_TOKEN AUT_PROCESS32_EX -#define AU_SUBJECT_64_EX_TOKEN AUT_SUBJECT64_EX -#define AU_PROCESS_64_EX_TOKEN AUT_PROCESS64_EX -#define AU_IN_ADDR_EX_TOKEN AUT_IN_ADDR_EX -#define AU_SOCK_32_EX_TOKEN AUT_SOCKET_EX - -/* * The values for the following token ids are not defined by BSM. * * XXXRW: Not sure how to handle these in OpenBSM yet, but I'll give them @@ -165,9 +124,6 @@ #define AUT_SOCKINET32 0x80 /* XXX */ #define AUT_SOCKINET128 0x81 /* XXX */ #define AUT_SOCKUNIX 0x82 /* XXX */ -#define AU_SOCK_INET_32_TOKEN AUT_SOCKINET32 -#define AU_SOCK_INET_128_TOKEN AUT_SOCKINET128 -#define AU_SOCK_UNIX_TOKEN AUT_SOCKUNIX /* print values for the arbitrary token */ #define AUP_BINARY 0 From rwatson at FreeBSD.org Sat Oct 4 14:47:38 2008 From: rwatson at FreeBSD.org (Robert Watson) Date: Sat Oct 4 14:47:45 2008 Subject: PERFORCE change 150967 for review Message-ID: <200810041447.m94Elbgp031406@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150967 Change 150967 by rwatson@rwatson_lethe on 2008/10/04 14:47:17 __unused isn't defined on some Linuxes, so include audit_inernal.h so it gets #define'd away. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#13 $ */ /* @@ -54,6 +54,7 @@ #include #include +#include #include #include From rwatson at FreeBSD.org Sat Oct 4 15:20:12 2008 From: rwatson at FreeBSD.org (Robert Watson) Date: Sat Oct 4 15:20:23 2008 Subject: PERFORCE change 150972 for review Message-ID: <200810041520.m94FKB8w035269@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150972 Change 150972 by rwatson@rwatson_cinnamon on 2008/10/04 15:19:48 Remove commented out expanded ip token -- there isn't one. Expand description of socket_ex token. Describe zonename token. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#19 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#18 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#19 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -229,15 +229,6 @@ .It "Source Address 4 bytes IPv4 source address" .It "Destination Address 4 bytes IPv4 destination address" .El -.\" .Ss Expanded ip Token -.\" The -.\" .Dq expanded ip -.\" token ... -.\" .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" -.\" .It Sy "Field Bytes Description" -.\" .It "Token ID 1 byte Token ID" -.\" .It XXXX -.\" .El .Ss iport Token The .Dq iport @@ -583,7 +574,7 @@ .Ss Expanded Socket Token The .Dq expanded socket -token ... +token contains information about IPv4 and IPv6 sockets. .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" @@ -639,11 +630,18 @@ .Ss Zonename Token The .Dq zonename -token ... +token holds a NUL-terminated string with the name of the zone or jail from +which the record originated. +A +.Dz zonename +token can be created using +.Xr au_to_zonename 3 . +.Pp .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX +.It "Zonename length 2 bytes Length of zonename string including NUL" +.It "Zonename N bytes + 1 NUL Zonename string including NUL" .El .Sh SEE ALSO .Xr auditreduce 1 , From sam at FreeBSD.org Sat Oct 4 18:07:26 2008 From: sam at FreeBSD.org (Sam Leffler) Date: Sat Oct 4 18:07:34 2008 Subject: PERFORCE change 150981 for review Message-ID: <200810041807.m94I7Pbc097782@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150981 Change 150981 by sam@sam_ebb on 2008/10/04 18:07:12 remove an_tp; the net80211 layer calculates the same thing but does a better job--just use it Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#10 edit .. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#13 edit .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#13 edit .. //depot/projects/vap/sys/dev/ath/if_ath.c#95 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#31 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#10 (text+ko) ==== @@ -277,8 +277,7 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); ==== //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#13 (text+ko) ==== @@ -251,8 +251,7 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#13 (text+ko) ==== @@ -656,7 +656,7 @@ { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct sample_node *sn = ATH_NODE_SAMPLE(an); const HAL_RATE_TABLE *rt = sc->sc_currates; int x, y, srate; ==== //depot/projects/vap/sys/dev/ath/if_ath.c#95 (text+ko) ==== @@ -5864,29 +5864,10 @@ struct ath_node *an = ATH_NODE(ni); struct ieee80211vap *vap = ni->ni_vap; struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc; - const struct ieee80211_txparam *tp; - enum ieee80211_phymode mode; + const struct ieee80211_txparam *tp = ni->ni_txparms; - /* - * Deduce netband of station to simplify setting up xmit - * parameters. Note this allows us to assign different - * parameters to each station in a mixed bss (b/g, n/[abg]). - */ - if (ni->ni_flags & IEEE80211_NODE_HT) { - if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) - mode = IEEE80211_MODE_11NA; - else - mode = IEEE80211_MODE_11NG; - } else if (IEEE80211_IS_CHAN_A(ni->ni_chan)) - mode = IEEE80211_MODE_11A; - else if (ni->ni_flags & IEEE80211_NODE_ERP) - mode = IEEE80211_MODE_11G; - else - mode = IEEE80211_MODE_11B; - tp = &vap->iv_txparms[mode]; - an->an_tp = tp; - an->an_mcastrix = ath_tx_findrix(sc->sc_rates[mode], tp->mcastrate); - an->an_mgmtrix = ath_tx_findrix(sc->sc_rates[mode], tp->mgmtrate); + an->an_mcastrix = ath_tx_findrix(sc->sc_currates, tp->mcastrate); + an->an_mgmtrix = ath_tx_findrix(sc->sc_currates, tp->mgmtrate); ath_rate_newassoc(sc, an, isnew); if (isnew && ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#31 (text+ko) ==== @@ -82,7 +82,6 @@ /* driver-specific node state */ struct ath_node { struct ieee80211_node an_node; /* base class */ - const struct ieee80211_txparam *an_tp; u_int8_t an_mgmtrix; /* min h/w rate index */ u_int8_t an_mcastrix; /* mcast h/w rate index */ struct ath_buf *an_ff_buf[WME_NUM_AC]; /* ff staging area */ From pgj at FreeBSD.org Sun Oct 5 00:13:41 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 5 00:13:49 2008 Subject: PERFORCE change 150992 for review Message-ID: <200810050013.m950DePu045735@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150992 Change 150992 by pgj@kolbasz on 2008/10/05 00:13:10 Add Hungarian translation of chapter "Updating FreeBSD" from Handbook Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#2 (text+ko) ==== @@ -4,6 +4,7 @@ --> @@ -14,318 +15,450 @@ Tom Rhodes - Written by + Írta: Colin Percival - Based on notes provided by + A megíráshoz felhasznált + jegyzeteket készítette: - Updating &os; + A &os; frissítése - Synopsis + Áttekintés - Updating FreeBSD + a &os; frissítése freebsd-update - Updating + frissítés - Over time, one primary aspect of the &os; operating system - has remained the same. This is the requirement to use - applications and utilities to obtain major and minor system - updates. + A &os; operációs rendszerrel szemben + fejlõdése során egy komoly + elvárás az idõk folyamán + változatlanul fennmaradt: a felhasználóknak + szüksége van olyan alkalmazásokra és + segédprogramokra, amelyekkel képesek a nagyobb + és a kisebb rendszerfrissítéseket + letölteni. - For many years, users wishing to upgrade their system, - collect security patches, and obtain port and package updates - without breaking the Ports Collection visioning methods were - forced to use the CVSup tool. + Hosszú éveken keresztül a rendszerüket + frissíteni kívánó + felhasználók a CVSup + segítségével voltak kénytelenek + elvégezni a különféle biztonsági + javítások letöltését, valamint a + telepített portok és csomagok + frissítését a Portgyûjtemény + által támogatott módszerekkel + összhangban. - While use of CVSup is still - supported, and a true C-language version - was added to &os;, there are new methods to acquire system - updates. + Miközben a CVSup + továbbra is használható, illetve + bekerült az alaprendszerbe egy teljesen C nyelven + íródott változata, egyéb + módszerek is születettek a rendszer naprakészen + tartására. - Tools such as &man.portsnap.8;, and &man.freebsd-update.8; - have streamlined the upgrade process. These - new methods increase productivity while providing a more simple - interface for users. Some of the new tools may be run from - &man.cron.8; reducing the manual intervention of the systems - administrator; a benefit for those who monitor hundreds of &os; - machines. + A &man.portsnap.8; és &man.freebsd-update.8; + elnevezésû eszközök + modernizálták a frissítési + folyamatát. Elõdeiknél sokkal + hatékonyabbak és a felhasználók + számára is könnyebben alkalmazhatóak. + Némelyek közülük akár a &man.cron.8; + használatával is futtathatóak, aminek + köszönhetõen szinte teljesen + önállósítható a mûvelet. Ez + kifejezetten azok számára jelent elõnyt, akik + több száz &os; alapú rendszer + felügyeletéért felelõsek. - This chapter will explain these new methods, and how users - and system administrators alike may benefit from their practical - and easy use. + Ebben a fejezetben bemutatjuk ezeket az új + módszereket, valamint eláruljuk, hogy a + felhasználók és rendszergazdák milyen + módon tudnak leginkább profitálni + használatukból. - After reading this chapter, you will know: + A fejezet elolvasása során megismerjük: - What utilities may be used to update the system and - the Ports Collection. + a Portgyûjtemény + frissítésére milyen eszközök + állnak rendelkezésre; - How to use freebsd-update to apply - security patches and perform major and minor &os; - upgrades. + a freebsd-update parancs hogyan + alkalmazható a &os; biztonsági + javításainak, vagy kisebb és nagyobb + frissítéseinek + letöltésére; - How to compare the state of an installed system against - a known pristine copy. + hogyan vessük össze a telepített + rendszerünk állapotát egy ismert tiszta + változattal. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand &unix; and &os; basics - (). + a &unix; és a &os; alapjainak ismerete (); - Be familiar with the basics of kernel - configuration/compilation - (). + a rendszermag konfigurációjának + és fordításának ismerete (); - Have some familiarity with the Ports Collection and - installing third party applications on &os; - (). + a Portgyûjtemény alapvetõ fogalmainak, + valamint a külsõ alkalmazások + telepítésének ismerete (); - Be familiar with the various source components which make - up &os; and how to use the &man.mergemaster.8; tool - (). + a &os; alaprendszerét alkotó + forráskódok + felépítésének, valamint a + &man.mergemaster.8; eszköz használatának + ismerete (). - FreeBSD Update + A <command>freebsd-update</command> - Applying security patches is an important part of maintaining - computer software, especially the operating system. For the - longest time on &os; this process was not an easy one. Patches - had to be applied to the source code, the code rebuilt into - binaries, and then the binaries had to be re-installed. + A biztonsági javítások + telepítése minden + számítógépes szoftver, + különösen az operációs rendszerek + számára lényeges mozzanat. Nagyon + hosszú ideig ez a &os; esetében nem volt + könnyen megoldható: a javításokat + közvetlenül a forráskódon kellett + elvégezni, ezekbõl újrafordítani a + rendszert, majd telepíteni. - This is no longer the case as &os; now includes a utility - simply called freebsd-update. This utility - provides two separate functions. First, it allows for binary - security and errata updates to be applied to the &os; base system - without the build and install requirements. Second, the utility - supports minor and major release upgrades. + Ez a nehézség mostanra viszont már + elhárult, mivel a &os; legfrissebb verziói már + tartalmaznak egy freebsd-update nevû + segédprogramot, amellyel mindez leegyszerûsödik. + Ez a program két külön funkciót lát + el. Elõször is, lehetõvé teszi, hogy a &os; + alaprendszer újrafordítása és + -telepítése nélkül javítsunk + biztonsági és egyéb apró + hibákat, valamint másodsorban támogatja a + kisebb és nagyobb verziójú kiadások + közti váltást. - Binary updates are available for all architectures and - releases currently supported by the security team; however, - some features, such as the &os; operating system upgrades, - require the latest release of &man.freebsd-update.8; and - &os; 6.3. Before updating to a new release, the current - release announcements should be reviewed as they may contain - important information pertinent to the desired release. These - announcements may be viewed at the following link: - . + Ezek a bináris frissítések azonban csak + a &os; biztonsági csapata által is felügyelt + architektúrák és kiadások + esetén érhetõek el. Emellett bizonyos + lehetõségek használatához, + például a &os; verziói közti + átállás támogatásához + a &man.freebsd-update.8; legújabb változata, + valamint minimum a &os; 6.3 kiadása + szükségeltetik. Ezért ne felejtsük el + alaposan átolvasni a legújabb + kiadásokról szóló + bejelentéseket mielõtt frissítenénk + rájuk, mivel ezzel kapcsolatban fontos + információkat tartalmazhatnak. Az említett + bejelentések a címen + érhetõek el. - If a crontab utilizing the features - of freebsd-update exists, it must be - disabled before the following operation is started. The - latest version of freebsd-update may - be installed by downloading the tar and - gzip'd package from the above - URL and installed with the following - commands: + Ha a crontab már hivatkozik a + freebsd-update programra, akkor a most + következõ mûvelet elkezdése elõtt + tiltsuk le. A freebsd-update legújabb + változatát tartalmazó, + gzip és tar + parancsokkal tömörített csomagját az + elõbbi címrõl tölthetjük le, majd az + alábbi parancsok kiadásával + telepíthetjük: &prompt.root; gunzip -c freebsd-update-upgrade.tgz | tar xvf - &prompt.root; mv freebsd-update.sh /usr/sbin/freebsd-update &prompt.root; mv freebsd-update.conf /etc - For all current releases, downloading the latest version - is not required. + A &os; frissebb változatainál már semmit + sem kell telepítenünk a + használatához. - The Configuration File + A konfigurációs állományok - Some users may wish to tweak the configuration file, - allowing better control of the process. The options are - very well documented, but the following few may require a - bit more explanation: + Elõfordulhat, hogy változtatni akarunk valamin + a frissítési folyamatban és ezért + szeretnénk módosítani a programhoz + tartozó konfigurációs + állományt. Az opciók részletes + ismertetéssel rendelkeznek, habár + némelyiknél még további + magyarázat kellhet: - # Components of the base system which should be kept updated. + # Az alaprendszerben frissíteni kívánt komponensek Components src world kernel - This parameter controls what parts of &os; will be kept - up to date. The default is to update the source code, the - entire base system, and the kernel. Components are the - same as those available during the install, for instance, - adding "world/games" here would allow game patches to be - applied. Using "src/bin" would allow the source code in - src/bin to be - updated. + Ezzel a paraméterrel határozhatjuk meg, hogy a + &os; mely részei kerüljenek frissítésre. + Alapértelmezés szerint a program frissíti a + forrásokat, a teljes alaprendszert és a + rendszermagot. Komponensként a + telepítésnél választható + elemeket adhatjuk meg, például "world/games" + hozzáadásakor a games kategória elemei is + folyamatosan frissülni fognak. Az "src/bin" + megadásakor pedig az src/bin könyvtár + tartalma frissül. - The best option is to leave this at the default as - changing it to include specific items will require the user - to list every item they prefer to be updated. This could - have disastrous consequences as source code and binaries may - become out of sync. + Ezt a beállítást a legjobb meghagyni az + alapértelmezett értéken, mivel a + további elemek megadásánál + egyenként fel kell sorolni a frissítendõ + komponenseket. Ha itt viszont kifelejtünk valamit, akkor + könnyen megeshet, hogy a források és a + binárisok verziója elcsúszik + egymástól. - # Paths which start with anything matching an entry in an IgnorePaths -# statement will be ignored. + # Az IgnorePaths beállítás után megadott szövegre illeszkedõ összes +# bejegyzés frissítése kimarad IgnorePaths - Add paths, such as - /bin or - /sbin to leave these - specific directories untouched during the update - process. This option may be used to prevent - freebsd-update from overwriting local - modifications. + Ennél a beállításnál + azokat a könyvtárakat kell megadnunk, amelyeket + (és tartalmukat) ki szeretnénk hagyni a + frissítés során. Ezek lehetnek + például a /bin vagy az /sbin. Így meg tudjuk + akadályozni, hogy freebsd-update + esetleg felülírjon valamilyen helyi + változtatást a rendszerünkben. - # Paths which start with anything matching an entry in an UpdateIfUnmodified -# statement will only be updated if the contents of the file have not been -# modified by the user (unless changes are merged; see below). + # Az UpdateIfUnmodified beállítás után megadott elérési útvonalakon csak +# a felhasználó által még nem módosított állományok fognak frissülni +# (hacsak a módosításokat össze nem fésüljük, lásd lentebb) UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile - Update configuration files in the specified directories - only if they have not been modified. Any changes made by the - user will invalidate the automatic updating of these files. - There is another option, - KeepModifiedMetadata, which will instruct - freebsd-update to save the changes during - the merge. + A megadott könyvtárakban csak azokat a + konfigurációs állományokat fogja + frissíteni, amelyeket nem változtattuk meg. + Amennyiben bármelyikük eltér az eredetileg + frissítendõ változattól, azt a program + nem módosítja. Létezik egy másik + hasonló beállítás, a + KeepModifiedMetadata, amely + hatására a freebsd-update az + összefésülés során elmenti a + változtatásokat. - # When upgrading to a new &os; release, files which match MergeChanges -# will have any local changes merged into the version from the new release. + # A MergeChanges beállításnál szereplõ állományok helyi módosításait +# automatikusan összefésüljük a &os; újabb verziójára frissítése közben MergeChanges /etc/ /var/named/etc/ - List of directories with configuration files that - freebsd-update should attempt merges in. - The file merge process is a series of &man.diff.1; patches - similar to &man.mergemaster.8; with fewer options, the merges - are either accepted, open an editor, or - freebsd-update will abort. When in doubt, - backup /etc and just - accept the merges. See for more - information about the mergemaster - command. + Itt azokat a könyvtárakat adhatjuk meg, + amelyekben a freebsd-update + számára engedélyezzük a + konfigurációs állományok új + verziójának + összefésülését a jelenlegi + állapottal. Az összefésülés + lényegében a &man.mergemaster.8; + használatánál már megszokott + módon, &man.diff.1; formátumban érkezõ + módosítások sorozata alapján + történik. Ekkor egy szövegszerkesztõ + segítségével felügyelhetjük az + összefésülés menetét vagy + megállíthatjuk a freebsd-update + futását. Ha kétségeink + adódnak, akkor egyszerûen mentsük le az + /etc + könyvtárat és fogadjuk el mindegyik + összefésülés eredményét. + A mergemaster + mûködésérõl a ad részletesebb + tájékoztatást. - # Directory in which to store downloaded updates and temporary -# files used by &os; Update. + # A &os; frissítésekor ezt a könyvtárat fogja a program használni a +# letöltött módosítások és az egyéb ideiglenes állományok tárolására # WorkDir /var/db/freebsd-update - This directory is where all patches and temporary - files will be placed. In cases where the user is doing - a version upgrade, this location should have a least a - gigabyte of disk space available. + Az itt megadott könyvtárba fognak kerülni + az elvégzendõ módosítások + és az egyéb ideiglenesen keletkezõ + állományok. A verziók közti + váltás során ebben a + könyvtárban ajánlott legalább + 1 GB szabad tárterületnek lennie. - # When upgrading between releases, should the list of Components be -# read strictly (StrictComponents yes) or merely as a list of components -# which *might* be installed of which &os; Update should figure out -# which actually are installed and upgrade those (StrictComponents no)? + # A kiadások közti váltás során a Components beállításnál megadott +# elemek kerüljenek csak frissítésre (StrictComponents yes), vagy a +# program próbálja meg magától kitalálni, hogy milyen komponesek +# *lehetnek* fenn a rendszeren és azokat frissítse (StrictComponents +# no)? # StrictComponents no - When set to yes, - freebsd-update will assume that the - Components list is complete and will not - attempt to make changes outside of the list. Effectively, - freebsd-update will attempt to update - every file which belongs to the Components - list. + Ha ennél a beállításnál a + yes értéket adjuk meg, akkor a + freebsd-update feltételezni fogja, + hogy a Components opciónál + felsoroltunk minden frissítendõ komponenst és + nem próbál meg mást is + megváltoztatni. Ilyenkor tehát a + freebsd-update tulajdonképpen + egyedül csak a Components által + meghatározott elemekhez tartozó + állományokat fogja frissíteni. - Security Patches + Biztonsági javítások - Security patches are stored on a remote machine and - may be downloaded and installed using the following - command: + A biztonsági javítások mindig egy + távoli gépen tárolódnak, a + következõ parancsok használatával + tölthetõek le és + telepíthetõek: &prompt.root; freebsd-update fetch &prompt.root; freebsd-update install - If any kernel patches have been applied the system will - need a reboot. If all went well the system should be patched - and freebsd-update may be ran as a nightly - &man.cron.8; job. An entry in /etc/crontab - would be sufficient to accomplish this task: + Amennyiben a rendszermagot is érintik + javítások, úgy a rendszert a mûvelet + befejezõdésével újra kell + indítanunk. Ha minden a megfelelõ módon + történt, akkor a rendszerünk már + tartalmazni fogja a korábban letöltött + és telepített javításokat, és + a freebsd-update akár + beállítható egy naponta + végrehajtandó &man.cron.8; feladatnak. Ehhez + mindössze a következõ bejegyzést kell + elhelyeznünk az /etc/crontab + állományban: @daily root freebsd-update cron - This entry states that once every day, the - freebsd-update will be ran. In this way, - using the argument, - freebsd-update will only check if updates - exist. If patches exist, they will automatically be downloaded - to the local disk but not applied. The - root user will be sent an email so they - may install them manually. + A bejegyzés szerint naponta egyszer le fog futni a + freebsd-update. Ilyenkor, vagyis a + paraméter megadásakor a + freebsd-update csak ellenõrzi, hogy + vannak-e telepítendõ frissítések. Ha + talál, akkor automatikusan letölti ezeket a lemezre, + de nem telepíti. Helyette levélben + értesíti a root + felhasználót, aki ezután bármikor + manuálisan kérheti a + telepítést. - If anything went wrong, freebsd-update - has the ability to roll back the last set of changes with - the following command: + Probléma esetén az alábbi paranccsal + megkérhetjük a freebsd-update + programot a legutóbb telepített + módosítások + visszavonására: &prompt.root; freebsd-update rollback - Once complete, the system should be restarted if the kernel - or any kernel modules were modified. This will allow &os; to - load the new binaries into memory. + Ha ez a visszavonás a rendszermagra vagy annak + moduljaira is vonatkozott, akkor a rendszert újra kell + indítanunk a parancs futásának + befejezõdésével. A &os; csak ilyenkor + képes betölteni az új binárisokat + betölteni a memóriába. - The freebsd-update only works with - the GENERIC kernel. If any changes have - been made to GENERIC or a custom kernel - has been installed, freebsd-update will - not complete — failing in the former case and - producing an error in the latter. + A freebsd-update + kizárólag csak a GENERIC + konfigurációjú rendszermagok + esetén alkalmazható. Amennyiben a + GENERIC típusú + rendszermagot módosítottuk, vagy egy + saját rendszermagot telepítettünk, a + freebsd-update nem fog rendesen + mûködni — az elõbbi esetben + megáll, az utóbbiban pedig hibát fog + jelezni. - Major and Minor Upgrades + Váltás kisebb és nagyobb + verziók között - This process will remove old object files and - libraries which will break most third party applications. - It is recommended that all installed ports either be removed - and re-installed or upgraded later using the - ports-mgmt/portupgrade - utility. Most users will want to run a test build using - the following command: + Verziók közti váltás során + a külsõ alkalmazások + mûkõdését akadályozó + régi tárgykódok és + függvénykönyvtárak törlõdni + fognak. Ezért javasoljuk, hogy vagy + töröljük le az összes portot és + telepítsük újra, vagy az alaprendszer + frissítése után hozzuk ezeket is + naprakész állapotba a ports-mgmt/portupgrade + segédprogram segítségével. + Elõször minden bizonnyal szeretnék + kipróbálni a frissítést, ezt a + következõ paranccsal tehetjük meg: &prompt.root; portupgrade -af - This will ensure everything will be re-installed - correctly. Note that setting the - BATCH environment variable to - yes will answer yes to - any prompts during this process, removing the need for - manual intervention during the build process. + Ezzel gondoskodunk róla, hogy a minden a + megfelelõen telepítõdjön újra. Ha a + BATCH környezeti változót a + yes értékre + állítjuk, akkor a folyamat során + megjelenõ összes kérdésre automatikusan + a yes választ adjuk, ezáltal + önállósítani tudjuk. - Major and minor version updates may be performed by - providing freebsd-update with a release - version target, for example, the following command will - update to &os; 6.3: + A freebsd-update képes + frissíteni rendszerünket egy adott kiadásra. + Például a következõ paraméterek + megadásával válthatunk a &os; 6.3 + használatára: &prompt.root; freebsd-update -r 6.3-RELEASE upgrade - After the command has been received, - freebsd-update will evaluate the - configuration file and current system in an attempt to gather - the information necessary to update the system. A screen - listing will display what components have been detected and - what components have not been detected. For example: + A parancs elindulása után nem sokkal, a + váltáshoz szükséges + információk + összegyûjtéséhez a + freebsd-update elemzi a + konfigurációs állományában + megadott beállításokat és a rendszer + jelenleg használt verzióját. A + képernyõn ekkor sorban megjelennek a program + részérõl érzékelt és nem + érzékelt komponensek. Mint például + ahogy itt látható: Looking up update.FreeBSD.org mirrors... 1 mirrors found. Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done. @@ -344,68 +477,108 @@ Does this look reasonable (y/n)? y - At this point, freebsd-update will - attempt to download all files required for the upgrade. In - some cases, the user may be prompted with questions regarding - what to install or how to proceed. + Ekkor a freebsd-update + megpróbálja letölteni a verziók + közti váltáshoz szükséges + összes állományt. Bizonyos esetekben + kérdésekkel fordul a felhasználó + felé arra vonatkozóan, hogy miket + telepítsen fel vagy mit csináljon. - After all patches have been downloaded to the local - system, they will then be applied. This process may take - a while depending on the speed and workload of the machine. - Configuration files will then be merged — this part - of the process requires some user intervention as a file may be - merged or an editor may appear on screen for a manual merge. - The results of every successful merge will be shown to the user - as the process continues. A failed or ignored merge will cause - the process to abort. Users may wish to make a backup of - /etc and manually merge - important files, such as master.passwd - or group at a later time. + A javítások letöltését + követõen megkezdõdik a + telepítésük. A váltás ezen + lépése az adott gép aktuális + terhelésétõl és + sebességétõl függõen + változó hosszúságú lehet. + Ezután a konfigurációs + állományok összefésülése + zajlik le — itt általában a emberi + felügyeletre is szükség van az + állományok + összefésülésének + irányításához, amelynek folyamatosan + láthatóak az eredményei. A + meghiúsult vagy kihagyott + összefésülések a teljes + frissítési folyamat leállását + vonják maguk után. Az /etc könyvtárban + tárolt fontosabb állományokról, mint + például a master.passwd vagy + group javasolt elõzetesen + biztonsági mentést készíteni + és késõbb kézzel hozzájuk adni + a változtatásaikat. - The system is not being altered yet, all patching and - merging is happening in another directory. When all - patches have been applied successfully, all configuration - files have been merged and it seems the process will go - smoothly, the changes will need to be committed by the - user. + A rendszerben ekkor még nem lesz jelen semmilyen + konkrét változás, az összes + említett javítás és + összefésülés egy külön + könyvtárban történik. A + telepített javításokat és az + összefésült konfigurációs + állományokat a folyamat végén + magának a felhasználónak kell + véglegesíteni. - Once this process is complete, the upgrade may be committed - to disk using the following command. + A frissítési eljárás + végén a következõ parancs + kiadásával tudjuk ténylegesen + érvényesíteni az eddig elvégzett + módosításokat: &prompt.root; freebsd-update install - The kernel and kernel modules will be patched first. At - this point the machine must be rebooted. The following - command may be issued to restart the machine so the new - kernel will be loaded into memory: + Elõször mindig a rendszermag és a + hozzátartozó modulok cserélõdnek le. + Ahogy ez végrehajtódott, újra kell + indítanunk a rendszert. Az új rendszermagot + tehát a következõ parancs + futtatásával tudjuk a rendszer + újraindításán keresztül a + memóriába juttatni: &prompt.root; shutdown -r now - Once the system has come back online, - freebsd-update will need to be started - again. The state of the process has been saved and thus, - freebsd-update will not start from the - beginning, but will remove all old shared libraries and object - files. To continue to this stage, issue the following - command: + A rendszer sikeres újraindulása után + ismét el kell indítanunk a + freebsd-update programot, amely + korábban már elmentette a frissítés + állapotát, emiatt a legutóbbi + pontról fog folytatódni, illetve törli az + osztott könyvtárak és + tárgykódok régebbi változatait. + Innen az alábbi paranccsal léphetünk + tovább: &prompt.root; freebsd-update install - Depending on whether any libraries version numbers got - bumped, there may only be two install phases instead of - three. + A függvénykönyvtárak + verziói közti eltérések + mértékétõl függõen + elképzelhetõ, hogy a telepítés az + említett három fázis helyett + kettõben történik. - All third party software will now need to be rebuilt and - re-installed. This is required as installed software may - depend on libraries which have been removed during the upgrade - process. The - ports-mgmt/portupgrade - command may be used to automate this process. The following - commands may be used to begin this process: + Most pedig újra kell fordítanunk vagy + telepítenünk az összes általunk + korábban használt külsõ + alkalmazást. Erre azért van + szükségünk, mert bizonyos alkalmazások a + verziók közti váltás során + törölt programkönyvtáraktól + függtek. Ennek automatizálásában a + ports-mgmt/portupgrade lesz + segítségünkre. Az alkalmazások + frissítésének + elindításához a következõ + parancsokat használjuk: &prompt.root; portupgrade -f ruby &prompt.root; rm /var/db/pkg/pkgdb.db @@ -413,87 +586,133 @@ &prompt.root; rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db &prompt.root; portupgrade -af - This has completed, finish the upgrade process with a - final call to freebsd-update. Issue the - following command to tie up all loose ends in the upgrade - process: + A parancsok lefutását követõen a + freebsd-update utolsó + hívásával zárjuk le a + frissítést. Ezzel a paranccsal tudunk + tehát pontot tenni a frissítési + procedúra végére: &prompt.root; freebsd-update install - Reboot the machine into the new &os; version. The process - is complete. + Indítsuk újra a rendszert a &os; + frissített változatával. A folyamat ezzel + véget ért. - System State Comparison + Rendszerek állapotainak + összehasonlítása - The freebsd-update utility may be used - to test the state of the installed &os; version against a - known good copy. This option evaluates the current version - of system utilities, libraries, and configuration files. - To begin the comparison, issue the following command: + A freebsd-update ragyogóan + felhasználható a &os; egy telepített + változatának és egy általunk + garantáltan megbízható + példányának + összevetésére. Ilyenkor a rendszerhez + tartozó segédprogramokat, + programkönyvtárakat és + konfigurációs állományokat + ellenõriztethetjük le. Az + összehasonlítást ezzel a paranccsal + kezdhetjük meg: - &prompt.root; freebsd-update IDS >> outfile.ids + &prompt.root; freebsd-update IDS >> eredmeny.idk - While the command name is IDS it should - in no way be a replacement for an intrusion detection system - such as security/snort. - As freebsd-update stores data on disk, the - possibility of tampering is evident. While this possibility - may be reduced by using the - kern.securelevel setting and storing the - freebsd-update data on a read only file - system when not in use, a better solution would be to - compare the system against a secure disk. Such as a - DVD or securely stored external - USB disk device. + Habár a parancs neve IDS + (intrusion detection system), nem helyettesít semmilyen + olyan behatolásjelzõ megoldást, mint + amilyen például a security/snort. Mivel a + freebsd-update adatokat tárol a + lemezen, teljesen kézenfekvõ a + hamisítás lehetõsége. Míg + ennek eshetõsége adott mértékben + visszaszorítható a + kern.securelevel + csökkentésével és a + freebsd-update által használt + adatok írásvédett + állományrendszerre helyezésével, + erre a problémára az ideális + megoldást mégis egy teljes biztonságban + tudható referencia rendszer jelentheti. Ennek + tárolására alkalmas lehet + például egy DVD vagy egy + külsõ USB-egység. - The system will now be inspected, and a list of files - along with their &man.sha256.1; hash values, both known values - in the release and the current installed value. This is why - the output has been sent to the - outfile.ids file. It scrolls by too - quickly for eye comparisons, and soon it fills up the console - buffer. + A parancs kiadása után megkezdõdik a + rendszer vizsgálata, és az ellenõrzés + során folyamatosan jelennek meg az + átvizsgált állományok a + hozzájuk tartozó ismert és + kiszámított &man.sha256.1;-kódjukkal + együtt. Mivel a képernyõn + túlságosan gyorsan elúsznának az + eredmények, ezért ezeket egy + eredmeny.idk nevû + állományba mentjük a késõbbi + elemzésekhez. - These lines are also extremely long, but the output format - may be parsed quite easily. For instance, to obtain a list of - all files different from those in the release, issue the - following command: + Az így keletkezõ állomány sorai + ugyan meglehetõsen hosszúak, de szerencsére + viszonylag könnyen értelmezhetõek. + Például az adott kiadásban szereplõ + állományoktól eltérõeket ezzel + a paranccsal kérdezhetjük le: - &prompt.root; cat update.ids | awk '{ print $1 }' | more + &prompt.root; cat eredmeny.idk | awk '{ print $1 }' | more /etc/master.passwd /etc/motd /etc/passwd /etc/pf.conf - This output has been truncated, many more files exist. - Some of these files have natural modifications, the - /etc/passwd has been modified because - users have been added to the system. In some cases, there - may be other files, such as kernel modules, which differ - as freebsd-update may have updated them. - To exclude specific files or directories, add them to the - IDSIgnorePaths option in - /etc/freebsd-update.conf. + A példában most csak az elsõ + néhány állományt hagytuk meg, gyakran + tapasztalhatunk viszont ennél többet. Ezek + közül bizonyos állományok + értelemszerûen eltérnek, mint itt + például az /etc/passwd, mert + idõközben új felhasználókat + adtunk a rendszerhez. Máskor egyéb + állományok, például modulok nevei is + felbukkanhatnak, mert tegyük fel, hogy a + freebsd-update már frissítette + ezeket. Ha ki szeretnénk zárni valamilyen + állományokat vagy könyvtárakat az + ellenõrzésbõl, egyszerûen csak soroljuk + fel ezeket az /etc/freebsd-update.conf + állományban megjelenõ + IDSIgnorePaths + beállításnál. - This system may be used as part of an elaborate upgrade - method, aside from the previously discussed version. + A korábban tárgyaltaktól + függetlenül ez a rendszer alkalmas bonyolultabb + frissítési folyamatok + kisegítésére is. - Portsnap: A Ports Collection Update Tool + A Portgyûjtemény frissítése a + Portsnap használatával - The base system of &os; includes a utility for updating - the Ports Collection too: the &man.portsnap.8; utility. Upon - execution, it will connect to a remote site, verify the secure - key, and download a new copy of the ports collection. The key - is used to verify the integrity of all downloaded files, ensuring - they have not been modified in-flight. To download the latest - Ports Collection files, issue the following command: + A &os; alaprendszer a Portgyûjtemény + frissítéséhez is tartalmaz egy &man.portsnap.8; + elnevezésû segédprogramot. Ez a program >>> TRUNCATED FOR MAIL (1000 lines) <<< From pgj at FreeBSD.org Sun Oct 5 00:42:10 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 5 00:42:17 2008 Subject: PERFORCE change 150993 for review Message-ID: <200810050042.m950gABc048021@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150993 Change 150993 by pgj@kolbasz on 2008/10/05 00:41:44 MFen (doc): 1.286 -> 1.287 hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml 1.108 -> 1.109 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml 1.1099 -> 1.1100 hu_HU.ISO8859-2/books/faq/book.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#24 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#24 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -11454,31 +11454,42 @@ - A BIND (named) az 53-as és - más egyik nagyobb sorszámú portot - használ. Miért? + A BIND (named) + különféle nagyobb sorszámú + portokat használ. Miért? - A BIND a kimenõ kérések - részére egy véletlenszerûen - választott nagyobb sorszámú portot - használ. Amennyiben a ilyenkor is az 53-as portot - akarjuk használni, például ahhoz, hogy - át tudjon menni a tûzfalon vagy hogy - egyszerûen csak jobban érezzük magunkat, - akkor próbálkozzunk meg a következõ - beállítással az - /etc/namedb/named.conf - állományban: + A BIND a kimenõ kérésekhez + véletlenszerûen kiválaszt egy nagyobb + sorszámú portot. A legújabb + változataiban már minden egyes + kéréshez külön + véletlenszerûen keres új UDP portot. Ez + bizonyos hálózati konfigurációk + esetén problémákhoz vezethet, + különösen olyankor, amikor a + beérkezõ UDP csomagokat egy tûzfal + megállítja. A tûzfalak által + blokkolt porttartományok használatát az + avoid-v4-udp-ports vagy az + avoid-v6-udp-ports + beállítással tilthatjuk le a program + számára. - options { - query-source address * port 53; -}; - - Ha egyetlen IP-címre szeretnénk - leszûkíteni a küldést, akkor - * helyett adjuk meg azt. + + Ha ezt a portot (mint például az 53) az + /etc/namedb/named.conf + állományban a + query-source vagy a + query-source-v6 + beállításokkal adjuk meg explicit + módon, akkor a program nem fogja + véletlenszerûen váltogatni a portokat. + Határozottan javasoljuk, hogy ezekkel az + opciókkal ne adjunk meg elõre + rögzített portokat. + Mindenesetre örülünk, hogy ezt is valaki megkérdezte! Hiába, nem árt néha ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -1181,10 +1181,13 @@ néven (ahol a felhasználó nevet cseréljük a tényleges - felhasználó nevére): + felhasználó nevére, a + csoport nevet pedig a + felhasználóhoz tartozó elsõdleges + csoport nevére): &prompt.root; mkdir /mnt/felhasználó -&prompt.root; chown felhasználó:felhasználó /mnt/felhasználó +&prompt.root; chown felhasználó:csoport /mnt/felhasználó Most tegyük fel, hogy csatlakoztatnuk egy USB pen drive-ot és ennek megfelelõen megjelenik a @@ -1193,7 +1196,7 @@ állományrendszert tesznek, ezért így kell ezeket csatlakoztatni a &man.mount.8; paranccsal: - &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/felhasználó + &prompt.user; mount -t msdosfs -o -m=644,-M=755 /dev/da0s1 /mnt/felhasználó Ha leválasztjuk az eszközt (miután kiadtuk a &man.umount.8; parancsot), akkor a ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#12 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -3682,8 +3682,8 @@ következõt is (változtassuk meg igényeink szerint): - dhcp_program="/sbin/dhclient" -dhcp_flags="" + dhclient_program="/sbin/dhclient" +dhclient_flags="" From pgj at FreeBSD.org Sun Oct 5 00:54:23 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 5 00:54:30 2008 Subject: PERFORCE change 150994 for review Message-ID: <200810050054.m950sMB4058349@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150994 Change 150994 by pgj@kolbasz on 2008/10/05 00:54:21 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#8 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#14 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#4 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#8 (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.469 2008/09/28 19:09:35 danger Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.470 2008/10/04 15:39:37 simon Exp $ --> @@ -3247,6 +3247,7 @@ + ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.332 2008/07/06 10:57:58 danger Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.333 2008/10/04 15:41:25 simon Exp $ 2000 @@ -29,6 +29,7 @@ 2005 2006 2007 + 2008 The &os; Documentation Project @@ -614,6 +615,8 @@ Ethernet Interfaces + &hwlist.ae; + &hwlist.aue; &hwlist.axe; ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ - + ==== //depot/projects/docproj_hu/www/share/sgml/advisories.xml#4 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.221 2008/09/03 20:16:30 simon Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.222 2008/10/02 00:41:02 cperciva Exp $ @@ -10,6 +10,18 @@ 2008 + 10 + + + 2 + + + FreeBSD-SA-08:10.nd6 + + + + + 9 From pgj at FreeBSD.org Sun Oct 5 00:57:26 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 5 00:57:33 2008 Subject: PERFORCE change 150995 for review Message-ID: <200810050057.m950vP5j058602@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150995 Change 150995 by pgj@kolbasz on 2008/10/05 00:56:29 Update CVSId tags Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#8 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: doc/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile,v 1.1 2008/09/30 21:02:25 pgj Exp $ # # Article: Implementing UFS journaling on a desktop PC # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#8 (text+ko) ==== @@ -1,4 +1,4 @@ - + From pgj at FreeBSD.org Sun Oct 5 01:38:08 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 5 01:38:14 2008 Subject: PERFORCE change 150997 for review Message-ID: <200810050138.m951c77f063071@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=150997 Change 150997 by pgj@kolbasz on 2008/10/05 01:37:19 Update CVSId tags Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ # %SOURCE% en_US.ISO8859-1/books/handbook/dtrace/Makefile # %SRCID% 1.1 # -# $FreeBSD$ +# $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile,v 1.1 2008/10/05 01:34:24 pgj Exp $ # CHAPTERS= dtrace/chapter.sgml ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ 2004 2005 2006 + 2007 + 2008 DocEng From rene at FreeBSD.org Sun Oct 5 15:56:48 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Oct 5 15:56:54 2008 Subject: PERFORCE change 151018 for review Message-ID: <200810051556.m95Fuld1084117@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151018 Change 151018 by rene@rene_self on 2008/10/05 15:56:38 MFen network-servers/chapter.sgml 1.108 -> 1.109 Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.48 2006/01/05 21:13:23 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.108 + %SRCID% 1.109 --> @@ -2864,8 +2864,8 @@ worden, dan dient ook iets als het volgende toegevoegd te worden: - dhcp_program="/sbin/dhclient" -dhcp_flags="" + dhclient_program="/sbin/dhclient" +dhclient_flags="" From rene at FreeBSD.org Sun Oct 5 17:36:29 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Oct 5 17:36:36 2008 Subject: PERFORCE change 151020 for review Message-ID: <200810051736.m95HaSVU010369@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151020 Change 151020 by rene@rene_self on 2008/10/05 17:36:25 MFen geom/chapter.sgml 1.42 -> 1.43 Checked build, spelling (diff only), whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.13 2006/01/05 21:13:21 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/geom/chapter.sgml - %SRCID% 1.42 + %SRCID% 1.43 --> @@ -259,147 +259,131 @@ fysiek worden opgeslagen in een kluis. Begin met een systeem dat twee schijven heeft van gelijke - grootte. Deze oefening stelt dat het directe toegang + grootte. Deze oefeningen stellen dat het directe-toegang (&man.da.4;) SCSI-schijven zijn. - Begin door &os; te installeren op de eerste schijf met twee - partities. Een van de twee moet een swap-partitie zijn die twee - keer de grootte van het RAM-geheugen is en de rest van de ruimte - moet toegewezen worden aan het root bestandssysteem (/). Er zouden eigen partities - gemaakt kunnen worden voor andere koppelpunten, maar hierdoor - wordt de moeilijkheidsgraad wel tien keer hoger doordat de - instellingen voor &man.bsdlabel.8; en &man.fdisk.8; handmatig - gewijzigd moeten worden. + + Primaire schijven spiegelen - Herstart en wacht tot het systeem volledig is - geïnitialiseerd. Meld daarna aan als gebruiker - root. + Aannemende dat &os; op het eerste + da0-schijfapparaat is + geïnstalleerd, dient er aan &man.gmirror.8; verteld te + worden om daar de primaire gegevens op te slaan. - Maak het apparaat /dev/mirror/gm en link - het aan /dev/da1: + Voordat de mirror gebouwd wordt, dient aanvullende + debuginformatie en openingstoegang tot het apparaat aangezet te + worden door de &man.sysctl.8;-optie + kern.geom.debugflags op de volgende waarde in + te stellen: - &prompt.root; gmirror label -vnb round-robin gm0 /dev/da1 + &prompt.root; sysctl kern.geom.debugflags=17 - Het systeem hoort te antwoorden met: + Maak nu de mirror aan. Begin het proces door informatie + over metagegevens op het primaire schijfapparaat op te slaan, + waardoor effectief het apparaat /dev/mirror/geom aangemaakt + wordt met het volgende commando: - Metadata value stored on /dev/da1. -Done. + &prompt.root; gmirror label -vb round-robin gm0 /dev/da0 - Initialiseer GEOM, waardoor de kernelmodule - /boot/kernel/geom_mirror.ko wordt - geladen: + Het systeem hoort te antwoorden met: - &prompt.root; gmirror load + Metadata value stored on /dev/da0. +Done. - - Dit commando hoort het apparaatknooppunt - gm0 gemaakt te hebben onder de map - /dev/mirror. - + Initialiseer GEOM, dit zal de kernelmodule + /boot/kernel/geom_mirror.ko laden: - Installeer het algemene fdisk label en de - bootcode op het nieuw aangemaakte apparaat - gm0: + &prompt.root; gmirror load - &prompt.root; fdisk -vBI /dev/mirror/gm0 + + Wanneer dit commando succesvol verloopt, maakt het het + apparaatknooppunt gm0 aan onder de + map /dev/mirror. + - Installeer nu de algemene bsdlabel - informatie: + Maak het mogelijk om de kernelmodule + geom_mirror.ko tijdens systeeminitialisatie + te laden: - &prompt.root; bsdlabel -wB /dev/mirror/gm0s1 + &prompt.root; echo 'geom_mirror_load="YES"' >> /boot/loader.conf - - Als meerdere slices en partities bestaan, dienen de vlaggen - voor de vorige twee commando's anders te zijn. Ze moeten - gelijk zijn aan de groottes van de slice en partitie van de - andere schijf. - + Bewerk het bestand /etc/fstab, waarbij + verwijzingen naar het oude da0 worden + vervangen door de nieuwe apparaatknooppunten van het + mirrorapparaat gm0. Bewerk + /etc/fstab als de gebruiker + root: - Gebruik &man.newfs.8; om een standaard UFS - bestandssysteem te maken op het apparaatknooppunt - gm0s1a: + &prompt.root; vi /etc/fstab - &prompt.root; newfs -U /dev/mirror/gm0s1a + Maak een reservekopie van de huidige gegevens van + fstab in &man.vi.1; door :w + /etc/fstab.bak in te typen. Vervang daarna alle + oude verwijzingen naar da0 door + gm0 door + :%s/da/mirror\/gm/g in te typen. - Door het bovenstaande commando spuugt een systeem wat - informatie uit en wat getalletjes. Dat is goed. Bekijk de - uitvoer op het voorkomen van foutmeldingen en koppel het apparaat - op het koppelpunt /mnt: + Het resulterende fstab zou er ongeveer + hetzelfde als het volgende uit moeten zien. Het maakt niet uit + of de schijfstations SCSI of + RAID zijn, het + RAID-apparaat zal ongeacht hiervan + gm zijn. - &prompt.root; mount /dev/mirror/gm0s1a /mnt + # Device Mountpoint FStype Options Dump Pass# +/dev/mirror/gm0s2b none swap sw 0 0 +/dev/mirror/gm0s2a / ufs rw 1 1 +#/dev/mirror/gm0s2d /store ufs rw 2 2 +/dev/mirror/gm0s2e /usr ufs rw 2 2 +/dev/acd0 /cdrom cd9660 ro,noauto 0 0 - Verplaats nu alle gegevens van de bootschijf naar dit nieuwe - bestandssysteem. In dit voorbeeld worden &man.dump.8; en - &man.restore.8; gebruikt, maar &man.dd.1; werkt ook in dit - scenario. + Start het systeem opnieuw op: - &prompt.root; dump -L -0 -f- / |(cd /mnt && restore -r -v -f-) + &prompt.root; shutdown -r now - Dit dient voor ieder bestandssysteem uitgevoerd te worden. - Plaats eenvoudigweg het juiste bestandssysteem op de juiste - plaats bij het uitvoeren van het voorgaande commando. + Tijdens de systeeminitialisatie dient het apparaat + gm0 in plaats van + da0 gebruikt te worden. Als het + systeem volledig is geïnitialiseerd, kan dit gecontroleerd + worden door de uitvoer van het commando mount + te inspecteren: - Wijzig nu het gerepliceerde bestand - /mnt/etc/fstab en verwijder het swapbestand - of plaats er een commentaarteken voor. - - Het uitcommentariëren van de regel voor het - wisselbestand in fstab zorgt er - waarschijnlijk voor dat het beschikbaar maken van swapruimte - op een andere manier bewerkstelligd moet worden. In staat daarover meer - informatie. - - Wijzig de informatie voor de andere bestandssystemen zodat ze de - nieuwe schijf gebruiken, zie daarvoor het volgende voorbeeld: - + &prompt.root; mount +Filesystem 1K-blocks Used Avail Capacity Mounted on +/dev/mirror/gm0s1a 1012974 224604 707334 24% / +devfs 1 1 0 100% /dev +/dev/mirror/gm0s1f 45970182 28596 42263972 0% /home +/dev/mirror/gm0s1d 6090094 1348356 4254532 24% /usr +/dev/mirror/gm0s1e 3045006 2241420 559986 80% /var +devfs 1 1 0 100% /var/named/dev - # Device Mountpoint FStype Options Dump Pass# -#/dev/da0s2b none swap sw 0 0 -/dev/mirror/gm0s1a / ufs rw 1 1 + De uitvoer ziet er als verwacht uit. Plaats als laatste + stap, om synchronisatie te beginnen, de schijf + da1 in de mirror met het volgende + commando: - Zorg ervoor dat de geom_mirror.ko - module automatisch geladen wordt tijdens het opstarten van het - systeem door het volgende commando te draaien: + &prompt.root; gmirror insert gm0 /dev/da1 - &prompt.root; echo 'geom_mirror_load="YES"' >> /mnt/boot/loader.conf - &prompt.root; echo 'geom_mirror_load="YES"' >> /boot/loader.conf + De status kan gecontroleerd worden tijdens het bouwen van de + mirror met het volgende commando: - Herstart het systeem: + &prompt.root; gmirror status - &prompt.root; shutdown -r now + Wanneer de mirror gebouwd is en alle huidige gegevens zijn + gesynchroniseerd, dient de uitvoer van het bovenstaande commando + er als volgt uit te zien: - Kies in het opstartscherm optie vier (4) om toegang tot - enkele-gebruikersmodus te krijgen. Controleer op het console dat - het systeem van gm0s1a is opgestart. Dit - kan worden gedaan door de uitvoer van &man.df.1; te bekijken. - + Name Status Components +mirror/gm0 COMPLETE da0 + da1 - Als alles goed is gegaan, hoort het systeem gestart te zijn - vanaf het apparaat gm0s1a. Vanaf dit punt - kan de primaire schijf worden gewist en in de mirror worden - gestopt met de volgende commando's: + Als er problemen zijn, of als de mirror nog bezig is om het + bouwproces te voltooien, zal het voorbeeld + DEGRADED in plaats van + COMPLETE laten zien. + - &prompt.root; dd if=/dev/zero of=/dev/da0 bs=512 count=79 - - &prompt.root; gmirror configure -a gm0 -&prompt.root; gmirror insert gm0 /dev/da0 - - De vlag geeft &man.gmirror.8; aan dat - automatische synchronisatie gebruikt moet worden, ofwel dat - schrijfbewerkingen naar schijf automatisch gespiegeld moeten - worden. In de hulppagina wordt beschreven hoe schijven herbouwd - en vervangen kunnen worden, hoewel daar - data wordt gebruikt in plaats van - gm0. - - Tijdens het bouwen van de mirror kan de toestand worden - gecontroleerd met het volgende commando: - - &prompt.root; gmirror status - Problemen oplossen @@ -430,6 +414,30 @@ Hiermee moet het probleem opgelost zijn. + + + Herstellen van falende schijven + + Het mooie aan het spiegelen van schijven is dat als een + schijf faalt, deze vervangen kan worden, aangenomen zonder + gegevensverlies. + + Neem met betrekking tot de vorige + RAID1-configuratie aan dat + da1 het geeft begeven en vervangen moet + worden. Bepaal, om het te vervangen, welke schijf het heeft + begeven en schakel het systeem uit. Op dit moment kan de schijf + worden verwisseld door een nieuwe en kan het systeem weer worden + opgestart. Nadat het systeem is herstart, kunnen de volgende + commando's worden gebruikt om de schijf te vervangen: + + &prompt.root; gmirror forget gm0 + + &prompt.root; gmirror insert gm0 /dev/da1 + + Gebruik het commando gmirror status om de + voortgang van het herbouwen te bekijken. Zo eenvoudig is het. + From trasz at FreeBSD.org Sun Oct 5 18:14:20 2008 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Sun Oct 5 18:14:28 2008 Subject: PERFORCE change 151022 for review Message-ID: <200810051814.m95IE7DO014355@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151022 Change 151022 by trasz@trasz_victim7 on 2008/10/05 18:14:04 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/pkill.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/pkill.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/moduli.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/scp.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-add.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keysign.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_private.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_entry.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/cpuset.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/cpuset_getaffinity.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.tsc.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/init/init.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/setkey/setkey.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/FreeBSD_version/FreeBSD_version.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/makedev.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ae.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ata.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/nfe.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/vlan.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/vr.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/wpi.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/device_ids.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/make_dev.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/spl.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/param.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sparc64#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.sparc64#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asr/asr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/fb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/iscsi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/joy/joy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mly/mly.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mse/mse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/streams/streams.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ums.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/urio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/apm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/param.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/smp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/dump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/smp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_conf.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/param.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/smp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/trap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ae/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bridgestp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ef.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_faith.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gre.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_lagg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_loop.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_mib.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_stf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_vlan.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_cb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/vnet.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/igmp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_gif.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip6.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_options.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/vinet.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/dest6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/frag6.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/route6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/scope6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/vinet6.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/keysock.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/vipsec.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/dbdma.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/dbdma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/authunix_prot.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/dump_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/conf.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kerneldump.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pmc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/protosw.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysctl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/types.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/un.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vimage.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/swap_pager.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/top/machine.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/devices.c#5 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/soc2008/trasz_nfs4acl/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/scp.1#3 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-server.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp.1#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-add.1#3 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-agent.1#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keygen.1#3 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keyscan.1#3 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keysign.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh.1#3 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_config.5#3 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.8#3 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd_config.5#3 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#3 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/csu/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -D_OSRELDATE_H -include osreldate.h +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.12 2008/05/09 19:00:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.13 2008/09/27 15:58:37 kib Exp $"); #include #include @@ -242,10 +242,14 @@ }; struct kgdb_frame_cache { - int intrframe; + int frame_type; CORE_ADDR pc; CORE_ADDR sp; }; +#define FT_NORMAL 1 +#define FT_INTRFRAME 2 +#define FT_INTRTRAPFRAME 3 +#define FT_TIMERFRAME 4 static int kgdb_trgt_frame_offset[15] = { offsetof(struct trapframe, tf_eax), @@ -278,7 +282,17 @@ *this_cache = cache; cache->pc = frame_func_unwind(next_frame); find_pc_partial_function(cache->pc, &pname, NULL, NULL); - cache->intrframe = (pname[0] == 'X') ? 1 : 0; + if (pname[0] != 'X') + cache->frame_type = FT_NORMAL; + else if (strcmp(pname, "Xtimerint") == 0) + cache->frame_type = FT_TIMERFRAME; + else if (strcmp(pname, "Xcpustop") == 0 || + strcmp(pname, "Xrendezvous") == 0 || + strcmp(pname, "Xipi_intr_bitmap_handler") == 0 || + strcmp(pname, "Xlazypmap") == 0) + cache->frame_type = FT_INTRTRAPFRAME; + else + cache->frame_type = FT_INTRFRAME; frame_unwind_register(next_frame, SP_REGNUM, buf); cache->sp = extract_unsigned_integer(buf, register_size(current_gdbarch, SP_REGNUM)); @@ -321,7 +335,23 @@ return; cache = kgdb_trgt_frame_cache(next_frame, this_cache); - *addrp = cache->sp + ofs + (cache->intrframe ? 4 : 0); + switch (cache->frame_type) { + case FT_NORMAL: + break; + case FT_INTRFRAME: + ofs += 4; + break; + case FT_TIMERFRAME: + break; + case FT_INTRTRAPFRAME: + ofs -= ofs_fix; + break; + default: + fprintf_unfiltered(gdb_stderr, "Correct FT_XXX frame offsets " + "for %d\n", cache->frame_type); + break; + } + *addrp = cache->sp + ofs; *lvalp = lval_memory; target_read_memory(*addrp, valuep, regsz); } ==== //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.282 2008/09/26 05:50:08 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.283 2008/09/26 19:23:22 peter Exp $ # # Doing a "make install" builds /usr/include. @@ -103,16 +103,7 @@ echo "#else" >> osreldate.h; \ echo "#undef __FreeBSD_version" >> osreldate.h; \ echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ - echo "#ifdef __STDC__" >> osreldate.h; \ - echo "#ifndef _OSRELDATE_H" >> osreldate.h; \ - echo "#define _OSRELDATE_H" >> osreldate.h; \ - echo "#include " >> osreldate.h; \ - echo "__BEGIN_DECLS" >> osreldate.h; \ - echo "extern int getosreldate(void);" >> osreldate.h; \ - echo "__END_DECLS" >> osreldate.h; \ - echo "#endif /* _OSRELDATE_H */" >> osreldate.h; \ - echo "#endif /* __STDC__ */" >> osreldate.h; \ - echo "#endif /* _KERNEL */" >> osreldate.h + echo "#endif" >> osreldate.h .for i in ${LHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i ==== //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.90 2008/07/08 03:08:32 davidxu Exp $ + * $FreeBSD: src/include/unistd.h,v 1.91 2008/09/26 19:23:22 peter Exp $ */ #ifndef _UNISTD_H_ @@ -485,6 +485,7 @@ int getdomainname(char *, int); int getgrouplist(const char *, gid_t, gid_t *, int *); mode_t getmode(const void *, mode_t); +int getosreldate(void); int getpeereid(int, uid_t *, gid_t *); int getresgid(gid_t *, gid_t *, gid_t *); int getresuid(uid_t *, uid_t *, uid_t *); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.53 2008/09/01 04:54:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.54 2008/09/30 03:53:03 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -461,6 +461,24 @@ } time_t +archive_entry_birthtime(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime); +} + +long +archive_entry_birthtime_nsec(struct archive_entry *entry) +{ + return (entry->ae_stat.aest_birthtime_nsec); +} + +int +archive_entry_birthtime_is_set(struct archive_entry *entry) +{ + return (entry->ae_set & AE_SET_BIRTHTIME); +} + +time_t archive_entry_ctime(struct archive_entry *entry) { return (entry->ae_stat.aest_ctime); @@ -838,6 +856,22 @@ } void +archive_entry_set_birthtime(struct archive_entry *entry, time_t m, long ns) +{ + entry->stat_valid = 0; + entry->ae_set |= AE_SET_BIRTHTIME; + entry->ae_stat.aest_birthtime = m; + entry->ae_stat.aest_birthtime_nsec = ns; +} + +void +archive_entry_unset_birthtime(struct archive_entry *entry) +{ + archive_entry_set_birthtime(entry, 0, 0); + entry->ae_set &= ~AE_SET_BIRTHTIME; +} + +void archive_entry_set_ctime(struct archive_entry *entry, time_t t, long ns) { entry->stat_valid = 0; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -174,6 +174,9 @@ __LA_DECL time_t archive_entry_atime(struct archive_entry *); __LA_DECL long archive_entry_atime_nsec(struct archive_entry *); __LA_DECL int archive_entry_atime_is_set(struct archive_entry *); +__LA_DECL time_t archive_entry_birthtime(struct archive_entry *); +__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *); +__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *); __LA_DECL time_t archive_entry_ctime(struct archive_entry *); __LA_DECL long archive_entry_ctime_nsec(struct archive_entry *); __LA_DECL int archive_entry_ctime_is_set(struct archive_entry *); @@ -224,6 +227,8 @@ __LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_atime(struct archive_entry *); +__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long); +__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *); __LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long); __LA_DECL void archive_entry_unset_ctime(struct archive_entry *); __LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_copy_stat.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From pgj at FreeBSD.org Sun Oct 5 18:35:42 2008 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 5 18:35:50 2008 Subject: PERFORCE change 151023 for review Message-ID: <200810051835.m95IZgPa015987@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151023 Change 151023 by pgj@kolbasz on 2008/10/05 18:34:56 Add Hungarian translation of chapter "Overview" from fdp-primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#2 (text+ko) ==== @@ -31,262 +31,335 @@ --> - Overview + Áttekintés + + Üdvözöljük a &os; + Dokumentációs Projektben! A &os; + sikerességéhez elegendhetetlenül fontos a + jó minõségû dokumentáció, + amelynek jelentõs részét a &os; + Dokumentációs Projekt (röviden FDP) + állítja elõ. Ez a projekt rendkívül + értékesnek tart bármilyen fajta + támogatást. + + Ennek a dokumentumnak fõ célja, hogy bemutassa + az FDP szervezõdését, + hogyan készítsünk és + küldjünk az FDP részére + dokumentációt, és hogyan + használjuk hatékonyan a dokumentációk + írásához készített + eszközöket. + + tagság + + Az FDP bárkit szívesen fogad. A tagságnak + nincs semmiféle elõfeltétele, a tagoknak nem + kötelezõ havonta adott mennyiségû + dokumentációk írniuk. A + belépésnek mindössze annyit kell tennünk, + hogy feliratkozunk a &a.doc; tagjai közé. - Welcome to the FreeBSD Documentation Project. Good quality - documentation is very important to the success of FreeBSD, and the - FreeBSD Documentation Project (FDP) is how a lot of that documentation - is produced. Your contributions are very valuable. - - This document's main purpose is to clearly explain how - the FDP is organized, how to write and submit - documentation to the FDP, and how to - effectively use the tools available to you when writing - documentation. - - - Membership - - Everyone is welcome to join the FDP. There is no minimum - membership requirement, no quota of documentation you need to - produce per month. All you need to do is subscribe to the - &a.doc;. + A könyv elolvasása során + megismerjük: - After you have finished reading this document you should: - - - Know which documentation is maintained by the FDP. + + milyen dokumentációkat tart karban az FDP; - + - Be able to read and understand the SGML source code for the - documentation maintained by the FDP. + az FDP által karbantartott + dokumentációk megírásához + használt SGML nyelvet; - - - Be able to make changes to the documentation. + + + hogyan készítsünk + módosításokat a + dokumentációhoz; - + - Be able to submit your changes back for review and eventual - inclusion in the FreeBSD documentation. - + hogyan küldjük be és nézessük + át a módosításainkat, ezek + miként kerülhetnek be a &os; hivatalos + dokumentációjába. + - The FreeBSD Documentation Set + A &os; dokumentációja + + Az FDP a &os;-hez mellékelt dokumentációk + négy fajtájáért felelõs: - The FDP is responsible for four categories of FreeBSD - documentation. - - Manual pages + Man oldalak - - The English language system manual pages are not written by - the FDP, as they are part of the base system. However, the FDP can - (and has) re-worded parts of existing manual pages to make them - clearer, or to correct inaccuracies. + + Az angol nyelvû man oldalakat nem az FDP tagjai + készítik, azok az alaprendszer részei. + Az FDP viszont az olvashatóság vagy az + esetleges pontatlanságok javítása + érdekében át tudja fogalmazni + ezeket. - The translation teams are responsible for translating the - system manual pages into different languages. These translations - are kept within the FDP. - + Továbbá a különbözõ + fordítói csoportok felelõsek a rendszerhez + tartozó egyes man oldalak + fordításaiért, amelyek szintén + az FDP keretein belül készülnek. + - FAQ - - - The FAQ aims to address (in short question and answer format) - questions that are asked, or should be asked, on the various - mailing lists and newsgroups devoted to FreeBSD. The format does - not permit long and comprehensive answers. - + GYIK + + + A GYIK célja a &os;-vel foglalkozó + különbözõ levelezõ listákon + és hírcsoportokon felbukkanó gyakran + ismételt kérdések (rövid, + lényegretörõ) megválaszolása. + Ez a formátum nem teszi lehetõvé hosszabb + és minden részletre kiterjedõ + válaszok megfogalmazását. + - Handbook + Kézikönyv - - The Handbook aims to be the comprehensive on-line resource and - reference for FreeBSD users. - + + A kézikönyv a &os; + felhasználók számára + összeállított átfogó, + intereten keresztül is olvasható + referencia. + - + - Web site - - - This is the main FreeBSD presence on the World Wide Web, - visible at Honlap + + + A http://www.FreeBSD.org/ - and many mirrors around the world. The web site is many people's - first exposure to FreeBSD. + címen, illetve annak különbözõ + tükrözésein keresztül + elérhetõ honlapok képviselik a &os; + elsõdleges megjelenési formáját a + világhálón. Legtöbben ezen az + oldalon találkoznak a &os;-vel + elõször. - - These four groups of documentation are all available in the - FreeBSD CVS tree. This means that the logs of changes to these - files are visible to anyone, and anyone can use a program such as - CVSup or - CTM to keep local copies of - this documentation. - - In addition, many people have written tutorials or other web - sites relating to FreeBSD. Some of these are stored in the CVS - repository as well (where the author has agreed to this). In - other cases the author has decided to keep his documentation - separate from the main FreeBSD repository. The FDP endeavors to - provide links to as much of this documentation as - possible. - - + + Az imént felsorolt kategóriák mindegyike + megtalálható a &os; repositoryjában, + ezért a velük kapcsolatos + változtatásokhoz tartozó + naplóbejegyzések mindenki számára + láthatóak, illetve a + CVSup vagy + CTM alkalmazások + használatával a + dokumentációkból létre tudunk hozni + egy helyi másolatot. + + Mindezek mellett sokan készítettek + további oktatóanyagokat és &os;-hez + kapcsolódó honlapokat. Ezek némelyike (a + szerzõ elõzetes engedélyével) a + repositoryban is megtalálható. A többi esetben + a szerzõk úgy döntöttek, hogy a &os; + forrásaitól független helyen szeretnék + tárolni a leírásaikat. Ilyenkor pedig az FDP + törekszik belinkelni ezeket. + + - Before you start - - This document assumes that you already know: - - - - How to maintain an up-to-date local copy of the FreeBSD - documentation by maintaining a local copy of the - FreeBSD CVS repository (using CVS - and either CVSup or - CTM) or by using - CVSup to download just a - checked-out copy. + Mielõtt belekezdenénk + + Az alábbi ismereteket feltételezzük az + olvasó részérõl: + + + + Képesek vagyunk lekérni és + folyamatosan frissíteni a &os; repository egy helyi + számítógépen tárolt + változatát (például a + CVS, + CVSup vagy + CTM alkalmazások + valamelyikének használatával), vagy + egyszerûen csak letölteni belõle a + CVSup + segítségével egy elõre + kikért példányt. + + + + Tudunk szoftvereket telepíteni a &os; + Portgyûjteményébõl vagy a + &man.pkg.add.1; használatával. - - - How to download and install new software using either the - FreeBSD Ports system or &man.pkg.add.1;. - - + - Quick Start + A legfontosabb tudnivalók - If you just want to get going, and feel confident you can pick - things up as you go along, follow these instructions. + Ha most csak a legalapvetõbb ismeretekre van + szükségünk, és a részletekkel + csupán késõbb akarunk majd foglalkozni, akkor + az alábbi utasítások alapján javasolt + elindulni: - Install the textproc/docproj - meta-port. + Telepítsük a textproc/docproj metaportot: &prompt.root; cd /usr/ports/textproc/docproj &prompt.root; make JADETEX=no install - Get a local copy of the FreeBSD doc tree. - Either use CVSup in checkout mode to do this, or - get a full copy of the CVS repository locally. + Készítsünk egy helyi másolatot a + &os; forrásának doc + könyvtáráról. Erre megfelel a + CVSup checkout + módja vagy a repository teljes tartalmának + letöltése. - If you have the CVS repository locally then as a minimum you - will need to checkout the doc/share, and + Egy használható helyi másolathoz + legalább a doc/share és doc/en_US.ISO8859-1/share - directories. + könyvtárakat kell kikérnünk: &prompt.user; cvs checkout doc/share &prompt.user; cvs checkout doc/en_US.ISO8859-1/share - If you have plenty of disk space then you could check out - everything. + Ha viszont sok tárhellyel rendelkezük, akkor + akár mindent kikérhetünk: &prompt.user; cvs checkout doc - If you are preparing a change to an existing book or article, - check it out of the repository as necessary. If you are planning on - contributing a new book or article then use an existing one as a - guide. + Amikor egy korábban felrakott könyvhöz + vagy cikkhez készítünk + módosításokat, elõtte + kérjük ki a repositoryból. Ha egy + új könyvet vagy cikket szeretnék + beküldeni, akkor építkezzünk a + meglevõekbõl. - For example, if you want to contribute a new article about - setting up a VPN between FreeBSD and Windows 2000 you might do the - following. + Tegyük fel például, hogy írtunk + egy cikket a &os; és &windows; 2000 rendszerek közti + VPN-hálózatok + létrehozásáról: - Check out the articles - directory. + Kérjük ki az articles + könyvtár tartalmát. &prompt.user; cvs checkout doc/en_US.ISO8859-1/articles - Copy an existing article to use as a template. In this - case, you have decided that your new article belongs in a - directory called vpn-w2k. + Másoljunk le valamelyik cikket és + használjuk fel sablonként. Most úgy + döntöttük, hogy az új cikket a + vpn-w2k könyvtárba + helyezzük el: &prompt.user; cd doc/en_US.ISO8859-1/articles &prompt.user; cp -R committers-guide vpn-w2k - If you wanted to edit an existing document, such as the FAQ, - which is in doc/en_US.ISO8859-1/books/faq you - would check it out of the repository like this. + Ha viszont egy már létezõ dokumentumot + akarunk szerkeszteni, például a GYIK-ot, akkor + kérjük ki azt a könyvtárat, amelyikben + található. Ez ebben az esetben a + doc/en_US.ISO8859-1/books/faq: &prompt.user; cvs checkout doc/en_US.ISO8859-1/books/faq - Edit the .sgml files using your editor of - choice. + A könyvtárban található + .sgml állományokat + írjuk át a kedvenc + szövegszerkesztõnkkel. - Test the markup using the lint - target. This will quickly find any errors in the document - without actually performing the time-consuming - transformation. + A forrásban használt markupokat a + lint cél + segítségével ellenõrizhetjük. + Ilyenkor anélkül tudjuk megtalálni a + dokumentum forrásában rejtõzõ + hibákat, hogy ténylegesen el kellene + végeznünk azok idõigényes + átalakítását: &prompt.user; make lint - When you are ready to actually build the document, you - may specify a single format or a list of formats in the - FORMATS variable. Currently, - html, html-split, - txt, ps, - pdf, and rtf are - supported. The most up to date list of supported formats is - listed at the top of the - doc/share/mk/doc.docbook.mk file. Make - sure to use quotes around the list of formats when you build - more than one format with a single command. + Amikor viszont valóban le akarjuk + generáltatni a dokumentumot, a FORMATS + változóban tudjuk felsorolt a kért + formátumokat. Itt jelen pillanatban a + html, html-split, + txt, ps, + pdf és rtf + értékeket szerepeltethetjük. A + támogatott formátumok legfrissebb + listáját mellesleg a + doc/share/doc.docbook.mk + állományban találhatjuk meg. Ha + egyszerre több formátumot kértünk, + akkor ne felejtsük el idézõjelek + közé tenni a felsorolást. - For example, to convert the document to - html only, you would use: + Például így lehet egy dokumentumot + csak html formátumra + alakítani: &prompt.user; make FORMATS=html - But when you want to convert the document to both - html and txt format, - you could use either two separate &man.make.1; runs, - with: + Ha viszont egyszerre szeretnénk a + dokumentumból html és + txt formátumot létrehozatni, + akkor megtehetjük azt két külön + &man.make.1; paranccsal: &prompt.user; make FORMATS=html &prompt.user; make FORMATS=txt - or, you can do it in one command: + Vagy egyetlen paranccsal: &prompt.user; make FORMATS="html txt" - Submit your changes using &man.send-pr.1;. + Küldjük be a + módosításainkat a &man.send-pr.1; + használatával. From rene at FreeBSD.org Sun Oct 5 21:01:10 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Oct 5 21:01:17 2008 Subject: PERFORCE change 151026 for review Message-ID: <200810052101.m95L1AlZ040999@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151026 Change 151026 by rene@rene_self on 2008/10/05 21:00:19 Start translation of Updating chapter, section 1 done (22%). Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#2 (text+ko) ==== @@ -1,6 +1,9 @@ @@ -9,99 +12,109 @@ Tom Rhodes - Written by + Geschreven door Colin Percival - Based on notes provided by + Gebaseerd op notities geleverd door + + + + + René + Ladan + Vertaald door - Updating &os; + &os; bijwerken - Synopsis + Overzicht + + FreeBSD bijwerken - Updating FreeBSD freebsd-update - Updating + Bijwerken - Over time, one primary aspect of the &os; operating system - has remained the same. This is the requirement to use - applications and utilities to obtain major and minor system - updates. + Door de tijd heen is een primair aspect van het + besturingssysteem &os; hetzelfde gebleven. Dit is de eis om + applicaties en gereedschappen te gebruiken om grote en kleine + systeemupdate te verkrijgen. - For many years, users wishing to upgrade their system, - collect security patches, and obtain port and package updates - without breaking the Ports Collection visioning methods were - forced to use the CVSup tool. + Voor vele jaren waren gebruikers die hun systeem wilden + upgraden, beveiligingspatches wilden verzamelen, en updates voor + ports en pakketten wilden verkrijgen zonder de Portscollectie + kapot te maken verplicht om het gereedschap + CVSup te gebruiken. - While use of CVSup is still - supported, and a true C-language version - was added to &os;, there are new methods to acquire system - updates. + Hoewel het gebruik van CVSup nog + steeds wordt ondersteund, en er een ware versie geprogrammeerd in + de taal C aan &os; is toegevoegd, zijn er nieuwe methoden om + systeemupdates te verkrijgen. - Tools such as &man.portsnap.8;, and &man.freebsd-update.8; - have streamlined the upgrade process. These - new methods increase productivity while providing a more simple - interface for users. Some of the new tools may be run from - &man.cron.8; reducing the manual intervention of the systems - administrator; a benefit for those who monitor hundreds of &os; - machines. + Gereedschappen zoals &man.portsnap.8; en + &man.freebsd-update.8; hebben het upgradeproces gestroomlijnd. + Deze neiuwe methoden verhogen de productiviteit terwijl ze een + eenvoudigere interface voor gebruikers bieden. Sommige nieuwe + gereedschappen kunnen vanuit &man.cron.8; worden gedraaid waardoor + de handmatige tussenkomst van de systeembeheerder wordt + verminderd; een voordeel voor degenen die honderden &os;-machines + in de gaten houden. - This chapter will explain these new methods, and how users - and system administrators alike may benefit from their practical - and easy use. + Dit hoofdstuk zal deze nieuwe methoden uitleggen, en vertellen + hoe gebruikers alsmede systeembeheerders voordeel kunnen halen uit + hun praktische en eenvoudige gebruik. - After reading this chapter, you will know: + Na het lezen van dit hoofdstuk weet u: - What utilities may be used to update the system and - the Ports Collection. + Welke gereedschappen gebruikt kunnen worden om het systeem + en de Portscollectie te updaten. - How to use freebsd-update to apply - security patches and perform major and minor &os; - upgrades. + Hoe freebsd-update te gebruiken om + beveiligingspatches toe te passen en grote en kleine upgrades + van &os; uit te voeren. - How to compare the state of an installed system against - a known pristine copy. + Hoe de toestand van een geïnstalleerd systeem met een + bekende maagdelijke kopie te vergelijken. - Before reading this chapter, you should: + Voor het lezen van dit hoofdstuk dient u: - Understand &unix; and &os; basics + De beginselen van &unix; en &os; te begrijpen (). - Be familiar with the basics of kernel - configuration/compilation - (). + Bekend te zijn met de beginselen van het instellen en + compileren van de kernel (). - Have some familiarity with the Ports Collection and - installing third party applications on &os; + Enigszins bekend te zijn met de Portscollectie en het + installeren van applicaties van derde partijen op &os; (). - Be familiar with the various source components which make - up &os; and how to use the &man.mergemaster.8; tool + Bekend te zijn met de verschillende broncomponenten + waaruit &os; bestaat en hoe het gereedschap + &man.mergemaster.8; te gebruiken (). From rfrench at FreeBSD.org Mon Oct 6 22:07:01 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Mon Oct 6 22:07:08 2008 Subject: PERFORCE change 151074 for review Message-ID: <200810062207.m96M71jp059399@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151074 Change 151074 by rfrench@rfrench_mpls on 2008/10/06 22:06:34 Basic MPLS receiving/decoding/sending is now working. There is still a lot of work to go but for now when a packet is received using one of the labels in mpls-needle.conf then the packet has one of the 3 operations (swap, pop, push) performed on it and the packet is then sent back out. At the moment routing has not been implemented and when the packet is sent back out it is sent using the MAC broadcast address. Setting up routing tables is the next step, and then looking at implementing LDP and from there to ingress/egress routing. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#10 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#12 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#4 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#10 (text+ko) ==== @@ -100,6 +100,7 @@ #ifdef MPLS #include +#include #endif /*MPLS*/ #include @@ -262,6 +263,13 @@ } #endif /* NETATALK */ +#ifdef MPLS + case AF_MPLS: + type = htons(ETHERTYPE_MPLS); + bcopy(ifp->if_broadcastaddr, edst, ETHER_ADDR_LEN); + break; +#endif /* MPLS */ + case pseudo_AF_HDRCMPLT: hdrcmplt = 1; eh = (struct ether_header *)dst->sa_data; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#12 (text+ko) ==== @@ -36,6 +36,7 @@ #ifdef MPLS_DEBUG #define MPLS_LABEL_GET(l) ((ntohl((l) & MPLS_LABEL_MASK)) >> MPLS_LABEL_OFFSET) #define MPLS_TTL_GET(l) (ntohl((l) & MPLS_TTL_MASK)) +#define MPLS_LABEL_SET(l) (htonl((l) << MPLS_LABEL_OFFSET)) #endif void create_fake_entry(struct sockaddr_mpls *); @@ -57,19 +58,19 @@ if (MPLS_LABEL_GET(smpls->smpls_in_label) == 44) { smpls->smpls_operation = 1; smpls->smpls_out_exp = 14; - smpls->smpls_out_label = 66; + smpls->smpls_out_label = MPLS_LABEL_SET(66); smpls->smpls_out_ifindex = smpls->smpls_in_ifindex; } if (MPLS_LABEL_GET(smpls->smpls_in_label) == 55) { smpls->smpls_operation = 2; smpls->smpls_out_exp = 14; - smpls->smpls_out_label = 44; + smpls->smpls_out_label = MPLS_LABEL_SET(44); smpls->smpls_out_ifindex = smpls->smpls_in_ifindex; } if (MPLS_LABEL_GET(smpls->smpls_in_label) == 66) { smpls->smpls_operation = 3; smpls->smpls_out_exp = 14; - smpls->smpls_out_label = 1000; + smpls->smpls_out_label = MPLS_LABEL_SET(1000); smpls->smpls_out_ifindex = smpls->smpls_in_ifindex; } } ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#4 (text+ko) ==== From rfrench at FreeBSD.org Mon Oct 6 22:46:42 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Mon Oct 6 22:46:53 2008 Subject: PERFORCE change 151077 for review Message-ID: <200810062246.m96Mkf1H062545@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151077 Change 151077 by rfrench@rfrench_mpls on 2008/10/06 22:46:03 Removed the dropping of all broadcast MPLS packets for now while I am testing. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#11 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#13 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#11 (text+ko) ==== ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#13 (text+ko) ==== @@ -56,21 +56,9 @@ create_fake_entry(struct sockaddr_mpls *smpls) { if (MPLS_LABEL_GET(smpls->smpls_in_label) == 44) { - smpls->smpls_operation = 1; - smpls->smpls_out_exp = 14; - smpls->smpls_out_label = MPLS_LABEL_SET(66); - smpls->smpls_out_ifindex = smpls->smpls_in_ifindex; - } - if (MPLS_LABEL_GET(smpls->smpls_in_label) == 55) { - smpls->smpls_operation = 2; - smpls->smpls_out_exp = 14; - smpls->smpls_out_label = MPLS_LABEL_SET(44); - smpls->smpls_out_ifindex = smpls->smpls_in_ifindex; - } - if (MPLS_LABEL_GET(smpls->smpls_in_label) == 66) { smpls->smpls_operation = 3; smpls->smpls_out_exp = 14; - smpls->smpls_out_label = MPLS_LABEL_SET(1000); + smpls->smpls_out_label = MPLS_LABEL_SET(100); smpls->smpls_out_ifindex = smpls->smpls_in_ifindex; } } @@ -118,10 +106,10 @@ } /* drop all broadcast and multicast packets */ - if (m->m_flags & (M_BCAST | M_MCAST)) { - m_freem(m); - return; - } + //if (m->m_flags & (M_BCAST | M_MCAST)) { + // m_freem(m); + // return; + //} if (m->m_len < sizeof(*shim)) if ((m = m_pullup(m, sizeof(*shim))) == NULL) From rfrench at FreeBSD.org Mon Oct 6 23:02:59 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Mon Oct 6 23:03:05 2008 Subject: PERFORCE change 151078 for review Message-ID: <200810062302.m96N2wAA064252@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151078 Change 151078 by rfrench@rfrench_mpls on 2008/10/06 23:02:13 Added if_loop.c Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_loop.c#1 add Differences ... From rfrench at FreeBSD.org Mon Oct 6 23:06:02 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Mon Oct 6 23:06:08 2008 Subject: PERFORCE change 151079 for review Message-ID: <200810062306.m96N61ag065729@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151079 Change 151079 by rfrench@rfrench_mpls on 2008/10/06 23:05:56 Added MPLS case into if_loop.c Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_loop.c#2 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_loop.c#2 (text+ko) ==== @@ -329,6 +329,11 @@ isr = NETISR_ATALK2; break; #endif +#ifdef MPLS + case AF_MPLS: + isr = NETISR_MPLS; + break; +#endif default: printf("if_simloop: can't handle af=%d\n", af); m_freem(m); From rfrench at FreeBSD.org Mon Oct 6 23:35:35 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Mon Oct 6 23:35:41 2008 Subject: PERFORCE change 151081 for review Message-ID: <200810062335.m96NZVHc067917@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151081 Change 151081 by rfrench@rfrench_mpls on 2008/10/06 23:35:10 Forgot to include opt_mpls.h in if_loop.c Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_loop.c#3 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_loop.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" +#include "opt_mpls.h" #include #include From rfrench at FreeBSD.org Tue Oct 7 02:26:28 2008 From: rfrench at FreeBSD.org (Ryan French) Date: Tue Oct 7 02:26:34 2008 Subject: PERFORCE change 151082 for review Message-ID: <200810070226.m972QRNA093717@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151082 Change 151082 by rfrench@rfrench_mpls on 2008/10/07 02:26:19 Made changes to socket.h as per email from Andrew Thompson Affected files ... .. //depot/projects/soc2008/rfrench_mpls/sys/socket.h#4 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/sys/socket.h#4 (text+ko) ==== @@ -209,14 +209,14 @@ #define AF_ARP 35 #define AF_BLUETOOTH 36 /* Bluetooth sockets */ #define AF_IEEE80211 37 /* IEEE 802.11 protocol */ -#define AF_MAX 38 +#define AF_MPLS 38 /* MPLS protocol */ +#define AF_MAX 39 /* * When allocating a new AF_ constant, please only allocate * even numbered constants for FreeBSD until 134 as odd numbered AF_ * constants 39-133 are now reserved for vendors. */ #define AF_VENDOR00 39 -#define AF_MPLS 40 /* MPLS protocol */ #define AF_VENDOR01 41 #define AF_VENDOR02 43 #define AF_VENDOR03 45 From gonzo at FreeBSD.org Wed Oct 8 05:00:59 2008 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Wed Oct 8 05:01:07 2008 Subject: PERFORCE change 151119 for review Message-ID: <200810080500.m9850j1u061551@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151119 Change 151119 by gonzo@gonzo_jeeves on 2008/10/08 05:00:20 IFC @151118: Mostly because of dev/cfe changes Affected files ... .. //depot/projects/mips2/src/ObsoleteFiles.inc#24 integrate .. //depot/projects/mips2/src/UPDATING#21 integrate .. //depot/projects/mips2/src/bin/pkill/pkill.1#2 integrate .. //depot/projects/mips2/src/bin/pkill/pkill.c#2 integrate .. //depot/projects/mips2/src/crypto/openssh/moduli.5#2 integrate .. //depot/projects/mips2/src/crypto/openssh/scp.1#4 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/mips2/src/crypto/openssh/sftp.1#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-add.1#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh.1#4 integrate .. //depot/projects/mips2/src/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/mips2/src/crypto/openssh/sshd.8#4 integrate .. //depot/projects/mips2/src/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/mips2/src/etc/network.subr#8 integrate .. //depot/projects/mips2/src/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kld.c#5 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#7 integrate .. //depot/projects/mips2/src/include/Makefile#8 integrate .. //depot/projects/mips2/src/include/unistd.h#8 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_private.h#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#15 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_pax.c#9 integrate .. //depot/projects/mips2/src/lib/libarchive/config_freebsd.h#8 integrate .. //depot/projects/mips2/src/lib/libarchive/test/Makefile#10 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_entry.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk.c#9 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/mips2/src/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/mips2/src/lib/libpmc/Makefile#4 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.3#10 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/mips2/src/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/mips2/src/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/mips2/src/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/mips2/src/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.tsc.3#2 integrate .. //depot/projects/mips2/src/lib/libutil/pty.c#6 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#11 integrate .. //depot/projects/mips2/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/mips2/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/mips2/src/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/mips2/src/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/mips2/src/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#14 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/mips2/src/sbin/init/init.c#5 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#13 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#14 integrate .. //depot/projects/mips2/src/sbin/setkey/setkey.8#4 integrate .. //depot/projects/mips2/src/share/examples/FreeBSD_version/FreeBSD_version.c#2 integrate .. //depot/projects/mips2/src/share/examples/drivers/make_pseudo_driver.sh#4 integrate .. //depot/projects/mips2/src/share/man/man3/Makefile#7 integrate .. //depot/projects/mips2/src/share/man/man3/makedev.3#1 branch .. //depot/projects/mips2/src/share/man/man4/Makefile#22 integrate .. //depot/projects/mips2/src/share/man/man4/ae.4#1 branch .. //depot/projects/mips2/src/share/man/man4/ata.4#6 integrate .. //depot/projects/mips2/src/share/man/man4/bce.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/ddb.4#11 integrate .. //depot/projects/mips2/src/share/man/man4/em.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/igb.4#1 branch .. //depot/projects/mips2/src/share/man/man4/jme.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/nfe.4#8 integrate .. //depot/projects/mips2/src/share/man/man4/ng_tty.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/mips2/src/share/man/man4/vlan.4#7 integrate .. //depot/projects/mips2/src/share/man/man4/vr.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/wpi.4#4 integrate .. //depot/projects/mips2/src/share/man/man5/Makefile#7 integrate .. //depot/projects/mips2/src/share/man/man5/nullfs.5#1 branch .. //depot/projects/mips2/src/share/man/man9/Makefile#17 integrate .. //depot/projects/mips2/src/share/man/man9/device_ids.9#2 delete .. //depot/projects/mips2/src/share/man/man9/make_dev.9#5 integrate .. //depot/projects/mips2/src/share/man/man9/spl.9#2 integrate .. //depot/projects/mips2/src/share/misc/committers-src.dot#12 integrate .. //depot/projects/mips2/src/share/zoneinfo/southamerica#11 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/minidump_machdep.c#6 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/mips2/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/mips2/src/sys/amd64/include/smp.h#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/arm/arm/mem.c#3 integrate .. //depot/projects/mips2/src/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/mips2/src/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/mips2/src/sys/arm/at91/if_ate.c#10 integrate .. //depot/projects/mips2/src/sys/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/avila_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate .. //depot/projects/mips2/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/mips2/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/mips2/src/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/mips2/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/mips2/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/mips2/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/mips2/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/mips2/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/mips2/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/mips2/src/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/mips2/src/sys/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/mips2/src/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/mips2/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/mips2/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#25 integrate .. //depot/projects/mips2/src/sys/conf/files#30 integrate .. //depot/projects/mips2/src/sys/conf/files.powerpc#14 integrate .. //depot/projects/mips2/src/sys/conf/files.sparc64#10 integrate .. //depot/projects/mips2/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/mips2/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/mips2/src/sys/conf/options#22 integrate .. //depot/projects/mips2/src/sys/conf/options.sparc64#5 integrate .. //depot/projects/mips2/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/mips2/src/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/mips2/src/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/mips2/src/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/mips2/src/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/mips2/src/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/mips2/src/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/mips2/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/mips2/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/mips2/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/mips2/src/sys/dev/amr/amr.c#8 integrate .. //depot/projects/mips2/src/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/mips2/src/sys/dev/asr/asr.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#20 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/mips2/src/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/mips2/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/mips2/src/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/mips2/src/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#21 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#18 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#9 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/mips2/src/sys/dev/dc/dcphy.c#4 integrate .. //depot/projects/mips2/src/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_agpsupport.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_dma.c#8 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_drm.h#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/mips2/src/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/mips2/src/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/mips2/src/sys/dev/fb/fb.c#3 integrate .. //depot/projects/mips2/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/mips2/src/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/mips2/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/mips2/src/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/mips2/src/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/mips2/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/mips2/src/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/mips2/src/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/mips2/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/mips2/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/mips2/src/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/mips2/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/mips2/src/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/mips2/src/sys/dev/led/led.c#5 integrate .. //depot/projects/mips2/src/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/mips2/src/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/mips2/src/sys/dev/mii/miidevs#13 integrate .. //depot/projects/mips2/src/sys/dev/mlx/mlx.c#4 integrate .. //depot/projects/mips2/src/sys/dev/mly/mly.c#5 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/mips2/src/sys/dev/mse/mse.c#3 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/mips2/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/mips2/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/mips2/src/sys/dev/mxge/mxge_mcp.h#6 integrate .. //depot/projects/mips2/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/mips2/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfe.c#11 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfereg.h#6 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfevar.h#6 integrate .. //depot/projects/mips2/src/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/mips2/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/mips2/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/mips2/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/mips2/src/sys/dev/rp/rpvar.h#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/midi/sequencer.c#7 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/mips2/src/sys/dev/speaker/spkr.c#6 integrate .. //depot/projects/mips2/src/sys/dev/streams/streams.c#6 integrate .. //depot/projects/mips2/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/mips2/src/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb/ucomvar.h#7 integrate .. //depot/projects/mips2/src/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/mips2/src/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/mips2/src/sys/dev/usb/ums.c#9 integrate .. //depot/projects/mips2/src/sys/dev/usb/urio.c#4 integrate .. //depot/projects/mips2/src/sys/dev/usb/usb.c#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/mips2/src/sys/dev/vkbd/vkbd.c#5 integrate .. //depot/projects/mips2/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/mips2/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/mips2/src/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/mips2/src/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/mips2/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/mips2/src/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/mips2/src/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/mips2/src/sys/geom/geom_dev.c#7 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.c#11 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum.h#3 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/mips2/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/mips2/src/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/mips2/src/sys/i386/bios/apm.c#7 integrate .. //depot/projects/mips2/src/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/mips2/src/sys/i386/conf/GENERIC#18 integrate .. //depot/projects/mips2/src/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/mips2/src/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/mips2/src/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/i386/include/param.h#4 integrate .. //depot/projects/mips2/src/sys/i386/include/smp.h#7 integrate .. //depot/projects/mips2/src/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/mips2/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/interrupt.c#11 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/mp_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/sal.c#3 integrate .. //depot/projects/mips2/src/sys/ia64/include/smp.h#2 integrate .. //depot/projects/mips2/src/sys/kern/kern_conf.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_mib.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/mips2/src/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/mips2/src/sys/kern/subr_witness.c#19 integrate .. //depot/projects/mips2/src/sys/kern/sys_socket.c#8 integrate .. //depot/projects/mips2/src/sys/kern/tty.c#15 integrate .. //depot/projects/mips2/src/sys/kern/uipc_sockbuf.c#9 integrate .. //depot/projects/mips2/src/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/mips2/src/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/mips2/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/mips2/src/sys/mips/adm5120/if_admsw.c#4 integrate .. //depot/projects/mips2/src/sys/mips/include/param.h#7 integrate .. //depot/projects/mips2/src/sys/mips/include/smp.h#5 integrate .. //depot/projects/mips2/src/sys/mips/mips/mem.c#7 integrate .. //depot/projects/mips2/src/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#34 integrate .. //depot/projects/mips2/src/sys/mips/mips/trap.c#29 integrate .. //depot/projects/mips2/src/sys/mips/sentry5/s5_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#20 integrate .. //depot/projects/mips2/src/sys/modules/ae/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/wpifw/Makefile#2 integrate .. //depot/projects/mips2/src/sys/net/bridgestp.c#9 integrate .. //depot/projects/mips2/src/sys/net/if.c#14 integrate .. //depot/projects/mips2/src/sys/net/if_bridge.c#14 integrate .. //depot/projects/mips2/src/sys/net/if_ef.c#4 integrate .. //depot/projects/mips2/src/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/mips2/src/sys/net/if_faith.c#5 integrate .. //depot/projects/mips2/src/sys/net/if_gif.c#8 integrate .. //depot/projects/mips2/src/sys/net/if_gif.h#3 integrate .. //depot/projects/mips2/src/sys/net/if_gre.c#8 integrate .. //depot/projects/mips2/src/sys/net/if_lagg.c#13 integrate .. //depot/projects/mips2/src/sys/net/if_loop.c#9 integrate .. //depot/projects/mips2/src/sys/net/if_mib.c#4 integrate .. //depot/projects/mips2/src/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/mips2/src/sys/net/if_stf.c#8 integrate .. //depot/projects/mips2/src/sys/net/if_tap.c#7 integrate .. //depot/projects/mips2/src/sys/net/if_tun.c#5 integrate .. //depot/projects/mips2/src/sys/net/if_var.h#9 integrate .. //depot/projects/mips2/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/mips2/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/mips2/src/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/mips2/src/sys/net/route.c#13 integrate .. //depot/projects/mips2/src/sys/net/rtsock.c#10 integrate .. //depot/projects/mips2/src/sys/net/vnet.h#1 branch .. //depot/projects/mips2/src/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/mips2/src/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/mips2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/mips2/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/if_ether.c#12 integrate .. //depot/projects/mips2/src/sys/netinet/igmp.c#5 integrate .. //depot/projects/mips2/src/sys/netinet/in.c#8 integrate .. //depot/projects/mips2/src/sys/netinet/in.h#6 integrate .. //depot/projects/mips2/src/sys/netinet/in_gif.c#7 integrate .. //depot/projects/mips2/src/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/mips2/src/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/ip.h#5 integrate .. //depot/projects/mips2/src/sys/netinet/ip6.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/mips2/src/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/mips2/src/sys/netinet/ip_input.c#10 integrate .. //depot/projects/mips2/src/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/mips2/src/sys/netinet/ip_options.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_sack.c#7 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#17 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/mips2/src/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/mips2/src/sys/netinet/vinet.h#1 branch .. //depot/projects/mips2/src/sys/netinet6/dest6.c#5 integrate .. //depot/projects/mips2/src/sys/netinet6/frag6.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/mips2/src/sys/netinet6/in6.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_pcb.c#12 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_src.c#10 integrate .. //depot/projects/mips2/src/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/mips2/src/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/mips2/src/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/mips2/src/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/mips2/src/sys/netinet6/mld6.c#9 integrate .. //depot/projects/mips2/src/sys/netinet6/nd6.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/nd6.h#4 integrate .. //depot/projects/mips2/src/sys/netinet6/nd6_nbr.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/raw_ip6.c#11 integrate .. //depot/projects/mips2/src/sys/netinet6/route6.c#5 integrate .. //depot/projects/mips2/src/sys/netinet6/scope6.c#6 integrate .. //depot/projects/mips2/src/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/mips2/src/sys/netinet6/vinet6.h#1 branch .. //depot/projects/mips2/src/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/mips2/src/sys/netipsec/ipsec.h#7 integrate .. //depot/projects/mips2/src/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/mips2/src/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/mips2/src/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/mips2/src/sys/netipsec/key.c#8 integrate .. //depot/projects/mips2/src/sys/netipsec/keysock.c#7 integrate .. //depot/projects/mips2/src/sys/netipsec/vipsec.h#1 branch .. //depot/projects/mips2/src/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/mips2/src/sys/netipsec/xform_esp.c#6 integrate .. //depot/projects/mips2/src/sys/netipsec/xform_ipcomp.c#5 integrate .. //depot/projects/mips2/src/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_diskless.c#6 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/gdc.c#3 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/olpt.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/dbdma.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/mips2/src/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/dbdma.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/intr_machdep.c#13 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/mem.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/mp_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/rpc/authunix_prot.c#5 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_pipe.c#9 integrate .. //depot/projects/mips2/src/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/mips2/src/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/mips2/src/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/mips2/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mem.c#5 integrate .. //depot/projects/mips2/src/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/mips2/src/sys/sun4v/sun4v/dump_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/sys/conf.h#8 integrate .. //depot/projects/mips2/src/sys/sys/kerneldump.h#3 integrate .. //depot/projects/mips2/src/sys/sys/pmc.h#5 integrate .. //depot/projects/mips2/src/sys/sys/protosw.h#4 integrate .. //depot/projects/mips2/src/sys/sys/sysctl.h#12 integrate .. //depot/projects/mips2/src/sys/sys/systm.h#13 integrate .. //depot/projects/mips2/src/sys/sys/types.h#6 integrate .. //depot/projects/mips2/src/sys/sys/un.h#2 integrate .. //depot/projects/mips2/src/sys/sys/vimage.h#2 integrate .. //depot/projects/mips2/src/sys/vm/device_pager.c#6 integrate .. //depot/projects/mips2/src/sys/vm/swap_pager.c#10 integrate .. //depot/projects/mips2/src/sys/vm/vm_page.c#15 integrate .. //depot/projects/mips2/src/sys/vm/vm_page.h#6 integrate .. //depot/projects/mips2/src/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/mips2/src/sys/vm/vm_pageout.h#3 integrate .. //depot/projects/mips2/src/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/mips2/src/sys/xen/gnttab.c#3 integrate .. //depot/projects/mips2/src/sys/xen/gnttab.h#3 integrate .. //depot/projects/mips2/src/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/mips2/src/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/mips2/src/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/mips2/src/sys/xen/interface/domctl.h#3 integrate .. //depot/projects/mips2/src/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/grant_table.h#3 integrate .. //depot/projects/mips2/src/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/memory.h#3 integrate .. //depot/projects/mips2/src/sys/xen/interface/platform.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/trace.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/xen.h#2 integrate .. //depot/projects/mips2/src/tools/regression/netinet/udpzerobyte/Makefile#1 branch .. //depot/projects/mips2/src/tools/regression/netinet/udpzerobyte/udpzerobyte.c#1 branch .. //depot/projects/mips2/src/tools/regression/sockets/fstat/Makefile#1 branch .. //depot/projects/mips2/src/tools/regression/sockets/fstat/fstat.c#1 branch .. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/mips2/src/usr.bin/make/job.c#5 integrate .. //depot/projects/mips2/src/usr.bin/top/machine.c#9 integrate .. //depot/projects/mips2/src/usr.sbin/Makefile#17 integrate .. //depot/projects/mips2/src/usr.sbin/boot0cfg/boot0cfg.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/mips2/src/usr.sbin/gstat/gstat.8#3 integrate .. //depot/projects/mips2/src/usr.sbin/gstat/gstat.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat.8#7 integrate .. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat.c#9 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/devices.c#7 integrate Differences ... ==== //depot/projects/mips2/src/ObsoleteFiles.inc#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080928: removal of inaccurate device_ids(9) manual page +OLD_FILES+=usr/share/man/man9/device_ids.9.gz +OLD_FILES+=usr/share/man/man9/major.9.gz +OLD_FILES+=usr/share/man/man9/minor.9.gz +OLD_FILES+=usr/share/man/man9/umajor.9.gz +OLD_FILES+=usr/share/man/man9/uminor.9.gz # 20080917: removal of manpage for axed kernel primitive suser(9) OLD_FILES+=usr/share/man/man9/suser.9.gz OLD_FILES+=usr/share/man/man9/suser_cred.9.gz ==== //depot/projects/mips2/src/UPDATING#21 (text+ko) ==== @@ -59,6 +59,11 @@ option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh command line. + Please note that the sequence of keys offered for + authentication has been changed as well. You may want to + specify IdentityFile in a different order to revert this + behavior. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1018,7 +1023,7 @@ - + @@ -1126,4 +1131,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.542 2008/09/14 19:25:57 ed Exp $ +$FreeBSD: src/UPDATING,v 1.543 2008/10/08 01:31:00 delphij Exp $ ==== //depot/projects/mips2/src/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.3 2008/09/30 17:30:39 ed Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. ==== //depot/projects/mips2/src/bin/pkill/pkill.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.3 2008/09/30 17:30:39 ed Exp $"); #include #include @@ -607,12 +607,11 @@ struct passwd *pw; struct group *gr; struct stat st; - const char *cp, *prefix; + const char *cp; char *sp, *ep, buf[MAXPATHLEN]; int empty; empty = 1; - prefix = _PATH_DEV; while ((sp = strsep(&src, ",")) != NULL) { if (*sp == '\0') @@ -673,21 +672,21 @@ cp = "console"; } else { cp = sp; - if (strncmp(sp, "tty", 3) != 0) - prefix = _PATH_TTY; } - snprintf(buf, sizeof(buf), "%s%s", prefix, cp); + snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; + + snprintf(buf, sizeof(buf), _PATH_DEV "tty%s", cp); + if (stat(buf, &st) != -1) + goto foundtty; - if (stat(buf, &st) == -1) { - if (errno == ENOENT) { - errx(STATUS_BADUSAGE, - "No such tty: `%s'", sp); - } - err(STATUS_ERROR, "Cannot access `%s'", sp); - } + if (errno == ENOENT) + errx(STATUS_BADUSAGE, "No such tty: `%s'", sp); + err(STATUS_ERROR, "Cannot access `%s'", sp); - if ((st.st_mode & S_IFCHR) == 0) +foundtty: if ((st.st_mode & S_IFCHR) == 0) errx(STATUS_BADUSAGE, "Not a tty: `%s'", sp); li->li_number = st.st_rdev; ==== //depot/projects/mips2/src/crypto/openssh/moduli.5#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: June 26 2008 $ +.Dd June 26 2008 .Dt MODULI 5 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/scp.1#4 (text+ko) ==== @@ -11,7 +11,7 @@ .\" .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: July 12 2008 $ +.Dd July 12 2008 .Dt SCP 1 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/sftp-server.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 18 2008 $ +.Dd July 18 2008 .Dt SFTP-SERVER 8 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/sftp.1#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 15 2008 $ +.Dd July 15 2008 .Dt SFTP 1 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/ssh-add.1#3 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2007 $ +.Dd June 12 2007 .Dt SSH-ADD 1 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/ssh-agent.1#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 5 2007 $ +.Dd June 5 2007 .Dt SSH-AGENT 1 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/ssh-keygen.1#3 (text+ko) ==== @@ -37,7 +37,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 12 2008 $ +.Dd June 12 2008 .Dt SSH-KEYGEN 1 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/ssh-keyscan.1#4 (text+ko) ==== @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: April 30 2008 $ +.Dd April 30 2008 .Dt SSH-KEYSCAN 1 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/ssh-keysign.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd May 31 2007 .Dt SSH-KEYSIGN 8 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/ssh.1#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSH 1 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/ssh_config.5#5 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $ -.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: June 26 2008 $ +.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $ +.Dd June 26 2008 .Dt SSH_CONFIG 5 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/sshd.8#4 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD 8 .Os .Sh NAME ==== //depot/projects/mips2/src/crypto/openssh/sshd_config.5#5 (text+ko) ==== @@ -35,8 +35,8 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $ -.Dd $Mdocdate: July 2 2008 $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $ +.Dd July 2 2008 .Dt SSHD_CONFIG 5 .Os .Sh NAME ==== //depot/projects/mips2/src/etc/network.subr#8 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.190 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/network.subr,v 1.191 2008/10/01 18:46:46 brooks Exp $ # # @@ -506,15 +506,9 @@ # Create wireless interfaces child_wlans=`get_if_var $ifn wlans_IF` - if [ -z "${child_wlans}" ]; then - child_wlans=`get_if_var $ifn vaps_IF` - if [ -n "${child_wlans}" ]; then - warn "soon to be deleted vaps_$ifn variable defined use wlans_$ifn" - fi - fi for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF` `get_if_var $child vap_create_IF`" + create_args="wlandev $ifn `get_if_var $child create_args_IF`" if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ifconfig $child create ${create_args} && cfg=0 else ==== //depot/projects/mips2/src/gnu/lib/csu/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.31 2008/09/28 19:17:54 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs ==== //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kld.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.11 2008/10/02 20:42:10 jhb Exp $"); #include #include @@ -201,7 +201,7 @@ load_kld (char *path, CORE_ADDR base_addr, int from_tty) { struct section_addr_info *sap; - struct section_table *sections, *sections_end, *s; + struct section_table *sections = NULL, *sections_end = NULL, *s; struct cleanup *cleanup; bfd *bfd; int i; ==== //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.12 2008/05/09 19:00:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.13 2008/09/27 15:58:37 kib Exp $"); #include #include @@ -242,10 +242,14 @@ }; struct kgdb_frame_cache { - int intrframe; + int frame_type; CORE_ADDR pc; CORE_ADDR sp; }; +#define FT_NORMAL 1 +#define FT_INTRFRAME 2 +#define FT_INTRTRAPFRAME 3 +#define FT_TIMERFRAME 4 static int kgdb_trgt_frame_offset[15] = { offsetof(struct trapframe, tf_eax), @@ -278,7 +282,17 @@ *this_cache = cache; cache->pc = frame_func_unwind(next_frame); find_pc_partial_function(cache->pc, &pname, NULL, NULL); - cache->intrframe = (pname[0] == 'X') ? 1 : 0; + if (pname[0] != 'X') + cache->frame_type = FT_NORMAL; + else if (strcmp(pname, "Xtimerint") == 0) + cache->frame_type = FT_TIMERFRAME; + else if (strcmp(pname, "Xcpustop") == 0 || + strcmp(pname, "Xrendezvous") == 0 || + strcmp(pname, "Xipi_intr_bitmap_handler") == 0 || + strcmp(pname, "Xlazypmap") == 0) + cache->frame_type = FT_INTRTRAPFRAME; + else + cache->frame_type = FT_INTRFRAME; frame_unwind_register(next_frame, SP_REGNUM, buf); cache->sp = extract_unsigned_integer(buf, register_size(current_gdbarch, SP_REGNUM)); @@ -321,7 +335,23 @@ return; cache = kgdb_trgt_frame_cache(next_frame, this_cache); - *addrp = cache->sp + ofs + (cache->intrframe ? 4 : 0); + switch (cache->frame_type) { + case FT_NORMAL: + break; + case FT_INTRFRAME: + ofs += 4; + break; + case FT_TIMERFRAME: + break; + case FT_INTRTRAPFRAME: + ofs -= ofs_fix; + break; + default: + fprintf_unfiltered(gdb_stderr, "Correct FT_XXX frame offsets " + "for %d\n", cache->frame_type); + break; + } + *addrp = cache->sp + ofs; *lvalp = lval_memory; target_read_memory(*addrp, valuep, regsz); } ==== //depot/projects/mips2/src/include/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.281 2008/07/25 12:37:46 ed Exp $ +# $FreeBSD: src/include/Makefile,v 1.283 2008/09/26 19:23:22 peter Exp $ # # Doing a "make install" builds /usr/include. ==== //depot/projects/mips2/src/include/unistd.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.90 2008/07/08 03:08:32 davidxu Exp $ + * $FreeBSD: src/include/unistd.h,v 1.91 2008/09/26 19:23:22 peter Exp $ */ #ifndef _UNISTD_H_ @@ -485,6 +485,7 @@ int getdomainname(char *, int); int getgrouplist(const char *, gid_t, gid_t *, int *); mode_t getmode(const void *, mode_t); +int getosreldate(void); int getpeereid(int, uid_t *, gid_t *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Wed Oct 8 15:24:46 2008 From: zec at FreeBSD.org (Marko Zec) Date: Wed Oct 8 15:24:54 2008 Subject: PERFORCE change 151137 for review Message-ID: <200810081524.m98FOjPx050955@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151137 Change 151137 by zec@zec_tca51 on 2008/10/08 15:23:48 unbreak the build by hiding a few issues under the rug... remove a few unnecessary #includes. Affected files ... .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 edit .. //depot/projects/vimage/src/sys/net/bpf.c#27 edit .. //depot/projects/vimage/src/sys/net/bridgestp.c#15 edit .. //depot/projects/vimage/src/sys/net/if.c#42 edit .. //depot/projects/vimage/src/sys/net/if_bridge.c#20 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#11 edit .. //depot/projects/vimage/src/sys/net/if_ef.c#9 edit .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#27 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#27 edit .. //depot/projects/vimage/src/sys/net/if_mib.c#10 edit .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#11 edit .. //depot/projects/vimage/src/sys/net/if_stf.c#14 edit .. //depot/projects/vimage/src/sys/net/if_tap.c#9 edit .. //depot/projects/vimage/src/sys/net/if_vlan.c#13 edit .. //depot/projects/vimage/src/sys/net/netisr.c#11 edit .. //depot/projects/vimage/src/sys/net/route.c#29 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#18 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#25 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#19 edit .. //depot/projects/vimage/src/sys/netinet/in.c#18 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#13 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#34 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#22 edit .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#16 edit .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#14 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#49 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#9 edit .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#20 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#37 edit .. //depot/projects/vimage/src/sys/netinet/ip_options.c#16 edit .. //depot/projects/vimage/src/sys/netinet/ip_output.c#19 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#29 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#27 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#38 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#25 edit .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#13 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#53 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#42 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#23 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#25 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#35 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#31 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#31 edit .. //depot/projects/vimage/src/sys/netinet6/in6.c#23 edit .. //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#26 edit .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#23 edit .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#22 edit .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#24 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#36 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#18 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#21 edit .. //depot/projects/vimage/src/sys/netinet6/mld6.c#17 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#33 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#22 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#20 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#26 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#18 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#31 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#28 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#24 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#15 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#18 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#67 edit Differences ... ==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 (text+ko) ==== @@ -36,7 +36,11 @@ char hw_serial[11] = "0"; struct opensolaris_utsname utsname = { +#ifdef VIMAGE + .nodename = "XXX" /* XXX FIXME!!! */ +#else .nodename = hostname +#endif }; int ==== //depot/projects/vimage/src/sys/net/bpf.c#27 (text+ko) ==== @@ -61,11 +61,9 @@ #include #include #include -#include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/bridgestp.c#15 (text+ko) ==== @@ -49,14 +49,12 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include ==== //depot/projects/vimage/src/sys/net/if.c#42 (text+ko) ==== @@ -56,11 +56,9 @@ #include #include #include -#include #include -#include #include #include #include @@ -211,7 +209,6 @@ struct ifaddr * ifaddr_byindex(u_short idx) { - INIT_VNET_NET(curvnet); struct ifaddr *ifa; IFNET_RLOCK(); ==== //depot/projects/vimage/src/sys/net/if_bridge.c#20 (text+ko) ==== @@ -100,7 +100,6 @@ #include #include #include -#include #include #include @@ -119,7 +118,6 @@ #ifdef INET6 #include #include -#include #endif #ifdef DEV_CARP #include @@ -130,12 +128,10 @@ #include #include #include -#include #include #include #include -#include /* * Size of the route hash table. Must be a power of two. @@ -3380,7 +3376,6 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh, int snap, struct llc *llc) { - INIT_VNET_INET(curvnet); struct mbuf *m0; struct ip *ip; int error = -1; ==== //depot/projects/vimage/src/sys/net/if_clone.c#11 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include -#include #include #include #if 0 ==== //depot/projects/vimage/src/sys/net/if_ef.c#9 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -50,7 +49,6 @@ #include #include #include -#include #ifdef INET #include ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#27 (text+ko) ==== @@ -51,9 +51,7 @@ #include #include #include -#include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/if_loop.c#27 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/if_mib.c#10 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include -#include #include #include ==== //depot/projects/vimage/src/sys/net/if_spppsubr.c#11 (text+ko) ==== @@ -40,13 +40,11 @@ #include -#include #include #include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/if_stf.c#14 (text+ko) ==== @@ -95,7 +95,6 @@ #include #include -#include #include #include #include @@ -103,7 +102,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/if_tap.c#9 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/if_vlan.c#13 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/netisr.c#11 (text+ko) ==== @@ -51,7 +51,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/net/route.c#29 (text+ko) ==== @@ -51,7 +51,6 @@ #include #include -#include #include #include ==== //depot/projects/vimage/src/sys/net/rtsock.c#18 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#25 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include -#include #include #include #include @@ -63,7 +62,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/igmp.c#19 (text+ko) ==== @@ -59,11 +59,9 @@ #include #include -#include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/in.c#18 (text+ko) ==== @@ -45,12 +45,10 @@ #include #include -#include #include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#13 (text+ko) ==== @@ -53,9 +53,7 @@ #include #include #include -#include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#34 (text+ko) ==== @@ -60,12 +60,10 @@ #include -#include #include #include #include -#include #include #include #include @@ -77,7 +75,6 @@ #include #include #endif /* INET6 */ -#include #ifdef IPSEC #include ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#22 (text+ko) ==== @@ -53,10 +53,8 @@ #include #include -#include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_divert.c#16 (text+ko) ==== @@ -62,12 +62,10 @@ #include -#include #include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#14 (text+ko) ==== @@ -89,7 +89,6 @@ #include #include -#include #include #include #include @@ -97,7 +96,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#49 (text+ko) ==== @@ -66,7 +66,6 @@ #include #include -#include #include #include #include @@ -93,7 +92,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#9 (text+ko) ==== @@ -53,7 +53,6 @@ #define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */ #include -#include #include #include #include @@ -65,7 +64,6 @@ #include #include #include -#include #include /* XXX for in_cksum */ ==== //depot/projects/vimage/src/sys/netinet/ip_icmp.c#20 (text+ko) ==== @@ -129,8 +129,6 @@ /* * ICMP broadcast echo sysctl */ - -static int icmpbmcastecho = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, icmpbmcastecho, 0, ""); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#37 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include -#include #include #include #include @@ -62,7 +61,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_options.c#16 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include -#include #include #include #include @@ -55,7 +54,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_output.c#19 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include -#include #include #include #include @@ -61,7 +60,6 @@ #include #endif -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#29 (text+ko) ==== @@ -56,11 +56,9 @@ #include -#include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#27 (text+ko) ==== @@ -73,10 +73,8 @@ #include #include -#include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#38 (text+ko) ==== @@ -57,13 +57,11 @@ #include -#include #include #include #define TCPSTATES /* for logging */ -#include #include #include #include @@ -75,7 +73,6 @@ #include #include #include -#include #include #include #include @@ -94,7 +91,6 @@ #ifdef IPSEC #include #include -#include #endif /*IPSEC*/ #include ==== //depot/projects/vimage/src/sys/netinet/tcp_output.c#25 (text+ko) ==== @@ -51,10 +51,8 @@ #include #include -#include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_sack.c#13 (text+ko) ==== @@ -95,11 +95,9 @@ #include -#include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#53 (text+ko) ==== @@ -59,11 +59,9 @@ #include -#include #include #include -#include #include #include #include @@ -97,7 +95,6 @@ #include #endif #include -#include #ifdef IPSEC #include ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#42 (text+ko) ==== @@ -58,11 +58,9 @@ #include -#include #include #include -#include #include #include #include @@ -376,7 +374,6 @@ syncache_timer(void *xsch) { struct syncache_head *sch = (struct syncache_head *)xsch; - INIT_VNET_INET(sch->sch_vnet); struct syncache *sc, *nsc; int tick = ticks; char *s; ==== //depot/projects/vimage/src/sys/netinet/tcp_timer.c#23 (text+ko) ==== @@ -47,10 +47,8 @@ #include #include -#include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#25 (text+ko) ==== @@ -59,11 +59,9 @@ #include #endif -#include #include #include -#include #include #include #ifdef INET6 ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#35 (text+ko) ==== @@ -61,11 +61,9 @@ #include -#include #include #include -#include #include #include #include @@ -86,7 +84,6 @@ #ifdef IPSEC #include -#include #endif #include ==== //depot/projects/vimage/src/sys/netinet/vinet.h#31 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#31 (text+ko) ==== @@ -83,20 +83,17 @@ #include #include -#include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6.c#23 (text+ko) ==== @@ -80,7 +80,6 @@ #include #include -#include #include #include #include @@ -94,7 +93,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#6 (text+ko) ==== @@ -67,8 +67,6 @@ #include #include -#include - #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#26 (text+ko) ==== @@ -42,20 +42,17 @@ #include #include -#include #include #include #include #include -#include #include #include #include #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#23 (text+ko) ==== @@ -86,12 +86,10 @@ #include -#include #include #include #include -#include #include #include #include @@ -99,7 +97,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#22 (text+ko) ==== @@ -87,15 +87,12 @@ #include #include -#include #include #include #include #include #include -#include - #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_src.c#24 (text+ko) ==== @@ -84,21 +84,18 @@ #include #include -#include #include #include #ifdef RADIX_MPATH #include #endif -#include #include #include #include #include #include -#include #include #include #include @@ -463,7 +460,6 @@ struct ifnet **retifp, struct rtentry **retrt, int clone, int norouteok) { - INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); int error = 0; struct ifnet *ifp = NULL; ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#36 (text+ko) ==== @@ -82,7 +82,6 @@ #include #include -#include #include #include #include @@ -104,7 +103,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#18 (text+ko) ==== @@ -103,7 +103,6 @@ #include #include -#include #include #include #include @@ -114,7 +113,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/ip6_output.c#21 (text+ko) ==== @@ -80,7 +80,6 @@ #include #include -#include #include #include #include @@ -88,7 +87,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/mld6.c#17 (text+ko) ==== @@ -81,12 +81,10 @@ #include #include -#include #include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Wed Oct 8 15:28:51 2008 From: zec at FreeBSD.org (Marko Zec) Date: Wed Oct 8 15:28:58 2008 Subject: PERFORCE change 151138 for review Message-ID: <200810081528.m98FSoX0051263@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151138 Change 151138 by zec@zec_tca51 on 2008/10/08 15:28:27 IFC @ 151135 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#8 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#10 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#8 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#6 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/vimage/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#25 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#26 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#32 integrate .. //depot/projects/vimage/src/sys/conf/files#38 integrate .. //depot/projects/vimage/src/sys/conf/newvers.sh#6 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/vimage/src/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/vimage/src/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/vimage/src/sys/dev/aha/aha_isa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha_mca.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_agpsupport.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#16 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/vimage/src/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#16 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio.c#6 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#13 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/vimage/src/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#16 integrate .. //depot/projects/vimage/src/sys/kern/sys_socket.c#13 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#11 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#29 integrate .. //depot/projects/vimage/src/sys/modules/ae/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/wpifw/Makefile#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/ng_netflow.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#54 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#36 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#24 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#32 integrate .. //depot/projects/vimage/src/sys/sys/un.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.258 2008/09/11 18:33:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -280,6 +280,14 @@ */ bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe)); + /* If the current thread has the trap bit set (i.e. a debugger had + * single stepped the process to the system call), we need to clear + * the trap flag from the new frame. Otherwise, the new thread will + * receive a (likely unexpected) SIGTRAP when it executes the first + * instruction after returning to userland. + */ + td->td_frame->tf_rflags &= ~PSL_T; + /* * Set registers for trampoline to user mode. Leave space for the * return address on stack. These are the kernel mode register values. ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#21 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.508 2008/10/03 10:31:31 stas Exp $ cpu HAMMER ident GENERIC @@ -200,6 +200,7 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device ae # Attansic/Atheros L2 FastEthernet device age # Attansic/Atheros L1 Gigabit Ethernet device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet device bfe # Broadcom BCM440x 10/100 Ethernet ==== //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.7 2008/09/30 02:32:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.8 2008/10/07 17:23:16 imp Exp $"); #include #include @@ -175,9 +175,9 @@ /* * Allocate DMA tags and maps */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1, MAXPHYS, - BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, US_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1, + MAXPHYS, BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); if (err != 0) goto out; ==== //depot/projects/vimage/src/sys/arm/at91/at91_spi.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.6 2007/02/27 17:15:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.7 2008/10/07 17:23:16 imp Exp $"); #include #include @@ -97,9 +97,9 @@ /* * Allocate DMA tags and maps */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, 2058, 1, 2048, BUS_DMA_ALLOCNOW, - NULL, NULL, &sc->dmatag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, 2058, 1, + 2048, BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); if (err != 0) goto out; for (i = 0; i < 4; i++) { ==== //depot/projects/vimage/src/sys/arm/at91/if_ate.c#10 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.28 2008/08/31 18:20:01 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.29 2008/10/07 17:23:16 imp Exp $"); #include #include @@ -359,9 +359,9 @@ /* * Allocate DMA tags and maps */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, - busdma_lock_mutex, &sc->sc_mtx, &sc->mtag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, + 1, MCLBYTES, 0, busdma_lock_mutex, &sc->sc_mtx, &sc->mtag); if (err != 0) goto errout; for (i = 0; i < ATE_MAX_TX_BUFFERS; i++) { @@ -377,15 +377,15 @@ /* * Allocate DMA tags and maps for RX. */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, - busdma_lock_mutex, &sc->sc_mtx, &sc->rxtag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, + 1, MCLBYTES, 0, busdma_lock_mutex, &sc->sc_mtx, &sc->rxtag); if (err != 0) goto errout; /* Dma TAG and MAP for the rx descriptors. */ - err = bus_dma_tag_create(NULL, sizeof(eth_rx_desc_t), 0, - BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + err = bus_dma_tag_create(bus_get_dma_tag(dev), sizeof(eth_rx_desc_t), + 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), 1, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), 0, busdma_lock_mutex, &sc->sc_mtx, &sc->rx_desc_tag); ==== //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#8 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.15 2008/08/02 08:01:56 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.16 2008/10/07 17:23:16 imp Exp $"); #include "opt_comconsole.h" @@ -350,9 +350,10 @@ /* * Allocate DMA tags and maps */ - err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, USART_BUFFER_SIZE, 1, - USART_BUFFER_SIZE, BUS_DMA_ALLOCNOW, NULL, NULL, &atsc->dmatag); + err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + USART_BUFFER_SIZE, 1, USART_BUFFER_SIZE, BUS_DMA_ALLOCNOW, NULL, + NULL, &atsc->dmatag); if (err != 0) goto errout; err = bus_dmamap_create(atsc->dmatag, 0, &atsc->tx_map); ==== //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#6 (text+ko) ==== @@ -1,4 +1,6 @@ /*- + * Copyright (c) 2008 John Hay + * Copyright (c) 2006 Warner Losh * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -14,7 +16,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.8 2007/10/26 21:02:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.12 2008/10/07 17:44:04 imp Exp $"); #include #include @@ -51,7 +53,7 @@ /* 0x13 is reserved for boot programs. */ /* #define RBX_PAUSE 0x14 -p */ /* #define RBX_QUIET 0x15 -q */ -/* #define RBX_NOINTR 0x1c -n */ +#define RBX_NOINTR 0x1c /* -n */ /* 0x1d is reserved for log2(RB_MULTIPLE) and is just misnamed here. */ /* #define RBX_DUAL 0x1d -D */ /* 0x1f is reserved for log2(RB_BOOTINFO). */ @@ -66,20 +68,21 @@ //#define PATH_KERNEL "/boot/kernel/kernel" #define PATH_KERNEL "/boot/kernel/kernel.gz.tramp" -#define NOPT 5 +extern uint32_t _end; + +#define NOPT 6 #define OPT_SET(opt) (1 << (opt)) #define OPT_CHECK(opt) ((opts) & OPT_SET(opt)) -extern uint32_t _end; - -static const char optstr[NOPT] = "agrsv"; +static const char optstr[NOPT] = "agnrsv"; static const unsigned char flags[NOPT] = { - RBX_ASKNAME, - RBX_GDB, - RBX_DFLTROOT, - RBX_SINGLE, - RBX_VERBOSE + RBX_ASKNAME, + RBX_GDB, + RBX_NOINTR, + RBX_DFLTROOT, + RBX_SINGLE, + RBX_VERBOSE }; unsigned dsk_start; @@ -92,206 +95,299 @@ static int parse(void); static int xfsread(ino_t, void *, size_t); static int dskread(void *, unsigned, unsigned); +#ifdef FIXUP_BOOT_DRV +static void fixup_boot_drv(caddr_t, int, int, int); +#endif #define UFS_SMALL_CGBASE #include "ufsread.c" +#ifdef DEBUG +#define DPRINTF(fmt, ...) printf(fmt, __VA_ARGS__) +#else +#define DPRINTF(fmt, ...) +#endif + static inline int xfsread(ino_t inode, void *buf, size_t nbyte) { - if ((size_t)fsread(inode, buf, nbyte) != nbyte) - return -1; - return 0; + if ((size_t)fsread(inode, buf, nbyte) != nbyte) + return -1; + return 0; } static inline void getstr(int c) { - char *s; + char *s; - s = cmd; - if (c == 0) - c = getc(10000); - for (;;) { - switch (c) { - case 0: - break; - case '\177': - case '\b': - if (s > cmd) { - s--; - printf("\b \b"); - } - break; - case '\n': - case '\r': - *s = 0; - return; - default: - if (s - cmd < sizeof(cmd) - 1) - *s++ = c; - xputchar(c); + s = cmd; + if (c == 0) + c = getc(10000); + for (;;) { + switch (c) { + case 0: + break; + case '\177': + case '\b': + if (s > cmd) { + s--; + printf("\b \b"); + } + break; + case '\n': + case '\r': + *s = 0; + return; + default: + if (s - cmd < sizeof(cmd) - 1) + *s++ = c; + xputchar(c); + } + c = getc(10000); } - c = getc(10000); - } } int main(void) { - int autoboot, c = 0; - ino_t ino; + int autoboot, c = 0; + ino_t ino; - board_init(); + dmadat = (void *)(0x20000000 + (16 << 20)); + board_init(); - dmadat = (void *)(0x20000000 + (16 << 20)); - /* Process configuration file */ + autoboot = 1; - autoboot = 1; + /* Process configuration file */ + if ((ino = lookup(PATH_CONFIG))) + fsread(ino, cmd, sizeof(cmd)); - if ((ino = lookup(PATH_CONFIG))) - fsread(ino, cmd, sizeof(cmd)); + if (*cmd) { + if (parse()) + autoboot = 0; + printf("%s: %s\n", PATH_CONFIG, cmd); + /* Do not process this command twice */ + *cmd = 0; + } - if (*cmd) { - if (parse()) - autoboot = 0; - printf("%s: %s", PATH_CONFIG, cmd); - /* Do not process this command twice */ - *cmd = 0; - } + if (*kname == '\0') + strcpy(kname, PATH_KERNEL); - /* Present the user with the boot2 prompt. */ - - if (*kname == '\0') - strcpy(kname, PATH_KERNEL); - for (;;) { - printf("\nDefault: %s\nboot: ", kname); - if (!autoboot || (c = getc(2)) != -1) - getstr(c); - xputchar('\n'); - autoboot = 0; - c = 0; - if (parse()) - xputchar('\a'); -#ifdef XMODEM_DL - else if (*cmd == '*') - Update(); -#endif - else - load(); - } + /* Present the user with the boot2 prompt. */ + for (;;) { + printf("\nDefault: %s\nboot: ", kname); + if (!autoboot || + (OPT_CHECK(RBX_NOINTR) == 0 && (c = getc(2)) != 0)) + getstr(c); + xputchar('\n'); + autoboot = 0; + c = 0; + if (parse()) + xputchar('\a'); + else + load(); + } } static void load(void) { - Elf32_Ehdr eh; - static Elf32_Phdr ep[2]; - caddr_t p; - ino_t ino; - uint32_t addr; - int i, j; + Elf32_Ehdr eh; + static Elf32_Phdr ep[2]; + caddr_t p; + ino_t ino; + uint32_t addr; + int i, j; +#ifdef FIXUP_BOOT_DRV + caddr_t staddr; + int klen; - if (!(ino = lookup(kname))) { - if (!ls) - printf("No %s\n", kname); - return; - } - if (xfsread(ino, &eh, sizeof(eh))) - return; - if (!IS_ELF(eh)) { - printf("Invalid %s\n", "format"); - return; - } - fs_off = eh.e_phoff; - for (j = i = 0; i < eh.e_phnum && j < 2; i++) { - if (xfsread(ino, ep + j, sizeof(ep[0]))) - return; - if (ep[j].p_type == PT_LOAD) - j++; - } - for (i = 0; i < 2; i++) { - p = (caddr_t)ep[i].p_paddr; - fs_off = ep[i].p_offset; - if (xfsread(ino, p, ep[i].p_filesz)) - return; - } - addr = eh.e_entry; - ((void(*)(int))addr)(opts & RBX_MASK); + staddr = (caddr_t)0xffffffff; + klen = 0; +#endif + if (!(ino = lookup(kname))) { + if (!ls) + printf("No %s\n", kname); + return; + } + if (xfsread(ino, &eh, sizeof(eh))) + return; + if (!IS_ELF(eh)) { + printf("Invalid %s\n", "format"); + return; + } + fs_off = eh.e_phoff; + for (j = i = 0; i < eh.e_phnum && j < 2; i++) { + if (xfsread(ino, ep + j, sizeof(ep[0]))) + return; + if (ep[j].p_type == PT_LOAD) + j++; + } + for (i = 0; i < 2; i++) { + p = (caddr_t)ep[i].p_paddr; + fs_off = ep[i].p_offset; +#ifdef FIXUP_BOOT_DRV + if (staddr == (caddr_t)0xffffffff) + staddr = p; + klen += ep[i].p_filesz; +#endif + if (xfsread(ino, p, ep[i].p_filesz)) + return; + } + addr = eh.e_entry; +#ifdef FIXUP_BOOT_DRV + fixup_boot_drv(staddr, klen, bootslice, bootpart); +#endif + ((void(*)(int))addr)(opts & RBX_MASK); } static int parse() { - char *arg = cmd; - char *ep, *p; - int c, i; + char *arg = cmd; + char *ep, *p; + int c, i; - while ((c = *arg++)) { - if (c == ' ' || c == '\t' || c == '\n') - continue; - for (p = arg; *p && *p != '\n' && *p != ' ' && *p != '\t'; p++); - ep = p; - if (*p) - *p++ = 0; - if (c == '-') { - while ((c = *arg++)) { - for (i = 0; c != optstr[i]; i++) - if (i == NOPT - 1) - return -1; - opts ^= OPT_SET(flags[i]); - } - } else { - arg--; - if ((i = ep - arg)) { - if ((size_t)i >= sizeof(kname)) - return -1; - memcpy(kname, arg, i + 1); - } + while ((c = *arg++)) { + if (c == ' ' || c == '\t' || c == '\n') + continue; + for (p = arg; *p && *p != '\n' && *p != ' ' && *p != '\t'; p++); + ep = p; + if (*p) + *p++ = 0; + if (c == '-') { + while ((c = *arg++)) { + for (i = 0; c != optstr[i]; i++) + if (i == NOPT - 1) + return -1; + opts ^= OPT_SET(flags[i]); + } + } else { + arg--; + if ((i = ep - arg)) { + if ((size_t)i >= sizeof(kname)) + return -1; + memcpy(kname, arg, i + 1); + } + } + arg = p; } - arg = p; - } - return 0; + return 0; } static int dskread(void *buf, unsigned lba, unsigned nblk) { - struct dos_partition *dp; - struct disklabel *d; - char *sec; - int i; + struct dos_partition *dp; + struct disklabel *d; + char *sec; + int i; - if (!dsk_meta) { - sec = dmadat->secbuf; - dsk_start = 0; - if (drvread(sec, DOSBBSECTOR, 1)) - return -1; - dp = (void *)(sec + DOSPARTOFF); - for (i = 0; i < NDOSPART; i++) { - if (dp[i].dp_typ == DOSPTYP_386BSD) - break; + if (!dsk_meta) { + sec = dmadat->secbuf; + dsk_start = 0; + if (drvread(sec, DOSBBSECTOR, 1)) + return -1; + dp = (void *)(sec + DOSPARTOFF); + for (i = 0; i < NDOSPART; i++) { + if (dp[i].dp_typ == DOSPTYP_386BSD) + break; + } + if (i == NDOSPART) + return -1; + /* + * Although dp_start is aligned within the disk + * partition structure, DOSPARTOFF is 446, which is + * only word (2) aligned, not longword (4) aligned. + * Cope by using memcpy to fetch the start of this + * partition. + */ + memcpy(&dsk_start, &dp[1].dp_start, 4); + if (drvread(sec, dsk_start + LABELSECTOR, 1)) + return -1; + d = (void *)(sec + LABELOFFSET); + if (d->d_magic != DISKMAGIC || d->d_magic2 != DISKMAGIC) { + printf("Invalid %s\n", "label"); + return -1; + } + if (!d->d_partitions[0].p_size) { + printf("Invalid %s\n", "partition"); + return -1; + } + dsk_start += d->d_partitions[0].p_offset; + dsk_start -= d->d_partitions[RAW_PART].p_offset; + dsk_meta++; } - if (i == NDOSPART) - return -1; - // Although dp_start is aligned within the disk partition structure, - // DOSPARTOFF is 446, which is only word (2) aligned, not longword (4) - // aligned. Cope by using memcpy to fetch the start of this partition. - memcpy(&dsk_start, &dp[1].dp_start, 4); - if (drvread(sec, dsk_start + LABELSECTOR, 1)) - return -1; - d = (void *)(sec + LABELOFFSET); - if (d->d_magic != DISKMAGIC || d->d_magic2 != DISKMAGIC) { - printf("Invalid %s\n", "label"); - return -1; + return drvread(buf, dsk_start + lba, nblk); +} + +#ifdef FIXUP_BOOT_DRV +/* + * fixup_boot_drv() will try to find the ROOTDEVNAME spec in the kernel + * and change it to what was specified on the comandline or /boot.conf + * file or to what was encountered on the disk. It will try to handle 3 + * different disk layouts, raw (dangerously dedicated), slice only and + * slice + partition. It will look for the following strings in the + * kernel, but if it is one of the first three, the string in the kernel + * must use the correct form to match the actual disk layout: + * - ufs:ad0a + * - ufs:ad0s1 + * - ufs:ad0s1a + * - ufs:ROOTDEVNAME + * In the case of the first three strings, only the "a" at the end and + * the "1" after the "s" will be modified, if they exist. The string + * length will not be changed. In the case of the last string, the + * whole string will be built up and nul, '\0' terminated. + */ +static void +fixup_boot_drv(caddr_t addr, int klen, int bs, int bp) +{ + const u_int8_t op[] = "ufs:ROOTDEVNAME"; + const u_int8_t op2[] = "ufs:ad0"; + u_int8_t *p, *ps; + + DPRINTF("fixup_boot_drv: 0x%x, %d, slice %d, partition %d\n", + (int)addr, klen, bs, bp); + if (bs > 4) + return; + if (bp > 7) + return; + ps = memmem(addr, klen, op, sizeof(op)); + if (ps != NULL) { + p = ps + 4; /* past ufs: */ + DPRINTF("Found it at 0x%x\n", (int)ps); + p[0] = 'a'; p[1] = 'd'; p[2] = '0'; /* ad0 */ + p += 3; + if (bs > 0) { + /* append slice */ + *p++ = 's'; + *p++ = bs + '0'; + } + if (disk_layout != DL_SLICE) { + /* append partition */ + *p++ = bp + 'a'; + } + *p = '\0'; + } else { + ps = memmem(addr, klen, op2, sizeof(op2) - 1); + if (ps != NULL) { + p = ps + sizeof(op2) - 1; + DPRINTF("Found it at 0x%x\n", (int)ps); + if (*p == 's') { + /* fix slice */ + p++; + *p++ = bs + '0'; + } + if (*p == 'a') + *p = bp + 'a'; + } } - if (!d->d_partitions[0].p_size) { - printf("Invalid %s\n", "partition"); - return -1; + if (ps == NULL) { + printf("Could not locate \"%s\" to fix kernel boot device, " + "check ROOTDEVNAME is set\n", op); + return; } - dsk_start += d->d_partitions[0].p_offset; - dsk_start -= d->d_partitions[RAW_PART].p_offset; - dsk_meta++; - } - return drvread(buf, dsk_start + lba, nblk); + DPRINTF("Changed boot device to %s\n", ps); } +#endif ==== //depot/projects/vimage/src/sys/boot/arm/at91/boot2/centipad_board.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/centipad_board.c,v 1.1 2007/07/13 14:27:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/centipad_board.c,v 1.2 2008/10/05 23:39:28 imp Exp $"); #include @@ -51,11 +51,6 @@ } void -Update(void) -{ -} - -void board_init(void) { InitEEPROM(); ==== //depot/projects/vimage/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.4 2007/07/13 14:27:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.5 2008/10/05 23:39:28 imp Exp $"); #include @@ -49,11 +49,6 @@ } void -Update(void) -{ -} - -void board_init(void) { InitEEPROM(); ==== //depot/projects/vimage/src/sys/boot/forth/loader.conf#15 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.133 2008/09/10 18:36:58 jhb Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.134 2008/10/04 11:49:53 stas Exp $ ############################################################## ### Basic configuration options ############################ @@ -208,6 +208,7 @@ ############################################################## miibus_load="NO" # miibus support, needed for some drivers +if_ae_load="NO" # Attansic/Atheros L2 FastEthernet if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i ==== //depot/projects/vimage/src/sys/boot/i386/libi386/bootinfo64.c#2 (text+ko) ==== @@ -25,13 +25,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.37 2006/09/29 20:27:41 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.38 2008/10/07 14:05:42 jhb Exp $"); #include #include #include #include #include +#include +#include +#include #include "bootstrap.h" #include "libi386.h" #include "btxv86.h" @@ -124,7 +127,45 @@ } /* - * Load the information expected by an i386 kernel. + * Check to see if this CPU supports long mode. + */ +static int +bi_checkcpu(void) +{ + char *cpu_vendor; + int vendor[3]; + int eflags, regs[4]; + + /* Check for presence of "cpuid". */ + eflags = read_eflags(); + write_eflags(eflags ^ PSL_ID); + if (!((eflags ^ read_eflags()) & PSL_ID)) + return (0); + + /* Fetch the vendor string. */ + do_cpuid(0, regs); + vendor[0] = regs[1]; + vendor[1] = regs[3]; + vendor[2] = regs[2]; + cpu_vendor = (char *)vendor; + + /* Check for vendors that support AMD features. */ + if (strncmp(cpu_vendor, "GenuineIntel", 12) != 0 && + strncmp(cpu_vendor, "AuthenticAMD", 12) != 0) + return (0); + + /* Has to support AMD features. */ + do_cpuid(0x80000000, regs); + if (!(regs[0] >= 0x80000001)) + return (0); + + /* Check for long mode. */ + do_cpuid(0x80000001, regs); + return (regs[3] & AMDID_LM); +} + +/* + * Load the information expected by an amd64 kernel. * * - The 'boothowto' argument is constructed * - The 'bootdev' argument is constructed @@ -145,6 +186,11 @@ char *rootdevname; int howto; + if (!bi_checkcpu()) { + printf("CPU doesn't support long mode\n"); + return (EINVAL); + } + howto = bi_getboothowto(args); /* ==== //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.38 2008/09/10 20:07:08 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.39 2008/10/05 14:00:44 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -261,7 +261,7 @@ sparc64_autoload(void) { - printf("nothing to autoload yet.\n"); + setenv("hw.ata.atapi_dma", "0", 0); return (0); } ==== //depot/projects/vimage/src/sys/boot/uboot/lib/api_public.h#3 (text+ko) ==== @@ -48,7 +48,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/uboot/lib/api_public.h,v 1.3 2008/03/13 17:54:21 obrien Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/api_public.h,v 1.5 2008/10/04 13:19:15 raj Exp $ * * This file needs to be kept in sync with U-Boot reference: * http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/api_public.h @@ -62,6 +62,7 @@ #define API_ENOMEM 3 /* no memory */ #define API_EBUSY 4 /* busy, occupied etc. */ #define API_EIO 5 /* I/O error */ +#define API_ESYSC 6 /* syscall error */ typedef int (*scp_t)(int, int *, ...); @@ -117,7 +118,7 @@ #undef CFG_64BIT_LBA #ifdef CFG_64BIT_LBA -typedef u_int64_t lbasize_t; +typedef uint64_t lbasize_t; #else typedef unsigned long lbasize_t; #endif ==== //depot/projects/vimage/src/sys/boot/uboot/lib/glue.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From rene at FreeBSD.org Wed Oct 8 16:34:58 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Oct 8 16:35:05 2008 Subject: PERFORCE change 151139 for review Message-ID: <200810081634.m98GYveL057584@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151139 Change 151139 by rene@rene_self on 2008/10/08 16:34:06 Translated first few paragraphs of section 2 of the Updating chapter. Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#3 (text+ko) ==== @@ -123,31 +123,34 @@ FreeBSD Update - Applying security patches is an important part of maintaining - computer software, especially the operating system. For the - longest time on &os; this process was not an easy one. Patches - had to be applied to the source code, the code rebuilt into - binaries, and then the binaries had to be re-installed. + Het toepassen van beveiligingspatches is een belangrijk + onderdeel van het beheren van computersoftware, met name het + besturingssysteem. Dit was voor een lange tijd geen gemakkelijk + proces op &os;. Er moesten patches op de broncode worden + toegepast, de code moest herbouwd worden tot binairen, en daarna + moesten de binairen worden geherinstalleerd. - This is no longer the case as &os; now includes a utility - simply called freebsd-update. This utility - provides two separate functions. First, it allows for binary - security and errata updates to be applied to the &os; base system - without the build and install requirements. Second, the utility - supports minor and major release upgrades. + Dit is niet langer het geval aangezien &os; nu een gereedschap + heeft dat eenvoudigweg freebsd-update heet. + Dit gereedschap biedt twee gescheiden functies. Ten eerste + voorziet het in het toepassen van binaire beveiligins- en + errata-updates op het basissysteem van &os; zonder de eis om te + bouwen en te installeren. Ten tweede ondersteunt het gereedschap + kleine en grote uitgave-upgrades. - Binary updates are available for all architectures and - releases currently supported by the security team; however, - some features, such as the &os; operating system upgrades, - require the latest release of &man.freebsd-update.8; and - &os; 6.3. Before updating to a new release, the current - release announcements should be reviewed as they may contain - important information pertinent to the desired release. These - announcements may be viewed at the following link: + Binaire updates zijn beschikbaar voor alle architecturen en + uitgaven die momenteel door het beveiligingsteam worden + ondersteund; voor sommige eigenschappen, zoals de upgrades van + het besturingssysteem &os;, zijn de laatste uitgave van + &man.freebsd-update.8; en &os; 6.3 nodig. Voordat naar + een nieuwe uitgave wordt ge-updated, dienen de huidige + uitgaveaankondigingen gelezen te worden aangezien ze belangrijke + informatie voor de gewenste uitgave kunnen bevatten. De + aankondigingen kunnen op de volgende koppeling bekeken worden: . - + If a crontab utilizing the features of freebsd-update exists, it must be disabled before the following operation is started. The From rene at FreeBSD.org Wed Oct 8 16:40:03 2008 From: rene at FreeBSD.org (Rene Ladan) Date: Wed Oct 8 16:40:09 2008 Subject: PERFORCE change 151140 for review Message-ID: <200810081640.m98Ge2kB058056@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=151140 Change 151140 by rene@rene_self on 2008/10/08 16:39:27 Section 1 of the File System chapter is now translated. Checked build. Submitted by: Wouter Reviewed by: Rene Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 (text+ko) ==== @@ -1,6 +1,9 @@ @@ -9,106 +12,119 @@ Tom Rhodes - Written by + Geschreven door + + + + + Wouter + Reckman + Vertaald door - File Systems Support + Ondersteuning van bestandssystemen - Synopsis + Overzicht - File Systems + Bestandssystemen - File Systems Support - File Systems + Ondersteuning bestandssystemen + Bestandssystemen - File systems are an integral part of any operating system. - They allow for users to upload and store files, provide access - to data, and of course, make hard drives useful. Different - operating systems usually have one major aspect in common, that - is their native file system. On &os; this file system is known - as the Fast File System or FFS which is built - on the original Unix™ File System, also known as - UFS. This is the native file system on &os; - which is placed on hard disks for access to data. + Bestandssystemen zijn een integraal onderdeel van ieder + besturingssysteem. Ze stellen gebruikers in de gelegenheid om bestanden + te uploaden en op te slaan, geven toegang tot gegevens en maken + natuurlijk harde schijven bruikbaar. + Verschillende besturingssystemen hebben gewoonlijk één + gezamenlijk aspect, namelijk het bestandssysteem. Op &os; staat + dit bestandssysteem bekend onder de naam Fast File System ofwel + FFS, dat is gebaseerd op het oorspronkelijke + Unix™ File System, ook bekend als UFS. + Dit is het oorspronkelijke bestandssysteem van &os; dat op harde + schijven wordt geplaatst voor gegevenstoegang. - &os; also supports a multitude of different file systems to - provide support for accessing data from other operating systems - locally, i.e. data stored on locally attached - USB storage devices, flash drives, and hard - disks. There is also support for some non-native file systems. - These are file systems developed on other - operating systems, like the &linux; Extended File System - (EXT), and the &sun; Z File System - (ZFS). + &os; ondersteunt daarnaast ook een groot aantal + andere bestandssystemen om lokaal toegang tot gegevens van + andere besturingssystemen te bewerkstelligen; dat wil zeggen: + gegevens opgeslagen op lokaal aangesloten USB + opslagapparaten, flash drives, en harde schijven. Verder is er + ook ondersteuning voor vreemde bestandssystemen. + Dit zijn bestandssystemen ontwikkeld voor andere + besturingssystemen zoals het &linux; Extended File System + (EXT) en het &sun; Z File System + (ZFS). - There are different levels of support for the various file - systems in &os;. Some will require a kernel module to be loaded, - others may require a toolset to be installed. This chapter is - designed to help users of &os; access other file systems on their - systems, starting with the &sun; Z file - system. + Er zijn verschillende gradaties van + ondersteuning voor de verschillende bestandssystemen op &os;. + Sommigen ver