From owner-p4-projects@FreeBSD.ORG Sun Dec 12 00:01:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38BA816A4D1; Sun, 12 Dec 2004 00:01:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF1B116A4CE for ; Sun, 12 Dec 2004 00:01:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A65943D49 for ; Sun, 12 Dec 2004 00:01:18 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBC01IYB094677 for ; Sun, 12 Dec 2004 00:01:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBC01IP2094674 for perforce@freebsd.org; Sun, 12 Dec 2004 00:01:18 GMT (envelope-from sam@freebsd.org) Date: Sun, 12 Dec 2004 00:01:18 GMT Message-Id: <200412120001.iBC01IP2094674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 00:01:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=66847 Change 66847 by sam@sam_ebb on 2004/12/12 00:00:24 IFC @ 66846 Affected files ... .. //depot/projects/wifi/UPDATING#5 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#7 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/wifi/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#6 integrate .. //depot/projects/wifi/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/wifi/sys/dev/cp/cpddk.h#2 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/wifi/sys/dev/mse/mse.c#1 branch .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/wifi/sys/ia64/include/fpu.h#2 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/wifi/sys/sys/vnode.h#7 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/wifi/usr.bin/whois/whois.1#2 integrate .. //depot/projects/wifi/usr.bin/whois/whois.c#2 integrate .. //depot/projects/wifi/usr.sbin/mountd/mountd.c#2 integrate Differences ... ==== //depot/projects/wifi/UPDATING#5 (text+ko) ==== @@ -23,6 +23,18 @@ developers choose to disable these features on build machines to maximize performance. +20041201: + The wlan support has been updated to split the crypto support + into separate modules. For static WEP you must configure the + wlan_wep module in your system or build and install the module + in place where it can be loaded (the kernel will auto-load + the module when a wep key is configured). + +20041201: + The ath driver has been updated to split the tx rate control + algorithm into a separate module. You need to include either + ath_rate_onoe or ath_rate_amrr when configuring the kernel. + 20041116: Support for systems with an 80386 CPU has been removed. Please use FreeBSD 5.x or earlier on systems with an 80386. @@ -1963,4 +1975,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.381 2004/12/11 23:21:31 sam Exp $ ==== //depot/projects/wifi/games/fortune/datfiles/fortunes#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.148 2004/12/11 21:57:27 dds Exp $ % -- Gifts for Children -- @@ -1249,6 +1249,11 @@ why there are more Jews named Miller than Katz? Fat Chance. -- Arthur Naiman, "Every Goy's Guide to Yiddish" % + There are wavelengths that people cannot see, there are +sounds that people cannot hear, and maybe computers have thoughts +that people cannot think. + -- Richard W. Hamming +% Thompson, if he is to be believed, has sampled the entire rainbow of legal and illegal drugs in heroic efforts to feel better than he does. ==== //depot/projects/wifi/lib/libarchive/archive_entry.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.23 2004/08/08 07:39:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.24 2004/12/11 07:11:42 kientzle Exp $"); #include #include @@ -609,7 +609,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev(m, minor(d)); + entry->ae_stat.st_rdev = makedev(major(m), minor(d)); } void @@ -618,7 +618,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev( major(d), m); + entry->ae_stat.st_rdev = makedev(major(d), minor(m)); } void ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -258,7 +258,11 @@ &os; run on a 16 Mbyte system but you will not enjoy that. Kernel build times halved when I went to 32 Mbytes. Note that the SRM console steals 2Mbyte from the total system memory (and keeps - it). For more serious work 64 Mbytes or more are recommended. + it). For more serious work 64 Mbytes or more are recommended. + Although Alpha machines typically can accomodate large to very large + physical memory sizes, &os; is limited to 1 or 2 Gbytes (dependent + on the core chipset) of RAM. This restriction is due to the + current implementation of the VM system. While on the subject of memory: pay close attention to the type of memory your machine uses. There are very different memory ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.108 2004/12/08 19:18:07 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.109 2004/12/11 02:33:33 sam Exp $"; #endif /* not lint */ #include @@ -446,6 +446,27 @@ #undef N } +struct callback { + callback_func *cb_func; + void *cb_arg; + struct callback *cb_next; +}; +static struct callback *callbacks = NULL; + +void +callback_register(callback_func *func, void *arg) +{ + struct callback *cb; + + cb = malloc(sizeof(struct callback)); + if (cb == NULL) + errx(1, "unable to allocate memory for callback"); + cb->cb_func = func; + cb->cb_arg = arg; + cb->cb_next = callbacks; + callbacks = cb; +} + /* specially-handled comamnds */ static void setifaddr(const char *, int, int, const struct afswtch *); static const struct cmd setifaddr_cmd = DEF_CMD("ifaddr", 0, setifaddr); @@ -457,6 +478,7 @@ static int ifconfig(int argc, char *const *argv, const struct afswtch *afp) { + struct callback *cb; int s; if (afp == NULL) @@ -541,6 +563,14 @@ if (ioctl(s, afp->af_aifaddr, afp->af_addreq) < 0) Perror("ioctl (SIOCAIFADDR)"); } + + /* + * Do deferred callbacks registered while processing + * command-line arguments. + */ + for (cb = callbacks; cb != NULL; cb = cb->cb_next) + cb->cb_func(s, cb->cb_arg); + close(s); return(0); } ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.13 2004/12/08 19:18:07 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.14 2004/12/11 02:33:33 sam Exp $ */ #define __constructor __attribute__((constructor)) @@ -56,6 +56,9 @@ }; void cmd_register(struct cmd *); +typedef void callback_func(int s, void *); +void callback_register(callback_func *, void *); + /* * Macros for declaring command functions and initializing entries. */ ==== //depot/projects/wifi/share/mk/bsd.cpu.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.46 2004/11/16 21:12:47 jhb Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.47 2004/12/11 18:36:42 obrien Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -165,10 +165,11 @@ . endif . elif ${MACHINE_ARCH} == "amd64" . if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" -MACHINE_CPU = amd64 k8 athlon-mp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386 +MACHINE_CPU = k8 3dnow . elif ${CPUTYPE} == "nocona" -MACHINE_CPU = sse3 sse2 sse mmx +MACHINE_CPU = sse3 . endif +MACHINE_CPU += amd64 sse2 sse mmx . elif ${MACHINE_ARCH} == "ia64" . if ${CPUTYPE} == "itanium" MACHINE_CPU = itanium ==== //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.7 2004/11/16 00:57:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.8 2004/12/11 14:46:52 cognet Exp $"); /* * MacPPC bus dma support routines @@ -592,9 +592,9 @@ map->buffer = uio; if (uio->uio_segflg == UIO_USERSPACE) { + KASSERT(uio->uio_td != NULL, + ("bus_dmamap_load_uio: USERSPACE but no proc")); pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace); - KASSERT(td != NULL, - ("bus_dmamap_load_uio: USERSPACE but no proc")); } else pmap = kernel_pmap; ==== //depot/projects/wifi/sys/arm/arm/trap.c#6 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.6 2004/12/02 23:31:48 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.7 2004/12/11 23:54:03 cognet Exp $"); #include @@ -95,6 +95,7 @@ #include #include #include +#include #ifdef KTRACE #include #include @@ -910,6 +911,8 @@ ktrsyscall(code, nargs, args); #endif + CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); locked = 1; @@ -946,6 +949,9 @@ userret(td, frame, sticks); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); ==== //depot/projects/wifi/sys/dev/cp/cpddk.c#2 (text+ko) ==== @@ -15,10 +15,10 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * $Cronyx: cpddk.c,v 1.13.4.35 2004/08/16 16:29:06 rik Exp $ + * $Cronyx: cpddk.c,v 1.13.4.37 2004/12/11 16:14:39 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/cpddk.c,v 1.3 2004/08/16 17:28:04 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/cpddk.c,v 1.4 2004/12/11 22:44:12 rik Exp $"); #include @@ -26,57 +26,57 @@ #include #pragma pack(4) -typedef struct{unsigned long l51;unsigned long l109;unsigned long l121 -;unsigned long l103;unsigned long l96;unsigned long l95;unsigned long -l108;unsigned long l120;unsigned long l114;unsigned long l118; -unsigned long l105;unsigned long l100;}l163;typedef struct{unsigned -char j[32];unsigned char l41[32];}l69;typedef struct{unsigned long v; -unsigned long l90;unsigned long l89;unsigned long t;unsigned long l913 -;}l123;typedef struct{l123 l40[4];l123 l32[64];unsigned char l628[4][ -1664];unsigned char l749[64][1664];}l212;typedef struct{unsigned long -l141[4][128];unsigned long l92[4][128];unsigned long l98[128];}l170; -typedef struct l175{unsigned char*x;volatile unsigned long*l134, * -l132, *l82;volatile unsigned long*l126, *l93, *l135, *l77, *l125, * -l147;unsigned char l70,l81,l64,l45,l50,l67,l34;unsigned char p; -unsigned char f;struct l610*d;unsigned char l196;unsigned char l219; -unsigned long y;unsigned char l151;unsigned char l145;unsigned char -l164;unsigned char l176;unsigned char l55;unsigned char l140;unsigned -char l66;unsigned char l133;unsigned long j;unsigned char l184; -unsigned char l43;unsigned char l52;unsigned char l54;unsigned char -l31;unsigned char l165;unsigned char u;l69 o;unsigned char l83; -unsigned char l127;unsigned char l179;unsigned char l166;unsigned char -l560;unsigned char l146;unsigned char l131;unsigned long l73;unsigned -char l33;unsigned long l35;unsigned long l44;unsigned long l36; -unsigned char l39;unsigned char l26;unsigned char l37;unsigned long -l633;unsigned long l614;ulong64 l567;ulong64 l596;unsigned long l591; +typedef struct{unsigned long l47;unsigned long l112;unsigned long l121 +;unsigned long l103;unsigned long l101;unsigned long l89;unsigned long +l117;unsigned long l108;unsigned long l119;unsigned long l110; +unsigned long l120;unsigned long l100;}l166;typedef struct{unsigned +char j[32];unsigned char l40[32];}l72;typedef struct{unsigned long w; +unsigned long l88;unsigned long l99;unsigned long t;unsigned long l915 +;}l128;typedef struct{l128 l42[4];l128 l32[64];unsigned char l589[4][ +1664];unsigned char l751[64][1664];}l211;typedef struct{unsigned long +l155[4][128];unsigned long l97[4][128];unsigned long l94[128];}l172; +typedef struct l181{unsigned char*x;volatile unsigned long*l123, * +l124, *l82;volatile unsigned long*l130, *l102, *l135, *l75, *l132, * +l147;unsigned char l73,l81,l62,l44,l48,l64,l34;unsigned char p; +unsigned char f;struct l612*d;unsigned char l193;unsigned char l218; +unsigned long y;unsigned char l146;unsigned char l145;unsigned char +l164;unsigned char l177;unsigned char l53;unsigned char l156;unsigned +char l61;unsigned char l134;unsigned long j;unsigned char l186; +unsigned char l46;unsigned char l58;unsigned char l52;unsigned char +l31;unsigned char l167;unsigned char v;l72 o;unsigned char l86; +unsigned char l122;unsigned char l178;unsigned char l169;unsigned char +l669;unsigned char l144;unsigned char l133;unsigned long l70;unsigned +char l33;unsigned long l35;unsigned long l43;unsigned long l36; +unsigned char l41;unsigned char l26;unsigned char l38;unsigned long +l635;unsigned long l614;ulong64 l571;ulong64 l620;unsigned long l592; unsigned long l301;unsigned long l261;unsigned long l200;unsigned long -l588;unsigned long l554;unsigned short t;unsigned long l136;unsigned -long l56;unsigned long l119;unsigned long l107;l163 n;l163 l30;l163 -l116[48];unsigned long l101;unsigned long l138;unsigned long l617; -unsigned long l152;unsigned long l620;unsigned long l183[48];unsigned -long*l141;unsigned long*l92;int l600,l111;unsigned char*l156[4];l123* -l40;unsigned long l202[4];unsigned long l143[4];int l49;int l46; -unsigned char*l137[64];l123*l32;unsigned long l210[64];unsigned long -l65[64];int l28;void*l78[4];void*l531;unsigned char l912;void( *l186)( -struct l175*a,void*l78,int v);void( *l169)(struct l175*a,unsigned char - *l89,int v);void( *l62)(struct l175*a,int l914);}e;typedef struct -l610{unsigned char*g;unsigned char p;unsigned char f;unsigned long l76 -;char l42[16];e k[4];unsigned char l29;unsigned char l174;unsigned -char l128;unsigned char l115;unsigned char l148;unsigned char l84; -unsigned long l563;unsigned long*l98;int l112;unsigned char l173; -unsigned char*l72[8];void*l531;}s; +l591;unsigned long l556;unsigned short t;unsigned long l161;unsigned +long l55;unsigned long l105;unsigned long l109;l166 n;l166 l29;l166 +l118[48];unsigned long l95;unsigned long l148;unsigned long l616; +unsigned long l142;unsigned long l621;unsigned long l184[48];unsigned +long*l155;unsigned long*l97;int l608,l104;unsigned char*l151[4];l128* +l42;unsigned long l197[4];unsigned long l154[4];int l51;int l45; +unsigned char*l136[64];l128*l32;unsigned long l207[64];unsigned long +l67[64];int l28;void*l79[4];void*l700;unsigned char l914;void( *l187)( +struct l181*a,void*l79,int w);void( *l171)(struct l181*a,unsigned char + *l99,int w);void( *l65)(struct l181*a,int l916);}e;typedef struct +l612{unsigned char*g;unsigned char p;unsigned char f;unsigned long l80 +;char l39[16];e k[4];unsigned char l30;unsigned char l174;unsigned +char l125;unsigned char l116;unsigned char l137;unsigned char l83; +unsigned long l563;unsigned long*l94;int l115;unsigned char l180; +unsigned char*l71[8];void*l700;}s; #pragma pack() extern unsigned short cp_vendor_id;extern unsigned short cp_device_id ;unsigned short cp_init(s*b,int p,unsigned char*g);void cp_reset(s*b, -l170*l58,unsigned long l71);void cp_hard_reset(s*b);unsigned long -cp_regio(e*a,int l207,int z,unsigned long r);void cp_register_transmit -(e*a,void( *l87)(e* ,void* ,int));void cp_register_receive(e*a,void( * -l87)(e* ,unsigned char* ,int));void cp_register_error(e*a,void( *l87)( -e* ,int));void cp_start_chan(e*a,int l211,int l208,l212*l47,unsigned -long l71);void cp_stop_chan(e*a);void cp_start_e1(e*a);void cp_stop_e1 +l172*l60,unsigned long l69);void cp_hard_reset(s*b);unsigned long +cp_regio(e*a,int l194,int z,unsigned long r);void cp_register_transmit +(e*a,void( *l85)(e* ,void* ,int));void cp_register_receive(e*a,void( * +l85)(e* ,unsigned char* ,int));void cp_register_error(e*a,void( *l85)( +e* ,int));void cp_start_chan(e*a,int l208,int l191,l211*l49,unsigned +long l69);void cp_stop_chan(e*a);void cp_start_e1(e*a);void cp_stop_e1 (e*a);int cp_transmit_space(e*a);int cp_send_packet(e*a,unsigned char - *l89,int v,void*l78);int cp_interrupt(s*b);int cp_interrupt_poll(s*b -,int l218);void cp_handle_interrupt(s*b);void cp_enable_interrupt(s*b + *l99,int w,void*l79);int cp_interrupt(s*b);int cp_interrupt_poll(s*b +,int l217);void cp_handle_interrupt(s*b);void cp_enable_interrupt(s*b ,int m);void cp_g703_timer(e*a);void cp_e1_timer(e*a);void cp_e3_timer (e*a);void cp_led(s*b,int m);void cp_set_dtr(e*a,int m);void cp_set_rts(e*a,int m);int cp_get_dsr(e*a);int cp_get_cd(e*a);int @@ -84,18 +84,18 @@ cp_set_baud(e*a,int y);void cp_set_dpll(e*a,int m);void cp_set_nrzi(e *a,int m);void cp_set_invtxc(e*a,int m);void cp_set_invrxc(e*a,int m );void cp_set_lloop(e*a,int m);int cp_get_rloop(e*a);int cp_get_lq(e* -a);int cp_get_cable(e*a);void cp_set_gsyn(e*a,int l75);void cp_set_ts -(e*a,unsigned long j);void cp_set_dir(e*a,int u);void cp_set_mux(s*b, -int m);void l190(s*b,int m);void cp_set_dxc(e*a,l69*l915);void +a);int cp_get_cable(e*a);void cp_set_gsyn(e*a,int l78);void cp_set_ts +(e*a,unsigned long j);void cp_set_dir(e*a,int v);void cp_set_mux(s*b, +int m);void l195(s*b,int m);void cp_set_dxc(e*a,l72*l917);void cp_set_higain(e*a,int m);void cp_set_use16(e*a,int m);void cp_set_crc4 (e*a,int m);void cp_set_phony(e*a,int m);void cp_set_unfram(e*a,int m );void cp_set_scrambler(e*a,int m);void cp_set_monitor(e*a,int m); void cp_set_rloop(e*a,int m);void cp_set_ber(e*a,int m);void cp_set_cablen(e*a,int m);void cp_set_losais(e*a,int m);static void -l192(e*a);static void l142(long l199,long y,int*l48,int*l57);static -void l162(e*a);static void l188(e*a);static void l180(e*a,l69*l149); -static void l167(s*b);unsigned short cp_vendor_id=4362;unsigned short -cp_device_id=8450;static const unsigned char l525[]={79,231,255,255, +l189(e*a);static void l141(long l199,long y,int*l50,int*l54);static +void l165(e*a);static void l210(e*a);static void l179(e*a,l72*l149); +static void l168(s*b);unsigned short cp_vendor_id=4362;unsigned short +cp_device_id=8450;static const unsigned char l527[]={79,231,255,255, 98,255,57,0,0,213,255,255,255,255,255,255,255,255,255,255,255,255,255 ,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, @@ -2597,7 +2597,7 @@ 213,4,154,0,0,19,32,3,77,160,100,148,1,51,96,6,202,192,25,40,3,102, 192,12,144,1,0,14,128,12,152,1,50,64,6,200,68,19,32,3,100,128,12,56,1 ,50,64,6,152,4,25,32,57,100,128,12,48,1,16,249,255,255,0};static const -unsigned char l437[]={79,231,255,255,98,255,57,0,0,213,255,255,255, +unsigned char l295[]={79,231,255,255,98,255,57,0,0,213,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, @@ -3715,7 +3715,7 @@ 22,160,2,112,248,192,9,52,1,146,211,4,154,64,19,104,2,100,160,225,148 ,129,50,80,6,202,128,25,40,3,102,160,12,144,1,0,14,128,12,152,1,50,64 ,6,72,22,25,32,3,102,128,12,56,1,50,64,6,154,68,25,32,89,100,128,12, -52,1,16,250,255,255,0};static const unsigned char l655[]={79,231,255, +52,1,16,250,255,255,0};static const unsigned char l649[]={79,231,255, 255,98,255,57,0,0,213,255,255,255,255,255,255,255,255,255,255,255,255 ,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, @@ -5123,7 +5123,7 @@ 232,254,128,9,48,1,134,215,4,154,0,0,19,32,3,77,192,100,152,129,50, 112,6,202,64,25,40,3,101,192,12,144,1,0,14,128,12,152,1,50,64,6,200, 68,19,32,3,100,128,12,52,1,50,64,6,152,4,25,32,121,100,128,12,48,1, -152,252,255,255,0};static const unsigned char l449[]={79,231,255,255, +152,252,255,255,0};static const unsigned char l451[]={79,231,255,255, 98,255,57,0,0,213,255,255,255,255,255,255,255,255,255,255,255,255,255 ,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, @@ -5557,703 +5557,704 @@ ,48,0,0,6,200,128,19,0,0,3,96,128,12,128,1,50,0,0,6,192,128,19,48,3, 96,0,0,12,148,1,0,14,192,12,152,1,48,0,0,6,204,64,25,0,0,3,96,0,0,12, 148,129,50,208,4,154,128,19,112,2,77,160,9,56,1,24,253,255,255,0}; -typedef struct{const unsigned char*l94;unsigned char l122;unsigned -char l160;}l185;static unsigned short l692(l185*l38,const unsigned -char*l94){unsigned short v;v= *l94++;v|= *l94++<<8;l38->l94=l94;l38-> -l122=0;l38->l160=0;return v;}static unsigned char l293(l185*l38){{if( -!(l38->l160>0))goto l645;{--l38->l160;return l38->l122;}l645:;}l38-> -l122= *l38->l94++;{if(!(l38->l122==0))goto l638;l38->l160= *l38->l94 -++;l638:;}return l38->l122;}static int l559(s*b){const unsigned char* -l72=0;unsigned short v;unsigned short q;unsigned char r;l185 l38;int c +typedef struct{const unsigned char*l98;unsigned char l129;unsigned +char l160;}l163;static unsigned short l695(l163*l37,const unsigned +char*l98){unsigned short w;w= *l98++;w|= *l98++<<8;l37->l98=l98;l37-> +l129=0;l37->l160=0;return w;}static unsigned char l293(l163*l37){{if( +!(l37->l160>0))goto l651;{--l37->l160;return l37->l129;}l651:;}l37-> +l129= *l37->l98++;{if(!(l37->l129==0))goto l639;l37->l160= *l37->l98 +++;l639:;}return l37->l129;}static int l529(s*b){const unsigned char* +l71=0;unsigned short w;unsigned short q;unsigned char r;l163 l37;int c ;q=4|32|64|128; * (volatile unsigned short* )((b)->g+1024)=q|2|1; * ( volatile unsigned short* )((b)->g+1028)=q; * (volatile unsigned short - * )((b)->g+1028)=(q^=(32|4));{c=0;l630:if(!(( * (volatile unsigned -short* )((b)->g+1028)&(8|16))))goto l621;goto l616;l622:c++;goto l630 -;l616:{{if(!(c==3))goto l613;{; * (volatile unsigned short* )((b)->g+ -1024)=255;return 1;}l613:;}}goto l622;l621:;}{c=0;l606:if(!(c<30))goto -l267;goto l266;l603:c++;goto l606;l266:{ * (volatile unsigned short* )( -(b)->g+1028)=q;}goto l603;l267:;} * (volatile unsigned short* )((b)-> + * )((b)->g+1028)=(q^=(32|4));{c=0;l632:if(!(( * (volatile unsigned +short* )((b)->g+1028)&(8|16))))goto l622;goto l618;l624:c++;goto l632 +;l618:{{if(!(c==3))goto l613;{; * (volatile unsigned short* )((b)->g+ +1024)=255;return 1;}l613:;}}goto l624;l622:;}{c=0;l607:if(!(c<30))goto +l267;goto l266;l604:c++;goto l607;l266:{ * (volatile unsigned short* )( +(b)->g+1028)=q;}goto l604;l267:;} * (volatile unsigned short* )((b)-> g+1028)=(q|=4);{c=0;l264:if(!(( * (volatile unsigned short* )((b)->g+ 1028)&(8|16))!=8))goto l260;goto l259;l262:c++;goto l264;l259:{{if(!( c==60))goto l255;{; * (volatile unsigned short* )((b)->g+1024)=255; return 1;}l255:;}}goto l262;l260:;}{c=0;l241:if(!(c<15))goto l238; -goto l811;l239:c++;goto l241;l811:{ * (volatile unsigned short* )((b)-> -g+1028)=q;}goto l239;l238:;}{if(!(!b->l72[(b->l173= * (volatile -unsigned short* )((b)->g+1028)>>(8+5))]))goto l796;{switch(b->l173){ -case 1:l72=l449;break;case 2:l72=l437;break;case 3:l72=l525;break; -case 6:l72=l655;break;case 7:l72=l565;break;default:; * (volatile +goto l818;l239:c++;goto l241;l818:{ * (volatile unsigned short* )((b)-> +g+1028)=q;}goto l239;l238:;}{if(!(!b->l71[(b->l180= * (volatile +unsigned short* )((b)->g+1028)>>(8+5))]))goto l806;{switch(b->l180){ +case 1:l71=l451;break;case 2:l71=l295;break;case 3:l71=l527;break; +case 6:l71=l649;break;case 7:l71=l565;break;default:; * (volatile unsigned short* )((b)->g+1024)=255; * (volatile unsigned short* )((b)-> -g+1028)=32|64|128;return 2;break;}}goto l790;l796:;{l72=b->l72[b-> -l173];}l790:;}v=l692(&l38,l72);;{;l774:if(!(v>0))goto l762;goto l750; -l733:--v;goto l774;l750:{r=l293(&l38);{if(!(( * (volatile unsigned -short* )((b)->g+1028)&8)==0))goto l728;{;goto l215;}l728:;}{if(!(( * ( -volatile unsigned short* )((b)->g+1028)&16)))goto l722;{{c=0;l716:if( -!(c<20))goto l644;goto l641;l647:++c;goto l716;l641:( * (volatile +g+1028)=32|64|128;return 2;break;}}goto l786;l806:;{l71=b->l71[b-> +l180];}l786:;}w=l695(&l37,l71);;{;l774:if(!(w>0))goto l765;goto l750; +l734:--w;goto l774;l750:{r=l293(&l37);{if(!(( * (volatile unsigned +short* )((b)->g+1028)&8)==0))goto l730;{;goto l213;}l730:;}{if(!(( * ( +volatile unsigned short* )((b)->g+1028)&16)))goto l726;{{c=0;l716:if( +!(c<20))goto l638;goto l636;l643:++c;goto l716;l636:( * (volatile unsigned short* )((b)->g+1028)=(q|2), * (volatile unsigned short* )(( -b)->g+1028)=q);goto l647;l644:;}{if(!(( * (volatile unsigned short* )( -(b)->g+1028)&8)==0))goto l637;{;goto l215;}l637:;}; * (volatile -unsigned short* )((b)->g+1024)=255;return 0;}l722:;}{{if(!(r&1))goto -l624;q|=1;goto l629;l624:;q&=~1;l629:;} * (volatile unsigned short* )( +b)->g+1028)=q);goto l643;l638:;}{if(!(( * (volatile unsigned short* )( +(b)->g+1028)&8)==0))goto l631;{;goto l213;}l631:;}; * (volatile +unsigned short* )((b)->g+1024)=255;return 0;}l726:;}{{if(!(r&1))goto +l623;q|=1;goto l626;l623:;q&=~1;l626:;} * (volatile unsigned short* )( (b)->g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&2))goto l627;q -|=1;goto l618;l627:;q&=~1;l618:;} * (volatile unsigned short* )((b)-> +volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&2))goto l625;q +|=1;goto l615;l625:;q&=~1;l615:;} * (volatile unsigned short* )((b)-> g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&4))goto l623;q -|=1;goto l619;l623:;q&=~1;l619:;} * (volatile unsigned short* )((b)-> +volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&4))goto l619;q +|=1;goto l617;l619:;q&=~1;l617:;} * (volatile unsigned short* )((b)-> g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&8))goto l592;q -|=1;goto l590;l592:;q&=~1;l590:;} * (volatile unsigned short* )((b)-> +volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&8))goto l593;q +|=1;goto l590;l593:;q&=~1;l590:;} * (volatile unsigned short* )((b)-> g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&16))goto l589;q -|=1;goto l587;l589:;q&=~1;l587:;} * (volatile unsigned short* )((b)-> +volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&16))goto l588;q +|=1;goto l587;l588:;q&=~1;l587:;} * (volatile unsigned short* )((b)-> g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&32))goto l586;q -|=1;goto l577;l586:;q&=~1;l577:;} * (volatile unsigned short* )((b)-> +volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&32))goto l585;q +|=1;goto l576;l585:;q&=~1;l576:;} * (volatile unsigned short* )((b)-> g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&64))goto l585;q -|=1;goto l584;l585:;q&=~1;l584:;} * (volatile unsigned short* )((b)-> +volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&64))goto l580;q +|=1;goto l579;l580:;q&=~1;l579:;} * (volatile unsigned short* )((b)-> g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&128))goto l579; -q|=1;goto l578;l579:;q&=~1;l578:;} * (volatile unsigned short* )((b)-> +volatile unsigned short* )((b)->g+1028)=q);};{{if(!(r&128))goto l578; +q|=1;goto l577;l578:;q&=~1;l577:;} * (volatile unsigned short* )((b)-> g+1028)=q;( * (volatile unsigned short* )((b)->g+1028)=(q|2), * ( -volatile unsigned short* )((b)->g+1028)=q);};}goto l733;l762:;};l215: -;return 3;}static unsigned char w(s*b,unsigned char z){unsigned short -l88=z|65280|b->l148;unsigned char r; * (volatile unsigned short* )((b -)->g+1024)=255; * (volatile unsigned short* )((b)->g+1028)=l88; * ( +volatile unsigned short* )((b)->g+1028)=q);};}goto l734;l765:;};l213: +;return 3;}static unsigned char u(s*b,unsigned char z){unsigned short +l93=z|65280|b->l137;unsigned char r; * (volatile unsigned short* )((b +)->g+1024)=255; * (volatile unsigned short* )((b)->g+1028)=l93; * ( volatile unsigned short* )((b)->g+1024)=255; * (volatile unsigned -short* )((b)->g+1028)=l88^128; * (volatile unsigned short* )((b)->g+ +short* )((b)->g+1028)=l93^128; * (volatile unsigned short* )((b)->g+ 1024)=255;r= * (volatile unsigned short* )((b)->g+1028)>>8; * ( -volatile unsigned short* )((b)->g+1028)=l88;return r;}static void l(s - *b,unsigned char z,unsigned char r){unsigned short l88=z|r<<8|b-> -l148; * (volatile unsigned short* )((b)->g+1024)=65535; * (volatile -unsigned short* )((b)->g+1028)=l88; * (volatile unsigned short* )((b)-> -g+1024)=65535; * (volatile unsigned short* )((b)->g+1028)=l88^64; * ( +volatile unsigned short* )((b)->g+1028)=l93;return r;}static void l(s + *b,unsigned char z,unsigned char r){unsigned short l93=z|r<<8|b-> +l137; * (volatile unsigned short* )((b)->g+1024)=65535; * (volatile +unsigned short* )((b)->g+1028)=l93; * (volatile unsigned short* )((b)-> +g+1024)=65535; * (volatile unsigned short* )((b)->g+1028)=l93^64; * ( volatile unsigned short* )((b)->g+1024)=65535; * (volatile unsigned -short* )((b)->g+1028)=l88; * (volatile unsigned short* )((b)->g+1024)= -255;}static unsigned char l53(e*a,unsigned char z){l(a->d,a->l50,z); -return w(a->d,a->d->l84);}static void i(e*a,unsigned char z,unsigned -char r){l(a->d,a->l50,z);l(a->d,a->d->l84,r);}static unsigned char l97 +short* )((b)->g+1028)=l93; * (volatile unsigned short* )((b)->g+1024)= +255;}static unsigned char l57(e*a,unsigned char z){l(a->d,a->l48,z); +return u(a->d,a->d->l83);}static void i(e*a,unsigned char z,unsigned +char r){l(a->d,a->l48,z);l(a->d,a->d->l83,r);}static unsigned char l90 (e*a,unsigned char z,unsigned char l214){unsigned char r;l(a->d,a-> -l50,z);l(a->d,a->d->l84,l214);l(a->d,a->l50,z);r=w(a->d,a->d->l84)& -l214;l(a->d,a->l50,z);l(a->d,a->d->l84,r);return r;}static void l177( +l48,z);l(a->d,a->d->l83,l214);l(a->d,a->l48,z);r=u(a->d,a->d->l83)& +l214;l(a->d,a->l48,z);l(a->d,a->d->l83,r);return r;}static void l176( s*b,unsigned char r,unsigned char l27){int c;l(b,40,l27);{c=0;l553:if -(!(c<8))goto l551;goto l550;l552:++c;goto l553;l550:{{if(!((r>>c)&1))goto -l547;{l(b,40,l27|4);l(b,40,l27|4);l(b,40,l27|4);l(b,40,l27|4);l(b,40, -l27|4|8);l(b,40,l27|4|8);l(b,40,l27|4|8);l(b,40,l27|4|8);}goto l542; -l547:;{l(b,40,l27);l(b,40,l27);l(b,40,l27);l(b,40,l27);l(b,40,l27|8); -l(b,40,l27|8);l(b,40,l27|8);l(b,40,l27|8);}l542:;}}goto l552;l551:;}l -(b,40,l27);}static void l104(e*a,unsigned char z,unsigned char r){ -unsigned char l27=16<p;l(a->d,40,0);l177(a->d,(z<<1)|0,l27);l177( -a->d,r,l27);l(a->d,40,0);}static unsigned char l604(e*a,unsigned char +(!(c<8))goto l549;goto l547;l552:++c;goto l553;l547:{{if(!((r>>c)&1))goto +l544;{l(b,40,l27|4);l(b,40,l27|4);l(b,40,l27|4);l(b,40,l27|4);l(b,40, +l27|4|8);l(b,40,l27|4|8);l(b,40,l27|4|8);l(b,40,l27|4|8);}goto l541; +l544:;{l(b,40,l27);l(b,40,l27);l(b,40,l27);l(b,40,l27);l(b,40,l27|8); +l(b,40,l27|8);l(b,40,l27|8);l(b,40,l27|8);}l541:;}}goto l552;l549:;}l +(b,40,l27);}static void l106(e*a,unsigned char z,unsigned char r){ +unsigned char l27=16<p;l(a->d,40,0);l176(a->d,(z<<1)|0,l27);l176( +a->d,r,l27);l(a->d,40,0);}static unsigned char l603(e*a,unsigned char z){unsigned char l27=16<p;unsigned char r=0;int c;l(a->d,40,0); -l177(a->d,(z<<1)|1,l27);{c=0;l540:if(!(c<8))goto l539;goto l535;l533: -++c;goto l540;l535:{l(a->d,40,l27|8);{if(!(w(a->d,a->l45)&128))goto -l470;r|=1<d,40,l27);}goto l533;l539:;}l(a->d,40,0); -return r;}unsigned long cp_regio(e*a,int l207,int z,unsigned long r){ -switch(l207){case 0:r=w(a->d,(unsigned char)z);break;case 1:r=l53(a,( -unsigned char)z);break;case 2:r=l97(a,(unsigned char)z,255);break; -case 3:r=l604(a,16);break;case 4:r=w(a->d,(unsigned char)z);l(a->d,( +l176(a->d,(z<<1)|1,l27);{c=0;l539:if(!(c<8))goto l537;goto l534;l532: +++c;goto l539;l534:{l(a->d,40,l27|8);{if(!(u(a->d,a->l44)&128))goto +l458;r|=1<d,40,l27);}goto l532;l537:;}l(a->d,40,0); +return r;}unsigned long cp_regio(e*a,int l194,int z,unsigned long r){ +switch(l194){case 0:r=u(a->d,(unsigned char)z);break;case 1:r=l57(a,( +unsigned char)z);break;case 2:r=l90(a,(unsigned char)z,255);break; +case 3:r=l603(a,16);break;case 4:r=u(a->d,(unsigned char)z);l(a->d,( unsigned char)z,(unsigned char)r);break;case 9:l(a->d,(unsigned char)z -,(unsigned char)r);r=w(a->d,(unsigned char)z);break;case 5:l(a->d,( -unsigned char)z,(unsigned char)r);break;case 6:l104(a,16,(unsigned +,(unsigned char)r);r=u(a->d,(unsigned char)z);break;case 5:l(a->d,( +unsigned char)z,(unsigned char)r);break;case 6:l106(a,16,(unsigned char)r);break;case 7: * (unsigned long* )(a->x+z)=r;r= * (unsigned long* )(a->x+z);break;case 8:i(a,(unsigned char)z,(unsigned char)r);r -=l53(a,(unsigned char)z);break;}return r;}static unsigned short l519( -s*b){int c;unsigned short r;unsigned short l226; * (volatile unsigned -short* )((b)->g+1024)=255;{c=255;l416:if(!(c>=0))goto l368;goto l366; -l365:c--;goto l416;l366:{ * (volatile unsigned short* )((b)->g+1028)= +=l57(a,(unsigned char)z);break;}return r;}static unsigned short l521( +s*b){int c;unsigned short r;unsigned short l222; * (volatile unsigned +short* )((b)->g+1024)=255;{c=255;l366:if(!(c>=0))goto l365;goto l370; +l371:c--;goto l366;l370:{ * (volatile unsigned short* )((b)->g+1028)= c|32; * (volatile unsigned short* )((b)->g+1024)=255;r=( * (volatile -unsigned short* )((b)->g+1028))>>8;l226=((c&(~32))|((~(c<<1))&32));{ -if(!(r!=l226))goto l370;{ * (volatile unsigned short* )((b)->g+1028)= -255;return(c|(r<<8));}l370:;}}goto l365;l368:;} * (volatile unsigned +unsigned short* )((b)->g+1028))>>8;l222=((c&(~32))|((~(c<<1))&32));{ +if(!(r!=l222))goto l372;{ * (volatile unsigned short* )((b)->g+1028)= +255;return(c|(r<<8));}l372:;}}goto l371;l365:;} * (volatile unsigned short* )((b)->g+1028)=255;return 0;}unsigned short cp_init(s*b,int p, -unsigned char*g){unsigned char l59;unsigned short l225;e*a;b->g=g;b-> -p=(unsigned char)p;b->l29=0;b->l174=0; * (volatile unsigned long* )(( +unsigned char*g){unsigned char l56;unsigned short l224;e*a;b->g=g;b-> +p=(unsigned char)p;b->l30=0;b->l174=0; * (volatile unsigned long* )(( b)->g+8)=262144; * (volatile unsigned short* )((b)->g+1032)=65535; * ( -volatile unsigned short* )((b)->g+1024)=0;b->l128=4;b->l115=0;b->l148 -=192;b->l84=38;switch(l559(b)){case 0:b->l148|=32;;{if(!((l225=l519(b -))))goto l371;return l225;l371:;}b->l84=30;break;case 1:l59=w(b,0);{ -if(!((l59&56)!=40&&(l59&128)==(w(b,0)&128)))goto l372;{return 65535;} -l372:;}break;case 2:case 3:default:return 65535;break;}l59=w(b,0); -switch(l59&56){default:b->f=0;strcpy(b->l42,"\x55\x6e\x6b\x6e\x6f\x77" -"\x6e");break;case 56:{if(!(l59&64))goto l373;{b->f=6;strcpy(b->l42,"" -"\x54\x61\x75\x2d\x50\x43\x49\x34");}goto l359;l373:;{b->f=1;strcpy(b -->l42,"\x54\x61\x75\x2d\x50\x43\x49");}l359:;}break;case 8:{if(!(l59& -64))goto l395;{b->f=10;strcpy(b->l42,"\x54\x61\x75\x2d\x50\x43\x49" -"\x34\x2d\x45\x31\x2f\x58");}goto l337;l395:;{b->f=5;strcpy(b->l42,"" -"\x54\x61\x75\x2d\x50\x43\x49\x2d\x45\x31");}l337:;}break;case 16:{if -(!(l59&64))goto l397;{b->f=7;strcpy(b->l42,"\x54\x61\x75\x2d\x50\x43" -"\x49\x34\x2d\x47\x37\x30\x33\x2f\x58");}goto l398;l397:;{b->f=4; -strcpy(b->l42,"\x54\x61\x75\x2d\x50\x43\x49\x2d\x47\x37\x30\x33");} -l398:;}break;case 24:{if(!(l59&64))goto l399;{b->f=10;strcpy(b->l42,"" -"\x54\x61\x75\x2d\x50\x43\x49\x34\x2d\x32\x45\x31\x2f\x58");}goto l400 -;l399:;{b->f=9;strcpy(b->l42,"\x54\x61\x75\x2d\x50\x43\x49\x2d\x32" -"\x45\x31");}l400:;}break;case 32:b->f=11;strcpy(b->l42,"\x54\x61\x75" -"\x2d\x50\x43\x49\x2d\x34\x45\x31");break;case 40:b->f=2;strcpy(b-> -l42,"\x54\x61\x75\x2d\x50\x43\x49\x2d\x45\x33");break;case 48:b->f=3; -strcpy(b->l42,"\x54\x61\x75\x2d\x50\x43\x49\x2d\x48\x53\x53\x49"); -break;}{if(!(b->f==2))goto l401;{switch(l59&6){default:break;case 6:b -->k->f=4;b->l76=34368000;break;case 4:strcpy(b->l42,"\x54\x61\x75\x2d" -"\x50\x43\x49\x2d\x54\x33");b->k->f=7;b->l76=44736000;break;case 2: -strcpy(b->l42,"\x54\x61\x75\x2d\x50\x43\x49\x2d\x53\x54\x53\x2d\x31"); -b->k->f=8;b->l76=51840000;break;}}goto l330;l401:;{switch(l59&6){ -default:break;case 6:b->l76=32768000;break;case 4:b->l76=16384000; -break;}}l330:;}{a=b->k;l403:if(!(ak+4))goto l426;goto l427;l404: -++a;goto l403;l427:{a->d=b;l192(a);}goto l404;l426:;}return 0;}static -void l68(e*a){unsigned char l80=1;{if(!(a->f!=4&&a->f!=7&&a->f!=8))goto -l428;return;l428:;}{if(!(a->l66))goto l429;l80|=2;l429:;}{if(!(a-> -l166))goto l430;l80|=8;l430:;}{if(!(a->l179))goto l431;l80|=48;goto -l432;l431:;{if(!(a->l83))goto l433;{switch(a->f){case 4:l80|=16;break -;case 7:l80|=32;break;case 8:default:break;}}l433:;}l432:;}{if(!(a-> -l140))goto l434;l80|=128;goto l435;l434:;{if(!(a->l55))goto l457;l80 -|=64;l457:;}l435:;}{if(!(a->l165))goto l275;l80|=4;l275:;}l(a->d,8, -l80);}static void l192(e*a){a->p=a-a->d->k;a->y=0;a->l151=0;a->l145=0 -;a->l164=0;a->l176=0;a->l55=0;a->l140=0;a->l66=0;a->l133=0;a->j=~1;a -->l184=0;a->l43=0;a->l52=0;a->u=a->p;a->l33=0;a->l39=0;a->l26=0;a-> -l37=0;a->l83=0;a->l179=0;a->l166=0;a->l127=1;switch(a->d->f){default: -a->f=0;break;case 6:a->f=1;break;case 11:a->f=3;break;case 8:a->f=2; -break;case 10:a->f=a->p<2?3:1;break;case 9:a->f=a->p<2?3:6;break;case -7:a->f=a->p<2?2:1;break;case 1:a->f=a->p<2?1:0;break;case 5:a->f=a->p -<2?3:0;break;case 4:a->f=a->p<2?2:0;break;case 2:a->f=a->p==0?a->f:0; -break;case 3:a->f=a->p==0?5:0;break;}{if(!(a->f==6))goto l459;a->j=0; -l459:;}a->x=a->d->g+a->p*128+256;switch(a->p){case 0:a->l134=( -unsigned long* )(a->d->g+20);a->l132=(unsigned long* )(a->d->g+36);a -->l82=(unsigned long* )(a->d->g+80);a->l126=(unsigned long* )(a->d->g -+84);a->l93=(unsigned long* )(a->d->g+152);a->l135=(unsigned long* )( -a->d->g+200);a->l77=(unsigned long* )(a->d->g+88);a->l125=(unsigned -long* )(a->d->g+176);a->l147=(unsigned long* )(a->d->g+224);a->l70=4; -a->l81=4;a->l64=32;a->l45=36;a->l50=32;a->l67=12;break;case 1:a->l134 -=(unsigned long* )(a->d->g+24);a->l132=(unsigned long* )(a->d->g+40); -a->l82=(unsigned long* )(a->d->g+92);a->l126=(unsigned long* )(a->d-> -g+96);a->l93=(unsigned long* )(a->d->g+156);a->l135=(unsigned long* )( -a->d->g+204);a->l77=(unsigned long* )(a->d->g+100);a->l125=(unsigned -long* )(a->d->g+180);a->l147=(unsigned long* )(a->d->g+228);a->l70=5; -a->l81=5;a->l64=34;a->l45=38;a->l50=34;a->l67=14;break;case 2:a->l134 -=(unsigned long* )(a->d->g+28);a->l132=(unsigned long* )(a->d->g+44); -a->l82=(unsigned long* )(a->d->g+104);a->l126=(unsigned long* )(a->d -->g+108);a->l93=(unsigned long* )(a->d->g+160);a->l135=(unsigned long - * )(a->d->g+208);a->l77=(unsigned long* )(a->d->g+112);a->l125=( -unsigned long* )(a->d->g+184);a->l147=(unsigned long* )(a->d->g+232); -a->l70=6;a->l81=6;a->l64=48;a->l45=52;a->l50=48;a->l67=13;break;case 3 -:a->l134=(unsigned long* )(a->d->g+32);a->l132=(unsigned long* )(a->d -->g+48);a->l82=(unsigned long* )(a->d->g+116);a->l126=(unsigned long* -)(a->d->g+120);a->l93=(unsigned long* )(a->d->g+164);a->l135=( -unsigned long* )(a->d->g+212);a->l77=(unsigned long* )(a->d->g+124);a -->l125=(unsigned long* )(a->d->g+188);a->l147=(unsigned long* )(a->d -->g+236);a->l70=7;a->l81=7;a->l64=50;a->l45=54;a->l50=50;a->l67=15; -break;}{if(!(a->d->l84==30))goto l274;{a->l37=1;switch(a->p){case 0:a -->l64=16;a->l34=20;a->l50=24;break;case 1:a->l64=18;a->l34=21;a->l50= -26;break;case 2:a->l64=17;a->l34=22;a->l50=25;break;case 3:a->l64=19; -a->l34=23;a->l50=27;break;}}l274:;}l68(a);{if(!(a->f==4||a->f==7||a-> -f==8))goto l461;{l(a->d,14,(2048>>8)&255);l(a->d,15,(2048>>16)&255);} -l461:;}}static void l150(e*a){unsigned char l158;{if(!(!a->l34))goto -l270;return;l270:;}{if(!(a->d->k[a->u].l31))goto l466;l158=a->p;goto -l263;l466:;l158=a->u;l263:;}{if(!(!a->l31&&!a->l54))goto l465;l158|=4 -;l465:;}l(a->d,a->l34,l158);}void cp_hard_reset(s*b){l(b,0,128);} -static void l739(e*a){int c;i(a,172,1);{c=0;l467:if(!(c<=255))goto -l824;goto l825;l410:c++;goto l467;l825:{{if(!(c!=172))goto l826;i(a, -192,0);l826:;}}goto l410;l824:;}i(a,172,0);{c=0;l827:if(!(c<=255))goto -l828;goto l829;l414:c++;goto l827;l829:{{if(!(c!=172))goto l833;i(a, -192,0);l833:;}}goto l414;l828:;}}void cp_reset(s*b,l170*l58,unsigned -long l71){e*a;{if(!(!b->g))goto l831;return;l831:;}{if(!(l58))goto -l853;memset(l58,0,sizeof(l170));l853:;} * (volatile unsigned long* )( +volatile unsigned short* )((b)->g+1024)=0;b->l125=4;b->l116=0;b->l137 +=192;b->l83=38;switch(l529(b)){case 0:b->l137|=32;;{if(!((l224=l521(b +))))goto l373;return l224;l373:;}b->l83=30;break;case 1:l56=u(b,0);{ +if(!((l56&56)!=40&&(l56&128)==(u(b,0)&128)))goto l359;{return 65535;} +l359:;}break;case 2:case 3:default:return 65535;break;}l56=u(b,0); +switch(l56&56){default:b->f=0;strcpy(b->l39,"\x55\x6e\x6b\x6e\x6f\x77" +"\x6e");break;case 56:{if(!((l56&64)!=(u(b,0)&64)))goto l375;{b->f=12 +;strcpy(b->l39,"\x54\x61\x75\x2d\x50\x43\x49\x2d\x4c");}goto l376; +l375:;{if(!(l56&64))goto l397;{b->f=6;strcpy(b->l39,"\x54\x61\x75\x2d" +"\x50\x43\x49\x34");}goto l333;l397:;{b->f=1;strcpy(b->l39,"\x54\x61" +"\x75\x2d\x50\x43\x49");}l333:;}l376:;}break;case 8:{if(!(l56&64))goto +l399;{b->f=10;strcpy(b->l39,"\x54\x61\x75\x2d\x50\x43\x49\x34\x2d\x45" +"\x31\x2f\x58");}goto l400;l399:;{b->f=5;strcpy(b->l39,"\x54\x61\x75" +"\x2d\x50\x43\x49\x2d\x45\x31");}l400:;}break;case 16:{if(!(l56&64))goto +l401;{b->f=7;strcpy(b->l39,"\x54\x61\x75\x2d\x50\x43\x49\x34\x2d\x47" +"\x37\x30\x33\x2f\x58");}goto l330;l401:;{b->f=4;strcpy(b->l39,"\x54" +"\x61\x75\x2d\x50\x43\x49\x2d\x47\x37\x30\x33");}l330:;}break;case 24 +:{if(!(l56&64))goto l403;{b->f=10;strcpy(b->l39,"\x54\x61\x75\x2d\x50" +"\x43\x49\x34\x2d\x32\x45\x31\x2f\x58");}goto l404;l403:;{b->f=9; +strcpy(b->l39,"\x54\x61\x75\x2d\x50\x43\x49\x2d\x32\x45\x31");}l404:; +}break;case 32:b->f=11;strcpy(b->l39,"\x54\x61\x75\x2d\x50\x43\x49" +"\x2d\x34\x45\x31");break;case 40:b->f=2;strcpy(b->l39,"\x54\x61\x75" +"\x2d\x50\x43\x49\x2d\x45\x33");break;case 48:b->f=3;strcpy(b->l39,"" +"\x54\x61\x75\x2d\x50\x43\x49\x2d\x48\x53\x53\x49");break;}{if(!(b->f +==2))goto l405;{switch(l56&6){default:break;case 6:b->k->f=4;b->l80= +34368000;break;case 4:strcpy(b->l39,"\x54\x61\x75\x2d\x50\x43\x49\x2d" +"\x54\x33");b->k->f=7;b->l80=44736000;break;case 2:strcpy(b->l39,"" +"\x54\x61\x75\x2d\x50\x43\x49\x2d\x53\x54\x53\x2d\x31");b->k->f=8;b-> +l80=51840000;break;}}goto l406;l405:;{switch(l56&6){default:break; +case 6:b->l80=32768000;break;case 4:b->l80=16384000;break;}}l406:;}{a +=b->k;l428:if(!(ak+4))goto l430;goto l431;l429:++a;goto l428;l431 +:{a->d=b;l189(a);}goto l429;l430:;}return 0;}static void l68(e*a){ +unsigned char l74=1;{if(!(a->f!=4&&a->f!=7&&a->f!=8))goto l432;return +;l432:;}{if(!(a->l61))goto l433;l74|=2;l433:;}{if(!(a->l169))goto l434 +;l74|=8;l434:;}{if(!(a->l178))goto l435;l74|=48;goto l436;l435:;{if(! +(a->l86))goto l437;{switch(a->f){case 4:l74|=16;break;case 7:l74|=32; +break;case 8:default:break;}}l437:;}l436:;}{if(!(a->l156))goto l459; +l74|=128;goto l274;l459:;{if(!(a->l53))goto l461;l74|=64;l461:;}l274: +;}{if(!(a->l167))goto l270;l74|=4;l270:;}l(a->d,8,l74);}static void +l189(e*a){a->p=a-a->d->k;a->y=0;a->l146=0;a->l145=0;a->l164=0;a->l177 +=0;a->l53=0;a->l156=0;a->l61=0;a->l134=0;a->j=~1;a->l186=0;a->l46=0;a +->l58=0;a->v=a->p;a->l33=0;a->l41=0;a->l26=0;a->l38=0;a->l86=0;a-> +l178=0;a->l169=0;a->l122=1;switch(a->d->f){default:a->f=0;break;case 6 +:a->f=1;break;case 11:a->f=3;break;case 8:a->f=2;break;case 10:a->f=a +->p<2?3:1;break;case 9:a->f=a->p<2?3:6;break;case 7:a->f=a->p<2?2:1; +break;case 1:a->f=a->p<2?1:0;break;case 5:a->f=a->p<2?3:0;break;case 4 +:a->f=a->p<2?2:0;break;case 2:a->f=a->p==0?a->f:0;break;case 3:a->f=a +->p==0?5:0;break;case 12:a->f=a->p==0?1:0;break;}{if(!(a->f==6))goto +l463;a->j=0;l463:;}a->x=a->d->g+a->p*128+256;switch(a->p){case 0:a-> +l123=(unsigned long* )(a->d->g+20);a->l124=(unsigned long* )(a->d->g+ +36);a->l82=(unsigned long* )(a->d->g+80);a->l130=(unsigned long* )(a +->d->g+84);a->l102=(unsigned long* )(a->d->g+152);a->l135=(unsigned +long* )(a->d->g+200);a->l75=(unsigned long* )(a->d->g+88);a->l132=( +unsigned long* )(a->d->g+176);a->l147=(unsigned long* )(a->d->g+224); +a->l73=4;a->l81=4;a->l62=32;a->l44=36;a->l48=32;a->l64=12;break;case 1 +:a->l123=(unsigned long* )(a->d->g+24);a->l124=(unsigned long* )(a->d +->g+40);a->l82=(unsigned long* )(a->d->g+92);a->l130=(unsigned long* )( +a->d->g+96);a->l102=(unsigned long* )(a->d->g+156);a->l135=(unsigned +long* )(a->d->g+204);a->l75=(unsigned long* )(a->d->g+100);a->l132=( +unsigned long* )(a->d->g+180);a->l147=(unsigned long* )(a->d->g+228); +a->l73=5;a->l81=5;a->l62=34;a->l44=38;a->l48=34;a->l64=14;break;case 2 +:a->l123=(unsigned long* )(a->d->g+28);a->l124=(unsigned long* )(a->d +->g+44);a->l82=(unsigned long* )(a->d->g+104);a->l130=(unsigned long* +)(a->d->g+108);a->l102=(unsigned long* )(a->d->g+160);a->l135=( +unsigned long* )(a->d->g+208);a->l75=(unsigned long* )(a->d->g+112);a +->l132=(unsigned long* )(a->d->g+184);a->l147=(unsigned long* )(a->d +->g+232);a->l73=6;a->l81=6;a->l62=48;a->l44=52;a->l48=48;a->l64=13; +break;case 3:a->l123=(unsigned long* )(a->d->g+32);a->l124=(unsigned +long* )(a->d->g+48);a->l82=(unsigned long* )(a->d->g+116);a->l130=( +unsigned long* )(a->d->g+120);a->l102=(unsigned long* )(a->d->g+164); +a->l135=(unsigned long* )(a->d->g+212);a->l75=(unsigned long* )(a->d +->g+124);a->l132=(unsigned long* )(a->d->g+188);a->l147=(unsigned long + * )(a->d->g+236);a->l73=7;a->l81=7;a->l62=50;a->l44=54;a->l48=50;a-> +l64=15;break;}{if(!(a->d->l83==30))goto l465;{a->l38=1;switch(a->p){ +case 0:a->l62=16;a->l34=20;a->l48=24;break;case 1:a->l62=18;a->l34=21 +;a->l48=26;break;case 2:a->l62=17;a->l34=22;a->l48=25;break;case 3:a +->l62=19;a->l34=23;a->l48=27;break;}}l465:;}l68(a);{if(!(a->f==4||a-> +f==7||a->f==8))goto l468;{l(a->d,14,(2048>>8)&255);l(a->d,15,(2048>> +16)&255);}l468:;}}static void l157(e*a){unsigned char l139;{if(!(!a-> +l34))goto l472;return;l472:;}{if(!(a->d->k[a->v].l31))goto l467;l139= +a->p;goto l469;l467:;l139=a->v;l469:;}{if(!(!a->l31&&!a->l52))goto +l824;l139|=4;l824:;}l(a->d,a->l34,l139);}void cp_hard_reset(s*b){l(b, +0,128);}static void l741(e*a){int c;i(a,172,1);{c=0;l826:if(!(c<=255))goto +l827;goto l828;l829:c++;goto l826;l828:{{if(!(c!=172))goto l414;i(a, +192,0);l414:;}}goto l829;l827:;}i(a,172,0);{c=0;l831:if(!(c<=255))goto +l832;goto l833;l834:c++;goto l831;l833:{{if(!(c!=172))goto l855;i(a, +192,0);l855:;}}goto l834;l832:;}}void cp_reset(s*b,l172*l60,unsigned +long l69){e*a;{if(!(!b->g))goto l856;return;l856:;}{if(!(l60))goto +l857;memset(l60,0,sizeof(l172));l857:;} * (volatile unsigned long* )( (b)->g+8)=262144; * (volatile unsigned short* )((b)->g+1032)=65535; * (volatile unsigned short* )((b)->g+1024)=255; * (volatile unsigned short* )((b)->g+1028)=255; * (volatile unsigned long* )((b)->g+768)= -4194304;l(b,0,b->l128&~4);cp_led(b,0); * (volatile unsigned long* )(( +4194304;l(b,0,b->l125&~4);cp_led(b,0); * (volatile unsigned long* )(( b)->g+12)=(128/32-1)<<28|(128/32-1)<<24|(128/32-1)<<20|(128/32-1)<<16 |(128/32-1)<<12|(128/32-1)<<8|(128/32-1)<<4|(128/32-1); * (volatile unsigned long* )((b)->g+16)=(128/32-1)<<16; * (volatile unsigned long * )((b)->g+68)=1108361216; * (volatile unsigned long* )((b)->g+72)= 3740719104UL; * (volatile unsigned long* )((b)->g+52)=404232216; * ( -volatile unsigned long* )((b)->g+76)=7;cp_set_mux(b,b->l29);{if(!(l58 -))goto l854;{b->l98=l58->l98; * (volatile unsigned long* )((b)->g+64)= -l71+((char* )b->l98-(char* )l58);}l854:;}b->l112=0;{a=b->k;l855:if(!( -ak+4))goto l857;goto l858;l856:++a;goto l855;l858:{{if(!(a->f==2))goto -l859;l162(a);goto l860;l859:;{if(!(a->f==3))goto l861;l188(a);l861:;} -l860:;}l150(a);a->l35=0; * (volatile unsigned long* )((a)->x+8)=a-> -l35;a->l36=0; * (volatile unsigned long* )((a)->x+16)=a->l36;a->l146= -1; * (volatile unsigned long* )((a)->x+84)=a->l73=~0; * (volatile +volatile unsigned long* )((b)->g+76)=7;cp_set_mux(b,b->l30);{if(!(l60 +))goto l858;{b->l94=l60->l94; * (volatile unsigned long* )((b)->g+64)= +l69+((char* )b->l94-(char* )l60);}l858:;}b->l115=0;{a=b->k;l859:if(!( +ak+4))goto l861;goto l862;l860:++a;goto l859;l862:{{if(!(a->f==2))goto +l863;l165(a);goto l864;l863:;{if(!(a->f==3))goto l441;l210(a);l441:;} +l864:;}l157(a);a->l35=0; * (volatile unsigned long* )((a)->x+8)=a-> +l35;a->l36=0; * (volatile unsigned long* )((a)->x+16)=a->l36;a->l144= +1; * (volatile unsigned long* )((a)->x+84)=a->l70=~0; * (volatile unsigned long* )((a)->x+28)=520552703; * (volatile unsigned long* )(( -a)->x+32)=520552703;{if(!(l58))goto l862;{a->l141=l58->l141[a->p];a-> -l92=l58->l92[a->p];( * (a)->l134)=l71+((char* )a->l141-(char* )l58);( - * (a)->l132)=l71+((char* )a->l92-(char* )l58);;}l862:;}a->l600=0;a-> -l111=0;( * (a)->l82)=0;( * (a)->l77)=0;}goto l856;l857:;} * (volatile -unsigned long* )((b)->g+0)=4279239169UL;{a=b->k;l440:if(!(ak+4))goto -l441;goto l886;l223:++a;goto l440;l886:{{if(!(a->f!=3||!a->l37||l53(a -,15)!=163))goto l887;goto l223;l887:;}l739(a);}goto l223;l441:;}}void -cp_stop_chan(e*a){unsigned long l178=0;unsigned long l102=0;int c;{if -(!(!a->f))goto l888;return;l888:;}outb(128,0);a->l35&=~2147483648UL; * -(volatile unsigned long* )((a)->x+8)=a->l35;{c=0;l889:if(!(c<200))goto -l890;goto l891;l892:c++;goto l889;l891:outb(128,0);goto l892;l890:;}{ -if(!(a->l36&134217728))goto l454;{;a->l36&=~134217728; * (volatile -unsigned long* )((a)->x+16)=a->l36;l178|=4194304;l102|=65536;}l454:;} -outb(128,0);{if(!(( * (a)->l77)!=0))goto l911;{;{c=0;l321:if(!(c<4))goto -l910;goto l354;l583:++c;goto l321;l354: * (volatile unsigned long* )& -a->l40[c].v=2147483648UL|1073741824;goto l583;l910:;}l178|=2097152; -l102|=16777216;}l911:;}outb(128,0); * (volatile unsigned long* )((a)-> -x+0)=l102;outb(128,0);( * (a)->l82)=l178;outb(128,0); * (volatile -unsigned long* )((a->d)->g+0)=513;outb(128,0);a->l73=~0;}void -cp_start_chan(e*a,int l211,int l208,l212*l47,unsigned long l71){int c -;unsigned long l102=0;{if(!(!a->f))goto l353;return;l353:;}{if(!(l47))goto -l582;{;a->l32=l47->l32;a->l40=l47->l40;{c=0;l529:if(!(c<64))goto l527 -;goto l462;l654:++c;goto l529;l462:a->l65[c]=l71+((char* )(a->l32+c)- -(char* )l47);goto l654;l527:;}{c=0;l336:if(!(c<4))goto l335;goto l320 -;l257:++c;goto l336;l320:a->l143[c]=l71+((char* )(a->l40+c)-(char* )l47 -);goto l257;l335:;};{c=0;l305:if(!(c<64))goto l273;goto l234;l288:++c -;goto l305;l234: * (volatile unsigned long* )&a->l32[c].l90=a->l65[(c -+1)%64];goto l288;l273:;}{c=0;l544:if(!(c<4))goto l512;goto l460;l304 -:++c;goto l544;l460: * (volatile unsigned long* )&a->l40[c].l90=a-> -l143[(c+1)%4];goto l304;l512:;}}l582:;}{if(!(a->d->f==2))goto l312;{a -->l35|=12; * (volatile unsigned long* )((a)->x+8)=a->l35;a->l44= -2097152;}l312:;}a->l44|=574914560; * (volatile unsigned long* )((a)-> -x+12)=a->l44;cp_set_phony(a,a->l54); * (volatile unsigned long* )((a)-> -x+64)=32768|(1664/32-1);{if(!(a->f==2))goto l351;l162(a);l351:;}a-> +a)->x+32)=520552703;{if(!(l60))goto l885;{a->l155=l60->l155[a->p];a-> +l97=l60->l97[a->p];( * (a)->l123)=l69+((char* )a->l155-(char* )l60);( + * (a)->l124)=l69+((char* )a->l97-(char* )l60);;}l885:;}a->l608=0;a-> +l104=0;( * (a)->l82)=0;( * (a)->l75)=0;}goto l860;l861:;} * (volatile +unsigned long* )((b)->g+0)=4279239169UL;{a=b->k;l887:if(!(ak+4))goto +l443;goto l889;l223:++a;goto l887;l889:{{if(!(a->f!=3||!a->l38||l57(a +,15)!=163))goto l891;goto l223;l891:;}l741(a);}goto l223;l443:;}}void +cp_stop_chan(e*a){unsigned long l175=0;unsigned long l96=0;int c;{if( +!(!a->f))goto l892;return;l892:;}outb(128,0);a->l35&=~2147483648UL; * +(volatile unsigned long* )((a)->x+8)=a->l35;{c=0;l893:if(!(c<200))goto +l913;goto l912;l446:c++;goto l893;l912:outb(128,0);goto l446;l913:;}{ +if(!(a->l36&134217728))goto l584;{;a->l36&=~134217728; * (volatile +unsigned long* )((a)->x+16)=a->l36;l175|=4194304;l96|=65536;}l584:;} +outb(128,0);{if(!(( * (a)->l75)!=0))goto l653;{;{c=0;l911:if(!(c<4))goto +l354;goto l353;l290:++c;goto l911;l353: * (volatile unsigned long* )& +a->l42[c].w=2147483648UL|1073741824;goto l290;l354:;}l175|=2097152; +l96|=16777216;}l653:;}outb(128,0); * (volatile unsigned long* )((a)-> +x+0)=l96;outb(128,0);( * (a)->l82)=l175;outb(128,0); * (volatile +unsigned long* )((a->d)->g+0)=513;outb(128,0);a->l70=~0;}void +cp_start_chan(e*a,int l208,int l191,l211*l49,unsigned long l69){int c +;unsigned long l96=0;{if(!(!a->f))goto l583;return;l583:;}{if(!(l49))goto +l531;{;a->l32=l49->l32;a->l42=l49->l42;{c=0;l464:if(!(c<64))goto l336 +;goto l335;l273:++c;goto l464;l335:a->l67[c]=l69+((char* )(a->l32+c)- +(char* )l49);goto l273;l336:;}{c=0;l320:if(!(c<4))goto l288;goto l257 +;l305:++c;goto l320;l257:a->l154[c]=l69+((char* )(a->l42+c)-(char* )l49 +);goto l305;l288:;};{c=0;l234:if(!(c<64))goto l546;goto l514;l906:++c +;goto l234;l514: * (volatile unsigned long* )&a->l32[c].l88=a->l67[(c ++1)%64];goto l906;l546:;}{c=0;l462:if(!(c<4))goto l312;goto l351;l319 +:++c;goto l462;l351: * (volatile unsigned long* )&a->l42[c].l88=a-> +l154[(c+1)%4];goto l319;l312:;}}l531:;}{if(!(a->d->f==2))goto l265;{a +->l35|=12; * (volatile unsigned long* )((a)->x+8)=a->l35;a->l43= +2097152;}l265:;}a->l43|=574914560; * (volatile unsigned long* )((a)-> +x+12)=a->l43;cp_set_phony(a,a->l52); * (volatile unsigned long* )((a)-> +x+64)=32768|(1664/32-1);{if(!(a->f==2))goto l334;l165(a);l334:;}a-> l35|=2147483648UL; * (volatile unsigned long* )((a)->x+8)=a->l35; -cp_set_nrzi(a,a->l145);cp_set_dir(a,a->u);cp_set_baud(a,a->y); -cp_set_dtr(a,0);cp_set_rts(a,0);( * (a)->l77)=0;{c=0;l334:if(!(c<64))goto -l328;goto l319;l287:++c;goto l334;l319:{{if(!(l47))goto l902;{a->l137 -[c]=l47->l749[c];a->l210[c]=l71+((char* )a->l137[c]-(char* )l47); * ( -volatile unsigned long* )&a->l32[c].v=1664<<16; * (volatile unsigned -long* )&a->l32[c].l89=a->l210[c];}l902:;} * (volatile unsigned long* )& -a->l32[c].t=0;}goto l287;l328:;}{c=0;l794:if(!(c<4))goto l751;goto -l718;l694:++c;goto l794;l718:{{if(!(l47))goto l675;{a->l156[c]=l47-> -l628[c];a->l202[c]=l71+((char* )a->l156[c]-(char* )l47); * (volatile -unsigned long* )&a->l40[c].v=2147483648UL|1073741824; * (volatile -unsigned long* )&a->l40[c].l89=a->l202[c];}l675:;} * (volatile -unsigned long* )&a->l40[c].t=0;a->l78[c]=0;}goto l694;l751:;}{if(!( -l47))goto l593;;l593:;}a->l28=0;a->l49=0;a->l46=a->l49; * (volatile -unsigned long* )&a->l32[64-1].l90=a->l65[64-1];{if(!(l211))goto l663; -{{if(!(!a->l146))goto l651;{a->l73&=~65536;}goto l639;l651:;{a->l73&= -~65536; * (volatile unsigned long* )((a)->x+84)=a->l73;}l639:;}l102|= -16777216;}l663:;}{if(!(l208))goto l543;{a->l36|=134217728; * ( -volatile unsigned long* )((a)->x+16)=a->l36;{if(!(!a->l146))goto l536 -;{a->l73&=~2;}goto l526;l536:;{a->l73&=~2; * (volatile unsigned long* -)((a)->x+84)=a->l73;}l526:;}l102|=65536;{if(!(a->f==2))goto l515;l(a -->d,a->l45,255);l515:;};( * (a)->l126)=a->l65[a->l28];( * (a)->l82)= -1048576; * (volatile unsigned long* )((a->d)->g+0)=513;}l543:;} * ( -volatile unsigned long* )((a)->x+0)=l102;}void cp_stop_e1(e*a){{if(!( -a->f!=3||a->l131==0))goto l511;return;l511:;}a->l131=0;i(a,23,0);} -void cp_start_e1(e*a){{if(!(a->f!=3||a->l131==1))goto l488;return; -l488:;}a->l131=1;i(a,23,16);}void cp_set_dtr(e*a,int m){a->l196=(m!=0 -);{if(!(a->l196))goto l458;a->l33|=1;goto l364;l458:;a->l33&=~1;l364: -;}l(a->d,a->l70,a->l33);}void cp_set_rts(e*a,int m){a->l219=(m!=0);{ -if(!(a->l219))goto l361;a->l44|=1048576;goto l357;l361:;a->l44&=~ -1048576;l357:;} * (volatile unsigned long* )((a)->x+12)=a->l44;}int -cp_get_dsr(e*a){{if(!(a->f!=1))goto l327;return 0;l327:;}return(w(a-> -d,a->l81)&1)!=0;}int cp_get_cd(e*a){{if(!(a->f==0))goto l324;return 0 -;l324:;}{if(!(a->d->f==2))goto l318;return(w(a->d,9)&2)==0;l318:;}{if -(!(a->f==6))goto l315;{ * (volatile unsigned long* )((a->d->k+a->u)-> -x+4);return( * (volatile unsigned long* )((a->d->k+a->u)->x+4)& -2097152)==0;}goto l311;l315:;{ * (volatile unsigned long* )((a)->x+4); -return( * (volatile unsigned long* )((a)->x+4)&2097152)==0;}l311:;}} -int cp_get_cts(e*a){{if(!(a->f!=1))goto l308;return 0;l308:;}return(w -(a->d,a->l81)&8)!=0;}int cp_get_txcerr(e*a){{if(!(a->f!=1))goto l303; -return 0;l303:;}return(w(a->d,a->l81)&16)!=0;}int cp_get_rxcerr(e*a){ -{if(!(a->f!=1))goto l300;return 0;l300:;}return(w(a->d,a->l81)&32)!=0 -;}void cp_set_baud(e*a,int y){int l57,l48;{if(!(a->f==2||((a->f==3)&& -a->l31)))goto l296;{int l99=(y+32000)/64000*64;{if(!(a->l54))goto l283 -;l99=2048;l283:;}a->l39&=~7;{if(!(!l99||l99>1024))goto l240;{a->l39|= -0;a->y=2048000;}goto l236;l240:;{if(!(l99>512))goto l235;{a->l39|=2;a -->y=1024000;}goto l232;l235:;{if(!(l99>256))goto l231;{a->l39|=3;a->y -=512000;}goto l229;l231:;{if(!(l99>128))goto l228;{a->l39|=4;a->y= >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 12 14:42:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BB6E16A4D0; Sun, 12 Dec 2004 14:42:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42A9116A4CE for ; Sun, 12 Dec 2004 14:42:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C152443D48 for ; Sun, 12 Dec 2004 14:42:25 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCEgPA8049551 for ; Sun, 12 Dec 2004 14:42:25 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBCEgNvi049548 for perforce@freebsd.org; Sun, 12 Dec 2004 14:42:23 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 12 Dec 2004 14:42:23 GMT Message-Id: <200412121442.iBCEgNvi049548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 66888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 14:42:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=66888 Change 66888 by davidxu@davidxu_tiger on 2004/12/12 14:41:29 IFC Affected files ... .. //depot/projects/davidxu_thread/src/MAINTAINERS#2 integrate .. //depot/projects/davidxu_thread/src/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/Makefile.inc1#3 integrate .. //depot/projects/davidxu_thread/src/UPDATING#2 integrate .. //depot/projects/davidxu_thread/src/bin/ps/ps.1#2 integrate .. //depot/projects/davidxu_thread/src/bin/sh/jobs.c#2 integrate .. //depot/projects/davidxu_thread/src/bin/sh/sh.1#2 integrate .. //depot/projects/davidxu_thread/src/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/davidxu_thread/src/etc/defaults/pccard.conf#2 integrate .. //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/davidxu_thread/src/etc/devd.conf#2 integrate .. //depot/projects/davidxu_thread/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/davidxu_thread/src/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/davidxu_thread/src/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/davidxu_thread/src/etc/network.subr#2 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/initdiskless#2 integrate .. //depot/projects/davidxu_thread/src/etc/usbd.conf#2 integrate .. //depot/projects/davidxu_thread/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/cvs/cvsbug/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/amd64/init.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/i386/init.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/include/string.h#2 integrate .. //depot/projects/davidxu_thread/src/include/unistd.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/alpha/gen/divrem.m4#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/getcontext.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/softfloat/bits32/softfloat.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/string/swab.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/string/swab.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/mount.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc_r/uthread/Makefile.inc#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc_r/uthread/pthread_private.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc_r/uthread/uthread_atfork.c#1 branch .. //depot/projects/davidxu_thread/src/lib/libc_r/uthread/uthread_fork.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc_r/uthread/uthread_init.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc_r/uthread/uthread_jmp.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc_r/uthread/uthread_stack.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libsdp/search.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_stack.c#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/davidxu_thread/src/release/i386/mkisoimages.sh#2 integrate .. //depot/projects/davidxu_thread/src/rescue/rescue/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/devd/devd.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/dump/dump.h#2 integrate .. //depot/projects/davidxu_thread/src/sbin/dump/itime.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/stripe/gstripe.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/gvinum/gvinum.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/af_atalk.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ifconfig/af_inet.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ifconfig/af_inet6.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ifconfig/af_ipx.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ifconfig/af_link.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifclone.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifmac.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifmedia.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount/mntopts.h#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount/mount.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount/mount.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/mount_ufs/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sbin/mount_ufs/mount_ufs.c#1 branch .. //depot/projects/davidxu_thread/src/sbin/sconfig/sconfig.8#2 integrate .. //depot/projects/davidxu_thread/src/sbin/swapon/swapon.c#2 integrate .. //depot/projects/davidxu_thread/src/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/acpi.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/amr.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ath.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ddb.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/gif.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/mac_portacl.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/man4.i386/cp.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/smp.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/snd_ich.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/udav.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/witness.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/wlan.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/xe.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man7/security.7#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man7/tuning.7#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/EVENTHANDLER.9#1 branch .. //depot/projects/davidxu_thread/src/share/man/man9/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/davidxu_thread/src/share/man/man9/jumbo.9#2 delete .. //depot/projects/davidxu_thread/src/share/man/man9/mbuf.9#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/style.9#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/vfs_mount.9#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/zero_copy.9#2 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/davidxu_thread/src/share/zoneinfo/europe#2 integrate .. //depot/projects/davidxu_thread/src/share/zoneinfo/northamerica#2 integrate .. //depot/projects/davidxu_thread/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/prom.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/loader/loader.rc#2 delete .. //depot/projects/davidxu_thread/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/davidxu_thread/src/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/pc98/loader/help.pc98#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.i386#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 delete .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/freebsd/opt_ah.h#2 delete .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/aac/aac_ioctl.h#2 delete .. //depot/projects/davidxu_thread/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/ath_rate/amrr/amrr.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ath/ath_rate/amrr/amrr.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ath/ath_rate/onoe/onoe.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ath/ath_rate/onoe/onoe.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_athrate.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cp/cpddk.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mlx/mlx_disk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mlx/mlxreg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/mse/mse.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/FILES#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/fifofs/fifo.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nwfs/nwfs.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/portalfs/portal.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/umapfs/umap.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_extern.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/gnu/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/acpica/genwakecode.sh#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/bios.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/gdb_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/gdb_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/bootinfo.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/fpu.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/gdb_machdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/isa/isavar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/isofs/cd9660/iso.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/init_main.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_jumbo.c#2 delete .. //depot/projects/davidxu_thread/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_init.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/ath_rate_amrr/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/if_gif/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/wlan_acl/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/wlan_ccmp/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/wlan_tkip/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/wlan_wep/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/wlan_xauth/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/net/bpf.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net/if.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/_ieee80211.h#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_acl.c#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto_ccmp.c#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto_none.c#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto_tkip.c#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_crypto_wep.c#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_freebsd.c#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_freebsd.h#1 branch .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/net80211/ieee80211_xauth.c#1 branch .. //depot/projects/davidxu_thread/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in_gif.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/scope6.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfs/nfs_common.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_lock.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/pci/if_ti.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/posix4/posix4_mib.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/rwindow.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/davidxu_thread/src/sys/sys/bus.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/domain.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/file.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/jumbo.h#2 delete .. //depot/projects/davidxu_thread/src/sys/sys/kernel.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mount.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mouse.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/pioctl.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/reboot.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/socket.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/systm.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/uio.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sys/user.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/vnode.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/vm/uma_int.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/davidxu_thread/src/tools/lib32/README#2 integrate .. //depot/projects/davidxu_thread/src/tools/lib32/build32.sh#2 delete .. //depot/projects/davidxu_thread/src/tools/regression/aio/aiotest/Makefile#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/aio/aiotest/aiotest.c#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/net80211/ccmp/Makefile#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/net80211/ccmp/test_ccmp.c#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/net80211/tkip/Makefile#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/net80211/tkip/test_tkip.c#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/net80211/wep/Makefile#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/net80211/wep/test_wep.c#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/netinet/tcpfullwindowrst/Makefile#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/usr.bin/make/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/usr.bin/make/regress.shell_2B.out#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/usr.bin/make/regress.shell_2j.out#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/usr.bin/make/shell_test.sh#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/README#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/ath/80211debug.c#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/ath/80211stats.c#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/ath/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/ath/athdebug.c#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/ath/athstats.c#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/Customize/NET4801#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/Customize/comconsole#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/Customize/default#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/Customize/nobeastie#1 branch .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/customize.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/i386.diskimage#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/make.conf#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/raidtest/Makefile#2 delete .. //depot/projects/davidxu_thread/src/tools/tools/raidtest/README#2 delete .. //depot/projects/davidxu_thread/src/tools/tools/raidtest/raidtest.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/day.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/gcore/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/gcore/aoutcore.c#3 delete .. //depot/projects/davidxu_thread/src/usr.bin/ktrace/subr.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/arch.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/buf.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/buf.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/compat.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/cond.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/dir.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/dir.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/for.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/hash.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/hash.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/job.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/job.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/list.h#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstAppend.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstAtEnd.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstAtFront.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstClose.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstConcat.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstDatum.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstDeQueue.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstDestroy.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstDupl.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstEnQueue.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstFind.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstFindFrom.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstFirst.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstForEach.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstForEachFrom.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstInit.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstInsert.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstInt.h#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstIsAtEnd.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstIsEmpty.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstLast.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstMember.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstNext.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstOpen.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstRemove.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstReplace.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/lst.lib/lstSucc.c#2 delete .. //depot/projects/davidxu_thread/src/usr.bin/make/main.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/make.1#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/make.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/make.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/nonints.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/str.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/suff.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/targ.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/util.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/var.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/var.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/make/var_modify.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/ncal/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/sockstat/sockstat.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/whois/whois.1#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/whois/whois.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/bundle.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/bundle.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pppd/cbcp.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/rpc.lockd/kern.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/sendmail/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/usbd/usbd.c#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $ +$FreeBSD: src/MAINTAINERS,v 1.101 2004/11/30 20:04:47 eik Exp $ subsystem login notes ----------------------------- @@ -102,6 +102,7 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. +pkg_install eik Pre-commit review or approval from portmgr@ requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/davidxu_thread/src/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ +# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $ # # The user-driven targets are: # @@ -217,6 +217,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ + PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ ==== //depot/projects/davidxu_thread/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -415,6 +415,10 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif .endfor +.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib + cd ${.CURDIR}/${_dir}; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} obj +.endfor .for _dir in lib/libncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools ==== //depot/projects/davidxu_thread/src/UPDATING#2 (text+ko) ==== @@ -23,6 +23,18 @@ developers choose to disable these features on build machines to maximize performance. +20041201: + The wlan support has been updated to split the crypto support + into separate modules. For static WEP you must configure the + wlan_wep module in your system or build and install the module + in place where it can be loaded (the kernel will auto-load + the module when a wep key is configured). + +20041201: + The ath driver has been updated to split the tx rate control + algorithm into a separate module. You need to include either + ath_rate_onoe or ath_rate_amrr when configuring the kernel. + 20041116: Support for systems with an 80386 CPU has been removed. Please use FreeBSD 5.x or earlier on systems with an 80386. @@ -45,14 +57,6 @@ userland programs that read kmem for tcp sockets directly (netstat, sockstat, etc.) -20041018: - A major sweep over the tty drivers to elimnate approx 3100 - lines of copy&pasted code have been performed. As a part of - this change some tty devices have changed names: - sio devices are now named: {tty,cua}d%d[.init,.lock] - ucom devices are now named: {tty,cua}U%d[.init,.lock] - For other drivers see the commit logs. - 20041007: The FreeBSD keyword is no longer a requirement for a valid rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check @@ -67,6 +71,14 @@ changed, thus breaking ABI compatibility. Make sure you rebuild this library with the kernel. +20041004: + A major sweep over the tty drivers to elimnate approx 3100 + lines of copy&pasted code have been performed. As a part of + this change some tty devices have changed names: + sio devices are now named: {tty,cua}d%d[.init,.lock] + ucom devices are now named: {tty,cua}U%d[.init,.lock] + For other drivers see the commit logs. + 20041001: The following libraries had their version number bumped up: /lib/libm.so.2 -> libm.so.3 @@ -195,12 +207,10 @@ is installed. 20040817: - IPFW has been converted to use PFIL_HOOKS. This change is + IPFW has been converted to use pfil(9). This change is transparent to userland and preserves the ipfw ABI. The ipfw core packet inspection and filtering functions have not been - changed, only how ipfw is invoked is different. Note that - "option PFIL_HOOKS" is required to use IPFIREWALL compiled - into the kernel or as KLD. + changed, only how ipfw is invoked is different. 20040814: The RANDOM_IP_ID option has been replaced by the sysctl @@ -268,9 +278,11 @@ The console initialization on Alpha has been reworked and is now identical to other platforms. This means that the hardcoding of the serial console and the debug port has been removed. As such, - hints are now required for the sio(4) driver to become a console - or debug port. The NO_SIO option has been decommissioned because - of this. + hints (hint.sio.0.flags="0x10") are now required for the sio(4) + driver to become a console or debug port. The NO_SIO option has + been decommissioned because of this. + Running mergemaster is the easiest way to ensure your + 'boot/device.hints' has the needed line. 20040710: A revamp of the debugging code in the kernel with some visible @@ -423,8 +435,7 @@ sure to run mergemaster -p before installworld to create required user account ("proxy"). If you do not want to build pf with your system you can use the NO_PF knob in make.conf. - Also note that pf requires "options PFIL_HOOKS" in the kernel. The - pf system consists of the following three devices: + The pf system consists of the following three devices: device pf # required device pflog # optional device pfsync # optional @@ -580,13 +591,6 @@ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and mount_cd9660(8) need to be in sync with kernel. -20030925: - Configuring a system to use IPFILTER now requires that PFIL_HOOKS - also be explicitly configured. Previously this dependency was - magically handled through some cruft in net/pfil.h; but that has - been removed. Building a kernel with IPFILTER but not PFIL_HOOKS - will fail with obtuse errors in ip_fil.c. - 20030923: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 12 14:50:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 723E616A4D0; Sun, 12 Dec 2004 14:50:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E31716A4CE for ; Sun, 12 Dec 2004 14:50:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15A7243D53 for ; Sun, 12 Dec 2004 14:50:36 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCEoa1C050023 for ; Sun, 12 Dec 2004 14:50:36 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBCEoZAA050020 for perforce@freebsd.org; Sun, 12 Dec 2004 14:50:35 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 12 Dec 2004 14:50:35 GMT Message-Id: <200412121450.iBCEoZAA050020@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 66889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 14:50:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=66889 Change 66889 by davidxu@davidxu_tiger on 2004/12/12 14:49:47 Make umtx to be sharable between processes, based on this change, it is possible to implement PTHREAD_PROCESS_SHARED pthread_mutex and pthread_cond etcs in thread library, posix requires PTHREAD_PROCESS_SHARED sync objects to be in shared memory page if user wants it to be shared betwee processes. Affected files ... .. //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#4 (text+ko) ==== @@ -37,21 +37,31 @@ #include #include #include +#include #include #include +#include +#include +#include +#include +#include + +struct umtx_key { + vm_object_t uk_object; + vm_ooffset_t uk_offset; +}; + struct umtx_q { LIST_ENTRY(umtx_q) uq_next; /* Linked list for the hash. */ - TAILQ_HEAD(, thread) uq_tdq; /* List of threads blocked here. */ - struct umtx *uq_umtx; /* Pointer key component. */ - pid_t uq_pid; /* Pid key component. */ - int uq_count; /* How many threads blocked. */ + struct umtx_key uq_key; + struct thread *uq_thread; }; LIST_HEAD(umtx_head, umtx_q); struct umtxq_chain { - struct mtx uc_lock; /* lock for this chain. */ - struct umtx_head uc_queues; /* List of sleep queues. */ + struct mtx uc_lock; /* Lock for this chain. */ + struct umtx_head uc_queue; /* List of sleep queues. */ }; #define GOLDEN_RATIO_PRIME 2654404609U @@ -64,17 +74,17 @@ #define UMTX_CONTESTED LONG_MIN static void umtx_init_chains(void *); -static int umtxq_hash(struct thread *, struct umtx *); -static void umtxq_lock(struct thread *td, struct umtx *key); -static void umtxq_unlock(struct thread *td, struct umtx *key); -static struct umtx_q *umtxq_lookup(struct thread *, struct umtx *); -static struct umtx_q *umtxq_insert(struct thread *, struct umtx *); -static int umtxq_count(struct thread *td, struct umtx *umtx); -static int umtx_sleep(struct thread *td, struct umtx *umtx, int priority, - const char *wmesg, int timo); -static void umtx_signal(struct thread *td, struct umtx *umtx); +static int umtxq_hash(struct umtx_key *); +static struct mtx *umtxq_mtx(int chain); +static void umtxq_lock(int chain); +static void umtxq_unlock(int chain); +static void umtxq_insert(int chain, struct umtx_q *); +static int umtxq_count(struct umtx_key *); +static void umtxq_signal(struct umtx_key *); +static void fork_handler(void *arg, struct proc *p1, struct proc *p2, + int flags); -SYSINIT(umtx, SI_SUB_LOCK, SI_ORDER_MIDDLE, umtx_init_chains, NULL); +SYSINIT(umtx, SI_SUB_EVENTHANDLER+1, SI_ORDER_MIDDLE, umtx_init_chains, NULL); static void umtx_init_chains(void *arg __unused) @@ -84,154 +94,119 @@ for (i = 0; i < UMTX_CHAINS; ++i) { mtx_init(&umtxq_chains[i].uc_lock, "umtxq_lock", NULL, MTX_DEF | MTX_DUPOK); - LIST_INIT(&umtxq_chains[i].uc_queues); + LIST_INIT(&umtxq_chains[i].uc_queue); + } + EVENTHANDLER_REGISTER(process_fork, fork_handler, 0, 10000); +} + +static void +fork_handler(void *arg, struct proc *p1, struct proc *p2, int flags) +{ + struct thread *td; + + PROC_LOCK(p1); + FOREACH_THREAD_IN_PROC(p1, td) { + if (td->td_flags & TDF_UMTXQ) + wakeup(td); } + PROC_UNLOCK(p1); } static inline int -umtxq_hash(struct thread *td, struct umtx *umtx) +umtxq_hash(struct umtx_key *key) { - unsigned n = (uintptr_t)umtx + td->td_proc->p_pid; + unsigned n = (uintptr_t)key->uk_object + key->uk_offset; return (((n * GOLDEN_RATIO_PRIME) >> UMTX_SHIFTS) % UMTX_CHAINS); } -static inline void -umtxq_lock(struct thread *td, struct umtx *key) +static inline struct mtx * +umtxq_mtx(int chain) { - int chain = umtxq_hash(td, key); - mtx_lock(&umtxq_chains[chain].uc_lock); + return (&umtxq_chains[chain].uc_lock); } static inline void -umtxq_unlock(struct thread *td, struct umtx *key) +umtxq_lock(int chain) { - int chain = umtxq_hash(td, key); - mtx_unlock(&umtxq_chains[chain].uc_lock); + mtx_lock(umtxq_mtx(chain)); } -static struct umtx_q * -umtxq_lookup(struct thread *td, struct umtx *umtx) +static inline void +umtxq_unlock(int chain) { - struct umtx_head *head; - struct umtx_q *uq; - pid_t pid; - int chain; - - chain = umtxq_hash(td, umtx); - mtx_assert(&umtxq_chains[chain].uc_lock, MA_OWNED); - pid = td->td_proc->p_pid; - head = &umtxq_chains[chain].uc_queues; - LIST_FOREACH(uq, head, uq_next) { - if (uq->uq_pid == pid && uq->uq_umtx == umtx) - return (uq); - } - return (NULL); + mtx_unlock(umtxq_mtx(chain)); } /* * Insert a thread onto the umtx queue. */ -static struct umtx_q * -umtxq_insert(struct thread *td, struct umtx *umtx) +static inline void +umtxq_insert(int chain, struct umtx_q *uq) { struct umtx_head *head; - struct umtx_q *uq, *ins = NULL; - pid_t pid; - int chain; - chain = umtxq_hash(td, umtx); - pid = td->td_proc->p_pid; - if ((uq = umtxq_lookup(td, umtx)) == NULL) { - umtxq_unlock(td, umtx); - ins = malloc(sizeof(*uq), M_UMTX, M_ZERO | M_WAITOK); - umtxq_lock(td, umtx); - - /* - * Some one else could have succeeded while we were blocked - * waiting on memory. - */ - if ((uq = umtxq_lookup(td, umtx)) == NULL) { - head = &umtxq_chains[chain].uc_queues; - uq = ins; - uq->uq_pid = pid; - uq->uq_umtx = umtx; - uq->uq_count = 0; - LIST_INSERT_HEAD(head, uq, uq_next); - TAILQ_INIT(&uq->uq_tdq); - ins = NULL; - } - } - TAILQ_INSERT_TAIL(&uq->uq_tdq, td, td_umtx); - uq->uq_count++; - if (ins) { - umtxq_unlock(td, umtx); - free(ins, M_UMTX); - umtxq_lock(td, umtx); - } - return (uq); + head = &umtxq_chains[chain].uc_queue; + LIST_INSERT_HEAD(head, uq, uq_next); + mtx_lock_spin(&sched_lock); + uq->uq_thread->td_flags |= TDF_UMTXQ; + mtx_unlock_spin(&sched_lock); } /* - * Remove thread from umtx queue, umtx chain lock is also - * released. + * Remove thread from umtx queue released. */ -static void -umtx_remove(struct umtx_q *uq, struct thread *td, struct umtx *umtx) +static inline void +umtxq_remove(struct umtx_q *uq) { - int chain; - - chain = umtxq_hash(td, umtx); - mtx_assert(&umtxq_chains[chain].uc_lock, MA_OWNED); - TAILQ_REMOVE(&uq->uq_tdq, td, td_umtx); - uq->uq_count--; - if (TAILQ_EMPTY(&uq->uq_tdq)) { + if (uq->uq_thread->td_flags & TDF_UMTXQ) { LIST_REMOVE(uq, uq_next); - umtxq_unlock(td, umtx); - free(uq, M_UMTX); - } else - umtxq_unlock(td, umtx); + mtx_lock_spin(&sched_lock); + uq->uq_thread->td_flags &= ~TDF_UMTXQ; + mtx_unlock_spin(&sched_lock); + } } -static inline int -umtxq_count(struct thread *td, struct umtx *umtx) +static int +umtxq_count(struct umtx_key *key) { struct umtx_q *uq; - int count = 0; + struct umtx_head *head; + int chain, count = 0; - umtxq_lock(td, umtx); - if ((uq = umtxq_lookup(td, umtx)) != NULL) - count = uq->uq_count; - umtxq_unlock(td, umtx); + chain = umtxq_hash(key); + umtxq_lock(chain); + head = &umtxq_chains[chain].uc_queue; + LIST_FOREACH(uq, head, uq_next) { + if (uq->uq_key.uk_object == key->uk_object && + uq->uq_key.uk_offset == key->uk_offset) { + if (++count > 1) + break; + } + } + umtxq_unlock(chain); return (count); } -static inline int -umtx_sleep(struct thread *td, struct umtx *umtx, int priority, - const char *wmesg, int timo) -{ - int chain; - - chain = umtxq_hash(td, umtx); - mtx_assert(&umtxq_chains[chain].uc_lock, MA_OWNED); - return (msleep(td, &umtxq_chains[chain].uc_lock, priority, - wmesg, timo)); -} - static void -umtx_signal(struct thread *td, struct umtx *umtx) +umtxq_signal(struct umtx_key *key) { struct umtx_q *uq; + struct umtx_head *head; struct thread *blocked = NULL; + int chain; - umtxq_lock(td, umtx); - if ((uq = umtxq_lookup(td, umtx)) != NULL) { - if ((blocked = TAILQ_FIRST(&uq->uq_tdq)) != NULL) { - mtx_lock_spin(&sched_lock); - blocked->td_flags |= TDF_UMTXWAKEUP; - mtx_unlock_spin(&sched_lock); + chain = umtxq_hash(key); + umtxq_lock(chain); + head = &umtxq_chains[chain].uc_queue; + LIST_FOREACH(uq, head, uq_next) { + if (uq->uq_key.uk_object == key->uk_object && + uq->uq_key.uk_offset == key->uk_offset) { + blocked = uq->uq_thread; + umtxq_remove(uq); + break; } } - umtxq_unlock(td, umtx); + umtxq_unlock(chain); if (blocked != NULL) wakeup(blocked); } @@ -240,19 +215,29 @@ _umtx_lock(struct thread *td, struct _umtx_lock_args *uap) /* struct umtx *umtx */ { - struct umtx_q *uq; + struct umtx_q uq; struct umtx *umtx; + vm_map_t map; + vm_map_entry_t entry; + vm_object_t object; + vm_pindex_t pindex; + vm_prot_t prot; + boolean_t wired; intptr_t owner; intptr_t old; + int chain, page_off; int error = 0; - uq = NULL; - /* * Care must be exercised when dealing with this structure. It * can fault on any access. */ - umtx = uap->umtx; + umtx = uap->umtx; + + page_off = ((unsigned long)umtx) % PAGE_SIZE; + /* Must not on page boundary. */ + if (page_off + sizeof(void *) > PAGE_SIZE) + return (EINVAL); for (;;) { /* @@ -292,9 +277,22 @@ if (error) return (error); - umtxq_lock(td, umtx); - uq = umtxq_insert(td, umtx); - umtxq_unlock(td, umtx); + map = &td->td_proc->p_vmspace->vm_map; + if (vm_map_lookup(&map, (vm_offset_t)umtx, VM_PROT_WRITE, + &entry, &object, &pindex, &prot, &wired) != KERN_SUCCESS) { + vm_map_lookup_done(map, entry); + return EFAULT; + } + vm_object_reference(object); + uq.uq_key.uk_object = object; + uq.uq_key.uk_offset = entry->offset + entry->start - + (vm_offset_t)umtx; + uq.uq_thread = td; + chain = umtxq_hash(&uq.uq_key); + umtxq_lock(chain); + umtxq_insert(chain, &uq); + umtxq_unlock(chain); + vm_map_lookup_done(map, entry); /* * Set the contested bit so that a release in user space @@ -307,9 +305,10 @@ /* The address was invalid. */ if (old == -1) { - umtxq_lock(td, umtx); - umtx_remove(uq, td, umtx); - /* unlocked by umtx_remove */ + umtxq_lock(chain); + umtxq_remove(&uq); + umtxq_unlock(chain); + vm_object_deallocate(uq.uq_key.uk_object); return (EFAULT); } @@ -318,31 +317,22 @@ * and we need to retry or we lost a race to the thread * unlocking the umtx. */ - umtxq_lock(td, umtx); - if (old == owner && (td->td_flags & TDF_UMTXWAKEUP) == 0) - error = umtx_sleep(td, umtx, td->td_priority | PCATCH, - "umtx", 0); - else + umtxq_lock(chain); + if (old == owner && (td->td_flags & TDF_UMTXQ)) { + error = msleep(td, umtxq_mtx(chain), + td->td_priority | PCATCH | PDROP, + "umtx", 0); + if (td->td_flags & TDF_UMTXQ) { + umtxq_lock(chain); + umtxq_remove(&uq); + umtxq_unlock(chain); + } + } else { error = 0; - umtx_remove(uq, td, umtx); - /* unlocked by umtx_remove */ - - if (td->td_flags & TDF_UMTXWAKEUP) { - /* - * If we were resumed by umtxq_unlock, we should retry - * to avoid a race. - */ - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_UMTXWAKEUP; - mtx_unlock_spin(&sched_lock); - continue; + umtxq_remove(&uq); + umtxq_unlock(chain); } - - /* - * If we caught a signal, exit immediately. - */ - if (error) - return (error); + vm_object_deallocate(uq.uq_key.uk_object); } return (0); @@ -352,7 +342,14 @@ _umtx_unlock(struct thread *td, struct _umtx_unlock_args *uap) /* struct umtx *umtx */ { + struct umtx_q uq; struct umtx *umtx; + vm_map_t map; + vm_map_entry_t entry; + vm_object_t object; + vm_pindex_t pindex; + vm_prot_t prot; + boolean_t wired; intptr_t owner; intptr_t old; int count; @@ -368,7 +365,7 @@ if ((owner = fuword(&umtx->u_owner)) == -1) return (EFAULT); - if ((owner & ~UMTX_CONTESTED) != td->td_tid) + if ((owner & ~UMTX_CONTESTED) != td->td_tid) return (EPERM); /* We should only ever be in here for contested locks */ @@ -386,15 +383,28 @@ if (old != owner) return (EINVAL); + map = &td->td_proc->p_vmspace->vm_map; + if (vm_map_lookup(&map, (vm_offset_t)umtx, VM_PROT_WRITE, + &entry, &object, &pindex, &prot, &wired) != KERN_SUCCESS) { + vm_map_lookup_done(map, entry); + return EFAULT; + } + vm_object_reference(object); + uq.uq_key.uk_object = object; + uq.uq_key.uk_offset = entry->offset + entry->start - (vm_offset_t)umtx; + vm_map_lookup_done(map, entry); + /* * At the point, a new thread can lock the umtx before we * reach here, so contested bit will not be set, if there * are two or more threads on wait queue, we should set * contensted bit for them. */ - count = umtxq_count(td, umtx); - if (count <= 0) + count = umtxq_count(&uq.uq_key); + if (count <= 0) { + vm_object_deallocate(object); return (0); + } /* * If there is second thread waiting on umtx, set contested bit, @@ -408,8 +418,10 @@ owner | UMTX_CONTESTED); if (old == owner) break; - if (old == -1) + if (old == -1) { + vm_object_deallocate(object); return (EFAULT); + } owner = old; } /* @@ -417,12 +429,15 @@ * to wake more threads, that thread will do it when it unlocks * the umtx. */ - if ((owner & ~UMTX_CONTESTED) != 0) + if ((owner & ~UMTX_CONTESTED) != 0) { + vm_object_deallocate(object); return (0); + } } /* Wake blocked thread. */ - umtx_signal(td, umtx); + umtxq_signal(&uq.uq_key); + vm_object_deallocate(object); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Dec 12 15:01:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8763F16A4D0; Sun, 12 Dec 2004 15:01:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6470516A4CE for ; Sun, 12 Dec 2004 15:01:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E24843D60 for ; Sun, 12 Dec 2004 15:01:51 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCF1p5B050450 for ; Sun, 12 Dec 2004 15:01:51 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBCF1pvw050447 for perforce@freebsd.org; Sun, 12 Dec 2004 15:01:51 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 12 Dec 2004 15:01:51 GMT Message-Id: <200412121501.iBCF1pvw050447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 66892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 15:01:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=66892 Change 66892 by davidxu@davidxu_tiger on 2004/12/12 15:01:33 TDF_UMTXWAKEUP -> TDF_UMTXQ Affected files ... .. //depot/projects/davidxu_thread/src/sys/sys/proc.h#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/sys/proc.h#4 (text+ko) ==== @@ -346,7 +346,7 @@ #define TDF_NEEDRESCHED 0x00010000 /* Thread needs to yield. */ #define TDF_NEEDSIGCHK 0x00020000 /* Thread may need signal delivery. */ #define TDF_XSIG 0x00040000 /* Thread is exchanging signal under trace */ -#define TDF_UMTXWAKEUP 0x00080000 /* Libthr thread must not sleep on a umtx. */ +#define TDF_UMTXQ 0x00080000 /* Libthr thread is on a umtx. */ #define TDF_THRWAKEUP 0x00100000 /* Libthr thread must not suspend itself. */ #define TDF_DBSUSPEND 0x00200000 /* Thread is suspended by debugger */ #define TDF_UNUSED22 0x00400000 /* --available -- */ From owner-p4-projects@FreeBSD.ORG Sun Dec 12 15:02:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5414516A4D0; Sun, 12 Dec 2004 15:02:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3004E16A4CE for ; Sun, 12 Dec 2004 15:02:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C37B43D48 for ; Sun, 12 Dec 2004 15:02:53 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCF2qjh050470 for ; Sun, 12 Dec 2004 15:02:52 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBCF2qxP050467 for perforce@freebsd.org; Sun, 12 Dec 2004 15:02:52 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 12 Dec 2004 15:02:52 GMT Message-Id: <200412121502.iBCF2qxP050467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 66893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 15:02:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=66893 Change 66893 by davidxu@davidxu_tiger on 2004/12/12 15:02:52 reduce diff with -CURRENT Affected files ... .. //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/kern/kern_umtx.c#5 (text+ko) ==== @@ -365,7 +365,7 @@ if ((owner = fuword(&umtx->u_owner)) == -1) return (EFAULT); - if ((owner & ~UMTX_CONTESTED) != td->td_tid) + if ((owner & ~UMTX_CONTESTED) != td->td_tid) return (EPERM); /* We should only ever be in here for contested locks */ From owner-p4-projects@FreeBSD.ORG Sun Dec 12 23:29:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8D3D16A4D0; Sun, 12 Dec 2004 23:29:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B7CE16A4CE for ; Sun, 12 Dec 2004 23:29:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D06F43D5F for ; Sun, 12 Dec 2004 23:29:14 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCNTEfI083870 for ; Sun, 12 Dec 2004 23:29:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBCNTDKU083858 for perforce@freebsd.org; Sun, 12 Dec 2004 23:29:13 GMT (envelope-from peter@freebsd.org) Date: Sun, 12 Dec 2004 23:29:13 GMT Message-Id: <200412122329.iBCNTDKU083858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 23:29:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=66920 Change 66920 by peter@peter_daintree on 2004/12/12 23:28:22 IFC @66919 Affected files ... .. //depot/projects/hammer/UPDATING#69 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#16 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#15 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#32 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvsbug/Makefile#5 integrate .. //depot/projects/hammer/include/string.h#7 integrate .. //depot/projects/hammer/include/unistd.h#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/hammer/lib/libc/string/swab.3#3 integrate .. //depot/projects/hammer/lib/libc/string/swab.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#13 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_atfork.c#1 branch .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fork.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#8 integrate .. //depot/projects/hammer/lib/libsdp/search.c#4 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#23 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#15 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#22 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#33 integrate .. //depot/projects/hammer/share/man/man4/ath.4#19 integrate .. //depot/projects/hammer/share/man/man4/mac_portacl.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#5 integrate .. //depot/projects/hammer/share/man/man4/udav.4#3 integrate .. //depot/projects/hammer/share/man/man4/wlan_acl.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan_ccmp.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan_tkip.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan_xauth.4#2 integrate .. //depot/projects/hammer/share/man/man4/xe.4#6 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#12 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#27 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#9 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#7 integrate .. //depot/projects/hammer/sys/conf/files#97 integrate .. //depot/projects/hammer/sys/conf/files.i386#47 integrate .. //depot/projects/hammer/sys/conf/files.pc98#37 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#11 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#28 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#10 integrate .. //depot/projects/hammer/sys/dev/aac/aac_debug.c#7 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#11 integrate .. //depot/projects/hammer/sys/dev/aac/aac_ioctl.h#3 delete .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/hammer/sys/dev/ata/ata-all.h#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#49 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#23 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#12 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#14 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#21 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#25 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#23 integrate .. //depot/projects/hammer/sys/dev/mse/mse.c#1 branch .. //depot/projects/hammer/sys/dev/mse/mse_cbus.c#1 branch .. //depot/projects/hammer/sys/dev/mse/mse_isa.c#1 branch .. //depot/projects/hammer/sys/dev/mse/msevar.h#1 branch .. //depot/projects/hammer/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#53 integrate .. //depot/projects/hammer/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#19 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#26 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#15 integrate .. //depot/projects/hammer/sys/geom/geom.h#32 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#29 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#28 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#23 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#8 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#18 integrate .. //depot/projects/hammer/sys/i386/acpica/genwakecode.sh#3 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/longrun.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/mse.c#9 delete .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#19 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#40 integrate .. //depot/projects/hammer/sys/ia64/include/fpu.h#3 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#46 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#44 integrate .. //depot/projects/hammer/sys/modules/Makefile#62 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#18 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/hammer/sys/modules/mse/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_sppp.h#2 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#9 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#46 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#27 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#31 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#11 integrate .. //depot/projects/hammer/sys/pc98/pc98/mse.c#8 delete .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#29 integrate .. //depot/projects/hammer/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/hammer/sys/sys/mouse.h#3 integrate .. //depot/projects/hammer/sys/sys/param.h#50 integrate .. //depot/projects/hammer/sys/sys/vnode.h#39 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#17 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#28 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#39 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#25 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#10 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#7 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#7 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#7 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#19 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#9 integrate .. //depot/projects/hammer/usr.bin/make/var.c#15 integrate .. //depot/projects/hammer/usr.bin/whois/whois.1#5 integrate .. //depot/projects/hammer/usr.bin/whois/whois.c#10 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#12 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#11 integrate Differences ... ==== //depot/projects/hammer/UPDATING#69 (text+ko) ==== @@ -23,6 +23,18 @@ developers choose to disable these features on build machines to maximize performance. +20041201: + The wlan support has been updated to split the crypto support + into separate modules. For static WEP you must configure the + wlan_wep module in your system or build and install the module + in place where it can be loaded (the kernel will auto-load + the module when a wep key is configured). + +20041201: + The ath driver has been updated to split the tx rate control + algorithm into a separate module. You need to include either + ath_rate_onoe or ath_rate_amrr when configuring the kernel. + 20041116: Support for systems with an 80386 CPU has been removed. Please use FreeBSD 5.x or earlier on systems with an 80386. @@ -45,14 +57,6 @@ userland programs that read kmem for tcp sockets directly (netstat, sockstat, etc.) -20041018: - A major sweep over the tty drivers to elimnate approx 3100 - lines of copy&pasted code have been performed. As a part of - this change some tty devices have changed names: - sio devices are now named: {tty,cua}d%d[.init,.lock] - ucom devices are now named: {tty,cua}U%d[.init,.lock] - For other drivers see the commit logs. - 20041007: The FreeBSD keyword is no longer a requirement for a valid rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check @@ -67,6 +71,14 @@ changed, thus breaking ABI compatibility. Make sure you rebuild this library with the kernel. +20041004: + A major sweep over the tty drivers to elimnate approx 3100 + lines of copy&pasted code have been performed. As a part of + this change some tty devices have changed names: + sio devices are now named: {tty,cua}d%d[.init,.lock] + ucom devices are now named: {tty,cua}U%d[.init,.lock] + For other drivers see the commit logs. + 20041001: The following libraries had their version number bumped up: /lib/libm.so.2 -> libm.so.3 @@ -266,9 +278,11 @@ The console initialization on Alpha has been reworked and is now identical to other platforms. This means that the hardcoding of the serial console and the debug port has been removed. As such, - hints are now required for the sio(4) driver to become a console - or debug port. The NO_SIO option has been decommissioned because - of this. + hints (hint.sio.0.flags="0x10") are now required for the sio(4) + driver to become a console or debug port. The NO_SIO option has + been decommissioned because of this. + Running mergemaster is the easiest way to ensure your + 'boot/device.hints' has the needed line. 20040710: A revamp of the debugging code in the kernel with some visible @@ -1963,4 +1977,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.382 2004/12/12 07:22:16 obrien Exp $ ==== //depot/projects/hammer/etc/defaults/pccard.conf#16 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.270 2004/11/08 16:59:01 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.271 2004/12/09 22:27:11 rsm Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -2247,7 +2247,14 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Intel EtherExpress PRO/100 Mobile Adapter (16-bit verison) +# Intel EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter (Ethernet part) +card "Intel" "EtherExpress(TM) PRO/100 LAN/Modem PC Card Adapter" + config 0x27 "xe" ? +# config auto "sio" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + +# Intel EtherExpress PRO/100 Mobile Adapter (16-bit version) card "Intel" "EtherExpress(TM) PRO/100 PC Card Mobile Adapter16" config auto "xe" ? insert /etc/pccard_ether $device start ==== //depot/projects/hammer/etc/rc.d/initdiskless#15 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.40 2004/11/05 07:35:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.41 2004/12/12 08:04:26 obrien Exp $ # # PROVIDE: initdiskless # REQUIRE: preseedrandom @@ -305,7 +305,7 @@ if [ -f $j ]; then create_md $subdir echo "Loading /$subdir from cpio archive $j" - (cd / ; /stand/gzip -d < $j | /stand/cpio --extract -d ) + (cd / ; /rescue/pax -x cpio -r -z -p e -f $j) fi done for j in /conf/$i/*.remove ; do ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#32 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.148 2004/12/11 21:57:27 dds Exp $ % -- Gifts for Children -- @@ -1249,6 +1249,11 @@ why there are more Jews named Miller than Katz? Fat Chance. -- Arthur Naiman, "Every Goy's Guide to Yiddish" % + There are wavelengths that people cannot see, there are +sounds that people cannot hear, and maybe computers have thoughts +that people cannot think. + -- Richard W. Hamming +% Thompson, if he is to be believed, has sampled the entire rainbow of legal and illegal drugs in heroic efforts to feel better than he does. ==== //depot/projects/hammer/gnu/usr.bin/cvs/cvsbug/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.21 2004/09/28 21:19:31 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvsbug/Makefile,v 1.22 2004/12/10 18:16:52 kensmith Exp $ MAINTAINER= peter@FreeBSD.org @@ -21,6 +21,7 @@ -e "s,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g" \ -e "s,@SENDMAIL@,/usr/sbin/sendmail,g" \ -e "s,@MKTEMP_FUNCTION@,," \ + -e "s,@MKTEMP_SH_FUNCTION@,," \ ${.ALLSRC} > ${.TARGET} .include ==== //depot/projects/hammer/include/string.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.20 2004/07/23 02:20:05 tjr Exp $ + * $FreeBSD: src/include/string.h,v 1.21 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _STRING_H_ @@ -108,8 +108,19 @@ #endif size_t strxfrm(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE -void swab(const void *, void *, size_t); -#endif + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED + +#ifndef _SSIZE_T_DECLARED +typedef __ssize_t ssize_t; +#define _SSIZE_T_DECLARED +#endif /* _SIZE_T_DECLARED */ + +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* _STRING_H_ */ ==== //depot/projects/hammer/include/unistd.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.74 2004/12/07 07:10:39 phk Exp $ + * $FreeBSD: src/include/unistd.h,v 1.75 2004/12/10 15:24:40 trhodes Exp $ */ #ifndef _UNISTD_H_ @@ -436,7 +436,12 @@ int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void * __restrict, void * __restrict, ssize_t); */ + +#ifndef _SWAB_DECLARED +#define _SWAB_DECLARED +void swab(const void * __restrict, void * __restrict, ssize_t); +#endif /* _SWAB_DECLARED */ + void sync(void); useconds_t ualarm(useconds_t, useconds_t); int usleep(useconds_t); ==== //depot/projects/hammer/lib/libarchive/archive_entry.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.23 2004/08/08 07:39:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.24 2004/12/11 07:11:42 kientzle Exp $"); #include #include @@ -609,7 +609,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev(m, minor(d)); + entry->ae_stat.st_rdev = makedev(major(m), minor(d)); } void @@ -618,7 +618,7 @@ dev_t d; d = entry->ae_stat.st_rdev; - entry->ae_stat.st_rdev = makedev( major(d), m); + entry->ae_stat.st_rdev = makedev(major(d), minor(m)); } void ==== //depot/projects/hammer/lib/libc/string/swab.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)swab.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.7 2002/08/30 21:18:39 robert Exp $ +.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.9 2004/12/10 15:27:06 trhodes Exp $ .\" -.Dd June 4, 1993 +.Dd December 10, 2004 .Dt SWAB 3 .Os .Sh NAME @@ -41,9 +41,9 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In unistd.h .Ft void -.Fn swab "const void * restrict src" "void * restrict dst" "size_t len" +.Fn swab "const void * restrict src" "void * restrict dst" "ssize_t len" .Sh DESCRIPTION The function .Fn swab ==== //depot/projects/hammer/lib/libc/string/swab.c#3 (text+ko) ==== @@ -38,12 +38,12 @@ static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.6 2004/12/10 15:24:40 trhodes Exp $"); -#include +#include void -swab(const void * __restrict from, void * __restrict to, size_t len) +swab(const void * __restrict from, void * __restrict to, ssize_t len) { unsigned long temp; int n; ==== //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.38 2004/12/10 03:36:45 grog Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -10,6 +10,7 @@ uthread_acl_set_fd.c \ uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ + uthread_atfork.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ uthread_attr_getdetachstate.c \ ==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.84 2004/12/10 03:36:45 grog Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -451,6 +451,13 @@ void *routine_arg; }; +struct pthread_atfork { + TAILQ_ENTRY(pthread_atfork) qe; + void (*prepare)(void); + void (*parent)(void); + void (*child)(void); +}; + struct pthread_attr { int sched_policy; int sched_inherit; @@ -1025,6 +1032,9 @@ ; #endif +SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _atfork_list; +SCLASS pthread_mutex_t _atfork_mutex; + /* Default thread attributes: */ SCLASS struct pthread_attr _pthread_attr_default #ifdef GLOBAL_PTHREAD_PRIVATE ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_fork.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.27 2002/03/19 22:58:56 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.28 2004/12/10 03:36:45 grog Exp $ */ #include #include @@ -48,6 +48,7 @@ _fork(void) { struct pthread *curthread = _get_curthread(); + struct pthread_atfork *af; int i, flags, use_deadlist = 0; pid_t ret; pthread_t pthread; @@ -59,9 +60,23 @@ */ _thread_kern_sig_defer(); + _pthread_mutex_lock(&_atfork_mutex); + + /* Run down atfork prepare handlers. */ + TAILQ_FOREACH_REVERSE(af, &_atfork_list, atfork_head, qe) { + if (af->prepare != NULL) + af->prepare(); + } + /* Fork a new process: */ if ((ret = __sys_fork()) != 0) { - /* Parent process or error. Nothing to do here. */ + /* Run down atfork parent handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->parent != NULL) + af->parent(); + } + _pthread_mutex_unlock(&_atfork_mutex); + } else { /* Close the pthread kernel pipe: */ __sys_close(_thread_kern_pipe[0]); @@ -207,8 +222,15 @@ } } } + /* Run down atfork child handlers. */ + TAILQ_FOREACH(af, &_atfork_list, qe) { + if (af->child != NULL) + af->child(); + } + _mutex_reinit(&_atfork_mutex); } + /* * Undefer and handle pending signals, yielding if necessary: */ ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.48 2004/12/10 03:36:45 grog Exp $ */ /* Allocate space for global thread variables here: */ @@ -437,6 +437,8 @@ TAILQ_INIT(&_thread_list); TAILQ_INSERT_HEAD(&_thread_list, _thread_initial, tle); _set_curthread(_thread_initial); + TAILQ_INIT(&_atfork_list); + _pthread_mutex_init(&_atfork_mutex, NULL); /* Initialise the global signal action structure: */ sigfillset(&act.sa_mask); ==== //depot/projects/hammer/lib/libsdp/search.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: search.c,v 1.2 2003/09/04 22:12:13 max Exp $ - * $FreeBSD: src/lib/libsdp/search.c,v 1.6 2004/02/26 20:44:55 emax Exp $ + * $FreeBSD: src/lib/libsdp/search.c,v 1.7 2004/12/09 18:57:12 emax Exp $ */ #include @@ -55,7 +55,8 @@ sdp_session_p ss = (sdp_session_p) xss; uint8_t *req = NULL, *rsp = NULL, *rsp_tmp = NULL; - int32_t type, len; + int32_t t, len; + uint16_t lo, hi; if (ss == NULL) return (-1); @@ -66,11 +67,29 @@ return (-1); } - /* Calculate length of the request */ req = ss->req; + + /* Calculate ServiceSearchPattern length */ plen = plen * (sizeof(pp[0]) + 1); - alen = alen * (sizeof(ap[0]) + 1); + + /* Calculate AttributeIDList length */ + for (len = 0, t = 0; t < alen; t ++) { + lo = (uint16_t) (ap[t] >> 16); + hi = (uint16_t) (ap[t]); + + if (lo > hi) { + ss->error = EINVAL; + return (-1); + } + + if (lo != hi) + len += (sizeof(ap[t]) + 1); + else + len += (sizeof(lo) + 1); + } + alen = len; + /* Calculate length of the request */ len = plen + sizeof(uint8_t) + sizeof(uint16_t) + /* ServiceSearchPattern */ sizeof(uint16_t) + @@ -97,9 +116,21 @@ /* Put AttributeIDList */ SDP_PUT8(SDP_DATA_SEQ16, req); SDP_PUT16(alen, req); - for (; alen > 0; ap ++, alen -= (sizeof(ap[0]) + 1)) { - SDP_PUT8(SDP_DATA_UINT32, req); - SDP_PUT32(*ap, req); + for (; alen > 0; ap ++) { + lo = (uint16_t) (*ap >> 16); + hi = (uint16_t) (*ap); + + if (lo != hi) { + /* Put attribute range */ + SDP_PUT8(SDP_DATA_UINT32, req); + SDP_PUT32(*ap, req); + alen -= (sizeof(ap[0]) + 1); + } else { + /* Put attribute */ + SDP_PUT8(SDP_DATA_UINT16, req); + SDP_PUT16(lo, req); + alen -= (sizeof(lo) + 1); + } } /* Submit ServiceSearchAttributeRequest and wait for response */ @@ -241,8 +272,8 @@ rsp_tmp = ss->rsp; /* Skip the first SEQ */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -263,8 +294,8 @@ for (; rsp_tmp < rsp && vlen > 0; ) { /* Get set of attributes for the next record */ - SDP_GET8(type, rsp_tmp); - switch (type) { + SDP_GET8(t, rsp_tmp); + switch (t) { case SDP_DATA_SEQ8: SDP_GET8(len, rsp_tmp); break; @@ -286,8 +317,8 @@ /* Now rsp_tmp points to list of (attr,value) pairs */ for (; len > 0 && vlen > 0; vp ++, vlen --) { /* Attribute */ - SDP_GET8(type, rsp_tmp); - if (type != SDP_DATA_UINT16) { + SDP_GET8(t, rsp_tmp); + if (t != SDP_DATA_UINT16) { ss->error = ENOATTR; return (-1); } ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#23 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.197 2004/11/22 11:10:04 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.198 2004/12/12 17:30:28 yar Exp $"); /* * FTP server. @@ -273,6 +273,19 @@ LastArgv = envp[-1] + strlen(envp[-1]); #endif /* OLD_SETPROCTITLE */ + /* + * Prevent diagnostic messages from appearing on stderr. + * We run as a daemon or from inetd; in both cases, there's + * more reason in logging to syslog. + */ + (void) freopen(_PATH_DEVNULL, "w", stderr); + opterr = 0; + + /* + * LOG_NDELAY sets up the logging connection immediately, + * necessary for anonymous ftp's that chroot and can't do it later. + */ + openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, "46a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { @@ -367,7 +380,7 @@ val = strtol(optarg, &optarg, 8); if (*optarg != '\0' || val < 0) - warnx("bad value for -u"); + syslog(LOG_WARNING, "bad value for -u"); else defumask = val; break; @@ -385,7 +398,7 @@ break; default: - warnx("unknown flag -%c ignored", optopt); + syslog(LOG_WARNING, "unknown flag -%c ignored", optopt); break; } } @@ -393,13 +406,6 @@ #ifdef VIRTUAL_HOSTING inithosts(); #endif - (void) freopen(_PATH_DEVNULL, "w", stderr); - - /* - * LOG_NDELAY sets up the logging connection immediately, - * necessary for anonymous ftp's that chroot and can't do it later. - */ - openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); if (daemon_mode) { int *ctl_sock, fd, maxfd = -1, nfds, i; ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#15 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -258,7 +258,11 @@ &os; run on a 16 Mbyte system but you will not enjoy that. Kernel build times halved when I went to 32 Mbytes. Note that the SRM console steals 2Mbyte from the total system memory (and keeps - it). For more serious work 64 Mbytes or more are recommended. + it). For more serious work 64 Mbytes or more are recommended. + Although Alpha machines typically can accomodate large to very large + physical memory sizes, &os; is limited to 1 or 2 Gbytes (dependent + on the core chipset) of RAM. This restriction is due to the + current implementation of the VM system. While on the subject of memory: pay close attention to the type of memory your machine uses. There are very different memory ==== //depot/projects/hammer/sbin/fsck_ffs/main.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.42 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.43 2004/12/12 11:04:52 phk Exp $"); #include #include @@ -304,6 +304,7 @@ if (bkgrdflag) { snprintf(snapname, sizeof snapname, "%s/.snap/fsck_snapshot", mntp->f_mntonname); + memset(&args, 0, sizeof args); args.fspec = snapname; while (mount("ffs", mntp->f_mntonname, mntp->f_flags | MNT_UPDATE | MNT_SNAPSHOT, ==== //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.17 2004/11/04 19:12:43 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.18 2004/12/09 12:26:47 pjd Exp $ .\" .Dd May 21, 2004 .Dt GSTRIPE 8 @@ -169,7 +169,7 @@ This can be set to a number between 0 and 3 inclusive. If set to 0 minimal debug information is printed, and if set to 3 the maximum amount of debug information in printed. -.It Va kern.geom.stripe.fast : No 1 +.It Va kern.geom.stripe.fast : No 0 If set to a non-zero value enable .Dq "fast mode" instead of the normal @@ -182,7 +182,7 @@ .Nm STRIPE will fall back to .Dq "economic mode" . -.It Va kern.geom.stripe.maxmem : No 1310720 +.It Va kern.geom.stripe.maxmem : No 13107200 Maximum amount of memory that can be consumed by .Dq "fast mode" (in bytes). @@ -204,7 +204,7 @@ create a file system on it, and mount it: .Bd -literal -offset indent -gstripe label -v -s 4096 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 +gstripe label -v -s 131072 data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/stripe/data mount /dev/stripe/data /mnt [...] ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.c#22 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.108 2004/12/08 19:18:07 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.109 2004/12/11 02:33:33 sam Exp $"; #endif /* not lint */ #include @@ -446,6 +446,27 @@ #undef N } +struct callback { + callback_func *cb_func; + void *cb_arg; + struct callback *cb_next; +}; +static struct callback *callbacks = NULL; + +void +callback_register(callback_func *func, void *arg) +{ + struct callback *cb; + + cb = malloc(sizeof(struct callback)); + if (cb == NULL) + errx(1, "unable to allocate memory for callback"); + cb->cb_func = func; + cb->cb_arg = arg; + cb->cb_next = callbacks; + callbacks = cb; +} + /* specially-handled comamnds */ static void setifaddr(const char *, int, int, const struct afswtch *); static const struct cmd setifaddr_cmd = DEF_CMD("ifaddr", 0, setifaddr); @@ -457,6 +478,7 @@ static int ifconfig(int argc, char *const *argv, const struct afswtch *afp) { + struct callback *cb; int s; if (afp == NULL) @@ -541,6 +563,14 @@ if (ioctl(s, afp->af_aifaddr, afp->af_addreq) < 0) Perror("ioctl (SIOCAIFADDR)"); } + + /* + * Do deferred callbacks registered while processing + * command-line arguments. + */ + for (cb = callbacks; cb != NULL; cb = cb->cb_next) + cb->cb_func(s, cb->cb_arg); + close(s); return(0); } ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.13 2004/12/08 19:18:07 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.14 2004/12/11 02:33:33 sam Exp $ */ #define __constructor __attribute__((constructor)) @@ -56,6 +56,9 @@ }; void cmd_register(struct cmd *); +typedef void callback_func(int s, void *); +void callback_register(callback_func *, void *); + /* * Macros for declaring command functions and initializing entries. */ ==== //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.11 2004/12/08 19:18:07 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.12 2004/12/12 04:32:44 sam Exp $ */ /*- @@ -1382,9 +1382,10 @@ ireq.i_type = IEEE80211_IOC_WEP; if (ioctl(s, SIOCG80211, &ireq) != -1 && ireq.i_val != IEEE80211_WEP_NOSUP) { - int firstkey; + int firstkey, wepmode; - switch (ireq.i_val) { + wepmode = ireq.i_val; + switch (wepmode) { case IEEE80211_WEP_OFF: LINE_CHECK("%cprivacy OFF", spacer); break; @@ -1396,7 +1397,7 @@ break; default: LINE_CHECK("%cprivacy UNKNOWN (0x%x)", - spacer, ireq.i_val); + spacer, wepmode); break; } @@ -1412,7 +1413,7 @@ } if (ireq.i_val != -1) LINE_CHECK("%cdeftxkey %d", spacer, ireq.i_val+1); - else if (verbose) + else if (wepmode != IEEE80211_WEP_OFF || verbose) LINE_CHECK("%cdeftxkey UNDEF", spacer); ireq.i_type = IEEE80211_IOC_NUMWEPKEYS; ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#33 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.159 2004/11/03 21:51:34 ceri Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.160 2004/12/10 02:38:21 csjp Exp $ .\" .Dd October 22, 2004 .Dt IPFW 8 @@ -973,14 +973,10 @@ A .Ar group may be specified by name or number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm jail Ar prisonID Matches all TCP or UDP packets sent by or received for the jail whos prison ID is .Ar prisonID . -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm icmptypes Ar types Matches ICMP packets whose ICMP type is in the list .Ar types . @@ -1305,8 +1301,6 @@ A .Ar user may be matched by name or identification number. -This option should be used only if debug.mpsafenet=0 to avoid -lock ordering issues which could result in system hard locks. .It Cm verrevpath For incoming packets, a routing table lookup is done on the packet's source address. @@ -2342,10 +2336,6 @@ .Xr sysctl 8 , .Xr syslogd 8 .Sh BUGS -Lock ordering issues could result in system hard locks if rules which -contain UID, GID or jail ID constraints and used with debug.mpsafenet -set to 1. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 12 23:41:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D29CC16A4D0; Sun, 12 Dec 2004 23:41:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9371216A4CE for ; Sun, 12 Dec 2004 23:41:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 592CC43D55 for ; Sun, 12 Dec 2004 23:41:29 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCNfTqb084942 for ; Sun, 12 Dec 2004 23:41:29 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBCNfS7d084939 for perforce@freebsd.org; Sun, 12 Dec 2004 23:41:28 GMT (envelope-from peter@freebsd.org) Date: Sun, 12 Dec 2004 23:41:28 GMT Message-Id: <200412122341.iBCNfS7d084939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 23:41:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=66921 Change 66921 by peter@peter_daintree on 2004/12/12 23:41:13 integrate i386 changes into amd64 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#78 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#58 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#51 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#26 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#18 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#16 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#23 (text+ko) ==== @@ -210,31 +210,16 @@ */ .text SUPERALIGN_TEXT -IDTVEC(hardclock) +IDTVEC(ipi_intr_bitmap_handler) + PUSH_FRAME movq lapic, %rdx movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - - call forwarded_hardclock - MEXITCOUNT - jmp doreti - -/* - * Forward statclock to another CPU. Pushes a clockframe and calls - * forwarded_statclock(). - */ - .text - SUPERALIGN_TEXT -IDTVEC(statclock) - PUSH_FRAME - - movq lapic, %rdx - movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - + FAKE_MCOUNT(TF_RIP(%rsp)) - call forwarded_statclock + call ipi_bitmap_handler MEXITCOUNT jmp doreti ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#36 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 1992 Terrence R. Lambert. * Copyright (c) 1982, 1987, 1990 The Regents of the University of California. * Copyright (c) 1997 KATO Takenori. - * Copyright (c) 2001 Tamotsu Hattori. - * Copyright (c) 2001 Mitsuru IWASAKI. * All rights reserved. * * This code is derived from software contributed to Berkeley by ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#78 (text+ko) ==== @@ -131,6 +131,9 @@ } static cpu_info[MAXCPU]; static int cpu_apic_ids[MAXCPU]; +/* Holds pending bitmap based IPIs per CPU */ +static volatile u_int cpu_ipi_pending[MAXCPU]; + static u_int boot_address; static void set_logical_apic_ids(void); @@ -296,25 +299,22 @@ int i; /* Initialize the logical ID to APIC ID table. */ - for (i = 0; i < MAXCPU; i++) + for (i = 0; i < MAXCPU; i++) { cpu_apic_ids[i] = -1; + cpu_ipi_pending[i] = 0; + } /* Install an inter-CPU IPI for TLB invalidation */ setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLPG, IDTVEC(invlpg), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0); - - /* Install an inter-CPU IPI for forwarding hardclock() */ - setidt(IPI_HARDCLOCK, IDTVEC(hardclock), SDT_SYSIGT, SEL_KPL, 0); - - /* Install an inter-CPU IPI for forwarding statclock() */ - setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for all-CPU rendezvous */ setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); - /* Install an inter-CPU IPI for forcing an additional software trap */ - setidt(IPI_AST, IDTVEC(cpuast), SDT_SYSIGT, SEL_KPL, 0); + /* Install generic inter-CPU IPI handler */ + setidt(IPI_BITMAP_VECTOR, IDTVEC(ipi_intr_bitmap_handler), + SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for CPU stop/restart */ setidt(IPI_STOP, IDTVEC(cpustop), SDT_SYSIGT, SEL_KPL, 0); @@ -876,21 +876,7 @@ * For statclock, we send an IPI to all CPU's to have them call this * function. */ -void -forwarded_statclock(struct clockframe frame) -{ - struct thread *td; - CTR0(KTR_SMP, "forwarded_statclock"); - td = curthread; - td->td_intr_nesting_level++; - if (profprocs != 0) - profclock(&frame); - if (pscnt == psdiv) - statclock(&frame); - td->td_intr_nesting_level--; -} - void forward_statclock(void) { @@ -913,18 +899,7 @@ * state and call hardclock_process() on the CPU receiving the clock interrupt * and then just use a simple IPI to handle any ast's if needed. */ -void -forwarded_hardclock(struct clockframe frame) -{ - struct thread *td; - CTR0(KTR_SMP, "forwarded_hardclock"); - td = curthread; - td->td_intr_nesting_level++; - hardclock_process(&frame); - td->td_intr_nesting_level--; -} - void forward_hardclock(void) { @@ -940,6 +915,42 @@ ipi_selected(map, IPI_HARDCLOCK); } + +void ipi_bitmap_handler(struct clockframe frame) +{ + int cpu = PCPU_GET(cpuid); + u_int ipi_bitmap; + struct thread *td; + + ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); + + critical_enter(); + + /* Nothing to do for AST */ + + if (ipi_bitmap & (1 << IPI_HARDCLOCK)) { + td = curthread; + td->td_intr_nesting_level++; + hardclock_process(&frame); + td->td_intr_nesting_level--; + } + + if (ipi_bitmap & (1 << IPI_STATCLOCK)) { + CTR0(KTR_SMP, "forwarded_statclock"); + + td = curthread; + td->td_intr_nesting_level++; + if (profprocs != 0) + profclock(&frame); + if (pscnt == psdiv) + statclock(&frame); + td->td_intr_nesting_level--; + } + + critical_exit(); +} + + /* * send an IPI to a set of cpus. */ @@ -947,15 +958,36 @@ ipi_selected(u_int32_t cpus, u_int ipi) { int cpu; + u_int bitmap = 0; + u_int old_pending; + u_int new_pending; + if (IPI_IS_BITMAPED(ipi)) { + bitmap = 1 << ipi; + ipi = IPI_BITMAP_VECTOR; + } + CTR3(KTR_SMP, "%s: cpus: %x ipi: %x", __func__, cpus, ipi); while ((cpu = ffs(cpus)) != 0) { cpu--; + cpus &= ~(1 << cpu); + KASSERT(cpu_apic_ids[cpu] != -1, ("IPI to non-existent CPU %d", cpu)); + + if (bitmap) { + do { + old_pending = cpu_ipi_pending[cpu]; + new_pending = old_pending | bitmap; + } while (!atomic_cmpset_int(&cpu_ipi_pending[cpu],old_pending, new_pending)); + + if (old_pending) + continue; + } + lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]); - cpus &= ~(1 << cpu); } + } /* ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#58 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -128,6 +129,17 @@ td2->td_frame->tf_rdx = 1; /* + * If the parent process 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 unless the debugger had set PF_FORK + * on the parent. Otherwise, the child will receive a (likely + * unexpected) SIGTRAP when it executes the first instruction after + * returning to userland. + */ + if ((p1->p_pfsflags & PF_FORK) == 0) + td2->td_frame->tf_eflags &= ~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/hammer/sys/amd64/conf/NOTES#51 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1176) +# (XXX from i386:NOTES,v 1.1177) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.20 2004/09/22 01:04:54 peter Exp $ # @@ -240,8 +240,10 @@ #XXX#device ed #XXX#device lnc -#XXX#device ath -#XXX#device ath_hal # Atheros HAL (includes binary component) +device ath +device ath_hal # Atheros HAL (includes binary component) +device ath_rate_onoe # Onoe rate control for ath driver +#device ath_rate_amrr # AMRR rate control for ath driver device wlan # 802.11 layer # ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#26 (text+ko) ==== @@ -83,21 +83,54 @@ #define APIC_IO_INTS (IDT_IO_INTS + 16) #define APIC_NUM_IOINTS 192 +/* + ********************* !!! WARNING !!! ****************************** + * Each local apic has an interrupt receive fifo that is two entries deep + * for each interrupt priority class (higher 4 bits of interrupt vector). + * Once the fifo is full the APIC can no longer receive interrupts for this + * class and sending IPIs from other CPUs will be blocked. + * To avoid deadlocks there should be no more than two IPI interrupts + * pending at the same time. + * Currently this is guaranteed by dividing the IPIs in two groups that have + * each at most one IPI interrupt pending. The first group is protected by the + * smp_ipi_mtx and waits for the completion of the IPI (Only one IPI user + * at a time) The second group uses a single interrupt and a bitmap to avoid + * redundant IPI interrupts. + * + * Right now IPI_STOP used by kdb shares the interrupt priority class with + * the two IPI groups mentioned above. As such IPI_STOP may cause a deadlock. + * Eventually IPI_STOP should use NMI IPIs - this would eliminate this and + * other deadlocks caused by IPI_STOP. + */ + #define APIC_LOCAL_INTS 240 -#define APIC_TIMER_INT APIC_LOCAL_INTS -#define APIC_ERROR_INT (APIC_LOCAL_INTS + 1) -#define APIC_THERMAL_INT (APIC_LOCAL_INTS + 2) + +#if 0 +#define APIC_TIMER_INT (APIC_LOCAL_INTS + X) +#define APIC_ERROR_INT (APIC_LOCAL_INTS + X) +#define APIC_THERMAL_INT (APIC_LOCAL_INTS + X) +#endif -#define APIC_IPI_INTS (APIC_LOCAL_INTS + 3) -#define IPI_AST APIC_IPI_INTS /* Generate software trap. */ +#define APIC_IPI_INTS (APIC_LOCAL_INTS + 0) +#define IPI_RENDEZVOUS (APIC_IPI_INTS) /* Inter-CPU rendezvous. */ #define IPI_INVLTLB (APIC_IPI_INTS + 1) /* TLB Shootdown IPIs */ #define IPI_INVLPG (APIC_IPI_INTS + 2) #define IPI_INVLRNG (APIC_IPI_INTS + 3) -#define IPI_HARDCLOCK (APIC_IPI_INTS + 8) /* Inter-CPU clock handling. */ -#define IPI_STATCLOCK (APIC_IPI_INTS + 9) -#define IPI_RENDEZVOUS (APIC_IPI_INTS + 10) /* Inter-CPU rendezvous. */ -#define IPI_STOP (APIC_IPI_INTS + 11) /* Stop CPU until restarted. */ +/* Vector to handle bitmap based IPIs */ +#define IPI_BITMAP_VECTOR (APIC_IPI_INTS + 5) + +/* IPIs handled by IPI_BITMAPED_VECTOR (XXX ups is there a better place?) */ +#define IPI_AST 0 /* Generate software trap. */ +#define IPI_HARDCLOCK 1 /* Inter-CPU clock handling. */ +#define IPI_STATCLOCK 2 +#define IPI_BITMAP_LAST IPI_STATCLOCK +#define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) + +#define IPI_STOP (APIC_IPI_INTS + 6) /* Stop CPU until restarted. */ +/* The spurious interrupt can share the priority class with the IPIs since + * it is not a normal interrupt. (Does not use the APIC's interrupt fifo) + */ #define APIC_SPURIOUS_INT 255 #define LVT_LINT0 0 ==== //depot/projects/hammer/sys/amd64/include/smp.h#18 (text+ko) ==== @@ -40,9 +40,7 @@ IDTVEC(invltlb), /* TLB shootdowns - global */ IDTVEC(invlpg), /* TLB shootdowns - 1 page */ IDTVEC(invlrng), /* TLB shootdowns - page range */ - IDTVEC(hardclock), /* Forward hardclock() */ - IDTVEC(statclock), /* Forward statclock() */ - IDTVEC(cpuast), /* Additional software trap on other cpu */ + IDTVEC(ipi_intr_bitmap_handler), /* Bitmap based IPIs */ IDTVEC(cpustop), /* CPU stops & waits to be restarted */ IDTVEC(rendezvous); /* handle CPU rendezvous */ @@ -54,9 +52,8 @@ void ipi_all_but_self(u_int ipi); void ipi_self(u_int ipi); void forward_statclock(void); -void forwarded_statclock(struct clockframe frame); void forward_hardclock(void); -void forwarded_hardclock(struct clockframe frame); +void ipi_bitmap_handler(struct clockframe frame); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); void mp_topology(void); ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#16 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Dec 13 02:30:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49D3116A4D0; Mon, 13 Dec 2004 02:30:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2618016A4CE for ; Mon, 13 Dec 2004 02:30:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0137443D2D for ; Mon, 13 Dec 2004 02:30:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBD2Uw5h000142 for ; Mon, 13 Dec 2004 02:30:58 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBD2UwG9000139 for perforce@freebsd.org; Mon, 13 Dec 2004 02:30:58 GMT (envelope-from wsalamon@computer.org) Date: Mon, 13 Dec 2004 02:30:58 GMT Message-Id: <200412130230.iBD2UwG9000139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 66934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2004 02:30:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=66934 Change 66934 by wsalamon@rickenbacker on 2004/12/13 02:30:03 Add auditing to the open() and close() system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#10 edit .. //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#3 edit .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#6 edit .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#13 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#10 (text+ko) ==== @@ -357,9 +357,9 @@ /* * A Macro to wrap the audit_sysclose() function. */ -#define AUDIT_SYSCLOSE(args...) do { \ +#define AUDIT_SYSCLOSE(p, fd) do { \ if (audit_enabled) \ - audit_sysclose(args); \ + audit_sysclose(p, fd); \ } while (0) #else /* !AUDIT */ @@ -378,7 +378,7 @@ #define AUDIT_SYSCALL_EXIT(error, td) do { \ } while (0) -#define AUDIT_SYSCLOSE(op, args...) do { \ +#define AUDIT_SYSCLOSE(p, fd) do { \ } while (0) #endif /* AUDIT */ ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#3 (text+ko) ==== @@ -39,6 +39,9 @@ #include "opt_compat.h" +#include +#include + #include #include #include @@ -965,6 +968,12 @@ holdleaders = 0; fdp = td->td_proc->p_fd; mtx_lock(&Giant); + + /* The call to AUDIT_SYSCLOSE must be made with Giant held, + * but without the fd lock. + */ + AUDIT_SYSCLOSE(td->td_proc, fd); + FILEDESC_LOCK(fdp); if ((unsigned)fd >= fdp->fd_nfiles || (fp = fdp->fd_ofiles[fd]) == NULL) { ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#6 (text+ko) ==== @@ -953,6 +953,8 @@ struct flock lf; struct nameidata nd; + AUDIT_ARG(fflags, flags); + AUDIT_ARG(mode, mode); if ((flags & O_ACCMODE) == O_ACCMODE) return (EINVAL); flags = FFLAGS(flags); @@ -962,7 +964,7 @@ /* An extra reference on `nfp' has been held for us by falloc(). */ fp = nfp; cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; - NDINIT(&nd, LOOKUP, FOLLOW, pathseg, path, td); + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNPATH1, pathseg, path, td); td->td_dupfd = -1; /* XXX check for fdopen */ mtx_lock(&Giant); error = vn_open(&nd, &flags, cmode, indx); @@ -1135,7 +1137,7 @@ int mode; } */ *uap; { - + /* Auditing is done in kern_open() */ return (kern_open(td, uap->path, UIO_USERSPACE, O_WRONLY | O_CREAT | O_TRUNC, uap->mode)); } ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#4 (text+ko) ==== @@ -123,7 +123,7 @@ fmode = *flagp; if (fmode & O_CREAT) { ndp->ni_cnd.cn_nameiop = CREATE; - ndp->ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF; + ndp->ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | AUDITVNPATH1; if ((fmode & O_EXCL) == 0 && (fmode & O_NOFOLLOW) == 0) ndp->ni_cnd.cn_flags |= FOLLOW; bwillwrite(); @@ -185,10 +185,11 @@ #ifdef LOOKUP_SHARED ndp->ni_cnd.cn_flags = ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | - LOCKSHARED | LOCKLEAF; + LOCKSHARED | LOCKLEAF | AUDITVNPATH1; #else ndp->ni_cnd.cn_flags = - ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | LOCKLEAF; + ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | + LOCKLEAF | AUDITVNPATH1; #endif if ((error = namei(ndp)) != 0) return (error); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#13 (text+ko) ==== @@ -1276,8 +1276,8 @@ switch(ar->k_ar.ar_event) { - case AUE_OPEN_RWTC: - /* The open syscall always writes a OPEN_RWTC event; limit the + case AUE_OPEN: + /* The open syscall always writes a AUE_OPEN event; change it * to the proper type of event based on the flags and the error * value. */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#6 (text+ko) ==== @@ -797,18 +797,25 @@ kau_write(rec, tok); break; - case AUE_OPEN_R: case AUE_OPEN_RC: case AUE_OPEN_RTC: + case AUE_OPEN_RWC: + case AUE_OPEN_RWTC: + case AUE_OPEN_WC: + case AUE_OPEN_WTC: + /* case AUE_O_CREAT: */ /* AUE_O_CREAT == AUE_OPEN_RWTC */ + tok = au_to_arg32(3, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + /* fall through */ + + case AUE_OPEN_R: case AUE_OPEN_RT: case AUE_OPEN_RW: - case AUE_OPEN_RWC: - case AUE_OPEN_RWTC: case AUE_OPEN_RWT: case AUE_OPEN_W: - case AUE_OPEN_WC: - case AUE_OPEN_WTC: case AUE_OPEN_WT: + tok = au_to_arg32(2, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); UPATH1_TOKENS; /* Save the user space path */ KPATH1_VNODE1_TOKENS; /* Audit the kernel path as well */ break; From owner-p4-projects@FreeBSD.ORG Mon Dec 13 04:29:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A00616A4D0; Mon, 13 Dec 2004 04:29:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2210816A4CE for ; Mon, 13 Dec 2004 04:29:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAD8043D2F for ; Mon, 13 Dec 2004 04:29:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBD4TMA1004058 for ; Mon, 13 Dec 2004 04:29:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBD4TM74004055 for perforce@freebsd.org; Mon, 13 Dec 2004 04:29:22 GMT (envelope-from sam@freebsd.org) Date: Mon, 13 Dec 2004 04:29:22 GMT Message-Id: <200412130429.iBD4TM74004055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2004 04:29:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=66938 Change 66938 by sam@sam_ebb on 2004/12/13 04:28:39 IFC @ 66937 Affected files ... .. //depot/projects/wifi/Makefile#4 integrate .. //depot/projects/wifi/UPDATING#6 integrate .. //depot/projects/wifi/etc/rc.d/initdiskless#3 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.c#7 integrate .. //depot/projects/wifi/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#31 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/cp.4#2 integrate .. //depot/projects/wifi/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#7 integrate .. //depot/projects/wifi/sys/conf/files.i386#7 integrate .. //depot/projects/wifi/sys/conf/files.pc98#3 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/wifi/sys/dev/mse/mse.c#2 integrate .. //depot/projects/wifi/sys/dev/mse/mse_cbus.c#1 branch .. //depot/projects/wifi/sys/dev/mse/mse_isa.c#1 branch .. //depot/projects/wifi/sys/dev/mse/msevar.h#1 branch .. //depot/projects/wifi/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/wifi/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/wifi/sys/geom/geom.h#4 integrate .. //depot/projects/wifi/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/wifi/sys/geom/geom_dev.c#4 integrate .. //depot/projects/wifi/sys/geom/geom_disk.c#2 integrate .. //depot/projects/wifi/sys/geom/geom_mbr.c#4 integrate .. //depot/projects/wifi/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/wifi/sys/i386/acpica/genwakecode.sh#2 integrate .. //depot/projects/wifi/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/wifi/sys/i386/isa/mse.c#2 delete .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/wifi/sys/modules/Makefile#8 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_asus/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_ibm/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/mse/Makefile#1 branch .. //depot/projects/wifi/sys/net/if_sppp.h#2 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#4 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#17 integrate .. //depot/projects/wifi/sys/pc98/pc98/mse.c#2 delete .. //depot/projects/wifi/sys/sys/mouse.h#2 integrate .. //depot/projects/wifi/sys/sys/param.h#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#9 integrate Differences ... ==== //depot/projects/wifi/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $ +# $FreeBSD: src/Makefile,v 1.312 2004/12/13 00:49:52 marcel Exp $ # # The user-driven targets are: # @@ -86,8 +86,7 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= /usr/bin/env -i \ - PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ +_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} ${.MAKEFLAGS} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ ==== //depot/projects/wifi/UPDATING#6 (text+ko) ==== @@ -57,14 +57,6 @@ userland programs that read kmem for tcp sockets directly (netstat, sockstat, etc.) -20041018: - A major sweep over the tty drivers to elimnate approx 3100 - lines of copy&pasted code have been performed. As a part of - this change some tty devices have changed names: - sio devices are now named: {tty,cua}d%d[.init,.lock] - ucom devices are now named: {tty,cua}U%d[.init,.lock] - For other drivers see the commit logs. - 20041007: The FreeBSD keyword is no longer a requirement for a valid rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check @@ -79,6 +71,14 @@ changed, thus breaking ABI compatibility. Make sure you rebuild this library with the kernel. +20041004: + A major sweep over the tty drivers to elimnate approx 3100 + lines of copy&pasted code have been performed. As a part of + this change some tty devices have changed names: + sio devices are now named: {tty,cua}d%d[.init,.lock] + ucom devices are now named: {tty,cua}U%d[.init,.lock] + For other drivers see the commit logs. + 20041001: The following libraries had their version number bumped up: /lib/libm.so.2 -> libm.so.3 @@ -278,9 +278,11 @@ The console initialization on Alpha has been reworked and is now identical to other platforms. This means that the hardcoding of the serial console and the debug port has been removed. As such, - hints are now required for the sio(4) driver to become a console - or debug port. The NO_SIO option has been decommissioned because - of this. + hints (hint.sio.0.flags="0x10") are now required for the sio(4) + driver to become a console or debug port. The NO_SIO option has + been decommissioned because of this. + Running mergemaster is the easiest way to ensure your + 'boot/device.hints' has the needed line. 20040710: A revamp of the debugging code in the kernel with some visible @@ -1975,4 +1977,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.381 2004/12/11 23:21:31 sam Exp $ +$FreeBSD: src/UPDATING,v 1.382 2004/12/12 07:22:16 obrien Exp $ ==== //depot/projects/wifi/etc/rc.d/initdiskless#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.40 2004/11/05 07:35:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.41 2004/12/12 08:04:26 obrien Exp $ # # PROVIDE: initdiskless # REQUIRE: preseedrandom @@ -305,7 +305,7 @@ if [ -f $j ]; then create_md $subdir echo "Loading /$subdir from cpio archive $j" - (cd / ; /stand/gzip -d < $j | /stand/cpio --extract -d ) + (cd / ; /rescue/pax -x cpio -r -z -p e -f $j) fi done for j in /conf/$i/*.remove ; do ==== //depot/projects/wifi/libexec/ftpd/ftpd.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.197 2004/11/22 11:10:04 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.198 2004/12/12 17:30:28 yar Exp $"); /* * FTP server. @@ -273,6 +273,19 @@ LastArgv = envp[-1] + strlen(envp[-1]); #endif /* OLD_SETPROCTITLE */ + /* + * Prevent diagnostic messages from appearing on stderr. + * We run as a daemon or from inetd; in both cases, there's + * more reason in logging to syslog. + */ + (void) freopen(_PATH_DEVNULL, "w", stderr); + opterr = 0; + + /* + * LOG_NDELAY sets up the logging connection immediately, + * necessary for anonymous ftp's that chroot and can't do it later. + */ + openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, "46a:AdDEhlmMoOp:P:rRSt:T:u:UvW")) != -1) { @@ -367,7 +380,7 @@ val = strtol(optarg, &optarg, 8); if (*optarg != '\0' || val < 0) - warnx("bad value for -u"); + syslog(LOG_WARNING, "bad value for -u"); else defumask = val; break; @@ -385,7 +398,7 @@ break; default: - warnx("unknown flag -%c ignored", optopt); + syslog(LOG_WARNING, "unknown flag -%c ignored", optopt); break; } } @@ -393,13 +406,6 @@ #ifdef VIRTUAL_HOSTING inithosts(); #endif - (void) freopen(_PATH_DEVNULL, "w", stderr); - - /* - * LOG_NDELAY sets up the logging connection immediately, - * necessary for anonymous ftp's that chroot and can't do it later. - */ - openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP); if (daemon_mode) { int *ctl_sock, fd, maxfd = -1, nfds, i; ==== //depot/projects/wifi/sbin/fsck_ffs/main.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.42 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.43 2004/12/12 11:04:52 phk Exp $"); #include #include @@ -304,6 +304,7 @@ if (bkgrdflag) { snprintf(snapname, sizeof snapname, "%s/.snap/fsck_snapshot", mntp->f_mntonname); + memset(&args, 0, sizeof args); args.fspec = snapname; while (mount("ffs", mntp->f_mntonname, mntp->f_flags | MNT_UPDATE | MNT_SNAPSHOT, ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#31 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.11 2004/12/08 19:18:07 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.12 2004/12/12 04:32:44 sam Exp $ */ /*- @@ -1382,9 +1382,10 @@ ireq.i_type = IEEE80211_IOC_WEP; if (ioctl(s, SIOCG80211, &ireq) != -1 && ireq.i_val != IEEE80211_WEP_NOSUP) { - int firstkey; + int firstkey, wepmode; - switch (ireq.i_val) { + wepmode = ireq.i_val; + switch (wepmode) { case IEEE80211_WEP_OFF: LINE_CHECK("%cprivacy OFF", spacer); break; @@ -1396,7 +1397,7 @@ break; default: LINE_CHECK("%cprivacy UNKNOWN (0x%x)", - spacer, ireq.i_val); + spacer, wepmode); break; } @@ -1412,7 +1413,7 @@ } if (ireq.i_val != -1) LINE_CHECK("%cdeftxkey %d", spacer, ireq.i_val+1); - else if (verbose) + else if (wepmode != IEEE80211_WEP_OFF || verbose) LINE_CHECK("%cdeftxkey UNDEF", spacer); ireq.i_type = IEEE80211_IOC_NUMWEPKEYS; ==== //depot/projects/wifi/share/man/man4/man4.i386/cp.4#2 (text+ko) ==== @@ -11,9 +11,9 @@ .\" works or modified versions. .\" .\" Cronyx Id: cp.4,v 1.1.2.5 2004/06/21 17:47:40 rik Exp $ -.\" $FreeBSD: src/share/man/man4/man4.i386/cp.4,v 1.6 2004/07/07 19:41:42 simon Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/cp.4,v 1.8 2004/12/12 12:32:50 rik Exp $ .\" -.Dd July 7, 2004 +.Dd December 12, 2004 .Dt CP 4 i386 .Os .Sh NAME @@ -60,6 +60,10 @@ V.35 and RS-232 interfaces .It Cronyx Tau-PCI/R RS-530(RS-449) and X.21 interfaces +.It Cronyx Tau-PCI-L +one V.35 and RS-232 interface, low profile +.It Cronyx Tau-PCI-L/R +one RS-530(RS-449) and X.21 interface, low profile .It Cronyx Tau-PCI-E1 fractional E1 interfaces .It Cronyx Tau-PCI-G703 @@ -86,7 +90,9 @@ The .Nm driver was added in -.Fx 5.3 . +.Fx 5.3 +and +.Fx 4.11 . The .Nm driver for previous versions of ==== //depot/projects/wifi/sys/arm/arm/swtch.S#5 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.8 2004/12/05 22:46:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.9 2004/12/12 19:21:58 cognet Exp $"); /* @@ -128,11 +128,9 @@ .Lcpu_do_powersave: .word _C_LABEL(cpu_do_powersave) ENTRY(cpu_throw) - mov r4, r0 mov r5, r1 /* - * r4 = oldtd * r5 = newtd */ @@ -148,7 +146,6 @@ /* * r0 = Pointer to L1 slot for vector_page (or NULL) * r1 = lwp0's DACR - * r4 = lwp we're switching from * r5 = lwp0 * r6 = exit func * r7 = lwp0's PCB @@ -200,9 +197,15 @@ ldr r13, [r7, #(PCB_SP)] #endif - mov r0, #0x00000000 /* r5 = old lwp = NULL */ - mov r1, r5 - b .Lswitch_resume + /* We have a new curthread now so make a note it */ + ldr r6, .Lcurthread + str r5, [r6] + + /* Hook in a new pcb */ + ldr r6, .Lcurpcb + str r7, [r6] + + ldmfd sp, {r4-r7, pc} ENTRY(cpu_switch) stmfd sp!, {r4-r7, lr} @@ -228,16 +231,6 @@ ldr r2, [r1, #TD_PCB] str r2, [r7] - - /* - * If the old lwp on entry to cpu_switch was zero then the - * process that called it was exiting. This means that we do - * not need to save the current context. Instead we can jump - * straight to restoring the context for the new process. - */ - teq r0, #0x00000000 - beq .Lswitch_return - /* rem: r1 = new process */ /* rem: interrupts are enabled */ @@ -267,16 +260,15 @@ /* r1 now free! */ + mrs r3, cpsr /* - * This can be optimised... We know we want to go from SVC32 - * mode to UND32 mode + * We can do that, since + * PSR_SVC32_MODE|PSR_UND32_MODE == MSR_UND32_MODE */ - mrs r3, cpsr - bic r2, r3, #(PSR_MODE) - orr r2, r2, #(PSR_UND32_MODE) - msr cpsr_c, r2 + orr r8, r3, #(PSR_UND32_MODE) + msr cpsr_c, r8 - str sp, [r8, #(PCB_UND_SP)] + str sp, [r2, #(PCB_UND_SP)] msr cpsr_c, r3 /* Restore the old mode */ /* rem: r8 = old PCB */ @@ -378,6 +370,10 @@ movne r0, #0 /* We *know* vector_page's VA is 0x0 */ movne lr, pc ldrne pc, [r10, #CF_TLB_FLUSHID_SE] + /* + * We can do that, since + * PSR_SVC32_MODE|PSR_UND32_MODE == MSR_UND32_MODE + */ .Lcs_context_switched: @@ -385,14 +381,13 @@ /* rem: r9 = new PCB */ + mrs r3, cpsr /* - * This can be optimised... We know we want to go from SVC32 - * mode to UND32 mode + * We can do that, since + * PSR_SVC32_MODE|PSR_UND32_MODE == MSR_UND32_MODE */ - mrs r3, cpsr - bic r2, r3, #(PSR_MODE) - orr r2, r2, #(PSR_UND32_MODE) - msr cpsr_c, r2 + orr r2, r3, #(PSR_UND32_MODE) + msr cpsr_c, r2 ldr sp, [r9, #(PCB_UND_SP)] ==== //depot/projects/wifi/sys/arm/arm/trap.c#7 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.7 2004/12/11 23:54:03 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.8 2004/12/11 23:56:03 cognet Exp $"); #include @@ -921,43 +921,43 @@ td->td_retval[1] = 0; error = (*callp->sy_call)(td, args); } - switch (error) { - case 0: - frame->tf_r0 = td->td_retval[0]; - frame->tf_r1 = td->td_retval[1]; - - frame->tf_spsr &= ~PSR_C_bit; /* carry bit */ - break; - - case ERESTART: - /* - * Reconstruct the pc to point at the swi. - */ - frame->tf_pc -= INSN_SIZE; - break; - case EJUSTRETURN: - /* nothing to do */ - break; - default: + switch (error) { + case 0: + frame->tf_r0 = td->td_retval[0]; + frame->tf_r1 = td->td_retval[1]; + + frame->tf_spsr &= ~PSR_C_bit; /* carry bit */ + break; + + case ERESTART: + /* + * Reconstruct the pc to point at the swi. + */ + frame->tf_pc -= INSN_SIZE; + break; + case EJUSTRETURN: + /* nothing to do */ + break; + default: bad: - frame->tf_r0 = error; - frame->tf_spsr |= PSR_C_bit; /* carry bit */ - break; - } - if (locked && (callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - - userret(td, frame, sticks); - CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, - td->td_proc->p_pid, td->td_proc->p_comm, code); - + frame->tf_r0 = error; + frame->tf_spsr |= PSR_C_bit; /* carry bit */ + break; + } + if (locked && (callp->sy_narg & SYF_MPSAFE) == 0) + mtx_unlock(&Giant); + + + userret(td, frame, sticks); + CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, + td->td_proc->p_pid, td->td_proc->p_comm, code); + #ifdef KTRACE - if (KTRPOINT(td, KTR_SYSRET)) - ktrsysret(code, error, td->td_retval[0]); + if (KTRPOINT(td, KTR_SYSRET)) + ktrsysret(code, error, td->td_retval[0]); #endif - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); + mtx_assert(&sched_lock, MA_NOTOWNED); + mtx_assert(&Giant, MA_NOTOWNED); } void ==== //depot/projects/wifi/sys/conf/files.i386#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.510 2004/12/08 18:20:52 sam Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.511 2004/12/12 20:05:49 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -168,6 +168,8 @@ dev/lnc/if_lnc_isa.c optional lnc isa dev/io/iodev.c optional io dev/mem/memutil.c optional mem +dev/mse/mse.c optional mse +dev/mse/mse_isa.c optional mse isa dev/ppc/ppc.c optional ppc dev/ppc/ppc_puc.c optional ppc puc pci dev/random/nehemiah.c optional random @@ -290,7 +292,6 @@ i386/isa/if_el.c optional el i386/isa/isa.c optional isa i386/isa/isa_dma.c optional isa -i386/isa/mse.c optional mse i386/isa/nmi.c standard i386/isa/npx.c optional npx i386/isa/pcf.c optional pcf ==== //depot/projects/wifi/sys/conf/files.pc98#3 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.307 2004/11/23 00:00:43 imp Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.308 2004/12/12 20:05:49 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -111,6 +111,8 @@ dev/lnc/if_lnc_cbus.c optional lnc isa dev/io/iodev.c optional io dev/mem/memutil.c optional mem +dev/mse/mse.c optional mse +dev/mse/mse_cbus.c optional mse isa dev/ppc/ppc_puc.c optional ppc puc pci dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_pci.c optional sbni pci @@ -332,7 +334,6 @@ pc98/pc98/fd.c optional fdc pc98/pc98/fdc_cbus.c optional fdc isa pc98/pc98/isa_dma.c optional isa -pc98/pc98/mse.c optional mse pc98/pc98/nmi.c standard pc98/pc98/olpt.c optional olpt pc98/pc98/pc98gdc.c optional gdc ==== //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.1 2004/12/09 13:54:29 takawata Exp $ + * $FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.2 2004/12/13 03:22:11 scottl Exp $ */ #include "opt_acpi.h" @@ -38,6 +38,9 @@ #include #include +#define _COMPONENT ACPI_IBM +ACPI_MODULE_NAME("IBM") + #define IBM_RTC_MISCKEY 0x65 #define IBM_RTC_BRIGHTNESS 0x6c #define IBM_RTC_MASK_BRI 0x7 @@ -252,6 +255,8 @@ static int acpi_ibm_detach(device_t dev) { + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + struct acpi_ibm_softc *sc = device_get_softc(dev); acpi_SetInteger(acpi_get_handle(dev), IBM_NAME_ENABLE, 0); acpi_ibm_enable_mask(dev, sc->ibm_initialmask); ==== //depot/projects/wifi/sys/dev/acpica/acpivar.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.83 2004/10/08 17:56:47 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.84 2004/12/13 03:22:11 scottl Exp $ */ #include "acpi_if.h" @@ -152,6 +152,7 @@ #define ACPI_THERMAL 0x01000000 #define ACPI_TIMER 0x02000000 #define ACPI_ASUS 0x04000000 +#define ACPI_IBM 0x08000000 /* * Constants for different interrupt models used with acpi_SetIntrModel(). ==== //depot/projects/wifi/sys/dev/ata/atapi-cd.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.171 2004/08/24 10:39:00 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.172 2004/12/12 10:09:04 phk Exp $"); #include "opt_ata.h" #include @@ -63,7 +63,7 @@ static void lba2msf(u_int32_t, u_int8_t *, u_int8_t *, u_int8_t *); static u_int32_t msf2lba(u_int8_t, u_int8_t, u_int8_t); static int acd_geom_access(struct g_provider *, int, int, int); -static int acd_geom_ioctl(struct g_provider *, u_long, void *, struct thread *); +static g_ioctl_t acd_geom_ioctl; static void acd_geom_start(struct bio *); static void acd_done(struct ata_request *); static void acd_read_toc(struct acd_softc *); @@ -550,7 +550,7 @@ } static int -acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, struct thread *td) +acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, int fflag, struct thread *td) { struct acd_softc *cdp = pp->geom->softc; int error = 0; ==== //depot/projects/wifi/sys/dev/fdc/fdc.c#5 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.303 2004/11/21 16:25:21 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.304 2004/12/12 10:09:04 phk Exp $"); #include "opt_fdc.h" @@ -1407,7 +1407,7 @@ } static int -fd_ioctl(struct g_provider *pp, u_long cmd, void *data, struct thread *td) +fd_ioctl(struct g_provider *pp, u_long cmd, void *data, int fflag, struct thread *td) { struct fd_data *fd; struct fdc_status *fsp; @@ -1422,6 +1422,8 @@ return (0); case FD_STYPE: /* set drive type */ + if (!fflag & FWRITE) + return (EPERM); /* * Allow setting drive type temporarily iff * currently unset. Used for fdformat so any @@ -1443,6 +1445,8 @@ return (0); case FD_SOPTS: /* set drive options */ + if (!fflag & FWRITE) + return (EPERM); fd->options = *(int *)data; return (0); @@ -1464,6 +1468,8 @@ return (0); case FD_FORM: + if (!fflag & FWRITE) + return (EPERM); if (((struct fd_formb *)data)->format_version != FD_FORMAT_VERSION) return (EINVAL); /* wrong version of formatting prog */ ==== //depot/projects/wifi/sys/dev/hme/if_hme_pci.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.16 2004/11/22 06:46:30 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.17 2004/12/12 00:32:51 marius Exp $"); /* * PCI front-end device driver for the HME ethernet device. @@ -157,22 +157,14 @@ PCI_PRODUCT_SUN_HMENETWORK >> 8 }; #define PROMDATA_PTR_VPD 0x08 -#define PROMDATA_DATA2 0x0a - static const uint8_t promdat2[] = { - 0x18, 0x00, /* structure length */ - 0x00, /* structure revision */ - 0x00, /* interface revision */ - PCIS_NETWORK_ETHERNET, /* subclass code */ - PCIC_NETWORK /* class code */ - }; -#define PCI_VPDRES_ISLARGE(x) ((x) & 0x80) -#define PCI_VPDRES_LARGE_NAME(x) ((x) & 0x7f) -#define PCI_VPDRES_TYPE_VPD 0x10 /* large */ struct pci_vpd { uint8_t vpd_key0; uint8_t vpd_key1; uint8_t vpd_len; } *vpd; +#define PCI_VPDRES_ISLARGE(x) ((x) & 0x80) +#define PCI_VPDRES_LARGE_NAME(x) ((x) & 0x7f) +#define PCI_VPDRES_TYPE_VPD 0x10 /* large */ #endif pci_enable_busmaster(dev); @@ -299,7 +291,6 @@ /* Read PCI expansion PROM data. */ bus_space_read_region_1(romt, romh, dataoff, buf, sizeof(buf)); if (memcmp(buf, promdat, sizeof(promdat)) != 0 || - memcmp(buf + PROMDATA_DATA2, promdat2, sizeof(promdat2)) != 0 || (vpdoff = (buf[PROMDATA_PTR_VPD] | (buf[PROMDATA_PTR_VPD + 1] << 8))) < 0x1c) { device_printf(dev, "unexpected PCI expansion PROM data\n"); @@ -309,15 +300,22 @@ /* * Read PCI VPD. - * The VPD of HME is not in PCI 2.2 standard format. The length in - * the resource header is in big endian, and resources are not - * properly terminated (only one resource and no end tag). + * SUNW,hme cards have a single large resource VPD-R tag + * containing one NA. SUNW,qfe cards have four large resource + * VPD-R tags containing one NA each. + * The VPD used on both cards is not in PCI 2.2 standard format + * however. The length in the resource header is in big endian + * and the end tag is non-standard (0x79) and followed by an + * all-zero "checksum" byte. Sun calls this a "Fresh Choice + * Ethernet" VPD... */ - bus_space_read_region_1(romt, romh, vpdoff, buf, sizeof(buf)); + bus_space_read_region_1(romt, romh, + vpdoff + slot * (3 + sizeof(struct pci_vpd) + ETHER_ADDR_LEN), + buf, sizeof(buf)); vpd = (void *)(buf + 3); if (PCI_VPDRES_ISLARGE(buf[0]) == 0 || PCI_VPDRES_LARGE_NAME(buf[0]) != PCI_VPDRES_TYPE_VPD || - /* buf[1] != 0 || buf[2] != 9 || */ /*len*/ + (buf[1] << 8 | buf[2]) != sizeof(struct pci_vpd) + ETHER_ADDR_LEN || vpd->vpd_key0 != 0x4e /* N */ || vpd->vpd_key1 != 0x41 /* A */ || vpd->vpd_len != ETHER_ADDR_LEN) { @@ -325,12 +323,13 @@ error = ENXIO; goto fail_rres; } - if (buf + 6 == NULL) { + if (buf + 3 + sizeof(struct pci_vpd) == NULL) { device_printf(dev, "could not read network address\n"); error = ENXIO; goto fail_rres; } - bcopy(buf + 6, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN); + bcopy(buf + 3 + sizeof(struct pci_vpd), sc->sc_arpcom.ac_enaddr, + ETHER_ADDR_LEN); fail_rres: bus_release_resource(ebus_dev, SYS_RES_MEMORY, ebus_rrid, ebus_rres); ==== //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.73 2004/12/10 00:59:27 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.74 2004/12/12 07:45:42 sam Exp $"); #include "opt_bdg.h" @@ -1811,6 +1811,7 @@ "unknown nettype %d\n", arg); break; } + IEEE80211_ADDR_COPY(ic->ic_bss->ni_bssid, bs->nwbx_macaddr); free(bs, M_TEMP); } else return; ==== //depot/projects/wifi/sys/dev/mse/mse.c#2 (text+ko) ==== @@ -1,4 +1,34 @@ /* + * Copyright (c) 2004 M. Warner Losh + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification, immediately at the beginning of the file. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/mse/mse.c,v 1.69 2004/12/12 20:05:49 imp Exp $ + */ + +/* * Copyright 1992 by the University of Guelph * * Permission to use, copy and modify this @@ -11,10 +41,6 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. */ - -#include -__FBSDID("$FreeBSD: src/sys/dev/mse/mse.c,v 1.68 2004/06/16 09:47:08 phk Exp $"); - /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and * the X386 port, courtesy of @@ -57,7 +83,6 @@ #include #include -#include #include #include #include @@ -65,75 +90,10 @@ #include -/* driver configuration flags (config) */ -#define MSE_CONFIG_ACCEL 0x00f0 /* acceleration factor */ -#define MSE_CONFIG_FLAGS (MSE_CONFIG_ACCEL) +#include -/* - * Software control structure for mouse. The sc_enablemouse(), - * sc_disablemouse() and sc_getmouse() routines must be called spl'd(). - */ -typedef struct mse_softc { - int sc_flags; - int sc_mousetype; - struct selinfo sc_selp; - struct resource *sc_port; - struct resource *sc_intr; - bus_space_tag_t sc_iot; - bus_space_handle_t sc_ioh; - void *sc_ih; - void (*sc_enablemouse)(bus_space_tag_t t, - bus_space_handle_t h); - void (*sc_disablemouse)(bus_space_tag_t t, - bus_space_handle_t h); - void (*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but); - int sc_deltax; - int sc_deltay; - int sc_obuttons; - int sc_buttons; - int sc_bytesread; - u_char sc_bytes[MOUSE_SYS_PACKETSIZE]; - struct callout_handle sc_callout; - int sc_watchdog; - struct cdev *sc_dev; - struct cdev *sc_ndev; - mousehw_t hw; - mousemode_t mode; - mousestatus_t status; -} mse_softc_t; - -static devclass_t mse_devclass; - -static int mse_probe(device_t dev); -static int mse_attach(device_t dev); -static int mse_detach(device_t dev); - -static device_method_t mse_methods[] = { - DEVMETHOD(device_probe, mse_probe), - DEVMETHOD(device_attach, mse_attach), - DEVMETHOD(device_detach, mse_detach), - { 0, 0 } -}; - -static driver_t mse_driver = { - "mse", - mse_methods, - sizeof(mse_softc_t), -}; - -DRIVER_MODULE(mse, isa, mse_driver, mse_devclass, 0, 0); +devclass_t mse_devclass; -static struct isa_pnp_id mse_ids[] = { - { 0x000fd041, "Bus mouse" }, /* PNP0F00 */ - { 0x020fd041, "InPort mouse" }, /* PNP0F02 */ - { 0x0d0fd041, "InPort mouse compatible" }, /* PNP0F0D */ - { 0x110fd041, "Bus mouse compatible" }, /* PNP0F11 */ - { 0x150fd041, "Logitech bus mouse" }, /* PNP0F15 */ - { 0x180fd041, "Logitech bus mouse compatible" },/* PNP0F18 */ - { 0 } -}; - static d_open_t mseopen; static d_close_t mseclose; static d_read_t mseread; @@ -154,191 +114,27 @@ static void mseintr(void *); static timeout_t msetimeout; -/* Flags */ -#define MSESC_OPEN 0x1 -#define MSESC_WANT 0x2 - -/* and Mouse Types */ -#define MSE_NONE 0 /* don't move this! */ -#define MSE_LOGITECH 0x1 -#define MSE_ATIINPORT 0x2 -#define MSE_LOGI_SIG 0xA5 - -#define MSE_PORTA 0 -#define MSE_PORTB 1 -#define MSE_PORTC 2 -#define MSE_PORTD 3 -#define MSE_IOSIZE 4 - #define MSE_UNIT(dev) (minor(dev) >> 1) #define MSE_NBLOCKIO(dev) (minor(dev) & 0x1) -/* - * Logitech bus mouse definitions - */ -#define MSE_SETUP 0x91 /* What does this mean? */ - /* The definition for the control port */ - /* is as follows: */ - - /* D7 = Mode set flag (1 = active) */ - /* D6,D5 = Mode selection (port A) */ - /* 00 = Mode 0 = Basic I/O */ - /* 01 = Mode 1 = Strobed I/O */ - /* 10 = Mode 2 = Bi-dir bus */ - /* D4 = Port A direction (1 = input)*/ - /* D3 = Port C (upper 4 bits) */ - /* direction. (1 = input) */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 13 11:30:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3F8816A4CE; Mon, 13 Dec 2004 11:29:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8131F16A4CE for ; Mon, 13 Dec 2004 11:29:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C37943D45 for ; Mon, 13 Dec 2004 11:29:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBDBTxnf033832 for ; Mon, 13 Dec 2004 11:29:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBDBTxn5033829 for perforce@freebsd.org; Mon, 13 Dec 2004 11:29:59 GMT (envelope-from peter@freebsd.org) Date: Mon, 13 Dec 2004 11:29:59 GMT Message-Id: <200412131129.iBDBTxn5033829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2004 11:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=66966 Change 66966 by peter@peter_overcee on 2004/12/13 11:28:58 make it compile Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#59 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#59 (text+ko) ==== @@ -137,7 +137,7 @@ * returning to userland. */ if ((p1->p_pfsflags & PF_FORK) == 0) - td2->td_frame->tf_eflags &= ~PSL_T; + td2->td_frame->tf_rflags &= ~PSL_T; /* * Set registers for trampoline to user mode. Leave space for the From owner-p4-projects@FreeBSD.ORG Mon Dec 13 11:50:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D495216A4D0; Mon, 13 Dec 2004 11:50:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A93BF16A4CE for ; Mon, 13 Dec 2004 11:50:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 973C043D39 for ; Mon, 13 Dec 2004 11:50:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBDBo9qK034557 for ; Mon, 13 Dec 2004 11:50:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBDBo9pL034554 for perforce@freebsd.org; Mon, 13 Dec 2004 11:50:09 GMT (envelope-from peter@freebsd.org) Date: Mon, 13 Dec 2004 11:50:09 GMT Message-Id: <200412131150.iBDBo9pL034554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2004 11:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=66968 Change 66968 by peter@peter_overcee on 2004/12/13 11:49:09 make ath compile on 64 bit platforms Affected files ... .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#2 edit .. //depot/projects/hammer/sys/dev/ath/if_ath.c#23 edit Differences ... ==== //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#2 (text+ko) ==== @@ -310,7 +310,7 @@ static void ath_rate_cb(void *arg, struct ieee80211_node *ni) { - ath_rate_update(ni->ni_ic->ic_ifp->if_softc, ni, (int) arg); + ath_rate_update(ni->ni_ic->ic_ifp->if_softc, ni, (int)(uintptr_t) arg); } /* ==== //depot/projects/hammer/sys/dev/ath/if_ath.c#23 (text+ko) ==== @@ -294,7 +294,7 @@ */ sc->sc_keymax = ath_hal_keycachesize(ah); if (sc->sc_keymax > sizeof(sc->sc_keymap) * NBBY) { - if_printf(ifp, "Warning, using only %u of %u key cache slots\n", + if_printf(ifp, "Warning, using only %zu of %u key cache slots\n", sizeof(sc->sc_keymap) * NBBY, sc->sc_keymax); sc->sc_keymax = sizeof(sc->sc_keymap) * NBBY; } @@ -2772,7 +2772,7 @@ return NULL; } if (qnum >= N(sc->sc_txq)) { - device_printf(sc->sc_dev, "hal qnum %u out of range, max %u!\n", + device_printf(sc->sc_dev, "hal qnum %u out of range, max %zu!\n", qnum, N(sc->sc_txq)); ath_hal_releasetxqueue(ah, qnum); return NULL; @@ -2808,7 +2808,7 @@ struct ath_txq *txq; if (ac >= N(sc->sc_ac2q)) { - device_printf(sc->sc_dev, "AC %u out of range, max %u!\n", + device_printf(sc->sc_dev, "AC %u out of range, max %zu!\n", ac, N(sc->sc_ac2q)); return 0; } @@ -3578,7 +3578,8 @@ (void) ath_hal_stoptxdma(ah, txq->axq_qnum); DPRINTF(sc, ATH_DEBUG_RESET, "%s: tx queue [%u] %p, link %p\n", __func__, txq->axq_qnum, - (caddr_t) ath_hal_gettxbuf(ah, txq->axq_qnum), txq->axq_link); + (caddr_t)(uintptr_t) ath_hal_gettxbuf(ah, txq->axq_qnum), + txq->axq_link); } /* From owner-p4-projects@FreeBSD.ORG Mon Dec 13 18:25:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1653516A4D0; Mon, 13 Dec 2004 18:25:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB18816A4CE for ; Mon, 13 Dec 2004 18:25:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F70843D1F for ; Mon, 13 Dec 2004 18:25:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBDIPgM1063657 for ; Mon, 13 Dec 2004 18:25:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBDIPfvE063654 for perforce@freebsd.org; Mon, 13 Dec 2004 18:25:41 GMT (envelope-from sam@freebsd.org) Date: Mon, 13 Dec 2004 18:25:41 GMT Message-Id: <200412131825.iBDIPfvE063654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2004 18:25:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=66991 Change 66991 by sam@sam_ebb on 2004/12/13 18:24:41 IFC @ 66990 Affected files ... .. //depot/projects/wifi/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/urio.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/usb.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/wifi/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_sig.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_subr.c#5 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#4 integrate .. //depot/projects/wifi/sys/kern/subr_disk.c#2 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_ibm/Makefile#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#9 integrate .. //depot/projects/wifi/sys/sys/bio.h#2 integrate .. //depot/projects/wifi/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/wifi/usr.sbin/ppp/command.c#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/lcp.c#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/lcp.h#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/lqr.c#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/ppp.8.m4#4 integrate .. //depot/projects/wifi/usr.sbin/pppctl/pppctl.c#2 integrate Differences ... ==== //depot/projects/wifi/sbin/atm/atmconfig/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ # All rights reserved. # Author: Harti Brandt # -# $FreeBSD: src/sbin/atm/atmconfig/Makefile,v 1.6 2004/08/12 12:31:43 harti Exp $ +# $FreeBSD: src/sbin/atm/atmconfig/Makefile,v 1.7 2004/12/13 15:42:46 obrien Exp $ PROG= atmconfig .ifndef RESCUE @@ -30,7 +30,7 @@ .if ${MACHINE_ARCH} == "arm" WARNS?= 3 .else -WARNS?= 9 +WARNS?= 6 .endif FILES= atmconfig.help atmconfig_device.help ==== //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.40 2004/12/01 21:05:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.41 2004/12/13 06:59:34 njl Exp $"); #include "opt_acpi.h" #include @@ -753,7 +753,6 @@ static int acpi_pci_link_resume(device_t dev) { -#if 0 /* XXX Disabled temporarily since this hangs resume. */ ACPI_STATUS status; ACPI_SERIAL_BEGIN(pci_link); @@ -762,7 +761,6 @@ if (ACPI_FAILURE(status)) return (ENXIO); else -#endif return (0); } ==== //depot/projects/wifi/sys/dev/usb/ugen.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.98 2004/12/12 02:27:30 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.100 2004/12/13 07:45:02 julian Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -28,8 +28,8 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. * 4. Neither the name of The NetBSD Foundation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. @@ -70,9 +70,10 @@ #else #include #endif -#include #include #include +#include +#include #include #include @@ -545,10 +546,10 @@ if (clalloc(&sce->q, UGEN_IBSIZE, 0) == -1) return (ENOMEM); err = usbd_open_pipe_intr(sce->iface, - edesc->bEndpointAddress, - USBD_SHORT_XFER_OK, &sce->pipeh, sce, - sce->ibuf, isize, ugenintr, - USBD_DEFAULT_INTERVAL); + edesc->bEndpointAddress, + USBD_SHORT_XFER_OK, &sce->pipeh, sce, + sce->ibuf, isize, ugenintr, + USBD_DEFAULT_INTERVAL); if (err) { free(sce->ibuf, M_USBDEV); clfree(&sce->q); @@ -632,12 +633,6 @@ DPRINTFN(5, ("ugenclose: flag=%d, mode=%d, unit=%d, endpt=%d\n", flag, mode, UGENUNIT(dev), endpt)); - -#if defined(__NetBSD__) || defined(__OpenBSD__) - if (sc->sc_dying) - wakeup(&sc->sc_dying); -#endif - #ifdef DIAGNOSTIC if (!sc->sc_is_open[endpt]) { printf("ugenclose: not open\n"); @@ -673,6 +668,7 @@ case UE_ISOCHRONOUS: for (i = 0; i < UGEN_NISOREQS; ++i) usbd_free_xfer(sce->isoreqs[i].xfer); + default: break; } @@ -709,6 +705,7 @@ if (endpt == USB_CONTROL_ENDPOINT) return (ENODEV); +#ifdef DIAGNOSTIC if (sce->edesc == NULL) { printf("ugenread: no edesc\n"); return (EIO); @@ -717,6 +714,7 @@ printf("ugenread: no pipe\n"); return (EIO); } +#endif switch (sce->edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: @@ -757,32 +755,32 @@ } break; case UE_BULK: - xfer = usbd_alloc_xfer(sc->sc_udev); - if (xfer == 0) - return (ENOMEM); - while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) { + xfer = usbd_alloc_xfer(sc->sc_udev); + if (xfer == 0) + return (ENOMEM); + while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) { DPRINTFN(1, ("ugenread: start transfer %d bytes\n",n)); tn = n; - err = usbd_bulk_transfer( - xfer, sce->pipeh, - sce->state & UGEN_SHORT_OK ? - USBD_SHORT_XFER_OK : 0, - sce->timeout, buf, &tn, "ugenrb"); - if (err) { - if (err == USBD_INTERRUPTED) - error = EINTR; - else if (err == USBD_TIMEOUT) - error = ETIMEDOUT; - else - error = EIO; - break; - } - DPRINTFN(1, ("ugenread: got %d bytes\n", tn)); - error = uiomove(buf, tn, uio); - if (error || tn < n) - break; - } - usbd_free_xfer(xfer); + err = usbd_bulk_transfer( + xfer, sce->pipeh, + sce->state & UGEN_SHORT_OK ? + USBD_SHORT_XFER_OK : 0, + sce->timeout, buf, &tn, "ugenrb"); + if (err) { + if (err == USBD_INTERRUPTED) + error = EINTR; + else if (err == USBD_TIMEOUT) + error = ETIMEDOUT; + else + error = EIO; + break; + } + DPRINTFN(1, ("ugenread: got %d bytes\n", tn)); + error = uiomove(buf, tn, uio); + if (error || tn < n) + break; + } + usbd_free_xfer(xfer); break; case UE_ISOCHRONOUS: s = splusb(); @@ -862,6 +860,7 @@ if (endpt == USB_CONTROL_ENDPOINT) return (ENODEV); +#ifdef DIAGNOSTIC if (sce->edesc == NULL) { printf("ugenwrite: no edesc\n"); return (EIO); @@ -870,6 +869,7 @@ printf("ugenwrite: no pipe\n"); return (EIO); } +#endif switch (sce->edesc->bmAttributes & UE_XFERTYPE) { case UE_BULK: @@ -906,7 +906,7 @@ break; DPRINTFN(1, ("ugenwrite: transfer %d bytes\n", n)); err = usbd_intr_transfer(xfer, sce->pipeh, 0, - sce->timeout, buf, &n,"ugenwi"); + sce->timeout, buf, &n, "ugenwi"); if (err) { if (err == USBD_INTERRUPTED) error = EINTR; @@ -1097,7 +1097,7 @@ if(sce->fill < sce->cur && sce->cur <= sce->fill + count) { sce->cur += count; if(sce->cur >= sce->limit) - sce->cur = sce->ibuf + (sce->cur - sce->limit); + sce->cur = sce->ibuf + (sce->limit - sce->cur); DPRINTFN(5, ("ugen_isoc_rintr: throwing away %d bytes\n", count)); } @@ -1289,9 +1289,9 @@ /* All handled in the upper FS layer. */ return (0); case USB_SET_SHORT_XFER: - /* This flag only affects read */ if (endpt == USB_CONTROL_ENDPOINT) return (EINVAL); + /* This flag only affects read */ sce = &sc->sc_endpoints[endpt][IN]; if (sce->pipeh == NULL) { @@ -1365,7 +1365,8 @@ ai->uai_interface_index, &iface); if (err) return (EINVAL); - err = ugen_set_interface(sc, ai->uai_interface_index, ai->uai_alt_no); + err = ugen_set_interface(sc, ai->uai_interface_index, + ai->uai_alt_no); if (err) return (EINVAL); break; @@ -1379,7 +1380,8 @@ free(cdesc, M_TEMP); return (EINVAL); } - ai->uai_alt_no = usbd_get_no_alts(cdesc, idesc->bInterfaceNumber); + ai->uai_alt_no = usbd_get_no_alts(cdesc, + idesc->bInterfaceNumber); free(cdesc, M_TEMP); break; case USB_GET_DEVICE_DESC: @@ -1565,7 +1567,7 @@ /* XXX always IN */ sce = &sc->sc_endpoints[UGENENDPOINT(dev)][IN]; - +#ifdef DIAGNOSTIC if (!sce->edesc) { printf("ugenpoll: no edesc\n"); return (EIO); @@ -1574,7 +1576,7 @@ printf("ugenpoll: no pipe\n"); return (EIO); } - +#endif s = splusb(); switch (sce->edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: ==== //depot/projects/wifi/sys/dev/usb/uhid.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.74 2004/10/09 07:48:31 takawata Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.75 2004/12/13 07:08:22 imp Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -76,9 +76,10 @@ #include #endif #include -#include #include #include +#include +#include #include #include ==== //depot/projects/wifi/sys/dev/usb/ukbd.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.49 2004/08/15 23:39:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.50 2004/12/13 07:09:54 imp Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -66,8 +66,8 @@ #else #include #endif -#include #include +#include #include #include ==== //depot/projects/wifi/sys/dev/usb/umodem.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.54 2004/09/17 11:53:45 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.55 2004/12/13 07:09:54 imp Exp $"); /*- * Copyright (c) 2003, M. Warner Losh . * All rights reserved. @@ -91,9 +91,9 @@ #include #include #include -#include #include #include +#include #include #include ==== //depot/projects/wifi/sys/dev/usb/ums.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.73 2004/12/13 02:20:48 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.75 2004/12/13 07:08:22 imp Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -58,9 +58,10 @@ #else #include #endif -#include #include #include +#include +#include #include #include @@ -592,7 +593,7 @@ sc->qhead = sc->qtail = 0; sc->status.flags = 0; sc->status.button = sc->status.obutton = 0; - sc->status.dx = sc->status.dy = sc->status.dz = /* sc->status.dt */ = 0; + sc->status.dx = sc->status.dy = sc->status.dz /* = sc->status.dt */ = 0; callout_handle_init((struct callout_handle *)&sc->callout_handle); ==== //depot/projects/wifi/sys/dev/usb/uplcom.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.23 2004/10/02 12:47:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.24 2004/12/13 07:09:54 imp Exp $"); /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -93,9 +93,9 @@ #include #endif #include -#include #include #include +#include #include #include ==== //depot/projects/wifi/sys/dev/usb/urio.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/urio.c,v 1.33 2004/08/15 23:39:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/urio.c,v 1.34 2004/12/13 07:09:54 imp Exp $"); /* @@ -67,9 +67,9 @@ #else #include #endif -#include #include #include +#include #include #include ==== //depot/projects/wifi/sys/dev/usb/usb.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.100 2004/08/02 15:37:35 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.101 2004/12/13 07:08:22 imp Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -79,9 +79,10 @@ #else #include #endif -#include #include #include +#include +#include #include #include ==== //depot/projects/wifi/sys/dev/usb/usbdi.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.50 2004/08/15 23:39:18 imp Exp $ */ +/* $NetBSD: usbdi.h,v 1.64 2004/10/23 13:26:34 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.52 2004/12/13 08:12:06 julian Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -88,81 +88,73 @@ #define USBD_NO_TIMEOUT 0 #define USBD_DEFAULT_TIMEOUT 5000 /* ms = 5 s */ -#if defined(__FreeBSD__) -#endif - -usbd_status usbd_open_pipe(usbd_interface_handle iface, u_int8_t address, - u_int8_t flags, usbd_pipe_handle *pipe); -usbd_status usbd_close_pipe(usbd_pipe_handle pipe); -usbd_status usbd_transfer(usbd_xfer_handle req); +usbd_status usbd_open_pipe(usbd_interface_handle, u_int8_t, + u_int8_t, usbd_pipe_handle *); +usbd_status usbd_close_pipe(usbd_pipe_handle); +usbd_status usbd_transfer(usbd_xfer_handle); usbd_xfer_handle usbd_alloc_xfer(usbd_device_handle); -usbd_status usbd_free_xfer(usbd_xfer_handle xfer); -void usbd_setup_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe, - usbd_private_handle priv, void *buffer, - u_int32_t length, u_int16_t flags, u_int32_t timeout, +usbd_status usbd_free_xfer(usbd_xfer_handle); +void usbd_setup_xfer(usbd_xfer_handle, usbd_pipe_handle, + usbd_private_handle, void *, + u_int32_t, u_int16_t, u_int32_t, usbd_callback); -void usbd_setup_default_xfer(usbd_xfer_handle xfer, usbd_device_handle dev, - usbd_private_handle priv, u_int32_t timeout, - usb_device_request_t *req, void *buffer, - u_int32_t length, u_int16_t flags, usbd_callback); -void usbd_setup_isoc_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe, - usbd_private_handle priv, u_int16_t *frlengths, - u_int32_t nframes, u_int16_t flags, usbd_callback); -void usbd_get_xfer_status(usbd_xfer_handle xfer, usbd_private_handle *priv, - void **buffer, u_int32_t *count, usbd_status *status); +void usbd_setup_default_xfer(usbd_xfer_handle, usbd_device_handle, + usbd_private_handle, u_int32_t, + usb_device_request_t *, void *, + u_int32_t, u_int16_t, usbd_callback); +void usbd_setup_isoc_xfer(usbd_xfer_handle, usbd_pipe_handle, + usbd_private_handle, u_int16_t *, + u_int32_t, u_int16_t, usbd_callback); +void usbd_get_xfer_status(usbd_xfer_handle, usbd_private_handle *, + void **, u_int32_t *, usbd_status *); usb_endpoint_descriptor_t *usbd_interface2endpoint_descriptor - (usbd_interface_handle iface, u_int8_t address); -usbd_status usbd_abort_pipe(usbd_pipe_handle pipe); -usbd_status usbd_clear_endpoint_stall(usbd_pipe_handle pipe); -usbd_status usbd_clear_endpoint_stall_async(usbd_pipe_handle pipe); -void usbd_clear_endpoint_toggle(usbd_pipe_handle pipe); -usbd_status usbd_endpoint_count(usbd_interface_handle dev, u_int8_t *count); -usbd_status usbd_interface_count(usbd_device_handle dev, u_int8_t *count); -void usbd_interface2device_handle(usbd_interface_handle iface, - usbd_device_handle *dev); -usbd_status usbd_device2interface_handle(usbd_device_handle dev, - u_int8_t ifaceno, usbd_interface_handle *iface); + (usbd_interface_handle, u_int8_t); +usbd_status usbd_abort_pipe(usbd_pipe_handle); +usbd_status usbd_clear_endpoint_stall(usbd_pipe_handle); +usbd_status usbd_clear_endpoint_stall_async(usbd_pipe_handle); +void usbd_clear_endpoint_toggle(usbd_pipe_handle); +usbd_status usbd_endpoint_count(usbd_interface_handle, u_int8_t *); +usbd_status usbd_interface_count(usbd_device_handle, u_int8_t *); +void usbd_interface2device_handle(usbd_interface_handle, + usbd_device_handle *); +usbd_status usbd_device2interface_handle(usbd_device_handle, + u_int8_t, usbd_interface_handle *); usbd_device_handle usbd_pipe2device_handle(usbd_pipe_handle); -void *usbd_alloc_buffer(usbd_xfer_handle xfer, u_int32_t size); -void usbd_free_buffer(usbd_xfer_handle xfer); -void *usbd_get_buffer(usbd_xfer_handle xfer); -usbd_status usbd_sync_transfer(usbd_xfer_handle req); -usbd_status usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address, - u_int8_t flags, usbd_pipe_handle *pipe, - usbd_private_handle priv, void *buffer, - u_int32_t length, usbd_callback, int); -usbd_status usbd_do_request(usbd_device_handle pipe, usb_device_request_t *req, - void *data); -usbd_status usbd_do_request_async(usbd_device_handle pipe, - usb_device_request_t *req, void *data); -usbd_status usbd_do_request_flags(usbd_device_handle pipe, - usb_device_request_t *req, - void *data, u_int16_t flags, int*, u_int32_t); -usbd_status usbd_do_request_flags_pipe( - usbd_device_handle dev, usbd_pipe_handle pipe, - usb_device_request_t *req, void *data, u_int16_t flags, int *actlen, - u_int32_t); +void *usbd_alloc_buffer(usbd_xfer_handle, u_int32_t); +void usbd_free_buffer(usbd_xfer_handle); +void *usbd_get_buffer(usbd_xfer_handle); +usbd_status usbd_sync_transfer(usbd_xfer_handle); +usbd_status usbd_open_pipe_intr(usbd_interface_handle, u_int8_t, + u_int8_t, usbd_pipe_handle *, + usbd_private_handle, void *, + u_int32_t, usbd_callback, int); +usbd_status usbd_do_request(usbd_device_handle, usb_device_request_t *, void *); +usbd_status usbd_do_request_async(usbd_device_handle, + usb_device_request_t *, void *); +usbd_status usbd_do_request_flags(usbd_device_handle, usb_device_request_t *, + void *, u_int16_t, int*, u_int32_t); +usbd_status usbd_do_request_flags_pipe(usbd_device_handle, usbd_pipe_handle, + usb_device_request_t *, void *, u_int16_t, int *, u_int32_t); usb_interface_descriptor_t *usbd_get_interface_descriptor - (usbd_interface_handle iface); -usb_config_descriptor_t *usbd_get_config_descriptor(usbd_device_handle dev); -usb_device_descriptor_t *usbd_get_device_descriptor(usbd_device_handle dev); + (usbd_interface_handle); +usb_config_descriptor_t *usbd_get_config_descriptor(usbd_device_handle); +usb_device_descriptor_t *usbd_get_device_descriptor(usbd_device_handle); usbd_status usbd_set_interface(usbd_interface_handle, int); int usbd_get_no_alts(usb_config_descriptor_t *, int); -usbd_status usbd_get_interface(usbd_interface_handle iface, u_int8_t *aiface); +usbd_status usbd_get_interface(usbd_interface_handle, u_int8_t *); void usbd_fill_deviceinfo(usbd_device_handle, struct usb_device_info *, int); -int usbd_get_interface_altindex(usbd_interface_handle iface); +int usbd_get_interface_altindex(usbd_interface_handle); -usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *cd, - int iindex, int ano); -usb_endpoint_descriptor_t *usbd_find_edesc(usb_config_descriptor_t *cd, - int ifaceidx, int altidx, - int endptidx); +usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *, + int, int); +usb_endpoint_descriptor_t *usbd_find_edesc(usb_config_descriptor_t *, + int, int, int); void usbd_dopoll(usbd_interface_handle); -void usbd_set_polling(usbd_device_handle dev, int on); +void usbd_set_polling(usbd_device_handle, int); -const char *usbd_errstr(usbd_status err); +const char *usbd_errstr(usbd_status); void usbd_add_dev_event(int, usbd_device_handle); void usbd_add_drv_event(int, usbd_device_handle, device_ptr_t); @@ -170,7 +162,7 @@ void usbd_devinfo(usbd_device_handle, int, char *); const struct usbd_quirks *usbd_get_quirks(usbd_device_handle); usb_endpoint_descriptor_t *usbd_get_endpoint_descriptor - (usbd_interface_handle iface, u_int8_t address); + (usbd_interface_handle, u_int8_t); usbd_status usbd_reload_device_desc(usbd_device_handle); @@ -189,16 +181,16 @@ char onqueue; }; -void usb_add_task(usbd_device_handle dev, struct usb_task *task); -void usb_rem_task(usbd_device_handle dev, struct usb_task *task); +void usb_add_task(usbd_device_handle, struct usb_task *); +void usb_rem_task(usbd_device_handle, struct usb_task *); #define usb_init_task(t, f, a) ((t)->fun = (f), (t)->arg = (a), (t)->onqueue = 0) struct usb_devno { u_int16_t ud_vendor; u_int16_t ud_product; }; -const struct usb_devno *usb_match_device(const struct usb_devno *tbl, - u_int nentries, u_int sz, u_int16_t vendor, u_int16_t product); +const struct usb_devno *usb_match_device(const struct usb_devno *, + u_int, u_int, u_int16_t, u_int16_t); #define usb_lookup(tbl, vendor, product) \ usb_match_device((const struct usb_devno *)(tbl), sizeof (tbl) / sizeof ((tbl)[0]), sizeof ((tbl)[0]), (vendor), (product)) #define USB_PRODUCT_ANY 0xffff ==== //depot/projects/wifi/sys/dev/usb/uscanner.c#4 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.61 2004/12/13 00:25:03 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.62 2004/12/13 06:26:23 imp Exp $"); /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -67,10 +67,10 @@ #include #endif #include -#include #include #include #include +#include #include #include ==== //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.89 2004/12/07 08:15:39 phk Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.92 2004/12/13 07:41:19 phk Exp $ */ /* @@ -914,7 +914,7 @@ return (error); resid = uio->uio_resid; ioflag = 0; - if (fp->f_flag & FNONBLOCK) + if (fp->f_flag & O_NONBLOCK) ioflag |= IO_NDELAY; if (fp->f_flag & O_DIRECT) ioflag |= IO_DIRECT; @@ -1345,8 +1345,8 @@ return (error); KASSERT(uio->uio_td == td, ("uio_td %p is not td %p", uio->uio_td, td)); vp = fp->f_vnode; - ioflag = IO_UNIT; - if (fp->f_flag & FNONBLOCK) + ioflag = 0; + if (fp->f_flag & O_NONBLOCK) ioflag |= IO_NDELAY; if (fp->f_flag & O_DIRECT) ioflag |= IO_DIRECT; @@ -1412,6 +1412,7 @@ .vop_open = devfs_open, .vop_pathconf = devfs_pathconf, .vop_print = devfs_print, + .vop_read = VOP_PANIC, .vop_readdir = VOP_PANIC, .vop_readlink = VOP_PANIC, .vop_reallocblks = VOP_PANIC, @@ -1426,4 +1427,5 @@ #endif .vop_strategy = VOP_PANIC, .vop_symlink = VOP_PANIC, + .vop_write = VOP_PANIC, }; ==== //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.108 2004/12/01 23:16:32 phk Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.110 2004/12/13 10:07:57 phk Exp $ */ #include @@ -116,6 +116,7 @@ .vop_open = fifo_open, .vop_pathconf = fifo_pathconf, .vop_print = fifo_print, + .vop_read = VOP_PANIC, .vop_readdir = VOP_PANIC, .vop_readlink = VOP_PANIC, .vop_reallocblks = VOP_PANIC, @@ -125,6 +126,7 @@ .vop_rmdir = VOP_PANIC, .vop_setattr = VOP_EBADF, .vop_symlink = VOP_PANIC, + .vop_write = VOP_PANIC, }; struct mtx fifo_mtx; @@ -274,17 +276,15 @@ * a reader. That (and not still having one) * is the condition that we must wait for. */ - return (0); + mtx_lock(&fifo_mtx); } } mtx_unlock(&fifo_mtx); - if (ap->a_fdidx >= 0) { - fp = ap->a_td->td_proc->p_fd->fd_ofiles[ap->a_fdidx]; - if (fp->f_ops == &badfileops) { - fp->f_ops = &fifo_ops_f; - fp->f_data = fip; - } - } + KASSERT(ap->a_fdidx >= 0, ("can't fifo/vnode bypass %d", ap->a_fdidx)); + fp = ap->a_td->td_proc->p_fd->fd_ofiles[ap->a_fdidx]; + KASSERT(fp->f_ops == &badfileops, ("not badfileops in fifo_open")); + fp->f_ops = &fifo_ops_f; + fp->f_data = fip; return (0); } ==== //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.71 2004/12/12 12:02:33 phk Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.72 2004/12/13 16:21:48 ssouhlal Exp $ */ @@ -154,15 +154,12 @@ /* * If updating, check whether changing from read-only to - * read/write; if there is no device name, that's all we do. + * read/write. */ if (mp->mnt_flag & MNT_UPDATE) { - /* if not updating name...*/ - if (from == NULL) { - error = vfs_copyopt(mp->mnt_optnew, "export", - &export, sizeof export); - if (error) - return (error); + error = vfs_copyopt(mp->mnt_optnew, "export", + &export, sizeof export); + if ((error == 0) && export.ex_flags != 0) { /* * Process export requests. Jumping to "success" * will return the vfs_export() error code. ==== //depot/projects/wifi/sys/geom/raid3/g_raid3.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.28 2004/12/04 21:20:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.29 2004/12/13 13:02:06 pjd Exp $"); #include #include @@ -143,16 +143,6 @@ static void g_raid3_sync_stop(struct g_raid3_softc *sc, int type); -/* - * XXX: it should be placed in subr_disk.c. - */ -static void -bioq_insert_head(struct bio_queue_head *head, struct bio *bp) -{ - - TAILQ_INSERT_HEAD(&head->queue, bp, bio_queue); -} - static const char * g_raid3_disk_state2str(int state) { ==== //depot/projects/wifi/sys/i386/pci/pci_cfgreg.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.114 2004/12/10 15:44:12 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.115 2004/12/13 07:08:44 scottl Exp $"); #include #include @@ -523,7 +523,6 @@ TAILQ_REMOVE(pcielist, elem, elem); TAILQ_INSERT_HEAD(pcielist, elem, elem); } - critical_exit(); return (elem); } ==== //depot/projects/wifi/sys/kern/kern_sig.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.296 2004/11/15 20:51:32 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.297 2004/12/13 16:45:57 jeff Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1959,6 +1959,8 @@ * killed in this lifetime. */ if (action == SIG_DFL && (prop & SA_KILL)) { + if (p->p_nice > 0) + sched_nice(td->td_proc, 0); if (td->td_priority > PUSER) sched_prio(td, PUSER); } ==== //depot/projects/wifi/sys/kern/kern_subr.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.94 2004/12/08 05:25:08 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.95 2004/12/13 06:24:14 alc Exp $"); #include "opt_zero.h" @@ -68,6 +68,12 @@ /* Declared in uipc_socket.c */ extern int so_zero_copy_receive; +/* + * Identify the physical page mapped at the given kernel virtual + * address. Insert this physical page into the given address space at + * the given virtual address, replacing the physical page, if any, + * that already exists there. + */ static int vm_pgmoveco(vm_map_t mapa, vm_offset_t kaddr, vm_offset_t uaddr) { @@ -79,10 +85,17 @@ vm_prot_t prot; boolean_t wired; + KASSERT((uaddr & PAGE_MASK) == 0, + ("vm_pgmoveco: uaddr is not page aligned")); + /* - * First lookup the kernel page. + * Herein the physical page is validated and dirtied. It is + * unwired in sf_buf_mext(). */ kern_pg = PHYS_TO_VM_PAGE(vtophys(kaddr)); + kern_pg->valid = VM_PAGE_BITS_ALL; + KASSERT(kern_pg->queue == PQ_NONE && kern_pg->wire_count == 1, + ("vm_pgmoveco: kern_pg is not correctly wired")); if ((vm_map_lookup(&map, uaddr, VM_PROT_WRITE, &entry, &uobject, @@ -90,28 +103,25 @@ return(EFAULT); } VM_OBJECT_LOCK(uobject); +retry: if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { - do - vm_page_lock_queues(); - while (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")); + vm_page_lock_queues(); + if (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")) + goto retry; pmap_remove_all(user_pg); vm_page_free(user_pg); - } else + } else { + /* + * Even if a physical page does not exist in the + * object chain's first object, a physical page from a + * backing object may be mapped read only. + */ + if (uobject->backing_object != NULL) + pmap_remove(map->pmap, uaddr, uaddr + PAGE_SIZE); vm_page_lock_queues(); - if (kern_pg->busy || ((kern_pg->queue - kern_pg->pc) == PQ_FREE) || - (kern_pg->hold_count != 0)|| (kern_pg->flags & PG_BUSY)) { - printf("vm_pgmoveco: pindex(%lu), busy(%d), PG_BUSY(%d), " - "hold(%d) paddr(0x%lx)\n", (u_long)kern_pg->pindex, - kern_pg->busy, (kern_pg->flags & PG_BUSY) ? 1 : 0, - kern_pg->hold_count, (u_long)kern_pg->phys_addr); - if ((kern_pg->queue - kern_pg->pc) == PQ_FREE) - panic("vm_pgmoveco: renaming free page"); - else - panic("vm_pgmoveco: renaming busy page"); } vm_page_insert(kern_pg, uobject, upindex); vm_page_dirty(kern_pg); - kern_pg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); VM_OBJECT_UNLOCK(uobject); vm_map_lookup_done(map, entry); ==== //depot/projects/wifi/sys/kern/sched_ule.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.137 2004/11/11 19:48:57 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.138 2004/12/13 13:09:33 jeff Exp $"); #include @@ -79,18 +79,6 @@ int realstathz; int tickincr = 1; -#ifdef PREEMPTION -static void -printf_caddr_t(void *data) -{ - printf("%s", (char *)data); -} -static char preempt_warning[] = - "WARNING: Kernel PREEMPTION is unstable under SCHED_ULE.\n"; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 14 01:54:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D884416A552; Tue, 14 Dec 2004 01:54:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52C8316A530 for ; Tue, 14 Dec 2004 01:54:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C402243D55 for ; Tue, 14 Dec 2004 01:54:32 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE1sW2R098366 for ; Tue, 14 Dec 2004 01:54:32 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE1sWjm098363 for perforce@freebsd.org; Tue, 14 Dec 2004 01:54:32 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Dec 2004 01:54:32 GMT Message-Id: <200412140154.iBE1sWjm098363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 67012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 01:54:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=67012 Change 67012 by peter@peter_daintree on 2004/12/14 01:53:33 IFC @67011 This is to hold checkpoints of Jeff's smpffs.diff to enable easier indirect merges into other branches. Affected files ... .. //depot/projects/smpffs/Makefile#1 branch .. //depot/projects/smpffs/alpha/Makefile#1 branch .. //depot/projects/smpffs/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/smpffs/alpha/alpha/atomic.s#1 branch .. //depot/projects/smpffs/alpha/alpha/autoconf.c#1 branch .. //depot/projects/smpffs/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/busspace.c#1 branch .. //depot/projects/smpffs/alpha/alpha/clock.c#1 branch .. //depot/projects/smpffs/alpha/alpha/clock_if.m#1 branch .. //depot/projects/smpffs/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/smpffs/alpha/alpha/critical.c#1 branch .. //depot/projects/smpffs/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/smpffs/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/smpffs/alpha/alpha/db_interface.c#1 branch .. //depot/projects/smpffs/alpha/alpha/db_trace.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/smpffs/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/smpffs/alpha/alpha/divrem.m4#1 branch .. //depot/projects/smpffs/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/exception.s#1 branch .. //depot/projects/smpffs/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/smpffs/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/genassym.c#1 branch .. //depot/projects/smpffs/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/smpffs/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/smpffs/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/smpffs/alpha/alpha/interrupt.c#1 branch .. //depot/projects/smpffs/alpha/alpha/locore.s#1 branch .. //depot/projects/smpffs/alpha/alpha/machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/mem.c#1 branch .. //depot/projects/smpffs/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/pal.s#1 branch .. //depot/projects/smpffs/alpha/alpha/pmap.c#1 branch .. //depot/projects/smpffs/alpha/alpha/prom.c#1 branch .. //depot/projects/smpffs/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/smpffs/alpha/alpha/promcons.c#1 branch .. //depot/projects/smpffs/alpha/alpha/sgmap.c#1 branch .. //depot/projects/smpffs/alpha/alpha/support.s#1 branch .. //depot/projects/smpffs/alpha/alpha/swtch.s#1 branch .. //depot/projects/smpffs/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/timerreg.h#1 branch .. //depot/projects/smpffs/alpha/alpha/trap.c#1 branch .. //depot/projects/smpffs/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/smpffs/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/smpffs/alpha/compile/.cvsignore#1 branch .. //depot/projects/smpffs/alpha/conf/GENERIC#1 branch .. //depot/projects/smpffs/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/smpffs/alpha/conf/Makefile#1 branch .. //depot/projects/smpffs/alpha/conf/NOTES#1 branch .. //depot/projects/smpffs/alpha/conf/gethints.awk#1 branch .. //depot/projects/smpffs/alpha/include/_inttypes.h#1 branch .. //depot/projects/smpffs/alpha/include/_limits.h#1 branch .. //depot/projects/smpffs/alpha/include/_stdint.h#1 branch .. //depot/projects/smpffs/alpha/include/_types.h#1 branch .. //depot/projects/smpffs/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/smpffs/alpha/include/asm.h#1 branch .. //depot/projects/smpffs/alpha/include/atomic.h#1 branch .. //depot/projects/smpffs/alpha/include/bootinfo.h#1 branch .. //depot/projects/smpffs/alpha/include/bus.h#1 branch .. //depot/projects/smpffs/alpha/include/bus_memio.h#1 branch .. //depot/projects/smpffs/alpha/include/bus_pio.h#1 branch .. //depot/projects/smpffs/alpha/include/bwx.h#1 branch .. //depot/projects/smpffs/alpha/include/chipset.h#1 branch .. //depot/projects/smpffs/alpha/include/clock.h#1 branch .. //depot/projects/smpffs/alpha/include/clockvar.h#1 branch .. //depot/projects/smpffs/alpha/include/cpu.h#1 branch .. //depot/projects/smpffs/alpha/include/cpuconf.h#1 branch .. //depot/projects/smpffs/alpha/include/cpufunc.h#1 branch .. //depot/projects/smpffs/alpha/include/critical.h#1 branch .. //depot/projects/smpffs/alpha/include/db_machdep.h#1 branch .. //depot/projects/smpffs/alpha/include/elf.h#1 branch .. //depot/projects/smpffs/alpha/include/endian.h#1 branch .. //depot/projects/smpffs/alpha/include/exec.h#1 branch .. //depot/projects/smpffs/alpha/include/float.h#1 branch .. //depot/projects/smpffs/alpha/include/floatingpoint.h#1 branch .. //depot/projects/smpffs/alpha/include/fpu.h#1 branch .. //depot/projects/smpffs/alpha/include/frame.h#1 branch .. //depot/projects/smpffs/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/smpffs/alpha/include/ieee.h#1 branch .. //depot/projects/smpffs/alpha/include/ieeefp.h#1 branch .. //depot/projects/smpffs/alpha/include/in_cksum.h#1 branch .. //depot/projects/smpffs/alpha/include/inst.h#1 branch .. //depot/projects/smpffs/alpha/include/intr.h#1 branch .. //depot/projects/smpffs/alpha/include/intrcnt.h#1 branch .. //depot/projects/smpffs/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/smpffs/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/smpffs/alpha/include/kdb.h#1 branch .. //depot/projects/smpffs/alpha/include/limits.h#1 branch .. //depot/projects/smpffs/alpha/include/md_var.h#1 branch .. //depot/projects/smpffs/alpha/include/memdev.h#1 branch .. //depot/projects/smpffs/alpha/include/mutex.h#1 branch .. //depot/projects/smpffs/alpha/include/pal.h#1 branch .. //depot/projects/smpffs/alpha/include/param.h#1 branch .. //depot/projects/smpffs/alpha/include/pc/bios.h#1 branch .. //depot/projects/smpffs/alpha/include/pc/display.h#1 branch .. //depot/projects/smpffs/alpha/include/pc/msdos.h#1 branch .. //depot/projects/smpffs/alpha/include/pc/vesa.h#1 branch .. //depot/projects/smpffs/alpha/include/pcb.h#1 branch .. //depot/projects/smpffs/alpha/include/pcpu.h#1 branch .. //depot/projects/smpffs/alpha/include/pmap.h#1 branch .. //depot/projects/smpffs/alpha/include/proc.h#1 branch .. //depot/projects/smpffs/alpha/include/profile.h#1 branch .. //depot/projects/smpffs/alpha/include/prom.h#1 branch .. //depot/projects/smpffs/alpha/include/pte.h#1 branch .. //depot/projects/smpffs/alpha/include/ptrace.h#1 branch .. //depot/projects/smpffs/alpha/include/reg.h#1 branch .. //depot/projects/smpffs/alpha/include/reloc.h#1 branch .. //depot/projects/smpffs/alpha/include/resource.h#1 branch .. //depot/projects/smpffs/alpha/include/rpb.h#1 branch .. //depot/projects/smpffs/alpha/include/runq.h#1 branch .. //depot/projects/smpffs/alpha/include/setjmp.h#1 branch .. //depot/projects/smpffs/alpha/include/sf_buf.h#1 branch .. //depot/projects/smpffs/alpha/include/sgmap.h#1 branch .. //depot/projects/smpffs/alpha/include/sigframe.h#1 branch .. //depot/projects/smpffs/alpha/include/signal.h#1 branch .. //depot/projects/smpffs/alpha/include/smp.h#1 branch .. //depot/projects/smpffs/alpha/include/stdarg.h#1 branch .. //depot/projects/smpffs/alpha/include/swiz.h#1 branch .. //depot/projects/smpffs/alpha/include/sysarch.h#1 branch .. //depot/projects/smpffs/alpha/include/ucontext.h#1 branch .. //depot/projects/smpffs/alpha/include/varargs.h#1 branch .. //depot/projects/smpffs/alpha/include/vmparam.h#1 branch .. //depot/projects/smpffs/alpha/isa/isa.c#1 branch .. //depot/projects/smpffs/alpha/isa/isa_dma.c#1 branch .. //depot/projects/smpffs/alpha/isa/isavar.h#1 branch .. //depot/projects/smpffs/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/smpffs/alpha/linux/Makefile#1 branch .. //depot/projects/smpffs/alpha/linux/linux.h#1 branch .. //depot/projects/smpffs/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/smpffs/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/smpffs/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/smpffs/alpha/linux/linux_locore.s#1 branch .. //depot/projects/smpffs/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/smpffs/alpha/linux/linux_proto.h#1 branch .. //depot/projects/smpffs/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/smpffs/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/smpffs/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/smpffs/alpha/linux/syscalls.conf#1 branch .. //depot/projects/smpffs/alpha/linux/syscalls.master#1 branch .. //depot/projects/smpffs/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/smpffs/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/smpffs/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/smpffs/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/smpffs/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/smpffs/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/smpffs/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/smpffs/alpha/osf1/Makefile#1 branch .. //depot/projects/smpffs/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/smpffs/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/smpffs/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1.h#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/smpffs/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/smpffs/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/smpffs/alpha/osf1/syscalls.master#1 branch .. //depot/projects/smpffs/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/smpffs/alpha/pci/apecs.c#1 branch .. //depot/projects/smpffs/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/smpffs/alpha/pci/apecsreg.h#1 branch .. //depot/projects/smpffs/alpha/pci/apecsvar.h#1 branch .. //depot/projects/smpffs/alpha/pci/bwx.c#1 branch .. //depot/projects/smpffs/alpha/pci/cia.c#1 branch .. //depot/projects/smpffs/alpha/pci/cia_pci.c#1 branch .. //depot/projects/smpffs/alpha/pci/ciareg.h#1 branch .. //depot/projects/smpffs/alpha/pci/ciavar.h#1 branch .. //depot/projects/smpffs/alpha/pci/irongate.c#1 branch .. //depot/projects/smpffs/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/smpffs/alpha/pci/irongatereg.h#1 branch .. //depot/projects/smpffs/alpha/pci/irongatevar.h#1 branch .. //depot/projects/smpffs/alpha/pci/lca.c#1 branch .. //depot/projects/smpffs/alpha/pci/lca_pci.c#1 branch .. //depot/projects/smpffs/alpha/pci/lcareg.h#1 branch .. //depot/projects/smpffs/alpha/pci/lcavar.h#1 branch .. //depot/projects/smpffs/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/smpffs/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/smpffs/alpha/pci/pcibus.c#1 branch .. //depot/projects/smpffs/alpha/pci/pcibus.h#1 branch .. //depot/projects/smpffs/alpha/pci/swiz.c#1 branch .. //depot/projects/smpffs/alpha/pci/t2.c#1 branch .. //depot/projects/smpffs/alpha/pci/t2_pci.c#1 branch .. //depot/projects/smpffs/alpha/pci/t2reg.h#1 branch .. //depot/projects/smpffs/alpha/pci/t2var.h#1 branch .. //depot/projects/smpffs/alpha/pci/tsunami.c#1 branch .. //depot/projects/smpffs/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/smpffs/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/smpffs/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/gbus.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/smpffs/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/smpffs/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/smpffs/amd64/Makefile#1 branch .. //depot/projects/smpffs/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/smpffs/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/smpffs/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/smpffs/amd64/acpica/madt.c#1 branch .. //depot/projects/smpffs/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/smpffs/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/smpffs/amd64/amd64/atomic.c#1 branch .. //depot/projects/smpffs/amd64/amd64/autoconf.c#1 branch .. //depot/projects/smpffs/amd64/amd64/bios.c#1 branch .. //depot/projects/smpffs/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/smpffs/amd64/amd64/critical.c#1 branch .. //depot/projects/smpffs/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/smpffs/amd64/amd64/db_interface.c#1 branch .. //depot/projects/smpffs/amd64/amd64/db_trace.c#1 branch .. //depot/projects/smpffs/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/exception.S#1 branch .. //depot/projects/smpffs/amd64/amd64/fpu.c#1 branch .. //depot/projects/smpffs/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/genassym.c#1 branch .. //depot/projects/smpffs/amd64/amd64/identcpu.c#1 branch .. //depot/projects/smpffs/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/smpffs/amd64/amd64/initcpu.c#1 branch .. //depot/projects/smpffs/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/io.c#1 branch .. //depot/projects/smpffs/amd64/amd64/io_apic.c#1 branch .. //depot/projects/smpffs/amd64/amd64/legacy.c#1 branch .. //depot/projects/smpffs/amd64/amd64/local_apic.c#1 branch .. //depot/projects/smpffs/amd64/amd64/locore.S#1 branch .. //depot/projects/smpffs/amd64/amd64/machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/mem.c#1 branch .. //depot/projects/smpffs/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/smpffs/amd64/amd64/mpboot.S#1 branch .. //depot/projects/smpffs/amd64/amd64/mptable.c#1 branch .. //depot/projects/smpffs/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/smpffs/amd64/amd64/nexus.c#1 branch .. //depot/projects/smpffs/amd64/amd64/pmap.c#1 branch .. //depot/projects/smpffs/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/smpffs/amd64/amd64/support.S#1 branch .. //depot/projects/smpffs/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/trap.c#1 branch .. //depot/projects/smpffs/amd64/amd64/tsc.c#1 branch .. //depot/projects/smpffs/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/smpffs/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/smpffs/amd64/compile/.cvsignore#1 branch .. //depot/projects/smpffs/amd64/conf/GENERIC#1 branch .. //depot/projects/smpffs/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/smpffs/amd64/conf/Makefile#1 branch .. //depot/projects/smpffs/amd64/conf/NOTES#1 branch .. //depot/projects/smpffs/amd64/conf/gethints.awk#1 branch .. //depot/projects/smpffs/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/smpffs/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/smpffs/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/smpffs/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/smpffs/amd64/include/_inttypes.h#1 branch .. //depot/projects/smpffs/amd64/include/_limits.h#1 branch .. //depot/projects/smpffs/amd64/include/_stdint.h#1 branch .. //depot/projects/smpffs/amd64/include/_types.h#1 branch .. //depot/projects/smpffs/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/smpffs/amd64/include/apicreg.h#1 branch .. //depot/projects/smpffs/amd64/include/apicvar.h#1 branch .. //depot/projects/smpffs/amd64/include/asm.h#1 branch .. //depot/projects/smpffs/amd64/include/asmacros.h#1 branch .. //depot/projects/smpffs/amd64/include/atomic.h#1 branch .. //depot/projects/smpffs/amd64/include/bus.h#1 branch .. //depot/projects/smpffs/amd64/include/bus_amd64.h#1 branch .. //depot/projects/smpffs/amd64/include/bus_dma.h#1 branch .. //depot/projects/smpffs/amd64/include/bus_memio.h#1 branch .. //depot/projects/smpffs/amd64/include/bus_pio.h#1 branch .. //depot/projects/smpffs/amd64/include/clock.h#1 branch .. //depot/projects/smpffs/amd64/include/cpu.h#1 branch .. //depot/projects/smpffs/amd64/include/cpufunc.h#1 branch .. //depot/projects/smpffs/amd64/include/cputypes.h#1 branch .. //depot/projects/smpffs/amd64/include/critical.h#1 branch .. //depot/projects/smpffs/amd64/include/db_machdep.h#1 branch .. //depot/projects/smpffs/amd64/include/elf.h#1 branch .. //depot/projects/smpffs/amd64/include/endian.h#1 branch .. //depot/projects/smpffs/amd64/include/exec.h#1 branch .. //depot/projects/smpffs/amd64/include/float.h#1 branch .. //depot/projects/smpffs/amd64/include/floatingpoint.h#1 branch .. //depot/projects/smpffs/amd64/include/fpu.h#1 branch .. //depot/projects/smpffs/amd64/include/frame.h#1 branch .. //depot/projects/smpffs/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/smpffs/amd64/include/ieeefp.h#1 branch .. //depot/projects/smpffs/amd64/include/in_cksum.h#1 branch .. //depot/projects/smpffs/amd64/include/intr_machdep.h#1 branch .. //depot/projects/smpffs/amd64/include/iodev.h#1 branch .. //depot/projects/smpffs/amd64/include/kdb.h#1 branch .. //depot/projects/smpffs/amd64/include/legacyvar.h#1 branch .. //depot/projects/smpffs/amd64/include/limits.h#1 branch .. //depot/projects/smpffs/amd64/include/md_var.h#1 branch .. //depot/projects/smpffs/amd64/include/memdev.h#1 branch .. //depot/projects/smpffs/amd64/include/metadata.h#1 branch .. //depot/projects/smpffs/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/smpffs/amd64/include/mptable.h#1 branch .. //depot/projects/smpffs/amd64/include/mutex.h#1 branch .. //depot/projects/smpffs/amd64/include/param.h#1 branch .. //depot/projects/smpffs/amd64/include/pc/bios.h#1 branch .. //depot/projects/smpffs/amd64/include/pc/display.h#1 branch .. //depot/projects/smpffs/amd64/include/pcb.h#1 branch .. //depot/projects/smpffs/amd64/include/pcb_ext.h#1 branch .. //depot/projects/smpffs/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/smpffs/amd64/include/pcpu.h#1 branch .. //depot/projects/smpffs/amd64/include/pmap.h#1 branch .. //depot/projects/smpffs/amd64/include/proc.h#1 branch .. //depot/projects/smpffs/amd64/include/profile.h#1 branch .. //depot/projects/smpffs/amd64/include/psl.h#1 branch .. //depot/projects/smpffs/amd64/include/ptrace.h#1 branch .. //depot/projects/smpffs/amd64/include/reg.h#1 branch .. //depot/projects/smpffs/amd64/include/reloc.h#1 branch .. //depot/projects/smpffs/amd64/include/resource.h#1 branch .. //depot/projects/smpffs/amd64/include/runq.h#1 branch .. //depot/projects/smpffs/amd64/include/segments.h#1 branch .. //depot/projects/smpffs/amd64/include/setjmp.h#1 branch .. //depot/projects/smpffs/amd64/include/sf_buf.h#1 branch .. //depot/projects/smpffs/amd64/include/sigframe.h#1 branch .. //depot/projects/smpffs/amd64/include/signal.h#1 branch .. //depot/projects/smpffs/amd64/include/smp.h#1 branch .. //depot/projects/smpffs/amd64/include/specialreg.h#1 branch .. //depot/projects/smpffs/amd64/include/stdarg.h#1 branch .. //depot/projects/smpffs/amd64/include/sysarch.h#1 branch .. //depot/projects/smpffs/amd64/include/trap.h#1 branch .. //depot/projects/smpffs/amd64/include/tss.h#1 branch .. //depot/projects/smpffs/amd64/include/ucontext.h#1 branch .. //depot/projects/smpffs/amd64/include/varargs.h#1 branch .. //depot/projects/smpffs/amd64/include/vmparam.h#1 branch .. //depot/projects/smpffs/amd64/isa/atpic.c#1 branch .. //depot/projects/smpffs/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/smpffs/amd64/isa/clock.c#1 branch .. //depot/projects/smpffs/amd64/isa/elcr.c#1 branch .. //depot/projects/smpffs/amd64/isa/icu.h#1 branch .. //depot/projects/smpffs/amd64/isa/isa.c#1 branch .. //depot/projects/smpffs/amd64/isa/isa.h#1 branch .. //depot/projects/smpffs/amd64/isa/isa_dma.c#1 branch .. //depot/projects/smpffs/amd64/isa/nmi.c#1 branch .. //depot/projects/smpffs/amd64/isa/timerreg.h#1 branch .. //depot/projects/smpffs/amd64/linux32/Makefile#1 branch .. //depot/projects/smpffs/amd64/linux32/linux.h#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/smpffs/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/smpffs/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/smpffs/amd64/linux32/syscalls.master#1 branch .. //depot/projects/smpffs/amd64/pci/pci_bus.c#1 branch .. //depot/projects/smpffs/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/smpffs/arm/arm/autoconf.c#1 branch .. //depot/projects/smpffs/arm/arm/bcopy_page.S#1 branch .. //depot/projects/smpffs/arm/arm/bcopyinout.S#1 branch .. //depot/projects/smpffs/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/smpffs/arm/arm/blockio.S#1 branch .. //depot/projects/smpffs/arm/arm/bootconfig.c#1 branch .. //depot/projects/smpffs/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/smpffs/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/smpffs/arm/arm/copystr.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc.c#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/smpffs/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/smpffs/arm/arm/critical.c#1 branch .. //depot/projects/smpffs/arm/arm/db_disasm.c#1 branch .. //depot/projects/smpffs/arm/arm/db_interface.c#1 branch .. //depot/projects/smpffs/arm/arm/db_trace.c#1 branch .. //depot/projects/smpffs/arm/arm/disassem.c#1 branch .. //depot/projects/smpffs/arm/arm/dump_machdep.c#1 branch .. //depot/projects/smpffs/arm/arm/elf_machdep.c#1 branch .. //depot/projects/smpffs/arm/arm/exception.S#1 branch .. //depot/projects/smpffs/arm/arm/fiq.c#1 branch .. //depot/projects/smpffs/arm/arm/fiq_subr.S#1 branch .. //depot/projects/smpffs/arm/arm/fusu.S#1 branch .. //depot/projects/smpffs/arm/arm/genassym.c#1 branch .. //depot/projects/smpffs/arm/arm/identcpu.c#1 branch .. //depot/projects/smpffs/arm/arm/in_cksum.c#1 branch .. //depot/projects/smpffs/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/smpffs/arm/arm/intr.c#1 branch .. //depot/projects/smpffs/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/smpffs/arm/arm/locore.S#1 branch .. //depot/projects/smpffs/arm/arm/machdep.c#1 branch .. //depot/projects/smpffs/arm/arm/mem.c#1 branch .. //depot/projects/smpffs/arm/arm/nexus.c#1 branch .. //depot/projects/smpffs/arm/arm/nexus_io.c#1 branch .. //depot/projects/smpffs/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/smpffs/arm/arm/pmap.c#1 branch .. //depot/projects/smpffs/arm/arm/setcpsr.S#1 branch .. //depot/projects/smpffs/arm/arm/setstack.s#1 branch .. //depot/projects/smpffs/arm/arm/support.S#1 branch .. //depot/projects/smpffs/arm/arm/swtch.S#1 branch .. //depot/projects/smpffs/arm/arm/sys_machdep.c#1 branch .. //depot/projects/smpffs/arm/arm/trap.c#1 branch .. //depot/projects/smpffs/arm/arm/uio_machdep.c#1 branch .. //depot/projects/smpffs/arm/arm/undefined.c#1 branch .. //depot/projects/smpffs/arm/arm/vectors.S#1 branch .. //depot/projects/smpffs/arm/arm/vm_machdep.c#1 branch .. //depot/projects/smpffs/arm/compile/.cvsignore#1 branch .. //depot/projects/smpffs/arm/conf/IQ31244#1 branch .. //depot/projects/smpffs/arm/conf/SIMICS#1 branch .. //depot/projects/smpffs/arm/include/_inttypes.h#1 branch .. //depot/projects/smpffs/arm/include/_limits.h#1 branch .. //depot/projects/smpffs/arm/include/_stdint.h#1 branch .. //depot/projects/smpffs/arm/include/_types.h#1 branch .. //depot/projects/smpffs/arm/include/armreg.h#1 branch .. //depot/projects/smpffs/arm/include/asm.h#1 branch .. //depot/projects/smpffs/arm/include/asmacros.h#1 branch .. //depot/projects/smpffs/arm/include/atomic.h#1 branch .. //depot/projects/smpffs/arm/include/blockio.h#1 branch .. //depot/projects/smpffs/arm/include/bootconfig.h#1 branch .. //depot/projects/smpffs/arm/include/bus.h#1 branch .. //depot/projects/smpffs/arm/include/bus_memio.h#1 branch .. //depot/projects/smpffs/arm/include/bus_pio.h#1 branch .. //depot/projects/smpffs/arm/include/clock.h#1 branch .. //depot/projects/smpffs/arm/include/cpu.h#1 branch .. //depot/projects/smpffs/arm/include/cpuconf.h#1 branch .. //depot/projects/smpffs/arm/include/cpufunc.h#1 branch .. //depot/projects/smpffs/arm/include/critical.h#1 branch .. //depot/projects/smpffs/arm/include/db_machdep.h#1 branch .. //depot/projects/smpffs/arm/include/disassem.h#1 branch .. //depot/projects/smpffs/arm/include/elf.h#1 branch .. //depot/projects/smpffs/arm/include/endian.h#1 branch .. //depot/projects/smpffs/arm/include/exec.h#1 branch .. //depot/projects/smpffs/arm/include/fiq.h#1 branch .. //depot/projects/smpffs/arm/include/float.h#1 branch .. //depot/projects/smpffs/arm/include/floatingpoint.h#1 branch .. //depot/projects/smpffs/arm/include/fp.h#1 branch .. //depot/projects/smpffs/arm/include/frame.h#1 branch .. //depot/projects/smpffs/arm/include/ieee.h#1 branch .. //depot/projects/smpffs/arm/include/ieeefp.h#1 branch .. //depot/projects/smpffs/arm/include/in_cksum.h#1 branch .. //depot/projects/smpffs/arm/include/intr.h#1 branch .. //depot/projects/smpffs/arm/include/katelib.h#1 branch .. //depot/projects/smpffs/arm/include/kdb.h#1 branch .. //depot/projects/smpffs/arm/include/limits.h#1 branch .. //depot/projects/smpffs/arm/include/machdep.h#1 branch .. //depot/projects/smpffs/arm/include/md_var.h#1 branch .. //depot/projects/smpffs/arm/include/memdev.h#1 branch .. //depot/projects/smpffs/arm/include/metadata.h#1 branch .. //depot/projects/smpffs/arm/include/mutex.h#1 branch .. //depot/projects/smpffs/arm/include/param.h#1 branch .. //depot/projects/smpffs/arm/include/pcb.h#1 branch .. //depot/projects/smpffs/arm/include/pcpu.h#1 branch .. //depot/projects/smpffs/arm/include/pmap.h#1 branch .. //depot/projects/smpffs/arm/include/proc.h#1 branch .. //depot/projects/smpffs/arm/include/profile.h#1 branch .. //depot/projects/smpffs/arm/include/psl.h#1 branch .. //depot/projects/smpffs/arm/include/pte.h#1 branch .. //depot/projects/smpffs/arm/include/ptrace.h#1 branch .. //depot/projects/smpffs/arm/include/reg.h#1 branch .. //depot/projects/smpffs/arm/include/reloc.h#1 branch .. //depot/projects/smpffs/arm/include/resource.h#1 branch .. //depot/projects/smpffs/arm/include/runq.h#1 branch .. //depot/projects/smpffs/arm/include/setjmp.h#1 branch .. //depot/projects/smpffs/arm/include/sf_buf.h#1 branch .. //depot/projects/smpffs/arm/include/sigframe.h#1 branch .. //depot/projects/smpffs/arm/include/signal.h#1 branch .. //depot/projects/smpffs/arm/include/smp.h#1 branch .. //depot/projects/smpffs/arm/include/stdarg.h#1 branch .. //depot/projects/smpffs/arm/include/swi.h#1 branch .. //depot/projects/smpffs/arm/include/sysarch.h#1 branch .. //depot/projects/smpffs/arm/include/trap.h#1 branch .. //depot/projects/smpffs/arm/include/ucontext.h#1 branch .. //depot/projects/smpffs/arm/include/undefined.h#1 branch .. //depot/projects/smpffs/arm/include/utrap.h#1 branch .. //depot/projects/smpffs/arm/include/vmparam.h#1 branch .. //depot/projects/smpffs/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/smpffs/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/smpffs/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/smpffs/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/smpffs/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/smpffs/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/smpffs/arm/xscale/xscalereg.h#1 branch .. //depot/projects/smpffs/arm/xscale/xscalevar.h#1 branch .. //depot/projects/smpffs/boot/Makefile#1 branch .. //depot/projects/smpffs/boot/README#1 branch .. //depot/projects/smpffs/boot/alpha/Makefile#1 branch .. //depot/projects/smpffs/boot/alpha/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/smpffs/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/smpffs/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/smpffs/boot/alpha/cdboot/version#1 branch .. //depot/projects/smpffs/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/smpffs/boot/alpha/common/conf.c#1 branch .. //depot/projects/smpffs/boot/alpha/common/help.alpha#1 branch .. //depot/projects/smpffs/boot/alpha/common/ldscript#1 branch .. //depot/projects/smpffs/boot/alpha/common/main.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/smpffs/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/smpffs/boot/alpha/loader/Makefile#1 branch .. //depot/projects/smpffs/boot/alpha/loader/version#1 branch .. //depot/projects/smpffs/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/smpffs/boot/alpha/netboot/version#1 branch .. //depot/projects/smpffs/boot/arc/Makefile#1 branch .. //depot/projects/smpffs/boot/arc/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/smpffs/boot/arc/include/arctypes.h#1 branch .. //depot/projects/smpffs/boot/arc/include/libarc.h#1 branch .. //depot/projects/smpffs/boot/arc/lib/Makefile#1 branch .. //depot/projects/smpffs/boot/arc/lib/abort.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/smpffs/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/smpffs/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/delay.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/devicename.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/module.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/prom.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/smpffs/boot/arc/lib/time.c#1 branch .. //depot/projects/smpffs/boot/arc/loader/Makefile#1 branch .. //depot/projects/smpffs/boot/arc/loader/conf.c#1 branch .. //depot/projects/smpffs/boot/arc/loader/help.alpha#1 branch .. //depot/projects/smpffs/boot/arc/loader/main.c#1 branch .. //depot/projects/smpffs/boot/arc/loader/version#1 branch .. //depot/projects/smpffs/boot/common/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/common/bcache.c#1 branch .. //depot/projects/smpffs/boot/common/boot.c#1 branch .. //depot/projects/smpffs/boot/common/bootstrap.h#1 branch .. //depot/projects/smpffs/boot/common/commands.c#1 branch .. //depot/projects/smpffs/boot/common/console.c#1 branch .. //depot/projects/smpffs/boot/common/dev_net.c#1 branch .. //depot/projects/smpffs/boot/common/dev_net.h#1 branch .. //depot/projects/smpffs/boot/common/devopen.c#1 branch .. //depot/projects/smpffs/boot/common/help.common#1 branch .. //depot/projects/smpffs/boot/common/interp.c#1 branch .. //depot/projects/smpffs/boot/common/interp_backslash.c#1 branch .. //depot/projects/smpffs/boot/common/interp_forth.c#1 branch .. //depot/projects/smpffs/boot/common/interp_parse.c#1 branch .. //depot/projects/smpffs/boot/common/isapnp.c#1 branch .. //depot/projects/smpffs/boot/common/isapnp.h#1 branch .. //depot/projects/smpffs/boot/common/load.c#1 branch .. //depot/projects/smpffs/boot/common/load_elf.c#1 branch .. //depot/projects/smpffs/boot/common/load_elf32.c#1 branch .. //depot/projects/smpffs/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/smpffs/boot/common/load_elf64.c#1 branch .. //depot/projects/smpffs/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/smpffs/boot/common/load_elf_obj.c#1 branch .. //depot/projects/smpffs/boot/common/loader.8#1 branch .. //depot/projects/smpffs/boot/common/ls.c#1 branch .. //depot/projects/smpffs/boot/common/merge_help.awk#1 branch .. //depot/projects/smpffs/boot/common/misc.c#1 branch .. //depot/projects/smpffs/boot/common/module.c#1 branch .. //depot/projects/smpffs/boot/common/newvers.sh#1 branch .. //depot/projects/smpffs/boot/common/panic.c#1 branch .. //depot/projects/smpffs/boot/common/pnp.c#1 branch .. //depot/projects/smpffs/boot/common/pnpdata#1 branch .. //depot/projects/smpffs/boot/common/reloc_elf.c#1 branch .. //depot/projects/smpffs/boot/common/reloc_elf32.c#1 branch .. //depot/projects/smpffs/boot/common/reloc_elf64.c#1 branch .. //depot/projects/smpffs/boot/common/ufsread.c#1 branch .. //depot/projects/smpffs/boot/efi/Makefile#1 branch .. //depot/projects/smpffs/boot/efi/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/efi/include/README#1 branch .. //depot/projects/smpffs/boot/efi/include/efi.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efiapi.h#1 branch .. //depot/projects/smpffs/boot/efi/include/eficon.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efidebug.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efidef.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efidevp.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efierr.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efifs.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efilib.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efinet.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efipart.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efiprot.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efiser.h#1 branch .. //depot/projects/smpffs/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/smpffs/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/smpffs/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/smpffs/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/smpffs/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/smpffs/boot/efi/libefi/Makefile#1 branch .. //depot/projects/smpffs/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/copy.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/delay.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/smpffs/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/module.c#1 branch .. //depot/projects/smpffs/boot/efi/libefi/time.c#1 branch .. //depot/projects/smpffs/boot/ficl/Makefile#1 branch .. //depot/projects/smpffs/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/smpffs/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/smpffs/boot/ficl/dict.c#1 branch .. //depot/projects/smpffs/boot/ficl/ficl.c#1 branch .. //depot/projects/smpffs/boot/ficl/ficl.h#1 branch .. //depot/projects/smpffs/boot/ficl/fileaccess.c#1 branch .. //depot/projects/smpffs/boot/ficl/float.c#1 branch .. //depot/projects/smpffs/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/smpffs/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/smpffs/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/smpffs/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/smpffs/boot/ficl/loader.c#1 branch .. //depot/projects/smpffs/boot/ficl/math64.c#1 branch .. //depot/projects/smpffs/boot/ficl/math64.h#1 branch .. //depot/projects/smpffs/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/smpffs/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/smpffs/boot/ficl/prefix.c#1 branch .. //depot/projects/smpffs/boot/ficl/search.c#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/smpffs/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/smpffs/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/smpffs/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/smpffs/boot/ficl/stack.c#1 branch .. //depot/projects/smpffs/boot/ficl/testmain.c#1 branch .. //depot/projects/smpffs/boot/ficl/tools.c#1 branch .. //depot/projects/smpffs/boot/ficl/unix.c#1 branch .. //depot/projects/smpffs/boot/ficl/vm.c#1 branch .. //depot/projects/smpffs/boot/ficl/words.c#1 branch .. //depot/projects/smpffs/boot/forth/beastie.4th#1 branch .. //depot/projects/smpffs/boot/forth/frames.4th#1 branch .. //depot/projects/smpffs/boot/forth/loader.4th#1 branch .. //depot/projects/smpffs/boot/forth/loader.4th.8#1 branch .. //depot/projects/smpffs/boot/forth/loader.conf#1 branch .. //depot/projects/smpffs/boot/forth/loader.conf.5#1 branch .. //depot/projects/smpffs/boot/forth/loader.rc#1 branch .. //depot/projects/smpffs/boot/forth/pnp.4th#1 branch .. //depot/projects/smpffs/boot/forth/screen.4th#1 branch .. //depot/projects/smpffs/boot/forth/support.4th#1 branch .. //depot/projects/smpffs/boot/i386/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/i386/boot0/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/smpffs/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/smpffs/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/boot2/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/smpffs/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/smpffs/boot/i386/boot2/lib.h#1 branch .. //depot/projects/smpffs/boot/i386/boot2/sio.S#1 branch .. //depot/projects/smpffs/boot/i386/btx/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/smpffs/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/smpffs/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/smpffs/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/smpffs/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/smpffs/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/smpffs/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/smpffs/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/smpffs/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/smpffs/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/smpffs/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/smpffs/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/smpffs/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/smpffs/boot/i386/libi386/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/smpffs/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/smpffs/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/pread.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/smpffs/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/smpffs/boot/i386/libi386/time.c#1 branch .. //depot/projects/smpffs/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/smpffs/boot/i386/loader/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/loader/conf.c#1 branch .. //depot/projects/smpffs/boot/i386/loader/help.i386#1 branch .. //depot/projects/smpffs/boot/i386/loader/main.c#1 branch .. //depot/projects/smpffs/boot/i386/loader/version#1 branch .. //depot/projects/smpffs/boot/i386/mbr/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/smpffs/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/smpffs/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/smpffs/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/smpffs/boot/ia64/Makefile#1 branch .. //depot/projects/smpffs/boot/ia64/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/ia64/efi/Makefile#1 branch .. //depot/projects/smpffs/boot/ia64/efi/conf.c#1 branch .. //depot/projects/smpffs/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/smpffs/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/smpffs/boot/ia64/efi/main.c#1 branch .. //depot/projects/smpffs/boot/ia64/efi/start.S#1 branch .. //depot/projects/smpffs/boot/ia64/efi/version#1 branch .. //depot/projects/smpffs/boot/ia64/ski/Makefile#1 branch .. //depot/projects/smpffs/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/conf.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/copy.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/delay.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/exit.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/smpffs/boot/ia64/ski/libski.h#1 branch .. //depot/projects/smpffs/boot/ia64/ski/main.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/smpffs/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/smpffs/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/start.S#1 branch .. //depot/projects/smpffs/boot/ia64/ski/time.c#1 branch .. //depot/projects/smpffs/boot/ia64/ski/version#1 branch .. //depot/projects/smpffs/boot/ofw/Makefile#1 branch .. //depot/projects/smpffs/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/ofw/common/main.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/smpffs/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/smpffs/boot/pc98/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/io.c#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/start.S#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/smpffs/boot/pc98/boot2/table.c#1 branch .. //depot/projects/smpffs/boot/pc98/btx/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/smpffs/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/smpffs/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/smpffs/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/smpffs/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/smpffs/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/smpffs/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/smpffs/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/smpffs/boot/pc98/loader/Makefile#1 branch .. //depot/projects/smpffs/boot/pc98/loader/conf.c#1 branch .. //depot/projects/smpffs/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/smpffs/boot/pc98/loader/main.c#1 branch .. //depot/projects/smpffs/boot/powerpc/Makefile#1 branch .. //depot/projects/smpffs/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/smpffs/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/smpffs/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/smpffs/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/smpffs/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/smpffs/boot/powerpc/loader/start.c#1 branch .. //depot/projects/smpffs/boot/powerpc/loader/version#1 branch .. //depot/projects/smpffs/boot/sparc64/Makefile#1 branch .. //depot/projects/smpffs/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/smpffs/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/smpffs/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/smpffs/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/smpffs/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/smpffs/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/smpffs/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/smpffs/boot/sparc64/loader/main.c#1 branch .. //depot/projects/smpffs/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/smpffs/boot/sparc64/loader/version#1 branch .. //depot/projects/smpffs/cam/cam.c#1 branch .. //depot/projects/smpffs/cam/cam.h#1 branch .. //depot/projects/smpffs/cam/cam_ccb.h#1 branch .. //depot/projects/smpffs/cam/cam_debug.h#1 branch .. //depot/projects/smpffs/cam/cam_periph.c#1 branch .. //depot/projects/smpffs/cam/cam_periph.h#1 branch .. //depot/projects/smpffs/cam/cam_queue.c#1 branch .. //depot/projects/smpffs/cam/cam_queue.h#1 branch .. //depot/projects/smpffs/cam/cam_sim.c#1 branch .. //depot/projects/smpffs/cam/cam_sim.h#1 branch .. //depot/projects/smpffs/cam/cam_xpt.c#1 branch .. //depot/projects/smpffs/cam/cam_xpt.h#1 branch .. //depot/projects/smpffs/cam/cam_xpt_periph.h#1 branch .. //depot/projects/smpffs/cam/cam_xpt_sim.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_all.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_all.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_da.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_da.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_low.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_low.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_message.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_target.c#1 branch .. //depot/projects/smpffs/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/smpffs/coda/00READ#1 branch .. //depot/projects/smpffs/coda/README#1 branch .. //depot/projects/smpffs/coda/TODO#1 branch .. //depot/projects/smpffs/coda/cnode.h#1 branch .. //depot/projects/smpffs/coda/coda.h#1 branch .. //depot/projects/smpffs/coda/coda_fbsd.c#1 branch .. //depot/projects/smpffs/coda/coda_io.h#1 branch .. //depot/projects/smpffs/coda/coda_kernel.h#1 branch .. //depot/projects/smpffs/coda/coda_namecache.c#1 branch .. //depot/projects/smpffs/coda/coda_namecache.h#1 branch .. //depot/projects/smpffs/coda/coda_opstats.h#1 branch .. //depot/projects/smpffs/coda/coda_pioctl.h#1 branch .. //depot/projects/smpffs/coda/coda_psdev.c#1 branch .. //depot/projects/smpffs/coda/coda_psdev.h#1 branch .. //depot/projects/smpffs/coda/coda_subr.c#1 branch .. //depot/projects/smpffs/coda/coda_subr.h#1 branch .. //depot/projects/smpffs/coda/coda_venus.c#1 branch .. //depot/projects/smpffs/coda/coda_venus.h#1 branch .. //depot/projects/smpffs/coda/coda_vfsops.c#1 branch .. //depot/projects/smpffs/coda/coda_vfsops.h#1 branch .. //depot/projects/smpffs/coda/coda_vnops.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 14 01:59:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0357D16A4D0; Tue, 14 Dec 2004 01:59:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E091916A4CE for ; Tue, 14 Dec 2004 01:59:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C63443D2F for ; Tue, 14 Dec 2004 01:59:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE1xdtW098547 for ; Tue, 14 Dec 2004 01:59:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE1xdaU098544 for perforce@freebsd.org; Tue, 14 Dec 2004 01:59:39 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Dec 2004 01:59:39 GMT Message-Id: <200412140159.iBE1xdaU098544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 67013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 01:59:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=67013 Change 67013 by peter@peter_daintree on 2004/12/14 01:59:29 Apply smpffs.diff that I snarfed this morning. Affected files ... .. //depot/projects/smpffs/geom/geom_vfs.c#2 edit .. //depot/projects/smpffs/kern/init_sysent.c#2 edit .. //depot/projects/smpffs/kern/kern_descrip.c#2 edit .. //depot/projects/smpffs/kern/kern_lock.c#2 edit .. //depot/projects/smpffs/kern/syscalls.c#2 edit .. //depot/projects/smpffs/kern/syscalls.master#2 edit .. //depot/projects/smpffs/kern/vfs_bio.c#2 edit .. //depot/projects/smpffs/kern/vfs_cache.c#2 edit .. //depot/projects/smpffs/kern/vfs_cluster.c#2 edit .. //depot/projects/smpffs/kern/vfs_default.c#2 edit .. //depot/projects/smpffs/kern/vfs_lookup.c#2 edit .. //depot/projects/smpffs/kern/vfs_mount.c#2 edit .. //depot/projects/smpffs/kern/vfs_subr.c#2 edit .. //depot/projects/smpffs/kern/vfs_syscalls.c#2 edit .. //depot/projects/smpffs/kern/vfs_vnops.c#2 edit .. //depot/projects/smpffs/sys/ktr.h#2 edit .. //depot/projects/smpffs/sys/mount.h#2 edit .. //depot/projects/smpffs/sys/namei.h#2 edit .. //depot/projects/smpffs/sys/syscall.h#2 edit .. //depot/projects/smpffs/sys/syscall.mk#2 edit .. //depot/projects/smpffs/sys/sysproto.h#2 edit .. //depot/projects/smpffs/sys/vnode.h#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_alloc.c#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_balloc.c#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_extern.h#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_inode.c#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_snapshot.c#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_softdep.c#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_vfsops.c#2 edit .. //depot/projects/smpffs/ufs/ffs/ffs_vnops.c#2 edit .. //depot/projects/smpffs/ufs/ffs/fs.h#2 edit .. //depot/projects/smpffs/ufs/ufs/ufsmount.h#2 edit .. //depot/projects/smpffs/vm/vm_fault.c#2 edit .. //depot/projects/smpffs/vm/vm_mmap.c#2 edit .. //depot/projects/smpffs/vm/vm_object.c#2 edit .. //depot/projects/smpffs/vm/vnode_pager.c#2 edit Differences ... ==== //depot/projects/smpffs/geom/geom_vfs.c#2 (text+ko) ==== @@ -77,9 +77,7 @@ bp->b_ioflags |= BIO_ERROR; bp->b_resid = bp->b_bcount - bip->bio_completed; g_destroy_bio(bip); - mtx_lock(&Giant); bufdone(bp); - mtx_unlock(&Giant); } void ==== //depot/projects/smpffs/kern/init_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.180 2004/11/25 12:08:16 phk Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.180 2004/11/25 12:07:28 phk Exp */ @@ -40,11 +40,11 @@ { SYF_MPSAFE | AS(link_args), (sy_call_t *)link }, /* 9 = link */ { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ { 0, (sy_call_t *)nosys }, /* 11 = obsolete execv */ - { AS(chdir_args), (sy_call_t *)chdir }, /* 12 = chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir }, /* 13 = fchdir */ - { AS(mknod_args), (sy_call_t *)mknod }, /* 14 = mknod */ - { AS(chmod_args), (sy_call_t *)chmod }, /* 15 = chmod */ - { AS(chown_args), (sy_call_t *)chown }, /* 16 = chown */ + { SYF_MPSAFE | AS(chdir_args), (sy_call_t *)chdir }, /* 12 = chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(mknod_args), (sy_call_t *)mknod }, /* 14 = mknod */ + { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod }, /* 15 = chmod */ + { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown }, /* 16 = chown */ { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak }, /* 17 = break */ { compat4(AS(freebsd4_getfsstat_args),getfsstat) }, /* 18 = old getfsstat */ { compat(AS(olseek_args),lseek) }, /* 19 = old lseek */ @@ -61,10 +61,10 @@ { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept }, /* 30 = accept */ { SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername }, /* 31 = getpeername */ { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname }, /* 32 = getsockname */ - { AS(access_args), (sy_call_t *)access }, /* 33 = access */ - { AS(chflags_args), (sy_call_t *)chflags }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync }, /* 36 = sync */ + { SYF_MPSAFE | AS(access_args), (sy_call_t *)access }, /* 33 = access */ + { SYF_MPSAFE | AS(chflags_args), (sy_call_t *)chflags }, /* 34 = chflags */ + { SYF_MPSAFE | AS(fchflags_args), (sy_call_t *)fchflags }, /* 35 = fchflags */ + { SYF_MPSAFE | 0, (sy_call_t *)sync }, /* 36 = sync */ { SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill }, /* 37 = kill */ { compat(AS(ostat_args),stat) }, /* 38 = old stat */ { SYF_MPSAFE | 0, (sy_call_t *)getppid }, /* 39 = getppid */ @@ -84,12 +84,12 @@ { SYF_MPSAFE | AS(sigaltstack_args), (sy_call_t *)sigaltstack }, /* 53 = sigaltstack */ { SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl }, /* 54 = ioctl */ { SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot }, /* 55 = reboot */ - { AS(revoke_args), (sy_call_t *)revoke }, /* 56 = revoke */ - { AS(symlink_args), (sy_call_t *)symlink }, /* 57 = symlink */ - { AS(readlink_args), (sy_call_t *)readlink }, /* 58 = readlink */ + { SYF_MPSAFE | AS(revoke_args), (sy_call_t *)revoke }, /* 56 = revoke */ + { SYF_MPSAFE | AS(symlink_args), (sy_call_t *)symlink }, /* 57 = symlink */ + { SYF_MPSAFE | AS(readlink_args), (sy_call_t *)readlink }, /* 58 = readlink */ { SYF_MPSAFE | AS(execve_args), (sy_call_t *)execve }, /* 59 = execve */ { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot }, /* 61 = chroot */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot }, /* 61 = chroot */ { compat(SYF_MPSAFE | AS(ofstat_args),fstat) }, /* 62 = old fstat */ { compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo) }, /* 63 = old getkerninfo */ { compat(SYF_MPSAFE | 0,getpagesize) }, /* 64 = old getpagesize */ @@ -123,7 +123,7 @@ { SYF_MPSAFE | AS(fcntl_args), (sy_call_t *)fcntl }, /* 92 = fcntl */ { SYF_MPSAFE | AS(select_args), (sy_call_t *)select }, /* 93 = select */ { 0, (sy_call_t *)nosys }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync }, /* 95 = fsync */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync }, /* 95 = fsync */ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority }, /* 96 = setpriority */ { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket }, /* 97 = socket */ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect }, /* 98 = connect */ @@ -151,22 +151,22 @@ { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv }, /* 120 = readv */ { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev }, /* 121 = writev */ { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday }, /* 122 = settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */ { compat(SYF_MPSAFE | AS(recvfrom_args),recvfrom) }, /* 125 = old recvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */ - { AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */ + { SYF_MPSAFE | AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */ { compat(AS(otruncate_args),truncate) }, /* 129 = old truncate */ { compat(AS(oftruncate_args),ftruncate) }, /* 130 = old ftruncate */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock }, /* 131 = flock */ - { AS(mkfifo_args), (sy_call_t *)mkfifo }, /* 132 = mkfifo */ + { SYF_MPSAFE | AS(mkfifo_args), (sy_call_t *)mkfifo }, /* 132 = mkfifo */ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto }, /* 133 = sendto */ { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown }, /* 134 = shutdown */ { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir }, /* 137 = rmdir */ - { AS(utimes_args), (sy_call_t *)utimes }, /* 138 = utimes */ + { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir }, /* 136 = mkdir */ + { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir }, /* 137 = rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes }, /* 138 = utimes */ { 0, (sy_call_t *)nosys }, /* 139 = obsolete 4.2 sigreturn */ { SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime }, /* 140 = adjtime */ { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername) }, /* 141 = old getpeername */ @@ -188,8 +188,8 @@ { compat4(AS(freebsd4_statfs_args),statfs) }, /* 157 = old statfs */ { compat4(AS(freebsd4_fstatfs_args),fstatfs) }, /* 158 = old fstatfs */ { 0, (sy_call_t *)nosys }, /* 159 = nosys */ - { AS(lgetfh_args), (sy_call_t *)lgetfh }, /* 160 = lgetfh */ - { AS(getfh_args), (sy_call_t *)getfh }, /* 161 = getfh */ + { SYF_MPSAFE | AS(lgetfh_args), (sy_call_t *)lgetfh }, /* 160 = lgetfh */ + { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh }, /* 161 = getfh */ { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname }, /* 162 = getdomainname */ { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname }, /* 163 = setdomainname */ { SYF_MPSAFE | AS(uname_args), (sy_call_t *)uname }, /* 164 = uname */ @@ -216,25 +216,25 @@ { 0, (sy_call_t *)nosys }, /* 185 = lfs_markv */ { 0, (sy_call_t *)nosys }, /* 186 = lfs_segclean */ { 0, (sy_call_t *)nosys }, /* 187 = lfs_segwait */ - { AS(stat_args), (sy_call_t *)stat }, /* 188 = stat */ + { SYF_MPSAFE | AS(stat_args), (sy_call_t *)stat }, /* 188 = stat */ { SYF_MPSAFE | AS(fstat_args), (sy_call_t *)fstat }, /* 189 = fstat */ - { AS(lstat_args), (sy_call_t *)lstat }, /* 190 = lstat */ - { AS(pathconf_args), (sy_call_t *)pathconf }, /* 191 = pathconf */ + { SYF_MPSAFE | AS(lstat_args), (sy_call_t *)lstat }, /* 190 = lstat */ + { SYF_MPSAFE | AS(pathconf_args), (sy_call_t *)pathconf }, /* 191 = pathconf */ { SYF_MPSAFE | AS(fpathconf_args), (sy_call_t *)fpathconf }, /* 192 = fpathconf */ { 0, (sy_call_t *)nosys }, /* 193 = nosys */ { SYF_MPSAFE | AS(__getrlimit_args), (sy_call_t *)getrlimit }, /* 194 = getrlimit */ { SYF_MPSAFE | AS(__setrlimit_args), (sy_call_t *)setrlimit }, /* 195 = setrlimit */ - { AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 196 = getdirentries */ + { SYF_MPSAFE | AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 196 = getdirentries */ { SYF_MPSAFE | AS(mmap_args), (sy_call_t *)mmap }, /* 197 = mmap */ - { 0, (sy_call_t *)nosys }, /* 198 = __syscall */ - { AS(lseek_args), (sy_call_t *)lseek }, /* 199 = lseek */ - { AS(truncate_args), (sy_call_t *)truncate }, /* 200 = truncate */ - { AS(ftruncate_args), (sy_call_t *)ftruncate }, /* 201 = ftruncate */ + { SYF_MPSAFE | 0, (sy_call_t *)nosys }, /* 198 = __syscall */ + { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek }, /* 199 = lseek */ + { SYF_MPSAFE | AS(truncate_args), (sy_call_t *)truncate }, /* 200 = truncate */ + { SYF_MPSAFE | AS(ftruncate_args), (sy_call_t *)ftruncate }, /* 201 = ftruncate */ { SYF_MPSAFE | AS(sysctl_args), (sy_call_t *)__sysctl }, /* 202 = __sysctl */ { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock }, /* 203 = mlock */ { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock }, /* 204 = munlock */ - { AS(undelete_args), (sy_call_t *)undelete }, /* 205 = undelete */ - { AS(futimes_args), (sy_call_t *)futimes }, /* 206 = futimes */ + { SYF_MPSAFE | AS(undelete_args), (sy_call_t *)undelete }, /* 205 = undelete */ + { SYF_MPSAFE | AS(futimes_args), (sy_call_t *)futimes }, /* 206 = futimes */ { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys }, /* 208 = newreboot */ { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll }, /* 209 = poll */ @@ -282,7 +282,7 @@ { SYF_MPSAFE | AS(rfork_args), (sy_call_t *)rfork }, /* 251 = rfork */ { SYF_MPSAFE | AS(openbsd_poll_args), (sy_call_t *)openbsd_poll }, /* 252 = openbsd_poll */ { SYF_MPSAFE | 0, (sy_call_t *)issetugid }, /* 253 = issetugid */ - { AS(lchown_args), (sy_call_t *)lchown }, /* 254 = lchown */ + { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown }, /* 254 = lchown */ { 0, (sy_call_t *)nosys }, /* 255 = nosys */ { 0, (sy_call_t *)nosys }, /* 256 = nosys */ { 0, (sy_call_t *)nosys }, /* 257 = nosys */ @@ -300,15 +300,15 @@ { 0, (sy_call_t *)nosys }, /* 269 = nosys */ { 0, (sy_call_t *)nosys }, /* 270 = nosys */ { 0, (sy_call_t *)nosys }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents }, /* 272 = getdents */ + { SYF_MPSAFE | AS(getdents_args), (sy_call_t *)getdents }, /* 272 = getdents */ { 0, (sy_call_t *)nosys }, /* 273 = nosys */ - { AS(lchmod_args), (sy_call_t *)lchmod }, /* 274 = lchmod */ + { SYF_MPSAFE | AS(lchmod_args), (sy_call_t *)lchmod }, /* 274 = lchmod */ { AS(lchown_args), (sy_call_t *)lchown }, /* 275 = netbsd_lchown */ - { AS(lutimes_args), (sy_call_t *)lutimes }, /* 276 = lutimes */ + { SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes }, /* 276 = lutimes */ { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync }, /* 277 = netbsd_msync */ - { AS(nstat_args), (sy_call_t *)nstat }, /* 278 = nstat */ + { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat }, /* 278 = nstat */ { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat }, /* 279 = nfstat */ - { AS(nlstat_args), (sy_call_t *)nlstat }, /* 280 = nlstat */ + { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat }, /* 280 = nlstat */ { 0, (sy_call_t *)nosys }, /* 281 = nosys */ { 0, (sy_call_t *)nosys }, /* 282 = nosys */ { 0, (sy_call_t *)nosys }, /* 283 = nosys */ @@ -354,7 +354,7 @@ { 0, (sy_call_t *)nosys }, /* 323 = obsolete thr_wakeup */ { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall }, /* 324 = mlockall */ { SYF_MPSAFE | 0, (sy_call_t *)munlockall }, /* 325 = munlockall */ - { AS(__getcwd_args), (sy_call_t *)__getcwd }, /* 326 = __getcwd */ + { SYF_MPSAFE | AS(__getcwd_args), (sy_call_t *)__getcwd }, /* 326 = __getcwd */ { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam }, /* 327 = sched_setparam */ { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam }, /* 328 = sched_getparam */ { SYF_MPSAFE | AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler }, /* 329 = sched_setscheduler */ @@ -404,7 +404,7 @@ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd }, /* 373 = extattr_delete_fd */ { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid }, /* 374 = __setugid */ { AS(nfsclnt_args), (sy_call_t *)nosys }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess }, /* 376 = eaccess */ + { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys }, /* 377 = afs_syscall */ { SYF_MPSAFE | AS(nmount_args), (sy_call_t *)nmount }, /* 378 = nmount */ { SYF_MPSAFE | 0, (sy_call_t *)kse_exit }, /* 379 = kse_exit */ @@ -419,13 +419,13 @@ { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd }, /* 388 = __mac_set_fd */ { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ - { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ + { SYF_MPSAFE | AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall }, /* 394 = mac_syscall */ - { AS(getfsstat_args), (sy_call_t *)getfsstat }, /* 395 = getfsstat */ - { AS(statfs_args), (sy_call_t *)statfs }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs }, /* 397 = fstatfs */ + { SYF_MPSAFE | AS(getfsstat_args), (sy_call_t *)getfsstat }, /* 395 = getfsstat */ + { SYF_MPSAFE | AS(statfs_args), (sy_call_t *)statfs }, /* 396 = statfs */ + { SYF_MPSAFE | AS(fstatfs_args), (sy_call_t *)fstatfs }, /* 397 = fstatfs */ { AS(fhstatfs_args), (sy_call_t *)fhstatfs }, /* 398 = fhstatfs */ { 0, (sy_call_t *)nosys }, /* 399 = nosys */ { SYF_MPSAFE | AS(ksem_close_args), (sy_call_t *)lkmressys }, /* 400 = ksem_close */ ==== //depot/projects/smpffs/kern/kern_descrip.c#2 (text+ko) ==== @@ -1141,11 +1141,12 @@ } vp = fp->f_vnode; if (vp != NULL) { - mtx_lock(&Giant); + int vfslocked; + vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); error = VOP_PATHCONF(vp, uap->name, td->td_retval); VOP_UNLOCK(vp, 0, td); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); } else if (fp->f_type == DTYPE_PIPE || fp->f_type == DTYPE_SOCKET) { if (uap->name != _PC_PIPE_BUF) { error = EINVAL; @@ -1480,8 +1481,6 @@ struct vnode *vp; struct flock lf; - GIANT_REQUIRED; /* VFS */ - /* Certain daemons might not have file descriptors. */ fdp = td->td_proc->p_fd; if (fdp == NULL) @@ -1512,6 +1511,7 @@ lf.l_len = 0; lf.l_type = F_UNLCK; vp = fp->f_vnode; + VFS_ASSERT_GIANT(vp->v_mount); (void) VOP_ADVLOCK(vp, (caddr_t)td->td_proc-> p_leader, @@ -1814,13 +1814,15 @@ * aren't passed with the descriptor. */ if (fp->f_type == DTYPE_VNODE) { - mtx_lock(&Giant); + int vfslocked; + + vp = fp->f_vnode; + vfslocked = VFS_LOCK_GIANT(vp->v_mount); if ((td->td_proc->p_leader->p_flag & P_ADVLOCK) != 0) { lf.l_whence = SEEK_SET; lf.l_start = 0; lf.l_len = 0; lf.l_type = F_UNLCK; - vp = fp->f_vnode; (void) VOP_ADVLOCK(vp, (caddr_t)td->td_proc->p_leader, F_UNLCK, &lf, F_POSIX); } @@ -1858,7 +1860,7 @@ } FILEDESC_UNLOCK(fdp); } - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); } return (fdrop(fp, td)); } @@ -1952,8 +1954,6 @@ struct file *fp; int error; - GIANT_REQUIRED; /* VFS */ - *vpp = NULL; if ((error = _fget(td, fd, &fp, 0, 0)) != 0) return (error); ==== //depot/projects/smpffs/kern/kern_lock.c#2 (text+ko) ==== @@ -136,10 +136,10 @@ } static int -acquire(struct lock **lkpp, int extflags, int wanted) { +acquire(struct lock **lkpp, int extflags, int wanted) +{ struct lock *lkp = *lkpp; int s, error; - CTR3(KTR_LOCK, "acquire(): lkp == %p, extflags == 0x%x, wanted == 0x%x", lkp, extflags, wanted); @@ -148,7 +148,7 @@ return EBUSY; } - if (((lkp->lk_flags | extflags) & LK_NOPAUSE) == 0) { + if (((lkp->lk_flags | extflags) & (LK_NOPAUSE|LK_INTERLOCK)) == 0) { error = apause(lkp, wanted); if (error == 0) return 0; @@ -214,10 +214,6 @@ struct thread *thr; int extflags, lockflags; - CTR5(KTR_LOCK, - "lockmgr(): lkp == %p (lk_wmesg == \"%s\"), flags == 0x%x, " - "interlkp == %p, td == %p", lkp, lkp->lk_wmesg, flags, interlkp, td); - error = 0; if (td == NULL) thr = LK_KERNPROC; @@ -226,6 +222,17 @@ if ((flags & LK_INTERNAL) == 0) mtx_lock(lkp->lk_interlock); +#ifdef DEBUG_LOCKS + CTR6(KTR_LOCK, + "lockmgr(): lkp == %p (lk_wmesg == \"%s\"), flags == 0x%x, " + "td == %p %s:%d", lkp, lkp->lk_wmesg, flags, td, file, line); +#else + CTR6(KTR_LOCK, + "lockmgr(): lkp == %p (lk_wmesg == \"%s\"), owner == %p, exclusivecount == %d, flags == 0x%x, " + "td == %p", lkp, lkp->lk_wmesg, lkp->lk_lockholder, + lkp->lk_exclusivecount, flags, td); +#endif + if (flags & LK_INTERLOCK) { mtx_assert(interlkp, MA_OWNED | MA_NOTRECURSED); mtx_unlock(interlkp); @@ -479,9 +486,11 @@ return EBUSY; } - error = apause(lkp, LK_ALL); - if (error == 0) - return 0; + if ((extflags & LK_INTERLOCK) == 0) { + error = apause(lkp, LK_ALL); + if (error == 0) + return 0; + } while (lkp->lk_flags & LK_ALL) { lkp->lk_flags |= LK_WAITDRAIN; ==== //depot/projects/smpffs/kern/syscalls.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.166 2004/11/25 12:08:16 phk Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.180 2004/11/25 12:07:28 phk Exp */ ==== //depot/projects/smpffs/kern/syscalls.master#2 (text+ko) ==== @@ -61,11 +61,11 @@ 9 MSTD { int link(char *path, char *link); } 10 MSTD { int unlink(char *path); } 11 OBSOL execv -12 STD { int chdir(char *path); } -13 STD { int fchdir(int fd); } -14 STD { int mknod(char *path, int mode, int dev); } -15 STD { int chmod(char *path, int mode); } -16 STD { int chown(char *path, int uid, int gid); } +12 MSTD { int chdir(char *path); } +13 MSTD { int fchdir(int fd); } +14 MSTD { int mknod(char *path, int mode, int dev); } +15 MSTD { int chmod(char *path, int mode); } +16 MSTD { int chown(char *path, int uid, int gid); } 17 MSTD { int obreak(char *nsize); } break obreak_args int 18 COMPAT4 { int getfsstat(struct ostatfs *buf, long bufsize, int flags); } 19 COMPAT { long lseek(int fd, long offset, int whence); } @@ -88,10 +88,10 @@ __socklen_t * __restrict alen); } 32 MSTD { int getsockname(int fdes, struct sockaddr * __restrict asa, \ __socklen_t * __restrict alen); } -33 STD { int access(char *path, int flags); } -34 STD { int chflags(char *path, int flags); } -35 STD { int fchflags(int fd, int flags); } -36 STD { int sync(void); } +33 MSTD { int access(char *path, int flags); } +34 MSTD { int chflags(char *path, int flags); } +35 MSTD { int fchflags(int fd, int flags); } +36 MSTD { int sync(void); } 37 MSTD { int kill(int pid, int signum); } 38 COMPAT { int stat(char *path, struct ostat *ub); } 39 MSTD { pid_t getppid(void); } @@ -116,12 +116,12 @@ 53 MSTD { int sigaltstack(stack_t *ss, stack_t *oss); } 54 MSTD { int ioctl(int fd, u_long com, caddr_t data); } 55 MSTD { int reboot(int opt); } -56 STD { int revoke(char *path); } -57 STD { int symlink(char *path, char *link); } -58 STD { int readlink(char *path, char *buf, int count); } +56 MSTD { int revoke(char *path); } +57 MSTD { int symlink(char *path, char *link); } +58 MSTD { int readlink(char *path, char *buf, int count); } 59 MSTD { int execve(char *fname, char **argv, char **envv); } 60 MSTD { int umask(int newmask); } umask umask_args int -61 STD { int chroot(char *path); } +61 MSTD { int chroot(char *path); } 62 MCOMPAT { int fstat(int fd, struct ostat *sb); } 63 MCOMPAT { int getkerninfo(int op, char *where, size_t *size, \ int arg); } getkerninfo getkerninfo_args int @@ -163,7 +163,7 @@ 93 MSTD { int select(int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } 94 UNIMPL setdopt -95 STD { int fsync(int fd); } +95 MSTD { int fsync(int fd); } 96 MSTD { int setpriority(int which, int who, int prio); } 97 MSTD { int socket(int domain, int type, int protocol); } 98 MSTD { int connect(int s, caddr_t name, int namelen); } @@ -197,26 +197,26 @@ 120 MSTD { int readv(int fd, struct iovec *iovp, u_int iovcnt); } 121 MSTD { int writev(int fd, struct iovec *iovp, u_int iovcnt); } 122 MSTD { int settimeofday(struct timeval *tv, struct timezone *tzp); } -123 STD { int fchown(int fd, int uid, int gid); } -124 STD { int fchmod(int fd, int mode); } +123 MSTD { int fchown(int fd, int uid, int gid); } +124 MSTD { int fchmod(int fd, int mode); } 125 MCPT_NOA { int recvfrom(int s, caddr_t buf, size_t len, int flags, \ caddr_t from, int *fromlenaddr); } \ recvfrom recvfrom_args int 126 MSTD { int setreuid(int ruid, int euid); } 127 MSTD { int setregid(int rgid, int egid); } -128 STD { int rename(char *from, char *to); } +128 MSTD { int rename(char *from, char *to); } 129 COMPAT { int truncate(char *path, long length); } 130 COMPAT { int ftruncate(int fd, long length); } 131 MSTD { int flock(int fd, int how); } -132 STD { int mkfifo(char *path, int mode); } +132 MSTD { int mkfifo(char *path, int mode); } 133 MSTD { int sendto(int s, caddr_t buf, size_t len, int flags, \ caddr_t to, int tolen); } 134 MSTD { int shutdown(int s, int how); } 135 MSTD { int socketpair(int domain, int type, int protocol, \ int *rsv); } -136 STD { int mkdir(char *path, int mode); } -137 STD { int rmdir(char *path); } -138 STD { int utimes(char *path, struct timeval *tptr); } +136 MSTD { int mkdir(char *path, int mode); } +137 MSTD { int rmdir(char *path); } +138 MSTD { int utimes(char *path, struct timeval *tptr); } 139 OBSOL 4.2 sigreturn 140 MSTD { int adjtime(struct timeval *delta, \ struct timeval *olddelta); } @@ -247,8 +247,8 @@ 157 COMPAT4 { int statfs(char *path, struct ostatfs *buf); } 158 COMPAT4 { int fstatfs(int fd, struct ostatfs *buf); } 159 UNIMPL nosys -160 STD { int lgetfh(char *fname, struct fhandle *fhp); } -161 STD { int getfh(char *fname, struct fhandle *fhp); } +160 MSTD { int lgetfh(char *fname, struct fhandle *fhp); } +161 MSTD { int getfh(char *fname, struct fhandle *fhp); } 162 MSTD { int getdomainname(char *domainname, int len); } 163 MSTD { int setdomainname(char *domainname, int len); } 164 MSTD { int uname(struct utsname *name); } @@ -286,31 +286,31 @@ 185 UNIMPL lfs_markv 186 UNIMPL lfs_segclean 187 UNIMPL lfs_segwait -188 STD { int stat(char *path, struct stat *ub); } +188 MSTD { int stat(char *path, struct stat *ub); } 189 MSTD { int fstat(int fd, struct stat *sb); } -190 STD { int lstat(char *path, struct stat *ub); } -191 STD { int pathconf(char *path, int name); } +190 MSTD { int lstat(char *path, struct stat *ub); } +191 MSTD { int pathconf(char *path, int name); } 192 MSTD { int fpathconf(int fd, int name); } 193 UNIMPL nosys 194 MSTD { int getrlimit(u_int which, struct rlimit *rlp); } \ getrlimit __getrlimit_args int 195 MSTD { int setrlimit(u_int which, struct rlimit *rlp); } \ setrlimit __setrlimit_args int -196 STD { int getdirentries(int fd, char *buf, u_int count, \ +196 MSTD { int getdirentries(int fd, char *buf, u_int count, \ long *basep); } 197 MSTD { caddr_t mmap(caddr_t addr, size_t len, int prot, \ int flags, int fd, int pad, off_t pos); } -198 STD { int nosys(void); } __syscall __syscall_args int -199 STD { off_t lseek(int fd, int pad, off_t offset, int whence); } -200 STD { int truncate(char *path, int pad, off_t length); } -201 STD { int ftruncate(int fd, int pad, off_t length); } +198 MSTD { int nosys(void); } __syscall __syscall_args int +199 MSTD { off_t lseek(int fd, int pad, off_t offset, int whence); } +200 MSTD { int truncate(char *path, int pad, off_t length); } +201 MSTD { int ftruncate(int fd, int pad, off_t length); } 202 MSTD { int __sysctl(int *name, u_int namelen, void *old, \ size_t *oldlenp, void *new, size_t newlen); } \ __sysctl sysctl_args int 203 MSTD { int mlock(const void *addr, size_t len); } 204 MSTD { int munlock(const void *addr, size_t len); } -205 STD { int undelete(char *path); } -206 STD { int futimes(int fd, struct timeval *tptr); } +205 MSTD { int undelete(char *path); } +206 MSTD { int futimes(int fd, struct timeval *tptr); } 207 MSTD { int getpgid(pid_t pid); } 208 UNIMPL newreboot (NetBSD) 209 MSTD { int poll(struct pollfd *fds, u_int nfds, int timeout); } @@ -374,7 +374,7 @@ 252 MSTD { int openbsd_poll(struct pollfd *fds, u_int nfds, \ int timeout); } 253 MSTD { int issetugid(void); } -254 STD { int lchown(char *path, int uid, int gid); } +254 MSTD { int lchown(char *path, int uid, int gid); } 255 UNIMPL nosys 256 UNIMPL nosys 257 UNIMPL nosys @@ -392,17 +392,17 @@ 269 UNIMPL nosys 270 UNIMPL nosys 271 UNIMPL nosys -272 STD { int getdents(int fd, char *buf, size_t count); } +272 MSTD { int getdents(int fd, char *buf, size_t count); } 273 UNIMPL nosys -274 STD { int lchmod(char *path, mode_t mode); } +274 MSTD { int lchmod(char *path, mode_t mode); } 275 NOPROTO { int lchown(char *path, uid_t uid, gid_t gid); } \ netbsd_lchown lchown_args int -276 STD { int lutimes(char *path, struct timeval *tptr); } +276 MSTD { int lutimes(char *path, struct timeval *tptr); } 277 MNOPROTO { int msync(void *addr, size_t len, int flags); } \ netbsd_msync msync_args int -278 STD { int nstat(char *path, struct nstat *ub); } +278 MSTD { int nstat(char *path, struct nstat *ub); } 279 MSTD { int nfstat(int fd, struct nstat *sb); } -280 STD { int nlstat(char *path, struct nstat *ub); } +280 MSTD { int nlstat(char *path, struct nstat *ub); } 281 UNIMPL nosys 282 UNIMPL nosys 283 UNIMPL nosys @@ -453,7 +453,7 @@ 323 OBSOL thr_wakeup 324 MSTD { int mlockall(int how); } 325 MSTD { int munlockall(void); } -326 STD { int __getcwd(u_char *buf, u_int buflen); } +326 MSTD { int __getcwd(u_char *buf, u_int buflen); } 327 MSTD { int sched_setparam (pid_t pid, \ const struct sched_param *param); } @@ -471,7 +471,7 @@ 335 MSTD { int utrace(const void *addr, size_t len); } 336 MCOMPAT4 { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ struct sf_hdtr *hdtr, off_t *sbytes, int flags); } -337 STD { int kldsym(int fileid, int cmd, void *data); } +337 MSTD { int kldsym(int fileid, int cmd, void *data); } 338 MSTD { int jail(struct jail *jail); } 339 UNIMPL pioctl 340 MSTD { int sigprocmask(int how, const sigset_t *set, \ @@ -534,7 +534,7 @@ const char *attrname); } 374 MSTD { int __setugid(int flag); } 375 NOIMPL { int nfsclnt(int flag, caddr_t argp); } -376 STD { int eaccess(char *path, int flags); } +376 MSTD { int eaccess(char *path, int flags); } 377 UNIMPL afs_syscall 378 MSTD { int nmount(struct iovec *iovp, unsigned int iovcnt, \ int flags); } @@ -555,16 +555,16 @@ struct mac *mac_p); } 390 STD { int kenv(int what, const char *name, char *value, \ int len); } -391 STD { int lchflags(const char *path, int flags); } +391 MSTD { int lchflags(const char *path, int flags); } 392 STD { int uuidgen(struct uuid *store, int count); } 393 MSTD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ struct sf_hdtr *hdtr, off_t *sbytes, int flags); } 394 MSTD { int mac_syscall(const char *policy, int call, \ void *arg); } -395 STD { int getfsstat(struct statfs *buf, long bufsize, \ +395 MSTD { int getfsstat(struct statfs *buf, long bufsize, \ int flags); } -396 STD { int statfs(char *path, struct statfs *buf); } -397 STD { int fstatfs(int fd, struct statfs *buf); } +396 MSTD { int statfs(char *path, struct statfs *buf); } +397 MSTD { int fstatfs(int fd, struct statfs *buf); } 398 STD { int fhstatfs(const struct fhandle *u_fhp, \ struct statfs *buf); } 399 UNIMPL nosys ==== //depot/projects/smpffs/kern/vfs_bio.c#2 (text+ko) ==== @@ -403,8 +403,6 @@ vm_page_t m) { - GIANT_REQUIRED; - VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if (bp->b_flags & B_CACHE) { int base = (foff + off) & PAGE_MASK; @@ -523,8 +521,6 @@ struct buf *bp; int i; - GIANT_REQUIRED; - mtx_init(&bqlock, "buf queue lock", NULL, MTX_DEF); mtx_init(&rbreqlock, "runningbufspace lock", NULL, MTX_DEF); mtx_init(&nblock, "needsbuffer lock", NULL, MTX_DEF); @@ -628,8 +624,6 @@ bfreekva(struct buf *bp) { - GIANT_REQUIRED; - if (bp->b_kvasize) { atomic_add_int(&buffreekvacnt, 1); atomic_subtract_int(&bufspace, bp->b_kvasize); @@ -652,9 +646,10 @@ bremfree(struct buf *bp) { + CTR3(KTR_BUF, "bremfree(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); KASSERT(BUF_REFCNT(bp), ("bremfree: buf must be locked.")); KASSERT((bp->b_flags & B_REMFREE) == 0 && bp->b_qindex != QUEUE_NONE, - ("bremfree: buffer not on a queue.")); + ("bremfree: buffer %p not on a queue.", bp)); bp->b_flags |= B_REMFREE; /* Fixup numfreebuffers count. */ @@ -687,16 +682,15 @@ { int s = splbio(); + CTR3(KTR_BUF, "bremfreel(%p) vp %p flags %X", + bp, bp->b_vp, bp->b_flags); + KASSERT(BUF_REFCNT(bp), ("bremfreel: buffer %p not locked.", bp)); + KASSERT(bp->b_qindex != QUEUE_NONE, + ("bremfreel: buffer %p not on a queue.", bp)); mtx_assert(&bqlock, MA_OWNED); - if (bp->b_qindex != QUEUE_NONE) { - KASSERT(BUF_REFCNT(bp) == 1, ("bremfree: bp %p not locked",bp)); - TAILQ_REMOVE(&bufqueues[bp->b_qindex], bp, b_freelist); - bp->b_qindex = QUEUE_NONE; - } else { - if (BUF_REFCNT(bp) <= 1) - panic("bremfree: removing a buffer not on a queue"); - } + TAILQ_REMOVE(&bufqueues[bp->b_qindex], bp, b_freelist); + bp->b_qindex = QUEUE_NONE; /* * If this was a delayed bremfree() we only need to remove the buffer * from the queue and return the stats are already done. @@ -746,6 +740,7 @@ int i; int rv = 0, readwait = 0; + CTR3(KTR_BUF, "breadn(%p, %jd, %d)", vp, blkno, size); *bpp = bp = getblk(vp, blkno, size, 0, 0, 0); /* if not found in cache, do some I/O */ @@ -809,6 +804,7 @@ int oldflags, s; struct buf *newbp; + CTR3(KTR_BUF, "bufwrite(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); if (bp->b_flags & B_INVAL) { brelse(bp); return (0); @@ -1004,8 +1000,7 @@ struct buf *nbp; struct bufobj *bo; - GIANT_REQUIRED; - + CTR3(KTR_BUF, "bdwrite(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); KASSERT(bp->b_bufobj != NULL, ("No b_bufobj %p", bp)); KASSERT(BUF_REFCNT(bp) != 0, ("bdwrite: buffer is not busy")); @@ -1023,38 +1018,45 @@ */ vp = bp->b_vp; bo = bp->b_bufobj; - BO_LOCK(bo); - if (td->td_pflags & TDP_COWINPROGRESS) { - recursiveflushes++; - } else if (bo->bo_dirty.bv_cnt > dirtybufthresh + 10) { - BO_UNLOCK(bo); - (void) VOP_FSYNC(vp, td->td_ucred, MNT_NOWAIT, td); + if ((td->td_pflags & TDP_COWINPROGRESS) == 0) { BO_LOCK(bo); - altbufferflushes++; - } else if (bo->bo_dirty.bv_cnt > dirtybufthresh) { - /* - * Try to find a buffer to flush. - */ - TAILQ_FOREACH(nbp, &bo->bo_dirty.bv_hd, b_bobufs) { - if ((nbp->b_vflags & BV_BKGRDINPROG) || - buf_countdeps(nbp, 0) || - BUF_LOCK(nbp, LK_EXCLUSIVE | LK_NOWAIT, NULL)) - continue; - if (bp == nbp) - panic("bdwrite: found ourselves"); + if (bo->bo_dirty.bv_cnt > dirtybufthresh + 10) { BO_UNLOCK(bo); - if (nbp->b_flags & B_CLUSTEROK) { - vfs_bio_awrite(nbp); - } else { - bremfree(nbp); - bawrite(nbp); + (void) VOP_FSYNC(vp, td->td_ucred, MNT_NOWAIT, td); + altbufferflushes++; + } else if (bo->bo_dirty.bv_cnt > dirtybufthresh) { + /* + * Try to find a buffer to flush. + */ + TAILQ_FOREACH(nbp, &bo->bo_dirty.bv_hd, b_bobufs) { + if ((nbp->b_vflags & BV_BKGRDINPROG) || + BUF_LOCK(nbp, + LK_EXCLUSIVE | LK_NOWAIT, NULL)) + continue; + if (bp == nbp) + panic("bdwrite: found ourselves"); + BO_UNLOCK(bo); + /* Don't countdeps with the bo lock held. */ + if (buf_countdeps(nbp, 0)) { + BO_LOCK(bo); + BUF_UNLOCK(nbp); + continue; + } + if (nbp->b_flags & B_CLUSTEROK) { + vfs_bio_awrite(nbp); + } else { + bremfree(nbp); + bawrite(nbp); + } + dirtybufferflushes++; + break; } - BO_LOCK(bo); - dirtybufferflushes++; - break; - } - } - BO_UNLOCK(bo); + if (nbp == NULL) + BO_UNLOCK(bo); + } else + BO_UNLOCK(bo); + } else + recursiveflushes++; bdirty(bp); /* @@ -1127,6 +1129,9 @@ bdirty(struct buf *bp) { + CTR3(KTR_BUF, "bdirty(%p) vp %p flags %X", + bp, bp->b_vp, bp->b_flags); + KASSERT(BUF_REFCNT(bp) == 1, ("bdirty: bp %p not locked",bp)); KASSERT(bp->b_bufobj != NULL, ("No b_bufobj %p", bp)); KASSERT(bp->b_flags & B_REMFREE || bp->b_qindex == QUEUE_NONE, ("bdirty: buffer %p still on queue %d", bp, bp->b_qindex)); @@ -1134,7 +1139,7 @@ bp->b_iocmd = BIO_WRITE; if ((bp->b_flags & B_DELWRI) == 0) { - bp->b_flags |= B_DONE | B_DELWRI; + bp->b_flags |= /* XXX B_DONE | */ B_DELWRI; reassignbuf(bp); atomic_add_int(&numdirtybuffers, 1); bd_wakeup((lodirtybuffers + hidirtybuffers) / 2); @@ -1157,9 +1162,11 @@ bundirty(struct buf *bp) { + CTR3(KTR_BUF, "bundirty(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); KASSERT(bp->b_bufobj != NULL, ("No b_bufobj %p", bp)); KASSERT(bp->b_flags & B_REMFREE || bp->b_qindex == QUEUE_NONE, ("bundirty: buffer %p still on queue %d", bp, bp->b_qindex)); + KASSERT(BUF_REFCNT(bp) == 1, ("bundirty: bp %p not locked",bp)); if (bp->b_flags & B_DELWRI) { bp->b_flags &= ~B_DELWRI; @@ -1207,7 +1214,6 @@ if (numdirtybuffers >= hidirtybuffers) { int s; - mtx_lock(&Giant); s = splbio(); mtx_lock(&nblock); while (numdirtybuffers >= hidirtybuffers) { @@ -1218,7 +1224,6 @@ } splx(s); mtx_unlock(&nblock); - mtx_unlock(&Giant); } } @@ -1244,8 +1249,8 @@ { int s; - GIANT_REQUIRED; - + CTR3(KTR_BUF, "brelse(%p) vp %p flags %X", + bp, bp->b_vp, bp->b_flags); KASSERT(!(bp->b_flags & (B_CLUSTER|B_PAGING)), ("brelse: inappropriate B_PAGING or B_CLUSTER bp %p", bp)); @@ -1525,6 +1530,7 @@ s = splbio(); + CTR3(KTR_BUF, "bqrelse(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); KASSERT(!(bp->b_flags & (B_CLUSTER|B_PAGING)), ("bqrelse: inappropriate B_PAGING or B_CLUSTER bp %p", bp)); @@ -1595,7 +1601,6 @@ int i; vm_page_t m; - GIANT_REQUIRED; VM_OBJECT_LOCK(bp->b_bufobj->bo_object); vm_page_lock_queues(); for (i = 0; i < bp->b_npages; i++) { @@ -1787,8 +1792,6 @@ int nqindex; static int flushingbufs; - GIANT_REQUIRED; - /* * We can't afford to block since we might be holding a vnode lock, * which may prevent system daemons from running. We deal with @@ -1873,15 +1876,6 @@ break; } } - if (bp->b_vp) { - BO_LOCK(bp->b_bufobj); - if (bp->b_vflags & BV_BKGRDINPROG) { - BO_UNLOCK(bp->b_bufobj); - continue; - } - BO_UNLOCK(bp->b_bufobj); - } - /* * If we are defragging then we need a buffer with * b_kvasize != 0. XXX this situation should no longer @@ -1899,6 +1893,18 @@ */ if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL) != 0) continue; + if (bp->b_vp) { + BO_LOCK(bp->b_bufobj); + if (bp->b_vflags & BV_BKGRDINPROG) { + BO_UNLOCK(bp->b_bufobj); + BUF_UNLOCK(bp); + continue; + } + BO_UNLOCK(bp->b_bufobj); + } + CTR3(KTR_BUF, "getnewbuf(%p) vp %p flags %X (recycling)", + bp, bp->b_vp, bp->b_flags); + /* * Sanity Checks */ @@ -2185,10 +2191,9 @@ TAILQ_FOREACH(bp, &bufqueues[QUEUE_DIRTY], b_freelist) { if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL) != 0) continue; - KASSERT((bp->b_flags & B_DELWRI), - ("unexpected clean buffer %p", bp)); BO_LOCK(bp->b_bufobj); - if ((bp->b_vflags & BV_BKGRDINPROG) != 0) { + if ((bp->b_vflags & BV_BKGRDINPROG) != 0 || + (bp->b_flags & B_DELWRI) == 0) { BO_UNLOCK(bp->b_bufobj); BUF_UNLOCK(bp); continue; @@ -2226,6 +2231,8 @@ } if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT, td) == 0) { mtx_unlock(&bqlock); + CTR3(KTR_BUF, "flushbufqueue(%p) vp %p flags %X", + bp, bp->b_vp, bp->b_flags); vfs_bio_awrite(bp); vn_finished_write(mp); VOP_UNLOCK(vp, 0, td); @@ -2269,7 +2276,6 @@ vm_page_t m; vm_ooffset_t off; - GIANT_REQUIRED; ASSERT_VOP_LOCKED(vp, "inmem"); if (incore(&vp->v_bufobj, blkno)) @@ -2321,7 +2327,6 @@ int i; vm_object_t object; - GIANT_REQUIRED; /* * Degenerate case - empty buffer */ @@ -2442,9 +2447,10 @@ struct bufobj *bo; int s; int error; - ASSERT_VOP_LOCKED(vp, "getblk"); struct vm_object *vmo; + CTR3(KTR_BUF, "getblk(%p, %ld, %d)", vp, (long)blkno, size); + ASSERT_VOP_LOCKED(vp, "getblk"); if (size > MAXBSIZE) panic("getblk: size(%d) > MAXBSIZE(%d)\n", size, MAXBSIZE); @@ -2677,6 +2683,7 @@ splx(s); bp->b_flags &= ~B_DONE; } + CTR4(KTR_BUF, "getblk(%p, %ld, %d) = %p", vp, (long)blkno, size, bp); KASSERT(BUF_REFCNT(bp) == 1, ("getblk: bp %p not locked",bp)); KASSERT(bp->b_bufobj == bo, ("wrong b_bufobj %p should be %p", bp->b_bufobj, bo)); @@ -2728,8 +2735,6 @@ int newbsize, mbsize; int i; - GIANT_REQUIRED; - if (BUF_REFCNT(bp) == 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 14 02:54:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74A5F16A4CE; Tue, 14 Dec 2004 02:54:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F1BB16A4CE for ; Tue, 14 Dec 2004 02:54:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BB1843D46 for ; Tue, 14 Dec 2004 02:54:46 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE2sjnL000520 for ; Tue, 14 Dec 2004 02:54:46 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE2sjIw000517 for perforce@freebsd.org; Tue, 14 Dec 2004 02:54:45 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Dec 2004 02:54:45 GMT Message-Id: <200412140254.iBE2sjIw000517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 67014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 02:54:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=67014 Change 67014 by peter@peter_daintree on 2004/12/14 02:53:46 note origin and timestamp Affected files ... .. //depot/projects/smpffs/NOTE.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Dec 14 03:09:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F02B916A4D0; Tue, 14 Dec 2004 03:09:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEB5716A4CE for ; Tue, 14 Dec 2004 03:09:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACA4643D45 for ; Tue, 14 Dec 2004 03:09:03 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE393il001462 for ; Tue, 14 Dec 2004 03:09:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE393ah001459 for perforce@freebsd.org; Tue, 14 Dec 2004 03:09:03 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 03:09:03 GMT Message-Id: <200412140309.iBE393ah001459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 03:09:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=67015 Change 67015 by sam@sam_ebb on 2004/12/14 03:09:02 correct wme negotiation in station mode: o change ieee80211_parse_wmeparams to return <0 for an error, 0 for no change in the current parameters, and >0 for when parameters have been updated and need to be pushed to the driver o mark the node for QoS use if the wme params ie has no error (was only doing this if the negotiated parmateres required a push to the driver) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#30 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#30 (text+ko) ==== @@ -1587,7 +1587,7 @@ IEEE80211_DISCARD_IE(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, wh, "WME", "too short, len %u", len); - return 0; + return -1; } qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)]; qosinfo &= WME_QOSINFO_COUNT; @@ -1866,7 +1866,7 @@ /* XXX statistic */ } if (wme != NULL && - ieee80211_parse_wmeparams(ic, wme, wh)) + ieee80211_parse_wmeparams(ic, wme, wh) > 0) ieee80211_wme_updateparams(ic); /* NB: don't need the rest of this */ return; @@ -2354,7 +2354,8 @@ ni->ni_capinfo = capinfo; ni->ni_associd = associd; - if (wme != NULL && ieee80211_parse_wmeparams(ic, wme, wh)) { + if (wme != NULL && + ieee80211_parse_wmeparams(ic, wme, wh) >= 0) { ni->ni_flags |= IEEE80211_NODE_QOS; ieee80211_wme_updateparams(ic); } else From owner-p4-projects@FreeBSD.ORG Tue Dec 14 03:10:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A0EB16A4D0; Tue, 14 Dec 2004 03:10:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65B9616A4CE for ; Tue, 14 Dec 2004 03:10:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5497C43D4C for ; Tue, 14 Dec 2004 03:10:05 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE3A5Ol001493 for ; Tue, 14 Dec 2004 03:10:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE3A5Kt001490 for perforce@freebsd.org; Tue, 14 Dec 2004 03:10:05 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 03:10:05 GMT Message-Id: <200412140310.iBE3A5Kt001490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 03:10:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=67016 Change 67016 by sam@sam_ebb on 2004/12/14 03:09:19 cleanup some debug msgs Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#10 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#10 (text+ko) ==== @@ -258,9 +258,9 @@ struct ifnet *ifp = ic->ic_ifp; IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] %s replay detected \n", + "[%s] %s replay detected \n", ether_sprintf(wh->i_addr2), k->wk_cipher->ic_name, - (intmax_t) rsc, (intmax_t) k->wk_keyrsc); + (intmax_t) rsc, (intmax_t) k->wk_keyrsc, k->wk_keyix); if (ifp != NULL) { /* NB: for cipher test modules */ struct ieee80211_replay_event iev; @@ -282,7 +282,7 @@ struct ifnet *ifp = ic->ic_ifp; IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] Michael MIC verification failed \n", + "[%s] michael MIC verification failed \n", ether_sprintf(wh->i_addr2), keyix); ic->ic_stats.is_rx_tkipmic++; From owner-p4-projects@FreeBSD.ORG Tue Dec 14 03:11:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CC6316A4CE; Tue, 14 Dec 2004 03:11:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2579C16A4CE for ; Tue, 14 Dec 2004 03:11:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12FA343D2D for ; Tue, 14 Dec 2004 03:11:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE3B6co001589 for ; Tue, 14 Dec 2004 03:11:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE3B6Lc001586 for perforce@freebsd.org; Tue, 14 Dec 2004 03:11:06 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 03:11:06 GMT Message-Id: <200412140311.iBE3B6Lc001586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 03:11:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=67017 Change 67017 by sam@sam_ebb on 2004/12/14 03:10:12 o cleanup/unify debug msg for not having a xmit key o const'ify a memory reference Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#7 (text+ko) ==== @@ -481,8 +481,9 @@ ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) { if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "%s: No default xmit key for frame to %s\n", - __func__, ether_sprintf(wh->i_addr1)); + "[%s] no default transmit key (%s) deftxkey %u\n", + ether_sprintf(wh->i_addr1), __func__, + ic->ic_def_txkey); ic->ic_stats.is_tx_nodefkey++; return NULL; } @@ -511,7 +512,7 @@ struct ieee80211_key *k; struct ieee80211_frame *wh; const struct ieee80211_cipher *cip; - u_int8_t *ivp; + const u_int8_t *ivp; u_int8_t keyid; int hdrlen; @@ -532,7 +533,7 @@ */ wh = mtod(m, struct ieee80211_frame *); hdrlen = ieee80211_hdrsize(wh); - ivp = mtod(m, u_int8_t *) + hdrlen; /* XXX contig */ + ivp = mtod(m, const u_int8_t *) + hdrlen; /* XXX contig */ keyid = ivp[IEEE80211_WEP_IVLEN]; if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) From owner-p4-projects@FreeBSD.ORG Tue Dec 14 03:12:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D6A816A4D0; Tue, 14 Dec 2004 03:12:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4843A16A4CE for ; Tue, 14 Dec 2004 03:12:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3781743D41 for ; Tue, 14 Dec 2004 03:12:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE3C9AP001624 for ; Tue, 14 Dec 2004 03:12:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE3C8eS001621 for perforce@freebsd.org; Tue, 14 Dec 2004 03:12:08 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 03:12:08 GMT Message-Id: <200412140312.iBE3C8eS001621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 03:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=67019 Change 67019 by sam@sam_ebb on 2004/12/14 03:11:24 bring in rijndael crypto code to satisfy dependency: should break rijndael out into a separate module a la rc4 but several other cases need to be fixed also so for now do as others do Affected files ... .. //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#3 edit Differences ... ==== //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#3 (text+ko) ==== @@ -1,8 +1,10 @@ # $FreeBSD: src/sys/modules/wlan/Makefile,v 1.3 2004/04/10 19:41:15 kan Exp $ .PATH: ${.CURDIR}/../../net80211 +.PATH: ${.CURDIR}/../../crypto/rijndael KMOD= wlan_ccmp SRCS= ieee80211_crypto_ccmp.c +SRCS+= rijndael-alg-fst.c rijndael-api-fst.c .include From owner-p4-projects@FreeBSD.ORG Tue Dec 14 03:13:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CFB016A4D0; Tue, 14 Dec 2004 03:13:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4800716A4CE for ; Tue, 14 Dec 2004 03:13:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 325C443D66 for ; Tue, 14 Dec 2004 03:13:11 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE3DAY9001668 for ; Tue, 14 Dec 2004 03:13:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE3DAmU001665 for perforce@freebsd.org; Tue, 14 Dec 2004 03:13:10 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 03:13:10 GMT Message-Id: <200412140313.iBE3DAmU001665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 03:13:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=67020 Change 67020 by sam@sam_ebb on 2004/12/14 03:12:31 o fix mic pseudo hdr calculation for QoS frames o remove some XXX comments no longer needed o make debug msgs consistent Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#6 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#6 (text+ko) ==== @@ -200,7 +200,7 @@ return 0; /* NB: tkip_encrypt handles wk_keytsc */ } else - k->wk_keytsc++; /* XXX wrap at 48 bits */ + k->wk_keytsc++; return 1; } @@ -264,7 +264,7 @@ * No extended IV; discard frame. */ IEEE80211_DPRINTF(ctx->tc_ic, IEEE80211_MSG_CRYPTO, - "[%s] Missing ExtIV for TKIP cipher\n", + "[%s] missing ExtIV for TKIP cipher\n", ether_sprintf(wh->i_addr2)); ctx->tc_ic->ic_stats.is_rx_tkipformat++; return 0; @@ -274,14 +274,13 @@ */ if (ic->ic_flags & IEEE80211_F_COUNTERM) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] Discard frame due to countermeasures (%s)\n", + "[%s] discard frame due to countermeasures (%s)\n", ether_sprintf(wh->i_addr2), __func__); ic->ic_stats.is_crypto_tkipcm++; return 0; } - ctx->rx_rsc = READ_6(ivp[2], ivp[0], ivp[4], ivp[5], - ivp[6], ivp[7]); + ctx->rx_rsc = READ_6(ivp[2], ivp[0], ivp[4], ivp[5], ivp[6], ivp[7]); if (ctx->rx_rsc <= k->wk_keyrsc) { /* * Replay violation; notify upper layer. @@ -781,7 +780,12 @@ break; } - hdr[12] = 0; /* XXX qos priority */ + if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) { + const struct ieee80211_qosframe *qwh = + (const struct ieee80211_qosframe *) wh; + hdr[12] = qwh->i_qos[0] & IEEE80211_QOS_TID; + } else + hdr[12] = 0; hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */ } @@ -917,7 +921,7 @@ icv); (void) m_append(m, IEEE80211_WEP_CRCLEN, icv); /* XXX check return */ - key->wk_keytsc++; /* XXX wrap at 48 bits */ + key->wk_keytsc++; if ((u16)(key->wk_keytsc) == 0) ctx->tx_phase1_done = 0; return 1; From owner-p4-projects@FreeBSD.ORG Tue Dec 14 03:14:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B0E916A4D0; Tue, 14 Dec 2004 03:14:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC7F916A4CE for ; Tue, 14 Dec 2004 03:14:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC53543D60 for ; Tue, 14 Dec 2004 03:14:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE3ECfM001740 for ; Tue, 14 Dec 2004 03:14:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE3ECuG001737 for perforce@freebsd.org; Tue, 14 Dec 2004 03:14:12 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 03:14:12 GMT Message-Id: <200412140314.iBE3ECuG001737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 03:14:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=67021 Change 67021 by sam@sam_ebb on 2004/12/14 03:13:35 o fillin QoS header prior to enmic so it's available for TKIP o cleanup debug msg and add statistic for no default xmit key Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#25 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#25 (text+ko) ==== @@ -452,9 +452,10 @@ key = ieee80211_crypto_getkey(ic, eh.ether_dhost, ni); if (key == NULL && eh.ether_type != htons(ETHERTYPE_PAE)) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] no default transmit key\n", - ether_sprintf(ni->ni_macaddr)); - /* XXX statistic */ + "[%s] no default transmit key (%s) deftxkey %u\n", + ether_sprintf(ni->ni_macaddr), __func__, + ic->ic_def_txkey); + ic->ic_stats.is_tx_nodefkey++; } } else key = NULL; @@ -513,25 +514,6 @@ case IEEE80211_M_MONITOR: goto bad; } - if (eh.ether_type != htons(ETHERTYPE_PAE) || - (key != NULL && (ic->ic_flags & IEEE80211_F_WPA))) { - /* - * IEEE 802.1X: send EAPOL frames always in the clear. - * WPA/WPA2: encrypt EAPOL keys when pairwise keys are set. - */ - if (key != NULL) { - wh->i_fc[1] |= IEEE80211_FC1_WEP; - /* XXX do fragmentation */ - if (!ieee80211_crypto_enmic(ic, key, m)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_OUTPUT, - "[%s] enmic failed, discard frame\n", - ether_sprintf(eh.ether_dhost)); - /* XXX statistic */ - goto bad; - } - } - } - if (ni->ni_flags & IEEE80211_NODE_QOS) { struct ieee80211_qosframe *qwh = (struct ieee80211_qosframe *) wh; @@ -554,6 +536,24 @@ htole16(ni->ni_txseqs[0] << IEEE80211_SEQ_SEQ_SHIFT); ni->ni_txseqs[0]++; } + if (eh.ether_type != htons(ETHERTYPE_PAE) || + (key != NULL && (ic->ic_flags & IEEE80211_F_WPA))) { + /* + * IEEE 802.1X: send EAPOL frames always in the clear. + * WPA/WPA2: encrypt EAPOL keys when pairwise keys are set. + */ + if (key != NULL) { + wh->i_fc[1] |= IEEE80211_FC1_WEP; + /* XXX do fragmentation */ + if (!ieee80211_crypto_enmic(ic, key, m)) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_OUTPUT, + "[%s] enmic failed, discard frame\n", + ether_sprintf(eh.ether_dhost)); + /* XXX statistic */ + goto bad; + } + } + } IEEE80211_NODE_STAT(ni, tx_data); IEEE80211_NODE_STAT_ADD(ni, tx_bytes, datalen); From owner-p4-projects@FreeBSD.ORG Tue Dec 14 05:33:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AFC216A4D0; Tue, 14 Dec 2004 05:33:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61D8216A4CE for ; Tue, 14 Dec 2004 05:33:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEEC943D1D for ; Tue, 14 Dec 2004 05:33:06 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBE5X6rv013028 for ; Tue, 14 Dec 2004 05:33:06 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBE5X3Et013025 for perforce@freebsd.org; Tue, 14 Dec 2004 05:33:03 GMT (envelope-from julian@freebsd.org) Date: Tue, 14 Dec 2004 05:33:03 GMT Message-Id: <200412140533.iBE5X3Et013025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 67032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 05:33:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=67032 Change 67032 by julian@julian_ref on 2004/12/14 05:32:09 IFC@67029 Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/db_trace.c#6 integrate .. //depot/projects/nsched/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/fp_emulate.c#3 integrate .. //depot/projects/nsched/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/genassym.c#3 integrate .. //depot/projects/nsched/sys/alpha/alpha/interrupt.c#6 integrate .. //depot/projects/nsched/sys/alpha/alpha/machdep.c#7 integrate .. //depot/projects/nsched/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/nsched/sys/alpha/alpha/pmap.c#12 integrate .. //depot/projects/nsched/sys/alpha/alpha/prom.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/sys_machdep.c#3 integrate .. //depot/projects/nsched/sys/alpha/alpha/trap.c#4 integrate .. //depot/projects/nsched/sys/alpha/alpha/vm_machdep.c#5 integrate .. //depot/projects/nsched/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/nsched/sys/alpha/include/param.h#6 integrate .. //depot/projects/nsched/sys/alpha/linux/linux_machdep.c#3 integrate .. //depot/projects/nsched/sys/alpha/osf1/osf1_misc.c#6 integrate .. //depot/projects/nsched/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/nsched/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/nsched/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/nsched/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/nsched/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/nsched/sys/amd64/include/param.h#6 integrate .. //depot/projects/nsched/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/nsched/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/nsched/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/nsched/sys/arm/arm/db_trace.c#6 integrate .. //depot/projects/nsched/sys/arm/arm/exception.S#4 integrate .. //depot/projects/nsched/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/nsched/sys/arm/arm/intr.c#4 integrate .. //depot/projects/nsched/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/nsched/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/nsched/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/nsched/sys/arm/arm/trap.c#4 integrate .. //depot/projects/nsched/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/nsched/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/nsched/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/nsched/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/nsched/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/nsched/sys/arm/include/kdb.h#2 integrate .. //depot/projects/nsched/sys/arm/include/param.h#5 integrate .. //depot/projects/nsched/sys/arm/include/pmap.h#6 integrate .. //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/std.i80321#2 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/uart_bus_i80321.c#2 integrate .. //depot/projects/nsched/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/nsched/sys/boot/Makefile#4 integrate .. //depot/projects/nsched/sys/boot/common/commands.c#3 integrate .. //depot/projects/nsched/sys/boot/common/loader.8#9 integrate .. //depot/projects/nsched/sys/boot/efi/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/nsched/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#3 delete .. //depot/projects/nsched/sys/boot/efi/libefi/arch/ia64/start.S#3 delete .. //depot/projects/nsched/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/nsched/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/nsched/sys/boot/efi/loader/Makefile#3 delete .. //depot/projects/nsched/sys/boot/efi/loader/conf.c#2 delete .. //depot/projects/nsched/sys/boot/efi/loader/main.c#4 delete .. //depot/projects/nsched/sys/boot/efi/loader/version#2 delete .. //depot/projects/nsched/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/nsched/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/nsched/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/nsched/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/nsched/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/nsched/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/nsched/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/nsched/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/nsched/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/nsched/sys/boot/i386/loader/loader.rc#2 delete .. //depot/projects/nsched/sys/boot/ia64/Makefile#3 integrate .. //depot/projects/nsched/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/nsched/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/nsched/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/nsched/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/nsched/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/nsched/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/nsched/sys/boot/ia64/efi/version#1 branch .. //depot/projects/nsched/sys/boot/ia64/ski/bootinfo.c#3 integrate .. //depot/projects/nsched/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/nsched/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/nsched/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/nsched/sys/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/nsched/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/nsched/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/nsched/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/nsched/sys/coda/coda_vfsops.c#7 integrate .. //depot/projects/nsched/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/nsched/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/nsched/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/nsched/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/nsched/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_filio.c#3 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/nsched/sys/conf/NOTES#24 integrate .. //depot/projects/nsched/sys/conf/files#31 integrate .. //depot/projects/nsched/sys/conf/files.alpha#6 integrate .. //depot/projects/nsched/sys/conf/files.amd64#11 integrate .. //depot/projects/nsched/sys/conf/files.arm#2 integrate .. //depot/projects/nsched/sys/conf/files.i386#12 integrate .. //depot/projects/nsched/sys/conf/files.ia64#8 integrate .. //depot/projects/nsched/sys/conf/files.pc98#9 integrate .. //depot/projects/nsched/sys/conf/files.sparc64#8 integrate .. //depot/projects/nsched/sys/conf/kern.post.mk#7 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#12 integrate .. //depot/projects/nsched/sys/conf/options#20 integrate .. //depot/projects/nsched/sys/conf/options.arm#3 integrate .. //depot/projects/nsched/sys/conf/options.i386#3 integrate .. //depot/projects/nsched/sys/conf/options.pc98#6 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acglobal.h#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acinterp.h#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acobject.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/actypes.h#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/acutils.h#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbcmds.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbexec.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dswload.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evgpeblk.c#5 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exconfig.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exdump.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exfldio.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsaccess.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsdump.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nseval.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nssearch.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nsutils.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/uteval.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utglobal.c#4 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 delete .. //depot/projects/nsched/sys/contrib/dev/ath/freebsd/opt_ah.h#2 delete .. //depot/projects/nsched/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/nsched/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.c#8 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/nsched/sys/crypto/blowfish/arch/i386/bf_enc.S#2 integrate .. //depot/projects/nsched/sys/ddb/db_command.c#4 integrate .. //depot/projects/nsched/sys/ddb/db_ps.c#8 integrate .. //depot/projects/nsched/sys/ddb/db_run.c#3 integrate .. //depot/projects/nsched/sys/ddb/db_thread.c#3 integrate .. //depot/projects/nsched/sys/dev/aac/aac.c#8 integrate .. //depot/projects/nsched/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/nsched/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/nsched/sys/dev/aac/aac_disk.c#5 integrate .. //depot/projects/nsched/sys/dev/aac/aac_ioctl.h#2 delete .. //depot/projects/nsched/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/nsched/sys/dev/acpi_support/acpi_asus.c#1 branch .. //depot/projects/nsched/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/nsched/sys/dev/acpi_support/acpi_panasonic.c#1 branch .. //depot/projects/nsched/sys/dev/acpi_support/acpi_sony.c#1 branch .. //depot/projects/nsched/sys/dev/acpi_support/acpi_toshiba.c#1 branch .. //depot/projects/nsched/sys/dev/acpica/Osd/OsdInterrupt.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_acad.c#9 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#9 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci.c#11 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci_link.c#10 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcibvar.h#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpivar.h#13 integrate .. //depot/projects/nsched/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/nsched/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7xxx.c#5 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic_osm_lib.h#4 integrate .. //depot/projects/nsched/sys/dev/amr/amr.c#6 integrate .. //depot/projects/nsched/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/nsched/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/nsched/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.c#16 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/nsched/sys/dev/ata/ata-disk.c#11 integrate .. //depot/projects/nsched/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/nsched/sys/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/nsched/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/nsched/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/nsched/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/nsched/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/nsched/sys/dev/ath/ath_rate/amrr/amrr.c#1 branch .. //depot/projects/nsched/sys/dev/ath/ath_rate/amrr/amrr.h#1 branch .. //depot/projects/nsched/sys/dev/ath/ath_rate/onoe/onoe.c#1 branch .. //depot/projects/nsched/sys/dev/ath/ath_rate/onoe/onoe.h#1 branch .. //depot/projects/nsched/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/nsched/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/nsched/sys/dev/ath/if_athrate.h#1 branch .. //depot/projects/nsched/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/nsched/sys/dev/awi/awi.c#5 integrate .. //depot/projects/nsched/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/nsched/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/nsched/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/nsched/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/nsched/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/nsched/sys/dev/ctau/if_ct.c#10 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#14 integrate .. //depot/projects/nsched/sys/dev/drm/drm_os_freebsd.h#4 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/nsched/sys/dev/em/if_em.c#10 integrate .. //depot/projects/nsched/sys/dev/em/if_em.h#4 integrate .. //depot/projects/nsched/sys/dev/esp/esp_sbus.c#7 integrate .. //depot/projects/nsched/sys/dev/esp/lsi64854.c#3 delete .. //depot/projects/nsched/sys/dev/esp/lsi64854reg.h#2 delete .. //depot/projects/nsched/sys/dev/esp/lsi64854var.h#3 delete .. //depot/projects/nsched/sys/dev/fdc/fdc.c#14 integrate .. //depot/projects/nsched/sys/dev/firewire/fwmem.c#4 integrate .. //depot/projects/nsched/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme_sbus.c#5 integrate .. //depot/projects/nsched/sys/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/nsched/sys/dev/ic/ns16550.h#3 integrate .. //depot/projects/nsched/sys/dev/ic/sab82532.h#1 branch .. //depot/projects/nsched/sys/dev/ic/z8530.h#1 branch .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/nsched/sys/dev/mc146818/mc146818.c#1 branch .. //depot/projects/nsched/sys/dev/mc146818/mc146818reg.h#1 branch .. //depot/projects/nsched/sys/dev/mc146818/mc146818var.h#1 branch .. //depot/projects/nsched/sys/dev/md/md.c#15 integrate .. //depot/projects/nsched/sys/dev/mii/mii.c#5 integrate .. //depot/projects/nsched/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/nsched/sys/dev/mk48txx/mk48txxreg.h#3 integrate .. //depot/projects/nsched/sys/dev/mk48txx/mk48txxvar.h#1 branch .. //depot/projects/nsched/sys/dev/mlx/mlx_disk.c#3 integrate .. //depot/projects/nsched/sys/dev/mlx/mlxreg.h#2 integrate .. //depot/projects/nsched/sys/dev/mse/mse.c#1 branch .. //depot/projects/nsched/sys/dev/mse/mse_cbus.c#1 branch .. //depot/projects/nsched/sys/dev/mse/mse_isa.c#1 branch .. //depot/projects/nsched/sys/dev/mse/msevar.h#1 branch .. //depot/projects/nsched/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/nsched/sys/dev/pci/pci.c#10 integrate .. //depot/projects/nsched/sys/dev/puc/puc_sbus.c#5 integrate .. //depot/projects/nsched/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/nsched/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/nsched/sys/dev/sound/isa/es1888.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/nsched/sys/dev/streams/streams.c#4 integrate .. //depot/projects/nsched/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/nsched/sys/dev/uart/uart_bus.h#5 integrate .. //depot/projects/nsched/sys/dev/uart/uart_bus_isa.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_cpu_alpha.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_cpu_amd64.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_cpu_i386.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_cpu_pc98.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_cpu_sparc64.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_i8251.c#3 delete .. //depot/projects/nsched/sys/dev/uart/uart_dev_i8251.h#2 delete .. //depot/projects/nsched/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_ns8250.h#2 delete .. //depot/projects/nsched/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_sab82532.h#2 delete .. //depot/projects/nsched/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_z8530.h#2 delete .. //depot/projects/nsched/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/FILES#2 integrate .. //depot/projects/nsched/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/nsched/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/nsched/sys/dev/usb/uhci.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/umass.c#9 integrate .. //depot/projects/nsched/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/ums.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/urio.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/usb.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/nsched/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/nsched/sys/dev/vkbd/vkbd.c#1 branch .. //depot/projects/nsched/sys/dev/vkbd/vkbd_var.h#1 branch .. //depot/projects/nsched/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/nsched/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/nsched/sys/fs/autofs/autofs.h#4 delete .. //depot/projects/nsched/sys/fs/autofs/autofs_util.c#5 delete .. //depot/projects/nsched/sys/fs/autofs/autofs_vfsops.c#6 delete .. //depot/projects/nsched/sys/fs/autofs/autofs_vnops.c#7 delete .. //depot/projects/nsched/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/devfs/devfs_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/nsched/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/fifofs/fifo.h#3 integrate .. //depot/projects/nsched/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs.h#4 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/nsched/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs.h#4 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/nsched/sys/fs/nullfs/null.h#3 integrate .. //depot/projects/nsched/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/nsched/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/nwfs/nwfs.h#3 integrate .. //depot/projects/nsched/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/nsched/sys/fs/nwfs/nwfs_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/portalfs/portal.h#3 integrate .. //depot/projects/nsched/sys/fs/portalfs/portal_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/nsched/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/nsched/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/nsched/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/nsched/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs.h#3 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/nsched/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/nsched/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/nsched/sys/fs/umapfs/umap.h#3 integrate .. //depot/projects/nsched/sys/fs/umapfs/umap_vfsops.c#6 integrate .. //depot/projects/nsched/sys/fs/umapfs/umap_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_vfsops.c#7 integrate .. //depot/projects/nsched/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/nsched/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/nsched/sys/geom/gate/g_gate.c#8 integrate .. //depot/projects/nsched/sys/geom/geom.h#7 integrate .. //depot/projects/nsched/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/nsched/sys/geom/geom_dev.c#8 integrate .. //depot/projects/nsched/sys/geom/geom_disk.c#6 integrate .. //depot/projects/nsched/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/nsched/sys/geom/geom_mbr.c#4 integrate .. //depot/projects/nsched/sys/geom/geom_pc98.c#4 integrate .. //depot/projects/nsched/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/nsched/sys/geom/stripe/g_stripe.c#9 integrate .. //depot/projects/nsched/sys/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum.c#9 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum.h#6 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_init.c#5 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_plex.c#9 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_raid5.c#6 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_raid5.h#5 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_share.c#4 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_state.c#5 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_subr.c#8 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_bmap.c#4 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_extern.h#5 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_asus.c#7 delete .. //depot/projects/nsched/sys/i386/acpica/acpi_panasonic.c#4 delete .. //depot/projects/nsched/sys/i386/acpica/acpi_toshiba.c#8 delete .. //depot/projects/nsched/sys/i386/acpica/genwakecode.sh#3 integrate .. //depot/projects/nsched/sys/i386/conf/NOTES#15 integrate .. //depot/projects/nsched/sys/i386/conf/PAE#4 integrate .. //depot/projects/nsched/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/nsched/sys/i386/i386/autoconf.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/bios.c#7 integrate .. //depot/projects/nsched/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/gdb_machdep.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/nsched/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/nsched/sys/i386/i386/legacy.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/locore.s#4 integrate .. //depot/projects/nsched/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/nsched/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/nsched/sys/i386/i386/support.s#5 integrate .. //depot/projects/nsched/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/trap.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/nsched/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/nsched/sys/i386/include/atomic.h#2 integrate .. //depot/projects/nsched/sys/i386/include/cpu.h#6 integrate .. //depot/projects/nsched/sys/i386/include/endian.h#3 integrate .. //depot/projects/nsched/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/nsched/sys/i386/include/param.h#7 integrate .. //depot/projects/nsched/sys/i386/include/smp.h#2 integrate .. //depot/projects/nsched/sys/i386/isa/mse.c#4 delete .. //depot/projects/nsched/sys/i386/isa/npx.c#7 integrate .. //depot/projects/nsched/sys/i386/isa/pbio.c#2 delete .. //depot/projects/nsched/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/nsched/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/nsched/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/nsched/sys/ia64/ia64/gdb_machdep.c#3 integrate .. //depot/projects/nsched/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/nsched/sys/ia64/ia64/pmap.c#15 integrate .. //depot/projects/nsched/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/nsched/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/nsched/sys/ia64/include/bootinfo.h#2 integrate .. //depot/projects/nsched/sys/ia64/include/fpu.h#3 integrate .. //depot/projects/nsched/sys/ia64/include/gdb_machdep.h#3 integrate .. //depot/projects/nsched/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/nsched/sys/ia64/include/param.h#3 integrate .. //depot/projects/nsched/sys/ia64/include/pte.h#4 integrate .. //depot/projects/nsched/sys/isa/isavar.h#3 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_bmap.c#4 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_vnops.c#6 integrate .. //depot/projects/nsched/sys/isofs/cd9660/iso.h#5 integrate .. //depot/projects/nsched/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/nsched/sys/kern/init_main.c#16 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#8 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/nsched/sys/kern/kern_event.c#11 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#15 integrate .. //depot/projects/nsched/sys/kern/kern_exit.c#22 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#18 integrate .. //depot/projects/nsched/sys/kern/kern_intr.c#10 integrate .. //depot/projects/nsched/sys/kern/kern_kse.c#36 integrate .. //depot/projects/nsched/sys/kern/kern_lock.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_proc.c#16 integrate .. //depot/projects/nsched/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#15 integrate .. //depot/projects/nsched/sys/kern/kern_subr.c#8 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#42 integrate .. //depot/projects/nsched/sys/kern/kern_synch.c#20 integrate .. //depot/projects/nsched/sys/kern/kern_thr.c#21 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#47 integrate .. //depot/projects/nsched/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#62 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#44 integrate .. //depot/projects/nsched/sys/kern/subr_bus.c#12 integrate .. //depot/projects/nsched/sys/kern/subr_disk.c#3 integrate .. //depot/projects/nsched/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/nsched/sys/kern/subr_param.c#4 integrate .. //depot/projects/nsched/sys/kern/sys_generic.c#5 integrate .. //depot/projects/nsched/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/nsched/sys/kern/sys_process.c#5 integrate .. //depot/projects/nsched/sys/kern/sys_socket.c#6 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#8 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#8 integrate .. //depot/projects/nsched/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/nsched/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/nsched/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/nsched/sys/kern/tty.c#15 integrate .. //depot/projects/nsched/sys/kern/tty_cons.c#8 integrate .. //depot/projects/nsched/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/nsched/sys/kern/uipc_jumbo.c#4 delete .. //depot/projects/nsched/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/nsched/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/nsched/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/nsched/sys/kern/vfs_default.c#7 integrate .. //depot/projects/nsched/sys/kern/vfs_export.c#5 integrate .. //depot/projects/nsched/sys/kern/vfs_init.c#6 integrate .. //depot/projects/nsched/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/nsched/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/nsched/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/nsched/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/nsched/sys/kern/vnode_if.src#5 integrate .. //depot/projects/nsched/sys/modules/Makefile#16 integrate .. //depot/projects/nsched/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi_asus/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/nsched/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/acpi/acpi_sony/Makefile#1 branch .. //depot/projects/nsched/sys/modules/acpi/acpi_toshiba/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ath_rate_amrr/Makefile#1 branch .. //depot/projects/nsched/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/nsched/sys/modules/autofs/Makefile#3 delete .. //depot/projects/nsched/sys/modules/esp/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/if_gif/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/mse/Makefile#1 branch .. //depot/projects/nsched/sys/modules/sio/Makefile#4 integrate .. //depot/projects/nsched/sys/modules/uart/Makefile#5 integrate .. //depot/projects/nsched/sys/modules/vkbd/Makefile#1 branch .. //depot/projects/nsched/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/wlan_acl/Makefile#1 branch .. //depot/projects/nsched/sys/modules/wlan_ccmp/Makefile#1 branch .. //depot/projects/nsched/sys/modules/wlan_tkip/Makefile#1 branch .. //depot/projects/nsched/sys/modules/wlan_wep/Makefile#1 branch .. //depot/projects/nsched/sys/modules/wlan_xauth/Makefile#1 branch .. //depot/projects/nsched/sys/net/bpf.c#10 integrate .. //depot/projects/nsched/sys/net/if.c#17 integrate .. //depot/projects/nsched/sys/net/if.h#9 integrate .. //depot/projects/nsched/sys/net/if_sppp.h#2 integrate .. //depot/projects/nsched/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/nsched/sys/net/if_var.h#10 integrate .. //depot/projects/nsched/sys/net80211/_ieee80211.h#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/nsched/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_acl.c#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_crypto_ccmp.c#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211_crypto_none.c#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211_crypto_tkip.c#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211_crypto_wep.c#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211_freebsd.c#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211_freebsd.h#1 branch .. //depot/projects/nsched/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/nsched/sys/net80211/ieee80211_xauth.c#1 branch .. //depot/projects/nsched/sys/netatalk/ddp_input.c#5 integrate .. //depot/projects/nsched/sys/netgraph/atm/sscop/ng_sscop_cust.h#3 integrate .. //depot/projects/nsched/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/hci/ng_hci_misc.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket.c#5 integrate .. //depot/projects/nsched/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/nsched/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/nsched/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/nsched/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/nsched/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/nsched/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_one2many.h#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/nsched/sys/netgraph/ng_pptpgre.c#5 integrate .. //depot/projects/nsched/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/nsched/sys/netgraph/ng_source.c#5 integrate .. //depot/projects/nsched/sys/netgraph/ng_tty.c#8 integrate .. //depot/projects/nsched/sys/netinet/if_ether.c#8 integrate .. //depot/projects/nsched/sys/netinet/in.c#4 integrate .. //depot/projects/nsched/sys/netinet/in_gif.c#4 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/nsched/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/nsched/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/nsched/sys/netinet/ip_output.c#13 integrate .. //depot/projects/nsched/sys/netinet/tcp.h#6 integrate .. //depot/projects/nsched/sys/netinet/tcp_fsm.h#3 integrate .. //depot/projects/nsched/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/nsched/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/nsched/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/nsched/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/nsched/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/nsched/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/nsched/sys/netinet6/scope6.c#2 integrate .. //depot/projects/nsched/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/nsched/sys/nfs/nfs_common.c#3 integrate .. //depot/projects/nsched/sys/nfs/nfs_common.h#3 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vn_subs.c#3 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/nsched/sys/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/nsched/sys/nfsclient/nfs.h#7 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_lock.h#2 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_nfsiod.c#5 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_subs.c#8 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/nsched/sys/nfsclient/nfsm_subs.h#3 integrate .. //depot/projects/nsched/sys/nfsclient/nfsmount.h#4 integrate .. //depot/projects/nsched/sys/nfsclient/nfsnode.h#6 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_serv.c#9 integrate .. //depot/projects/nsched/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/nsched/sys/pc98/conf/GENERIC#11 integrate .. //depot/projects/nsched/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/nsched/sys/pc98/i386/machdep.c#11 integrate .. //depot/projects/nsched/sys/pc98/pc98/mse.c#4 delete .. //depot/projects/nsched/sys/pci/if_pcn.c#7 integrate .. //depot/projects/nsched/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/nsched/sys/pci/if_sf.c#7 integrate .. //depot/projects/nsched/sys/pci/if_sfreg.h#2 integrate .. //depot/projects/nsched/sys/pci/if_sk.c#8 integrate .. //depot/projects/nsched/sys/pci/if_skreg.h#4 integrate .. //depot/projects/nsched/sys/pci/if_ti.c#6 integrate .. //depot/projects/nsched/sys/posix4/posix4_mib.c#2 integrate .. //depot/projects/nsched/sys/powerpc/include/param.h#3 integrate .. //depot/projects/nsched/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/db_trace.c#6 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/vm_machdep.c#6 integrate .. //depot/projects/nsched/sys/security/mac/mac_sysv_msg.c#1 branch .. //depot/projects/nsched/sys/security/mac/mac_sysv_sem.c#1 branch .. //depot/projects/nsched/sys/security/mac/mac_sysv_shm.c#1 branch .. //depot/projects/nsched/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/nsched/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/nsched/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/nsched/sys/sparc64/include/eeprom.h#4 integrate .. //depot/projects/nsched/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/nsched/sys/sparc64/include/param.h#2 integrate .. //depot/projects/nsched/sys/sparc64/isa/isa.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/db_trace.c#6 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/eeprom.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_ebus.c#5 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_sbus.c#5 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/rtc.c#1 branch .. //depot/projects/nsched/sys/sparc64/sparc64/rwindow.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/vm_machdep.c#8 integrate .. //depot/projects/nsched/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/nsched/sys/sys/bio.h#6 integrate .. //depot/projects/nsched/sys/sys/buf.h#7 integrate .. //depot/projects/nsched/sys/sys/bus.h#5 integrate .. //depot/projects/nsched/sys/sys/domain.h#3 integrate .. //depot/projects/nsched/sys/sys/eventhandler.h#2 integrate .. //depot/projects/nsched/sys/sys/file.h#5 integrate .. //depot/projects/nsched/sys/sys/filedesc.h#5 integrate .. //depot/projects/nsched/sys/sys/jail.h#3 integrate .. //depot/projects/nsched/sys/sys/jumbo.h#2 delete .. //depot/projects/nsched/sys/sys/kernel.h#5 integrate .. //depot/projects/nsched/sys/sys/mac.h#4 integrate .. //depot/projects/nsched/sys/sys/mac_policy.h#6 integrate .. //depot/projects/nsched/sys/sys/mbuf.h#12 integrate .. //depot/projects/nsched/sys/sys/mount.h#9 integrate .. //depot/projects/nsched/sys/sys/mouse.h#3 integrate .. //depot/projects/nsched/sys/sys/msg.h#2 integrate .. //depot/projects/nsched/sys/sys/param.h#17 integrate .. //depot/projects/nsched/sys/sys/pbioio.h#2 delete .. //depot/projects/nsched/sys/sys/pioctl.h#2 integrate .. //depot/projects/nsched/sys/sys/proc.h#42 integrate .. //depot/projects/nsched/sys/sys/reboot.h#3 integrate .. //depot/projects/nsched/sys/sys/sem.h#2 integrate .. //depot/projects/nsched/sys/sys/shm.h#2 integrate .. //depot/projects/nsched/sys/sys/socket.h#7 integrate .. //depot/projects/nsched/sys/sys/syscall.h#8 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#8 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#8 integrate .. //depot/projects/nsched/sys/sys/systm.h#11 integrate .. //depot/projects/nsched/sys/sys/uio.h#4 integrate .. //depot/projects/nsched/sys/sys/user.h#8 integrate .. //depot/projects/nsched/sys/sys/vnode.h#11 integrate .. //depot/projects/nsched/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_alloc.c#10 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_snapshot.c#10 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vfsops.c#12 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_bmap.c#4 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_extern.h#5 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_vfsops.c#4 integrate .. //depot/projects/nsched/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/nsched/sys/vm/swap_pager.c#10 integrate .. //depot/projects/nsched/sys/vm/uma_int.h#4 integrate .. //depot/projects/nsched/sys/vm/vm_contig.c#6 integrate .. //depot/projects/nsched/sys/vm/vm_extern.h#5 integrate .. //depot/projects/nsched/sys/vm/vm_glue.c#10 integrate .. //depot/projects/nsched/sys/vm/vm_object.c#8 integrate .. //depot/projects/nsched/sys/vm/vm_object.h#5 integrate .. //depot/projects/nsched/sys/vm/vm_pageout.h#3 integrate .. //depot/projects/nsched/sys/vm/vm_pager.c#4 integrate .. //depot/projects/nsched/sys/vm/vnode_pager.c#7 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/db_trace.c#6 (text+ko) ==== @@ -42,17 +42,17 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.23 2004/11/27 06:51:32 das Exp $"); #include #include #include #include -#include #include #include #include +#include #include #include ==== //depot/projects/nsched/sys/alpha/alpha/divrem.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.3 2000/05/01 20:17:45 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* $NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $ */ /* @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/nsched/sys/alpha/alpha/fp_emulate.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.15 2004/11/27 06:51:32 das Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -47,6 +46,7 @@ #include #include #include +#include #include #include ==== //depot/projects/nsched/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -59,7 +59,7 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { switch (regnum) { } ==== //depot/projects/nsched/sys/alpha/alpha/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.44 2004/04/05 21:00:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.45 2004/11/20 02:28:14 das Exp $"); #include #include @@ -52,12 +52,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include ==== //depot/projects/nsched/sys/alpha/alpha/interrupt.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.82 2004/07/20 06:32:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.83 2004/11/23 22:11:53 jhb Exp $"); #include #include @@ -474,7 +474,7 @@ /* * Only one processor drives the actual timer. */ - if (PCPU_GET(cpuid) == boot_cpu_id) { + if (PCPU_GET(cpuid) == 0) { #endif (*platform.clockintr)(framep); /* divide hz (1024) by 8 to get stathz (128) */ ==== //depot/projects/nsched/sys/alpha/alpha/machdep.c#7 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.224 2004/11/05 19:16:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.226 2004/11/27 06:51:32 das Exp $"); #include "opt_compat.h" #include "opt_ddb.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 14 14:11:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B182116A4D0; Tue, 14 Dec 2004 14:11:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7450F16A4CE for ; Tue, 14 Dec 2004 14:11:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4352843D54 for ; Tue, 14 Dec 2004 14:11:06 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBEEB6BK048601 for ; Tue, 14 Dec 2004 14:11:06 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBEEB5Kx048598 for perforce@freebsd.org; Tue, 14 Dec 2004 14:11:05 GMT (envelope-from areisse@nailabs.com) Date: Tue, 14 Dec 2004 14:11:05 GMT Message-Id: <200412141411.iBEEB5Kx048598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 14:11:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=67061 Change 67061 by areisse@areisse_tislabs on 2004/12/14 14:10:46 bring flask configuration changes that were made in the kernel tree over to the policy. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/initial_sids#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkaccess_vector.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkflask.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/security_classes#5 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/Makefile#2 (text+ko) ==== @@ -1,40 +1,26 @@ -# flask needs to know where to export the libselinux headers. -LIBSELINC ?= ../../libselinux/include +# +# Makefile for building the SELinux module as part of the kernel. +# -# flask needs to know where to export the kernel headers. -LINUXDIR ?= ../../../linux-2.5 - AWK = awk -CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ - else if [ -x /bin/bash ]; then echo /bin/bash; \ - else echo sh; fi ; fi) - FLASK_H_DEPEND = security_classes initial_sids AV_H_DEPEND = access_vectors -FLASK_H_FILES = class_to_string.h flask.h initial_sid_to_string.h -AV_H_FILES = av_inherit.h common_perm_to_string.h av_perm_to_string.h av_permissions.h -ALL_H_FILES = $(FLASK_H_FILES) $(AV_H_FILES) +FLASK_H_FILES = av_inherit.h av_perm_to_string.h av_permissions.h class_to_string.h common_perm_to_string.h initial_sid_to_string.h -all: $(ALL_H_FILES) +all: flask.h av_permissions.h -$(FLASK_H_FILES): $(FLASK_H_DEPEND) - $(CONFIG_SHELL) mkflask.sh $(AWK) $(FLASK_H_DEPEND) +flask.h: $(FLASK_H_DEPEND) + /bin/sh ./mkflask.sh $(AWK) $(FLASK_H_DEPEND) -$(AV_H_FILES): $(AV_H_DEPEND) - $(CONFIG_SHELL) mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) +av_permissions.h: $(AV_H_DEPEND) + /bin/sh ./mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) -tolib: all - install -m 644 $(ALL_H_FILES) $(LIBSELINC)/selinux - -tokern: all - install -m 644 $(ALL_H_FILES) $(LINUXDIR)/security/selinux/include - -install: all - -relabel: +install: flask.h av_permissions.h + install -C -m0644 $(FLASK_H_FILES) ../avc + install -C -m0644 flask.h .. clean: rm -f $(FLASK_H_FILES) - rm -f $(AV_H_FILES) + rm -f $(FLASK_IH_FILES) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#6 (text+ko) ==== @@ -220,10 +220,11 @@ { fork transition - sigchld - sigkill - sigstop - signal + sigchld # commonly granted from child to parent + sigkill # cannot be caught or ignored + sigstop # cannot be caught or ignored + signull # for kill(pid, 0) + signal # all other signals ptrace getsched setsched @@ -233,11 +234,13 @@ getcap setcap share - signull getattr setexec setfscreate noatsecure + siginh + setrlimit + rlimitinh } @@ -289,6 +292,8 @@ load_policy compute_relabel compute_user + setenforce # was avc_toggle in system class + setbool } @@ -298,15 +303,8 @@ class system { - net_io_control - route_control - arp_control - rarp_control ipc_info - avc_toggle - nfsd_control - bdflush - syslog_read + syslog_read syslog_mod syslog_console } @@ -367,6 +365,11 @@ lease } + +# +# Define the access vector interpretation for controlling +# changes to passwd information. +# class passwd { passwd ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/initial_sids#4 (text+ko) ==== @@ -28,7 +28,10 @@ sid sysctl_vm sid sysctl_dev sid kmod +sid devfs +sid devpts +sid nfs sid policy -sid scmp_packet +sid tmpfs # FLASK ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkaccess_vector.sh#2 (text+ko) ==== @@ -36,22 +36,22 @@ printf("/* %s */\n\n", subproject) > cpermfile; printf("/* %s */\n\n", subproject) > inheritfile; - printf("struct av_inherit\n") > inheritfile; + printf("typedef struct\n") > inheritfile; printf("{\n") > inheritfile; - printf(" u16 tclass;\n") > inheritfile; + printf(" security_class_t tclass;\n") > inheritfile; printf(" char **common_pts;\n") > inheritfile; - printf(" u32 common_base;\n") > inheritfile; - printf("};\n\n") > inheritfile; - printf("static struct av_inherit av_inherit[] = {\n") > inheritfile; + printf(" access_vector_t common_base;\n") > inheritfile; + printf("} av_inherit_t;\n\n") > inheritfile; + printf("static av_inherit_t av_inherit[] = {\n") > inheritfile; printf("/* %s */\n\n", subproject) > avpermfile; - printf("struct av_perm_to_string\n") > avpermfile; + printf("typedef struct\n") > avpermfile; printf("{\n") > avpermfile; - printf(" u16 tclass;\n") > avpermfile; - printf(" u32 value;\n") > avpermfile; + printf(" security_class_t tclass;\n") > avpermfile; + printf(" access_vector_t value;\n") > avpermfile; printf(" char *name;\n") > avpermfile; - printf("};\n\n") > avpermfile; - printf("static struct av_perm_to_string av_perm_to_string[] = {\n") > avpermfile; + printf("} av_perm_to_string_t;\n\n") > avpermfile; + printf("static av_perm_to_string_t av_perm_to_string[] = {\n") > avpermfile; } /^[ \t]*#/ { next; @@ -129,12 +129,15 @@ spaces = 1; for (i = 0; i < spaces; i++) printf(" ") > outfile; - printf("0x%08xUL\n", common_perms[combined]) > outfile; + pt = common_perms[combined]; + printf("0x%08x%08xUL\n", pt>32 ? 2^(pt-33) : 0, pt<33 ? 2^(pt-1) : 0) > outfile; + #printf("0x%08xUL\n", common_perms[combined]) > outfile; } } printf("\n") > outfile; - printf(" { SECCLASS_%s, common_%s_perm_to_string, 0x%08xUL },\n", toupper(tclass), inherits, permission) > inheritfile; + printf(" { SECCLASS_%s, common_%s_perm_to_string, 0x%08x%08xUL },\n", toupper(tclass), inherits, + permission>32 ? 2^(permission-33) : 0, permission<33 ? 2^(permission-1) : 0) > inheritfile; nextstate = "CLASS_OR_CLASS-OPENBRACKET"; next; @@ -209,8 +212,8 @@ for (i = 0; i < spaces; i++) printf(" ") > outfile; - printf("0x%08xUL\n", permission) > outfile; - permission = permission * 2; + printf("0x%08x%08xUL\n", permission>32 ? 2^(permission-33) : 0, permission<33 ? 2^(permission-1) : 0) > outfile; + permission = permission + 1; } $1 == "}" { if (nextstate != "CLASS-CLOSEBRACKET" && @@ -239,9 +242,11 @@ printf("\n/* %s */\n", subproject) > cpermfile; printf("};\n\n") > inheritfile; + printf("#define AV_INHERIT_SIZE (sizeof(av_inherit)/sizeof(av_inherit_t))\n\n") > inheritfile; printf("\n/* %s */\n", subproject) > inheritfile; printf("};\n\n") > avpermfile; + printf("#define AV_PERM_TO_STRING_SIZE (sizeof(av_perm_to_string)/sizeof(av_perm_to_string_t))\n\n") > avpermfile; printf("\n/* %s */\n", subproject) > avpermfile; }' ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkflask.sh#2 (text+ko) ==== @@ -23,8 +23,10 @@ printf("/* This file is automatically generated. Do not edit. */\n") > outfile; - printf("#ifndef _SELINUX_FLASK_H_\n") > outfile; - printf("#define _SELINUX_FLASK_H_\n") > outfile; + printf("#ifndef _LINUX_FLASK_H_\n") > outfile; + printf("#define _LINUX_FLASK_H_\n") > outfile; + printf("\n#include \n") > outfile; + printf("\n/*\n * Security object class definitions\n */\n") > outfile; printf("/* This file is automatically generated. Do not edit. */\n") > debugfile; printf("/*\n * Security object class definitions\n */\n") > debugfile; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/security_classes#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Dec 14 15:19:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F12816A4D0; Tue, 14 Dec 2004 15:19:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 04FC516A4CE for ; Tue, 14 Dec 2004 15:19:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C586843D48 for ; Tue, 14 Dec 2004 15:19:28 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBEFJSkt052592 for ; Tue, 14 Dec 2004 15:19:28 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBEFJSIA052589 for perforce@freebsd.org; Tue, 14 Dec 2004 15:19:28 GMT (envelope-from areisse@nailabs.com) Date: Tue, 14 Dec 2004 15:19:28 GMT Message-Id: <200412141519.iBEFJSIA052589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 15:19:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=67063 Change 67063 by areisse@areisse_tislabs on 2004/12/14 15:19:13 Rebuild flask include files. Change AVC_TOGGLE to SETENFORCE. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_inherit.h#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/class_to_string.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/common_perm_to_string.h#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/initial_sid_to_string.h#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_inherit.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#5 (text+ko) ==== @@ -54,6 +54,7 @@ { SECCLASS_PROCESS, PROCESS__SIGCHLD, "sigchld" }, { SECCLASS_PROCESS, PROCESS__SIGKILL, "sigkill" }, { SECCLASS_PROCESS, PROCESS__SIGSTOP, "sigstop" }, + { SECCLASS_PROCESS, PROCESS__SIGNULL, "signull" }, { SECCLASS_PROCESS, PROCESS__SIGNAL, "signal" }, { SECCLASS_PROCESS, PROCESS__PTRACE, "ptrace" }, { SECCLASS_PROCESS, PROCESS__GETSCHED, "getsched" }, @@ -64,6 +65,13 @@ { SECCLASS_PROCESS, PROCESS__GETCAP, "getcap" }, { SECCLASS_PROCESS, PROCESS__SETCAP, "setcap" }, { SECCLASS_PROCESS, PROCESS__SHARE, "share" }, + { SECCLASS_PROCESS, PROCESS__GETATTR, "getattr" }, + { SECCLASS_PROCESS, PROCESS__SETEXEC, "setexec" }, + { SECCLASS_PROCESS, PROCESS__SETFSCREATE, "setfscreate" }, + { SECCLASS_PROCESS, PROCESS__NOATSECURE, "noatsecure" }, + { SECCLASS_PROCESS, PROCESS__SIGINH, "siginh" }, + { SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit" }, + { SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh" }, { SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue" }, { SECCLASS_MSG, MSG__SEND, "send" }, { SECCLASS_MSG, MSG__RECEIVE, "receive" }, @@ -74,24 +82,15 @@ { SECCLASS_POSIX_SEM, POSIX_SEM__WRITE, "write" }, { SECCLASS_POSIX_SEM, POSIX_SEM__READ, "read" }, { SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av" }, - { SECCLASS_SECURITY, SECURITY__NOTIFY_PERM, "notify_perm" }, - { SECCLASS_SECURITY, SECURITY__TRANSITION_SID, "transition_sid" }, - { SECCLASS_SECURITY, SECURITY__MEMBER_SID, "member_sid" }, - { SECCLASS_SECURITY, SECURITY__SID_TO_CONTEXT, "sid_to_context" }, - { SECCLASS_SECURITY, SECURITY__CONTEXT_TO_SID, "context_to_sid" }, + { SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create" }, + { SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER, "compute_member" }, + { SECCLASS_SECURITY, SECURITY__CHECK_CONTEXT, "check_context" }, { SECCLASS_SECURITY, SECURITY__LOAD_POLICY, "load_policy" }, - { SECCLASS_SECURITY, SECURITY__GET_SIDS, "get_sids" }, - { SECCLASS_SECURITY, SECURITY__REGISTER_AVC, "register_avc" }, - { SECCLASS_SECURITY, SECURITY__CHANGE_SID, "change_sid" }, - { SECCLASS_SECURITY, SECURITY__GET_USER_SIDS, "get_user_sids" }, - { SECCLASS_SYSTEM, SYSTEM__NET_IO_CONTROL, "net_io_control" }, - { SECCLASS_SYSTEM, SYSTEM__ROUTE_CONTROL, "route_control" }, - { SECCLASS_SYSTEM, SYSTEM__ARP_CONTROL, "arp_control" }, - { SECCLASS_SYSTEM, SYSTEM__RARP_CONTROL, "rarp_control" }, + { SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel" }, + { SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user" }, + { SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce" }, + { SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool" }, { SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info" }, - { SECCLASS_SYSTEM, SYSTEM__AVC_TOGGLE, "avc_toggle" }, - { SECCLASS_SYSTEM, SYSTEM__NFSD_CONTROL, "nfsd_control" }, - { SECCLASS_SYSTEM, SYSTEM__BDFLUSH, "bdflush" }, { SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read" }, { SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod" }, { SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console" }, @@ -139,6 +138,9 @@ { SECCLASS_CAPABILITY, CAPABILITY__SYS_TTY_CONFIG, "sys_tty_config" }, { SECCLASS_CAPABILITY, CAPABILITY__MKNOD, "mknod" }, { SECCLASS_CAPABILITY, CAPABILITY__LEASE, "lease" }, + { SECCLASS_PASSWD, PASSWD__PASSWD, "passwd" }, + { SECCLASS_PASSWD, PASSWD__CHFN, "chfn" }, + { SECCLASS_PASSWD, PASSWD__CHSH, "chsh" }, }; #define AV_PERM_TO_STRING_SIZE (sizeof(av_perm_to_string)/sizeof(av_perm_to_string_t)) ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#6 (text+ko) ==== @@ -482,16 +482,24 @@ #define PROCESS__SIGCHLD 0x0000000000000004UL #define PROCESS__SIGKILL 0x0000000000000008UL #define PROCESS__SIGSTOP 0x0000000000000010UL -#define PROCESS__SIGNAL 0x0000000000000020UL -#define PROCESS__PTRACE 0x0000000000000040UL -#define PROCESS__GETSCHED 0x0000000000000080UL -#define PROCESS__SETSCHED 0x0000000000000100UL -#define PROCESS__GETSESSION 0x0000000000000200UL -#define PROCESS__GETPGID 0x0000000000000400UL -#define PROCESS__SETPGID 0x0000000000000800UL -#define PROCESS__GETCAP 0x0000000000001000UL -#define PROCESS__SETCAP 0x0000000000002000UL -#define PROCESS__SHARE 0x0000000000004000UL +#define PROCESS__SIGNULL 0x0000000000000020UL +#define PROCESS__SIGNAL 0x0000000000000040UL +#define PROCESS__PTRACE 0x0000000000000080UL +#define PROCESS__GETSCHED 0x0000000000000100UL +#define PROCESS__SETSCHED 0x0000000000000200UL +#define PROCESS__GETSESSION 0x0000000000000400UL +#define PROCESS__GETPGID 0x0000000000000800UL +#define PROCESS__SETPGID 0x0000000000001000UL +#define PROCESS__GETCAP 0x0000000000002000UL +#define PROCESS__SETCAP 0x0000000000004000UL +#define PROCESS__SHARE 0x0000000000008000UL +#define PROCESS__GETATTR 0x0000000000010000UL +#define PROCESS__SETEXEC 0x0000000000020000UL +#define PROCESS__SETFSCREATE 0x0000000000040000UL +#define PROCESS__NOATSECURE 0x0000000000080000UL +#define PROCESS__SIGINH 0x0000000000100000UL +#define PROCESS__SETRLIMIT 0x0000000000200000UL +#define PROCESS__RLIMITINH 0x0000000000400000UL #define IPC__WRITE 0x0000000000000020UL #define IPC__UNIX_WRITE 0x0000000000000100UL @@ -546,28 +554,19 @@ #define POSIX_SEM__READ 0x0000000000000010UL #define SECURITY__COMPUTE_AV 0x0000000000000001UL -#define SECURITY__NOTIFY_PERM 0x0000000000000002UL -#define SECURITY__TRANSITION_SID 0x0000000000000004UL -#define SECURITY__MEMBER_SID 0x0000000000000008UL -#define SECURITY__SID_TO_CONTEXT 0x0000000000000010UL -#define SECURITY__CONTEXT_TO_SID 0x0000000000000020UL -#define SECURITY__LOAD_POLICY 0x0000000000000040UL -#define SECURITY__GET_SIDS 0x0000000000000080UL -#define SECURITY__REGISTER_AVC 0x0000000000000100UL -#define SECURITY__CHANGE_SID 0x0000000000000200UL -#define SECURITY__GET_USER_SIDS 0x0000000000000400UL +#define SECURITY__COMPUTE_CREATE 0x0000000000000002UL +#define SECURITY__COMPUTE_MEMBER 0x0000000000000004UL +#define SECURITY__CHECK_CONTEXT 0x0000000000000008UL +#define SECURITY__LOAD_POLICY 0x0000000000000010UL +#define SECURITY__COMPUTE_RELABEL 0x0000000000000020UL +#define SECURITY__COMPUTE_USER 0x0000000000000040UL +#define SECURITY__SETENFORCE 0x0000000000000080UL +#define SECURITY__SETBOOL 0x0000000000000100UL -#define SYSTEM__NET_IO_CONTROL 0x0000000000000001UL -#define SYSTEM__ROUTE_CONTROL 0x0000000000000002UL -#define SYSTEM__ARP_CONTROL 0x0000000000000004UL -#define SYSTEM__RARP_CONTROL 0x0000000000000008UL -#define SYSTEM__IPC_INFO 0x0000000000000010UL -#define SYSTEM__AVC_TOGGLE 0x0000000000000020UL -#define SYSTEM__NFSD_CONTROL 0x0000000000000040UL -#define SYSTEM__BDFLUSH 0x0000000000000080UL -#define SYSTEM__SYSLOG_READ 0x0000000000000100UL -#define SYSTEM__SYSLOG_MOD 0x0000000000000200UL -#define SYSTEM__SYSLOG_CONSOLE 0x0000000000000400UL +#define SYSTEM__IPC_INFO 0x0000000000000001UL +#define SYSTEM__SYSLOG_READ 0x0000000000000002UL +#define SYSTEM__SYSLOG_MOD 0x0000000000000004UL +#define SYSTEM__SYSLOG_CONSOLE 0x0000000000000008UL #define CAPABILITY__CHOWN 0x0000000000000001UL #define CAPABILITY__DAC_EXECUTE 0x0000000000000002UL @@ -614,5 +613,9 @@ #define CAPABILITY__MKNOD 0x0000040000000000UL #define CAPABILITY__LEASE 0x0000080000000000UL +#define PASSWD__PASSWD 0x0000000000000001UL +#define PASSWD__CHFN 0x0000000000000002UL +#define PASSWD__CHSH 0x0000000000000004UL + /* FLASK */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/class_to_string.h#5 (text+ko) ==== @@ -35,5 +35,6 @@ "shm", "ipc", "posix_sem", + "passwd", }; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/common_perm_to_string.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/initial_sid_to_string.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask.h#5 (text+ko) ==== @@ -37,6 +37,7 @@ #define SECCLASS_SHM 28 #define SECCLASS_IPC 29 #define SECCLASS_POSIX_SEM 30 +#define SECCLASS_PASSWD 31 /* * Security identifier indices for initial entities ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#5 (text+ko) ==== @@ -116,7 +116,7 @@ if (error) return (error); - error = thread_has_system (curthread, SYSTEM__AVC_TOGGLE); + error = thread_has_system (curthread, SECURITY__SETENFORCE); if (error) return error; From owner-p4-projects@FreeBSD.ORG Tue Dec 14 15:23:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7750F16A4D0; Tue, 14 Dec 2004 15:23:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F11316A4CE for ; Tue, 14 Dec 2004 15:23:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EB3043D39 for ; Tue, 14 Dec 2004 15:23:34 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBEFNYRs052742 for ; Tue, 14 Dec 2004 15:23:34 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBEFNXVN052739 for perforce@freebsd.org; Tue, 14 Dec 2004 15:23:33 GMT (envelope-from areisse@nailabs.com) Date: Tue, 14 Dec 2004 15:23:33 GMT Message-Id: <200412141523.iBEFNXVN052739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 15:23:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=67064 Change 67064 by areisse@areisse_tislabs on 2004/12/14 15:22:47 Use the policy/flask makefile to build the flask include files for the kernel. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/Makefile#3 (text+ko) ==== @@ -4,6 +4,8 @@ AWK = awk +KERNDIR = ../../../../sys/security/sebsd + FLASK_H_DEPEND = security_classes initial_sids AV_H_DEPEND = access_vectors @@ -18,8 +20,8 @@ /bin/sh ./mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) install: flask.h av_permissions.h - install -C -m0644 $(FLASK_H_FILES) ../avc - install -C -m0644 flask.h .. + install -C -m0644 $(FLASK_H_FILES) $(KERNDIR)/avc + install -C -m0644 flask.h $(KERNDIR) clean: rm -f $(FLASK_H_FILES) From owner-p4-projects@FreeBSD.ORG Tue Dec 14 15:24:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C02F16A4D0; Tue, 14 Dec 2004 15:24:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3444D16A4CE for ; Tue, 14 Dec 2004 15:24:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E117043D1D for ; Tue, 14 Dec 2004 15:24:35 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBEFOZ5u052764 for ; Tue, 14 Dec 2004 15:24:35 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBEFOZxT052761 for perforce@freebsd.org; Tue, 14 Dec 2004 15:24:35 GMT (envelope-from areisse@nailabs.com) Date: Tue, 14 Dec 2004 15:24:35 GMT Message-Id: <200412141524.iBEFOZxT052761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 15:24:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=67065 Change 67065 by areisse@areisse_tislabs on 2004/12/14 15:24:18 Remove flask source files from the kernel, to avoid confusion with those in the policy and to avoid maintaining two copies of the same data. All files necessary for a kernel build are still present. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/Makefile#5 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/README#3 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/access_vectors#6 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/initial_sids#4 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/mkaccess_vector.sh#6 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/mkflask.sh#4 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/security_classes#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Dec 14 23:22:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94D2216A4D0; Tue, 14 Dec 2004 23:22:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C5E316A4CE for ; Tue, 14 Dec 2004 23:22:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A94E43D39 for ; Tue, 14 Dec 2004 23:22:25 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBENMPwf082592 for ; Tue, 14 Dec 2004 23:22:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBENMPVG082589 for perforce@freebsd.org; Tue, 14 Dec 2004 23:22:25 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 23:22:25 GMT Message-Id: <200412142322.iBENMPVG082589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 23:22:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=67096 Change 67096 by sam@sam_ebb on 2004/12/14 23:21:44 add debug msgs for set+del crypto keys Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#8 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#8 (text+ko) ==== @@ -366,6 +366,12 @@ KASSERT(key->wk_cipher != NULL, ("No cipher!")); + IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, + "%s: %s keyix %u flags 0x%x rsc %ju tsc %ju len %u\n", + __func__, key->wk_cipher->ic_name, + key->wk_keyix, key->wk_flags, + key->wk_keyrsc, key->wk_keytsc, key->wk_keylen); + keyix = key->wk_keyix; if (keyix != IEEE80211_KEYIX_NONE) { /* @@ -436,6 +442,12 @@ KASSERT(cip != NULL, ("No cipher!")); + IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, + "%s: %s keyix %u flags 0x%x mac %s rsc %ju tsc %ju len %u\n", + __func__, cip->ic_name, key->wk_keyix, + key->wk_flags, ether_sprintf(macaddr), + key->wk_keyrsc, key->wk_keytsc, key->wk_keylen); + /* * Give cipher a chance to validate key contents. * XXX should happen before modifying state. From owner-p4-projects@FreeBSD.ORG Tue Dec 14 23:33:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68FB416A511; Tue, 14 Dec 2004 23:33:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 265EA16A502 for ; Tue, 14 Dec 2004 23:33:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0366F43D39 for ; Tue, 14 Dec 2004 23:33:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBENXdqs082894 for ; Tue, 14 Dec 2004 23:33:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBENXdCl082891 for perforce@freebsd.org; Tue, 14 Dec 2004 23:33:39 GMT (envelope-from sam@freebsd.org) Date: Tue, 14 Dec 2004 23:33:39 GMT Message-Id: <200412142333.iBENXdCl082891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2004 23:33:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=67098 Change 67098 by sam@sam_ebb on 2004/12/14 23:33:10 o teach ieee80211_dump_pkt about QoS and TKIP/CCM-encrypted frames o also handle h/w padding--this requires changing the calling covention to pass in struct ieee80211com Update drivers that ieee80211_dump_pkt to match. Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#42 edit .. //depot/projects/wifi/sys/dev/wi/if_wi.c#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#11 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#42 (text+ko) ==== @@ -2679,7 +2679,7 @@ } if (IFF_DUMPPKTS(sc, ATH_DEBUG_RECV)) { - ieee80211_dump_pkt(mtod(m, caddr_t), len, + ieee80211_dump_pkt(ic, mtod(m, caddr_t), len, sc->sc_hwmap[ds->ds_rxstat.rs_rate], ds->ds_rxstat.rs_rssi); } @@ -3219,7 +3219,7 @@ ctsrate = 0; if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) - ieee80211_dump_pkt(mtod(m0, caddr_t), m0->m_len, + ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, sc->sc_hwmap[txrate], -1); if (ic->ic_rawbpf) ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#8 (text+ko) ==== @@ -148,7 +148,8 @@ static int wi_scan_ap(struct wi_softc *, u_int16_t, u_int16_t); static void wi_scan_result(struct wi_softc *, int, int); -static void wi_dump_pkt(struct wi_frame *, struct ieee80211_node *, int rssi); +static void wi_dump_pkt(struct ieee80211com *, + struct wi_frame *, struct ieee80211_node *, int rssi); static int wi_get_debug(struct wi_softc *, struct wi_req *); static int wi_set_debug(struct wi_softc *, struct wi_req *); @@ -982,7 +983,7 @@ m_adj(m0, sizeof(struct ieee80211_frame)); frmhdr.wi_dat_len = htole16(m0->m_pkthdr.len); if (IFF_DUMPPKTS(ifp)) - wi_dump_pkt(&frmhdr, NULL, -1); + wi_dump_pkt(ic, &frmhdr, NULL, -1); fid = sc->sc_txd[cur].d_fid; off = sizeof(frmhdr); error = wi_write_bap(sc, fid, 0, &frmhdr, sizeof(frmhdr)) != 0 @@ -1439,7 +1440,7 @@ } if (IFF_DUMPPKTS(ifp)) - wi_dump_pkt(&frmhdr, NULL, frmhdr.wi_rx_signal); + wi_dump_pkt(ic, &frmhdr, NULL, frmhdr.wi_rx_signal); /* * Drop undecryptable or packets with receive errors here @@ -2836,9 +2837,10 @@ } static void -wi_dump_pkt(struct wi_frame *wh, struct ieee80211_node *ni, int rssi) +wi_dump_pkt(struct ieee80211com *ic, + struct wi_frame *wh, struct ieee80211_node *ni, int rssi) { - ieee80211_dump_pkt((u_int8_t *) &wh->wi_whdr, sizeof(wh->wi_whdr), + ieee80211_dump_pkt(ic, (u_int8_t *) &wh->wi_whdr, sizeof(wh->wi_whdr), ni ? ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL : -1, rssi); printf(" status 0x%x rx_tstamp1 %u rx_tstamp0 0x%u rx_silence %u\n", le16toh(wh->wi_status), le16toh(wh->wi_rx_tstamp1), ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#18 (text+ko) ==== @@ -258,7 +258,8 @@ } void -ieee80211_dump_pkt(const u_int8_t *buf, int len, int rate, int rssi) +ieee80211_dump_pkt(struct ieee80211com *ic, + const u_int8_t *buf, int len, int rate, int rssi) { const struct ieee80211_frame *wh; int i; @@ -300,12 +301,22 @@ printf(" type#%d", wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK); break; } + if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) { + const struct ieee80211_qosframe *qwh = + (const struct ieee80211_qosframe *)buf; + printf(" QoS [TID %u%s]", qwh->i_qos[0] & IEEE80211_QOS_TID, + qwh->i_qos[0] & IEEE80211_QOS_ACKPOLICY ? " ACM" : ""); + } if (wh->i_fc[1] & IEEE80211_FC1_WEP) { - int i; - printf(" WEP [IV"); - for (i = 0; i < IEEE80211_WEP_IVLEN; i++) - printf(" %.02x", buf[sizeof(*wh)+i]); - printf(" KID %u]", buf[sizeof(*wh)+i] >> 6); + int off; + + off = ieee80211_anyhdrspace(ic, wh); + printf(" WEP [IV %.02x %.02x %.02x", + buf[off+0], buf[off+1], buf[off+2]); + if (buf[off+IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV) + printf(" %.02x %.02x %.02x", + buf[off+4], buf[off+5], buf[off+6]); + printf(" KID %u]", buf[off+IEEE80211_WEP_IVLEN] >> 6); } if (rate >= 0) printf(" %dM", rate / 2); ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#11 (text+ko) ==== @@ -207,7 +207,8 @@ #define ieee80211_new_state(_ic, _nstate, _arg) \ (((_ic)->ic_newstate)((_ic), (_nstate), (_arg))) extern void ieee80211_print_essid(const u_int8_t *, int); -extern void ieee80211_dump_pkt(const u_int8_t *, int, int, int); +extern void ieee80211_dump_pkt(struct ieee80211com *, + const u_int8_t *, int, int, int); extern const char *ieee80211_state_name[IEEE80211_S_MAX]; extern const char *ieee80211_wme_acnames[]; From owner-p4-projects@FreeBSD.ORG Wed Dec 15 02:17:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80DC016A4D0; Wed, 15 Dec 2004 02:17:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38ACB16A4CE for ; Wed, 15 Dec 2004 02:17:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F27A543D1F for ; Wed, 15 Dec 2004 02:17:57 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBF2HvBG094506 for ; Wed, 15 Dec 2004 02:17:57 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBF2Hvv3094503 for perforce@freebsd.org; Wed, 15 Dec 2004 02:17:57 GMT (envelope-from wsalamon@computer.org) Date: Wed, 15 Dec 2004 02:17:57 GMT Message-Id: <200412150217.iBF2Hvv3094503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 67101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 02:17:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=67101 Change 67101 by wsalamon@rickenbacker on 2004/12/15 02:17:46 Fixup the auditing of the open() event: First, because we rely on userspace (auditd) to set the kernel's event->class mapping, we don't need kern_bsm_klib::au_evclassmap_inuit() to do it for the specific AUE_OPEN events. Second: Use the AUE_OPEN_RWTC, an event that covers all types of open-related classes, as the event to associate with the open() system call. Any open call will therefore be covered by preselection. Change this event mapping for freebsd32 and linux compat as well. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#5 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#5 edit .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#10 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { AS(open_args), (sy_call_t *)open, AUE_OPEN }, /* 5 = open */ + { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ { SYF_MPSAFE | AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_NULL }, /* 7 = freebsd32_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = obsolete old creat */ @@ -44,7 +44,7 @@ { AS(chmod_args), (sy_call_t *)chmod, AUE_NULL }, /* 15 = chmod */ { AS(chown_args), (sy_call_t *)chown, AUE_NULL }, /* 16 = chown */ { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ - { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat) }, /* 18 = old freebsd32_getfsstat */ + { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_NULL }, /* 18 = old freebsd32_getfsstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 19 = obsolete olseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ { AS(mount_args), (sy_call_t *)mount, AUE_NULL }, /* 21 = mount */ @@ -183,8 +183,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 156 = obsolete ogetdirentries */ - { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs) }, /* 157 = old freebsd32_statfs */ - { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs) }, /* 158 = old freebsd32_fstatfs */ + { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_NULL }, /* 157 = old freebsd32_statfs */ + { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_NULL }, /* 158 = old freebsd32_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 160 = nosys */ { AS(getfh_args), (sy_call_t *)getfh, AUE_NULL }, /* 161 = getfh */ @@ -323,7 +323,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = nosys */ - { compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs) }, /* 297 = old freebsd32_fhstatfs */ + { compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_NULL }, /* 297 = old freebsd32_fhstatfs */ { AS(fhopen_args), (sy_call_t *)fhopen, AUE_NULL }, /* 298 = fhopen */ { AS(fhstat_args), (sy_call_t *)fhstat, AUE_NULL }, /* 299 = fhstat */ { SYF_MPSAFE | AS(modnext_args), (sy_call_t *)modnext, AUE_NULL }, /* 300 = modnext */ @@ -362,15 +362,15 @@ { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL }, /* 333 = sched_get_priority_min */ { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 334 = sched_rr_get_interval */ { SYF_MPSAFE | AS(utrace_args), (sy_call_t *)utrace, AUE_NULL }, /* 335 = utrace */ - { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile) }, /* 336 = old freebsd32_sendfile */ + { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_NULL }, /* 336 = old freebsd32_sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL }, /* 337 = kldsym */ { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail, AUE_NULL }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 339 = pioctl */ { SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_NULL }, /* 340 = sigprocmask */ { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_NULL }, /* 341 = sigsuspend */ - { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction) }, /* 342 = old freebsd32_sigaction */ + { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_NULL }, /* 342 = old freebsd32_sigaction */ { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending, AUE_NULL }, /* 343 = sigpending */ - { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn) }, /* 344 = old freebsd32_sigreturn */ + { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_NULL }, /* 344 = old freebsd32_sigreturn */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 345 = sigtimedwait */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 346 = sigwaitinfo */ { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL }, /* 347 = __acl_get_file */ ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -57,7 +57,7 @@ 3 MNOPROTO { ssize_t read(int fd, void *buf, size_t nbyte); } AUE_NULL 4 MNOPROTO { ssize_t write(int fd, const void *buf, \ size_t nbyte); } AUE_NULL -5 NOPROTO { int open(char *path, int flags, int mode); } AUE_OPEN +5 NOPROTO { int open(char *path, int flags, int mode); } AUE_OPEN_RWTC 6 MNOPROTO { int close(int fd); } AUE_CLOSE 7 MSTD { int freebsd32_wait4(int pid, int *status, int options, \ struct rusage32 *rusage); } AUE_NULL ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN }, /* 5 = linux_open */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_NULL }, /* 7 = linux_waitpid */ { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#5 (text+ko) ==== @@ -40,7 +40,8 @@ 2 MSTD { int linux_fork(void); } AUE_FORK 3 MNOPROTO { int read(int fd, char *buf, u_int nbyte); } AUE_NULL 4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } AUE_NULL -5 STD { int linux_open(char *path, l_int flags, l_int mode); } AUE_OPEN +5 STD { int linux_open(char *path, l_int flags, l_int mode); } \ + AUE_OPEN_RWTC 6 MNOPROTO { int close(int fd); } AUE_CLOSE 7 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } AUE_NULL ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#10 (text+ko) ==== @@ -34,7 +34,7 @@ { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN }, /* 5 = open */ + { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4, AUE_NULL }, /* 7 = wait4 */ { compat(SYF_MPSAFE | AS(ocreat_args),creat), AUE_O_CREAT }, /* 8 = old creat */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#10 (text+ko) ==== @@ -56,7 +56,7 @@ 3 MSTD { ssize_t read(int fd, void *buf, size_t nbyte); } AUE_NULL 4 MSTD { ssize_t write(int fd, const void *buf, size_t nbyte); } \ AUE_NULL -5 MSTD { int open(char *path, int flags, int mode); } AUE_OPEN +5 MSTD { int open(char *path, int flags, int mode); } AUE_OPEN_RWTC ; XXX should be { int open(const char *path, int flags, ...); } ; but we're not ready for `const' or varargs. ; XXX man page says `mode_t mode'. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#14 (text+ko) ==== @@ -1276,12 +1276,13 @@ switch(ar->k_ar.ar_event) { - case AUE_OPEN: - /* The open syscall always writes a AUE_OPEN event; change it - * to the proper type of event based on the flags and the error - * value. + case AUE_OPEN_RWTC: + /* The open syscall always writes a AUE_OPEN_RWTC event; change + * it to the proper type of event based on the flags and the + * error value. */ - ar->k_ar.ar_event = flags_and_error_to_openevent(ar->k_ar.ar_arg_fflags, error); + ar->k_ar.ar_event = flags_and_error_to_openevent( + ar->k_ar.ar_arg_fflags, error); break; case AUE_SYSCTL: ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#8 (text+ko) ==== @@ -112,19 +112,6 @@ } } - /* Add the specific open events to the mapping. */ - au_evclassmap_insert(AUE_OPEN_R, AU_FREAD); - au_evclassmap_insert(AUE_OPEN_RC, AU_FREAD|AU_FCREATE); - au_evclassmap_insert(AUE_OPEN_RTC, AU_FREAD|AU_FCREATE|AU_FDELETE); - au_evclassmap_insert(AUE_OPEN_RT, AU_FREAD|AU_FDELETE); - au_evclassmap_insert(AUE_OPEN_RW, AU_FREAD|AU_FWRITE); - au_evclassmap_insert(AUE_OPEN_RWC, AU_FREAD|AU_FWRITE|AU_FCREATE); - au_evclassmap_insert(AUE_OPEN_RWTC, AU_FREAD|AU_FWRITE|AU_FCREATE|AU_FDELETE); - au_evclassmap_insert(AUE_OPEN_RWT, AU_FREAD|AU_FWRITE|AU_FDELETE); - au_evclassmap_insert(AUE_OPEN_W, AU_FWRITE); - au_evclassmap_insert(AUE_OPEN_WC, AU_FWRITE|AU_FCREATE); - au_evclassmap_insert(AUE_OPEN_WTC, AU_FWRITE|AU_FCREATE|AU_FDELETE); - au_evclassmap_insert(AUE_OPEN_WT, AU_FWRITE|AU_FDELETE); } /* From owner-p4-projects@FreeBSD.ORG Wed Dec 15 06:36:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51AF316A4D0; Wed, 15 Dec 2004 06:36:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B82F16A4CE for ; Wed, 15 Dec 2004 06:36:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 032FB43D58 for ; Wed, 15 Dec 2004 06:36:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBF6aBCc017212 for ; Wed, 15 Dec 2004 06:36:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBF6aBYn017209 for perforce@freebsd.org; Wed, 15 Dec 2004 06:36:11 GMT (envelope-from sam@freebsd.org) Date: Wed, 15 Dec 2004 06:36:11 GMT Message-Id: <200412150636.iBF6aBYn017209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 06:36:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=67111 Change 67111 by sam@sam_ebb on 2004/12/15 06:35:36 Relearn how WPA keying is supposed to work and fix WPA+WME while we're at it: o WPA/802.11i has a unicast key and a group key; in station mode everything is sent with the unicast key--we were consulting the destination mac address and incorrectly using the group key o (perpetuate fallback use of the default tx key to maintain compatibility with the way wpa_supplicant works) o correct EAPOL encryption logic to check unicast key instead of assuming other state implies this With these changes WPA+WME station and ap operation works (but only with newish 5212 parts and only with an unreleased hal). Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#26 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#26 (text+ko) ==== @@ -386,35 +386,37 @@ return 0; } +#define KEY_UNDEFINED(k) ((k).wk_cipher == &ieee80211_cipher_none) /* - * Return the transmit key to use in sending a frame to the specified - * destination. Multicast traffic always uses the group key which is - * installed the default tx key. Otherwise if a unicast key is set - * we use that. When no unicast key is set we fall back to the default - * transmit key unless WPA is enabled in which case there should be - * a unicast frame so we don't want to use a default key (which in - * this case is the group/multicast key). + * Return the transmit key to use in sending a unicast frame. + * If a unicast key is set we use that. When no unicast key is set + * we fall back to the default transmit key. */ static __inline struct ieee80211_key * -ieee80211_crypto_getkey(struct ieee80211com *ic, - const u_int8_t mac[IEEE80211_ADDR_LEN], struct ieee80211_node *ni) +ieee80211_crypto_getucastkey(struct ieee80211com *ic, struct ieee80211_node *ni) { -#define KEY_UNDEFINED(k) ((k).wk_cipher == &ieee80211_cipher_none) - if (IEEE80211_IS_MULTICAST(mac)) { + if (KEY_UNDEFINED(ni->ni_ucastkey)) { if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE || KEY_UNDEFINED(ic->ic_nw_keys[ic->ic_def_txkey])) return NULL; return &ic->ic_nw_keys[ic->ic_def_txkey]; - } else if (KEY_UNDEFINED(ni->ni_ucastkey)) { - if ((ic->ic_flags & IEEE80211_F_WPA) || - ic->ic_def_txkey == IEEE80211_KEYIX_NONE || - KEY_UNDEFINED(ic->ic_nw_keys[ic->ic_def_txkey])) - return NULL; - return &ic->ic_nw_keys[ic->ic_def_txkey]; } else { return &ni->ni_ucastkey; } -#undef KEY_UNDEFINED +} + +/* + * Return the transmit key to use in sending a multicast frame. + * Multicast traffic always uses the group key which is installed as + * the default tx key. + */ +static __inline struct ieee80211_key * +ieee80211_crypto_getmcastkey(struct ieee80211com *ic, struct ieee80211_node *ni) +{ + if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE || + KEY_UNDEFINED(ic->ic_nw_keys[ic->ic_def_txkey])) + return NULL; + return &ic->ic_nw_keys[ic->ic_def_txkey]; } /* @@ -449,11 +451,15 @@ * routines, but they will/should discard it. */ if (ic->ic_flags & IEEE80211_F_PRIVACY) { - key = ieee80211_crypto_getkey(ic, eh.ether_dhost, ni); + if (ic->ic_opmode == IEEE80211_M_STA || + !IEEE80211_IS_MULTICAST(eh.ether_dhost)) + key = ieee80211_crypto_getucastkey(ic, ni); + else + key = ieee80211_crypto_getmcastkey(ic, ni); if (key == NULL && eh.ether_type != htons(ETHERTYPE_PAE)) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, "[%s] no default transmit key (%s) deftxkey %u\n", - ether_sprintf(ni->ni_macaddr), __func__, + ether_sprintf(eh.ether_dhost), __func__, ic->ic_def_txkey); ic->ic_stats.is_tx_nodefkey++; } @@ -536,13 +542,14 @@ htole16(ni->ni_txseqs[0] << IEEE80211_SEQ_SEQ_SHIFT); ni->ni_txseqs[0]++; } - if (eh.ether_type != htons(ETHERTYPE_PAE) || - (key != NULL && (ic->ic_flags & IEEE80211_F_WPA))) { + if (key != NULL) { /* * IEEE 802.1X: send EAPOL frames always in the clear. * WPA/WPA2: encrypt EAPOL keys when pairwise keys are set. */ - if (key != NULL) { + if (eh.ether_type != htons(ETHERTYPE_PAE) || + ((ic->ic_flags & IEEE80211_F_WPA) && + !KEY_UNDEFINED(ni->ni_ucastkey))) { wh->i_fc[1] |= IEEE80211_FC1_WEP; /* XXX do fragmentation */ if (!ieee80211_crypto_enmic(ic, key, m)) { @@ -564,6 +571,7 @@ m_freem(m); return NULL; } +#undef KEY_UNDEFINED /* * Add a supported rates element id to a frame. @@ -1563,7 +1571,7 @@ ni->ni_savedq.ifq_drops, IEEE80211_PS_MAX_QUEUE); #ifdef IEEE80211_DEBUG if (ieee80211_msg_dumppkts(ic)) - ieee80211_dump_pkt(mtod(m, caddr_t), m->m_len, -1, -1); + ieee80211_dump_pkt(ic, mtod(m, caddr_t), m->m_len, -1, -1); #endif m_freem(m); return; From owner-p4-projects@FreeBSD.ORG Wed Dec 15 17:24:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74C5616A4D0; Wed, 15 Dec 2004 17:24:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A14B16A4CE for ; Wed, 15 Dec 2004 17:24:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBCF043D41 for ; Wed, 15 Dec 2004 17:24:38 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFHOc72064230 for ; Wed, 15 Dec 2004 17:24:38 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBFHOcjV064227 for perforce@freebsd.org; Wed, 15 Dec 2004 17:24:38 GMT (envelope-from areisse@nailabs.com) Date: Wed, 15 Dec 2004 17:24:38 GMT Message-Id: <200412151724.iBFHOcjV064227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 17:24:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=67131 Change 67131 by areisse@areisse_tislabs on 2004/12/15 17:23:47 types were not merged with rest of the policy... Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/devpts.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/file.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/network.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/nfs.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/procfs.te#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/security.te#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/x.te#1 branch Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#4 (text+ko) ==== @@ -15,108 +15,141 @@ # # null_device_t is the type of /dev/null. # -type null_device_t, file_type, mlstrustedobject; +type null_device_t, device_type, mlstrustedobject; # # zero_device_t is the type of /dev/zero. # -type zero_device_t, file_type, mlstrustedobject; +type zero_device_t, device_type, mlstrustedobject; # # console_device_t is the type of /dev/console. # -type console_device_t, file_type; +type console_device_t, device_type; # # memory_device_t is the type of /dev/kmem, # /dev/mem, and /dev/port. # -type memory_device_t, file_type; +type memory_device_t, device_type; # -# random_device_t is the type of /dev/urandom -# and /dev/random. +# random_device_t is the type of /dev/random +# urandom_device_t is the type of /dev/urandom # -type random_device_t, file_type; +type random_device_t, device_type; +type urandom_device_t, device_type; # # devtty_t is the type of /dev/tty. # -type devtty_t, file_type, mlstrustedobject; +type devtty_t, device_type, mlstrustedobject; # # tty_device_t is the type of /dev/*tty* # -type tty_device_t, file_type; +type tty_device_t, serial_device, device_type; + +# +# bsdpty_device_t is the type of /dev/[tp]ty[abcdepqrstuvwxyz][0-9a-f] +type bsdpty_device_t, device_type; + +# +# usbtty_device_t is the type of /dev/usr/tty* +# +type usbtty_device_t, serial_device, device_type; + +# +# printer_device_t is the type for printer devices +# +type printer_device_t, file_type, device_type; # # fixed_disk_device_t is the type of # /dev/hd* and /dev/sd*. # -type fixed_disk_device_t, file_type; +type fixed_disk_device_t, device_type; + +# +# scsi_generic_device_t is the type of /dev/sg* +# it gives access to ALL SCSI devices (both fixed and removable) +# +type scsi_generic_device_t, device_type; # # removable_device_t is the type of # /dev/scd* and /dev/fd*. # -type removable_device_t, file_type; +type removable_device_t, device_type; # # clock_device_t is the type of # /dev/rtc. # -type clock_device_t, file_type; +type clock_device_t, device_type; # # tun_tap_device_t is the type of /dev/net/tun/* and /dev/net/tap/* # -type tun_tap_device_t, file_type; +type tun_tap_device_t, device_type; # # misc_device_t is the type of miscellaneous devices. # XXX: FIXME! Appropriate access to these devices need to be identified. # -type misc_device_t, file_type; +type misc_device_t, device_type; # -# psaux_t is the type of the /dev/psaux mouse device. -# This type is deprecated and will be removed. +# A more general type for mouse devices. # -type psaux_t, file_type; +type mouse_device_t, device_type; # -# A more general type for mouse devices. +# For generic /dev/input/event* event devices # -type mouse_device_t, file_type; +type event_device_t, device_type; # # Not sure what these devices are for, but X wants access to them. # -type agp_device_t, file_type; -type dri_device_t, file_type; +type agp_device_t, device_type; +type dri_device_t, device_type; # Type for sound devices. -type sound_device_t, file_type; +type sound_device_t, device_type; # Type for /dev/ppp. -type ppp_device_t, file_type; +type ppp_device_t, device_type; # Type for frame buffer /dev/fb/* -type framebuf_device_t, file_type; +type framebuf_device_t, device_type; # Type for /dev/.devfsd -type devfs_control_t, file_type; +type devfs_control_t, device_type; # Type for /dev/cpu/mtrr -type mtrr_device_t, file_type; +type mtrr_device_t, device_type; # Type for /dev/bpf* type bpf_device_t, file_type; # Type for /dev/apm_bios -type apm_bios_t, file_type; +type apm_bios_t, device_type; # Type for v4l +type v4l_device_t, device_type; + +# tape drives +type tape_device_t, device_type; + +# scanners +type scanner_device_t, device_type; + +# cpu control devices /dev/cpu/0/* +type cpu_device_t, device_type; + +# for other device nodes such as the NVidia binary-only driver +type xserver_misc_device_t, device_type; type v4l_device_t, file_type; # Type for /dev/klog ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/devpts.te#4 (text+ko) ==== @@ -10,7 +10,7 @@ # # ptmx_t is the type for /dev/ptmx. # -type ptmx_t, file_type, sysadmfile; +type ptmx_t, file_type, sysadmfile, device_type; # # devpts_t is the type of the devpts file system and ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/file.te#4 (text+ko) ==== @@ -9,38 +9,47 @@ # # unlabeled_t is the type of unlabeled objects. -# Eventually, once all objects are labeled and -# controlled by the security policy, unlabeled_t -# will not be used. +# Objects that have no known labeling information or that +# have labels that are no longer valid are treated as having this type. # -type unlabeled_t, fs_type, file_type, root_dir_type, sysadmfile; +type unlabeled_t, sysadmfile; # -# fs_t is the default type of an unlabeled -# file system. When an unlabeled file system is -# mounted read-write, the file system is labeled -# with this type. Except for the root file system, -# other types may be specified using the fs_contexts -# or fs_contexts.mls file. +# fs_t is the default type for conventional filesystems. # type fs_t, fs_type; +# needs more work +type eventpollfs_t, fs_type; +type futexfs_t, fs_type; +type bdev_t, fs_type; +type usbfs_t, fs_type; +type nfsd_fs_t, fs_type; +type rpc_pipefs_t, fs_type; +type binfmt_misc_fs_t, fs_type; + # -# file_t is the default type of an unlabeled -# file. When an unlabeled file system is mounted -# read-write, all files in the file system are labeled -# with this type. Except for the root file system, -# other types may be specified using the fs_contexts -# or fs_contexts.mls file. +# file_t is the default type of a file that has not yet been +# assigned an extended attribute (EA) value (when using a filesystem +# that supports EAs). # type file_t, file_type, root_dir_type, sysadmfile; +# default_t is the default type for files that do not +# match any specification in the file_contexts configuration +# other than the generic /.* specification. +type default_t, file_type, root_dir_type, sysadmfile; + # # root_t is the type for the root directory. # type root_t, file_type, sysadmfile; # +# mnt_t is the type for mount points such as /mnt/cdrom +type mnt_t, file_type, sysadmfile; + +# # home_root_t is the type for the directory where user home directories # are created # @@ -74,6 +83,7 @@ # etc_t is the type of the system etc directories. # type etc_t, file_type, sysadmfile; + # # shadow_t is the type of the /etc/shadow file # @@ -93,16 +103,21 @@ type etc_runtime_t, file_type, sysadmfile; # +# fonts_runtime_t is the type of various +# fonts files in /usr that are automatically +# generated during initialization. +# +type fonts_t, file_type, sysadmfile, usercanread; + +# # etc_aliases_t is the type of the aliases database. -# etc_mail_t is the type of /etc/mail. -# sendmail needs write access to these files. # type etc_aliases_t, file_type, sysadmfile; -type etc_mail_t, file_type, sysadmfile; -# resolv_conf_t is the type of the /etc/resolv.conf file. -# pump needs write access to this file. -type resolv_conf_t, file_type, sysadmfile; +# net_conf_t is the type of the /etc/resolv.conf file. +# all DHCP clients and PPP need write access to this file. +type net_conf_t, file_type, sysadmfile; +typealias net_conf_t alias resolv_conf_t; # # lib_t is the type of files in the system lib directories. @@ -169,9 +184,6 @@ type var_yp_t, file_type, sysadmfile; type var_db_t, file_type, sysadmfile; -# Type for /var/log/sa. -type var_log_sa_t, file_type, sysadmfile, logfile; - # Type for /var/log/ksyms. type var_log_ksyms_t, file_type, sysadmfile, logfile; @@ -179,7 +191,7 @@ type lastlog_t, file_type, sysadmfile, logfile; # Type for /var/lib/nfs. -type var_lib_nfs_t, file_type, sysadmfile; +type var_lib_nfs_t, file_type, sysadmfile, usercanread; # # wtmp_t is the type of /var/log/wtmp. @@ -192,11 +204,6 @@ type catman_t, file_type, sysadmfile, tmpfile; # -# at_spool_t is the type for /var/spool/at. -# -type at_spool_t, file_type, sysadmfile; - -# # cron_spool_t is the type for /var/spool/cron. # type cron_spool_t, file_type, sysadmfile; @@ -245,34 +252,49 @@ # # locale_t is the type for system localization # -type locale_t, file_type; +type locale_t, file_type, sysadmfile; # # Allow each file type to be associated with # the default file system type. # -allow file_type fs_t:filesystem associate; +allow { file_type device_type } fs_t:filesystem associate; # Allow the pty to be associated with the file system. allow devpts_t devpts_t:filesystem associate; -allow tty_device_t device_t:filesystem associate; -allow device_t device_t:filesystem associate; type tmpfs_t, file_type, sysadmfile, fs_type, root_dir_type; allow { tmpfs_t tmp_t } tmpfs_t:filesystem associate; -type usbdevfs_t, fs_type, root_dir_type, sysadmfile; +type autofs_t, fs_type, root_dir_type, noexattrfile, sysadmfile; +allow autofs_t autofs_t:filesystem associate; + +type usbdevfs_t, fs_type, root_dir_type, noexattrfile, sysadmfile; allow usbdevfs_t usbdevfs_t:filesystem associate; -type usbdevfs_device_t, file_type, sysadmfile; -allow usbdevfs_device_t usbdevfs_t:filesystem associate; -type sysfs_t alias driverfs_t, fs_type, root_dir_type, sysadmfile; +type sysfs_t, fs_type, root_dir_type, sysadmfile; allow sysfs_t sysfs_t:filesystem associate; -type iso9660_t, fs_type, root_dir_type, sysadmfile; +type iso9660_t, fs_type, root_dir_type, noexattrfile, sysadmfile; allow iso9660_t iso9660_t:filesystem associate; -type dosfs_t, fs_type, root_dir_type, sysadmfile; +type romfs_t, fs_type, root_dir_type, sysadmfile; +allow romfs_t romfs_t:filesystem associate; + +type ramfs_t, fs_type, root_dir_type, sysadmfile; +allow ramfs_t ramfs_t:filesystem associate; + +type dosfs_t, fs_type, root_dir_type, noexattrfile, sysadmfile; allow dosfs_t dosfs_t:filesystem associate; +# udev_runtime_t is the type of the udev table file +type udev_runtime_t, file_type, sysadmfile; + +# krb5_conf_t is the type of the /etc/krb5.conf file +type krb5_conf_t, file_type, sysadmfile; + +type sambafs_t, fs_type, root_dir_type, noexattrfile, sysadmfile; +allow sambafs_t sambafs_t:filesystem associate; +typealias sambafs_t alias cifs_t; + type var_db_entropy_t, file_type, sysadmfile; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/network.te#4 (text+ko) ==== @@ -8,35 +8,55 @@ # Modified by Russell Coker # Move port types to their respective domains, add ifdefs, other cleanups. -############################################ +# generally we do not want to define port types in this file, but some things +# are insanely difficult to do elsewhere, xserver_port_t is a good example +# getting the type defined is the easy part for X, conditional code for many +# other domains (including one that starts with a) is the hard part. +ifdef(`xdm.te', `define(`use_x_ports')') +ifdef(`startx.te', `define(`use_x_ports')') +ifdef(`xauth.te', `define(`use_x_ports')') +ifdef(`xserver.te', `define(`use_x_ports')') +ifdef(`use_x_ports', ` +type xserver_port_t, port_type; +') # -# Network types +# Defines used by the te files need to be defined outside of net_constraints # +ifdef(`named.te', `define(`use_dns')') +ifdef(`nsd.te', `define(`use_dns')') +ifdef(`tinydns.te', `define(`use_dns')') +ifdef(`dnsmasq.te', `define(`use_dns')') +ifdef(`use_dns', ` +type dns_port_t, port_type; +') + +ifdef(`dhcpd.te', `define(`use_dhcpd')') +ifdef(`dnsmasq.te', `define(`use_dhcpd')') +ifdef(`use_dhcpd', ` +type dhcpd_port_t, port_type; +') + +ifdef(`cyrus.te', `define(`use_pop')') +ifdef(`courier.te', `define(`use_pop')') +ifdef(`perdition.te', `define(`use_pop')') +ifdef(`dovecot.te', `define(`use_pop')') +ifdef(`uwimapd.te', `define(`use_pop')') +ifdef(`use_pop', ` +type pop_port_t, port_type; +') +ifdef(`apache.te', `define(`use_http_cache')') +ifdef(`squid.te', `define(`use_http_cache')') +ifdef(`use_http_cache', ` +type http_cache_port_t, port_type; +') -# -# any_socket_t is the default destination -# socket type for UDP traffic. Unless a -# destination socket type is explicitly specified -# using sendto_secure/sendmsg_secure, this type -# is used for the udp_socket sendto permission check. -# -type any_socket_t, socket_type; -role system_r types any_socket_t; +ifdef(`dhcpd.te', `define(`use_pxe')') +ifdef(`pxe.te', `define(`use_pxe')') +############################################ # -# igmp_packet_t is the type of kernel-generated IGMP packets. -# icmp_socket_t is the type of the kernel socket used to send ICMP messages. -# tcp_socket_t is the type of the kernel socket used to send TCP resets. -# scmp_packet_t is the type for SCMP packets used by the SELOPT packet labeling. +# Network types # -type igmp_packet_t; -role system_r types igmp_packet_t; -type icmp_socket_t, socket_type; -role system_r types icmp_socket_t; -type tcp_socket_t, socket_type; -role system_r types tcp_socket_t; -type scmp_packet_t; -role system_r types scmp_packet_t; # # port_t is the default type of INET port numbers. @@ -62,22 +82,6 @@ type netif_ipsec2_t, netif_type; # -# netmsg_t is the default type of unlabeled received messages. -# The netmsg_*_t types are used for specific network -# interfaces in net_contexts or net_contexts.mls. -# -type netmsg_t, netmsg_type; -type netmsg_eth0_t, netmsg_type; -type netmsg_eth1_t, netmsg_type; -type netmsg_eth2_t, netmsg_type; -type netmsg_lo_t, netmsg_type; -type netmsg_ippp0_t, netmsg_type; - -type netmsg_ipsec0_t, netmsg_type; -type netmsg_ipsec1_t, netmsg_type; -type netmsg_ipsec2_t, netmsg_type; - -# # node_t is the default type of network nodes. # The node_*_t types are used for specific network # nodes in net_contexts or net_contexts.mls. @@ -85,54 +89,18 @@ type node_t, node_type; type node_lo_t, node_type; type node_internal_t, node_type; +type node_inaddr_any_t, node_type; +type node_unspec_t, node_type; +type node_link_local_t, node_type; +type node_site_local_t, node_type; +type node_multicast_t, node_type; +type node_mapped_ipv4_t, node_type; +type node_compat_ipv4_t, node_type; -# -# Permissions for the kernel-generated IGMP packets. -# -allow igmp_packet_t netif_type:netif { rawip_send rawip_recv }; -allow igmp_packet_t node_type:node { rawip_send rawip_recv }; +# Kernel-generated traffic, e.g. ICMP replies. +allow kernel_t netif_type:netif { rawip_send rawip_recv }; +allow kernel_t node_type:node { rawip_send rawip_recv }; -# -# Permissions for the kernel ICMP socket. -# -allow icmp_socket_t netif_type:netif { rawip_send rawip_recv }; -allow icmp_socket_t node_type:node { rawip_send rawip_recv }; -allow icmp_socket_t netmsg_type:rawip_socket recvfrom; - -# -# Permissions for the kernel TCP reset socket. -# -allow tcp_socket_t netif_type:netif { tcp_send tcp_recv }; -allow tcp_socket_t netmsg_type:tcp_socket recvfrom; -allow tcp_socket_t node_type:node { tcp_send tcp_recv }; - -# -# Allow network messages to be received. -# -allow netmsg_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_eth0_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_eth0_t netif_eth0_t:netif { tcp_recv udp_recv rawip_recv }; -allow netmsg_eth1_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_eth1_t netif_eth1_t:netif { tcp_recv udp_recv rawip_recv }; -allow netmsg_eth2_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_eth2_t netif_eth2_t:netif { tcp_recv udp_recv rawip_recv }; -allow netmsg_lo_t node_lo_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_lo_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_lo_t netif_lo_t:netif { tcp_recv udp_recv rawip_recv }; -allow netmsg_ippp0_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_ippp0_t netif_ippp0_t:netif { tcp_recv udp_recv rawip_recv }; -allow netmsg_ipsec0_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_ipsec0_t netif_ipsec0_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_ipsec1_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_ipsec1_t netif_ipsec1_t:netif { tcp_recv udp_recv rawip_recv }; -allow netmsg_ipsec2_t node_t:node { tcp_recv udp_recv rawip_recv }; -allow netmsg_ipsec2_t netif_ipsec2_t:netif { tcp_recv udp_recv rawip_recv }; - -# -# Allow ICMP echo requests to be sent and received, and echo replies to -# be received (when packets are labeled) -# -ifdef(`ping.te', -`allow ping_t netif_type:netif { rawip_send rawip_recv }; -allow ping_t node_type:node { rawip_send rawip_recv }; -allow ping_t netmsg_type:rawip_socket { recvfrom };') +# Kernel-generated traffic, e.g. TCP resets. +allow kernel_t netif_type:netif { tcp_send tcp_recv }; +allow kernel_t node_type:node { tcp_send tcp_recv }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/nfs.te#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/procfs.te#4 (text+ko) ==== @@ -21,21 +21,26 @@ # sysctl_fs_t is the type of /proc/sys/fs. # sysctl_kernel_t is the type of /proc/sys/kernel. # sysctl_modprobe_t is the type of /proc/sys/kernel/modprobe. +# sysctl_hotplug_t is the type of /proc/sys/kernel/hotplug. # sysctl_net_t is the type of /proc/sys/net. # sysctl_net_unix_t is the type of /proc/sys/net/unix. # sysctl_vm_t is the type of /proc/sys/vm. # sysctl_dev_t is the type of /proc/sys/dev. +# sysctl_rpc_t is the type of /proc/net/rpc. # # These types are applied to both the entries in # /proc/sys and the corresponding sysctl parameters. # -type sysctl_t; -type sysctl_fs_t; -type sysctl_kernel_t; -type sysctl_modprobe_t; -type sysctl_net_t; -type sysctl_net_unix_t; -type sysctl_vm_t; -type sysctl_dev_t; +type sysctl_t, sysctl_type; +type sysctl_fs_t, sysctl_type; +type sysctl_kernel_t, sysctl_type; +type sysctl_modprobe_t, sysctl_type; +type sysctl_hotplug_t, sysctl_type; +type sysctl_net_t, sysctl_type; +type sysctl_net_unix_t, sysctl_type; +type sysctl_vm_t, sysctl_type; +type sysctl_dev_t, sysctl_type; +type sysctl_rpc_t, sysctl_type; +type sysctl_irq_t, sysctl_type; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/security.te#4 (text+ko) ==== @@ -15,7 +15,7 @@ type security_t, fs_type; # -# policy_config_t is the type of /ss_policy, +# policy_config_t is the type of /etc/security/selinux/* # the security server policy configuration. # type policy_config_t, file_type; @@ -28,17 +28,15 @@ # # default_context_t is the type applied to -# /etc/security/default_context +# /etc/selinux/*/contexts/* # type default_context_t, file_type, sysadmfile, login_contexts; # -# file_labels_t is the type of the persistent -# label mapping stored in each file system. -# The mapping files are in the ...security -# subdirectory at the root of each file system. +# file_context_t is the type applied to +# /etc/selinux/*/contexts/files # -type file_labels_t, file_type, sysadmfile; +type file_context_t, file_type, sysadmfile; # # no_access_t is the type for objects that should @@ -46,4 +44,10 @@ # type no_access_t, file_type, sysadmfile; +# +# selinux_config_t is the type applied to +# /etc/selinux/config +# +type selinux_config_t, file_type, sysadmfile; + From owner-p4-projects@FreeBSD.ORG Wed Dec 15 19:16:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F63F16A4D0; Wed, 15 Dec 2004 19:16:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0580216A4CE for ; Wed, 15 Dec 2004 19:16:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2DA143D48 for ; Wed, 15 Dec 2004 19:16:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFJGtkN068177 for ; Wed, 15 Dec 2004 19:16:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBFJGt5Z068174 for perforce@freebsd.org; Wed, 15 Dec 2004 19:16:55 GMT (envelope-from sam@freebsd.org) Date: Wed, 15 Dec 2004 19:16:55 GMT Message-Id: <200412151916.iBFJGt5Z068174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 19:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=67136 Change 67136 by sam@sam_ebb on 2004/12/15 19:16:46 add debug sysctl to override driver capabilities Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#11 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#11 (text+ko) ==== @@ -123,6 +123,9 @@ "inact_init", CTLTYPE_INT | CTLFLAG_RW, &ic->ic_inact_init, 0, ieee80211_sysctl_inact, "I", "station initial state timeout (sec)"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "driver_caps", CTLFLAG_RW, &ic->ic_caps, 0, + "driver capabilities"); ic->ic_sysctl = ctx; } From owner-p4-projects@FreeBSD.ORG Wed Dec 15 19:17:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A92916A4D1; Wed, 15 Dec 2004 19:17:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB1F716A4CE for ; Wed, 15 Dec 2004 19:17:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 984D943D58 for ; Wed, 15 Dec 2004 19:17:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFJHvY3068202 for ; Wed, 15 Dec 2004 19:17:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBFJHvx2068199 for perforce@freebsd.org; Wed, 15 Dec 2004 19:17:57 GMT (envelope-from sam@freebsd.org) Date: Wed, 15 Dec 2004 19:17:57 GMT Message-Id: <200412151917.iBFJHvx2068199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 19:17:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=67137 Change 67137 by sam@sam_ebb on 2004/12/15 19:17:49 add stat for enmic failures Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#27 edit .. //depot/projects/wifi/tools/tools/ath/80211stats.c#6 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#18 (text+ko) ==== @@ -167,6 +167,7 @@ u_int32_t is_crypto_attachfail; /* cipher attach failed */ u_int32_t is_crypto_swfallback; /* cipher fallback to s/w */ u_int32_t is_crypto_keyfail; /* driver key alloc failed */ + u_int32_t is_crypto_enmicfail; /* en-MIC failed */ u_int32_t is_ibss_capmismatch; /* merge failed-cap mismatch */ u_int32_t is_ibss_norate; /* merge failed-rate mismatch */ u_int32_t is_ps_unassoc; /* ps-poll for unassoc. sta */ ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#27 (text+ko) ==== @@ -229,6 +229,7 @@ * bytes recovered to which we need additional space for the * 802.11 header and any crypto header. */ + /* XXX check trailing space and copy instead? */ if (M_LEADINGSPACE(m) < needed_space - TO_BE_RECLAIMED) { struct mbuf *n = m_gethdr(M_NOWAIT, m->m_type); if (n == NULL) { @@ -556,7 +557,7 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_OUTPUT, "[%s] enmic failed, discard frame\n", ether_sprintf(eh.ether_dhost)); - /* XXX statistic */ + ic->ic_stats.is_crypto_enmicfail++; goto bad; } } ==== //depot/projects/wifi/tools/tools/ath/80211stats.c#6 (text+ko) ==== @@ -137,7 +137,8 @@ STAT(crypto_nocipher, "setkey failed 'cuz cipher module unavailable"); STAT(crypto_attachfail, "setkey failed 'cuz cipher attach failed"); STAT(crypto_swfallback, "crypto fell back to s/w implementation"); - STAT(crypto_keyfail, "setkey faied 'cuz driver key alloc failed"); + STAT(crypto_keyfail, "setkey failed 'cuz driver key alloc failed"); + STAT(crypto_enmicfail, "enmic failed (may be mbuf exhaustion)"); STAT(ibss_capmismatch, "ibss merge faied 'cuz capabilities mismatch"); STAT(ibss_norate, "ibss merge faied 'cuz rate set mismatch"); STAT(ps_unassoc, "ps-poll received for unassociated station"); From owner-p4-projects@FreeBSD.ORG Wed Dec 15 19:21:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01B7316A4D0; Wed, 15 Dec 2004 19:21:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D178B16A4CE for ; Wed, 15 Dec 2004 19:21:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0D9B43D53 for ; Wed, 15 Dec 2004 19:21:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFJL1TH068339 for ; Wed, 15 Dec 2004 19:21:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBFJL1VP068336 for perforce@freebsd.org; Wed, 15 Dec 2004 19:21:01 GMT (envelope-from sam@freebsd.org) Date: Wed, 15 Dec 2004 19:21:01 GMT Message-Id: <200412151921.iBFJL1VP068336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 19:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=67138 Change 67138 by sam@sam_ebb on 2004/12/15 19:20:51 for parts that require split keycache entries report the the index of the first entry on a mic error so we're consistent with parts that don't have split keycache Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#43 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#43 (text+ko) ==== @@ -2608,7 +2608,10 @@ BUS_DMASYNC_POSTREAD); ieee80211_notify_michael_failure(ic, mtod(m, struct ieee80211_frame *), - ds->ds_rxstat.rs_keyix); + sc->sc_splitmic ? + ds->ds_rxstat.rs_keyix-32 : + ds->ds_rxstat.rs_keyix + ); } } ifp->if_ierrors++; From owner-p4-projects@FreeBSD.ORG Wed Dec 15 19:27:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 724E216A4D8; Wed, 15 Dec 2004 19:27:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47E0516A4DF for ; Wed, 15 Dec 2004 19:27:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D366B43D3F for ; Wed, 15 Dec 2004 19:27:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFJR9Nl068478 for ; Wed, 15 Dec 2004 19:27:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBFJR9HG068475 for perforce@freebsd.org; Wed, 15 Dec 2004 19:27:09 GMT (envelope-from sam@freebsd.org) Date: Wed, 15 Dec 2004 19:27:09 GMT Message-Id: <200412151927.iBFJR9HG068475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 67139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 19:27:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=67139 Change 67139 by sam@sam_ebb on 2004/12/15 19:26:48 IFC @ 67138 Affected files ... .. //depot/projects/wifi/UPDATING#7 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#7 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/wifi/etc/rc.d/jail#3 integrate .. //depot/projects/wifi/etc/rc.d/ppp-user#2 integrate .. //depot/projects/wifi/etc/rc.shutdown#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/wifi/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/wifi/share/examples/etc/make.conf#5 integrate .. //depot/projects/wifi/share/examples/ppp/ppp.conf.isdn#2 integrate .. //depot/projects/wifi/share/examples/ppp/ppp.conf.sample#3 integrate .. //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp#3 integrate .. //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp.working#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#9 integrate .. //depot/projects/wifi/share/man/man4/aac.4#2 integrate .. //depot/projects/wifi/share/man/man4/acpi.4#3 integrate .. //depot/projects/wifi/share/man/man4/firewire.4#2 integrate .. //depot/projects/wifi/share/man/man4/fwe.4#2 integrate .. //depot/projects/wifi/share/man/man4/fwip.4#2 integrate .. //depot/projects/wifi/share/man/man4/fwohci.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/Makefile#2 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/snd_audiocs.4#1 branch .. //depot/projects/wifi/share/man/man4/polling.4#3 integrate .. //depot/projects/wifi/share/man/man4/pst.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_maestro.4#1 branch .. //depot/projects/wifi/share/man/man4/snd_maestro3.4#2 integrate .. //depot/projects/wifi/share/man/man4/txp.4#2 integrate .. //depot/projects/wifi/share/man/man4/vpo.4#2 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#5 integrate .. //depot/projects/wifi/share/man/man9/Makefile#5 integrate .. //depot/projects/wifi/share/man/man9/kernel_mount.9#1 branch .. //depot/projects/wifi/share/misc/bsd-family-tree#5 integrate .. //depot/projects/wifi/sys/arm/arm/intr.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/wifi/sys/conf/files.amd64#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#44 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/wifi/sys/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/wifi/sys/dev/fb/vga.c#2 integrate .. //depot/projects/wifi/sys/dev/ida/ida.c#2 integrate .. //depot/projects/wifi/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ida/idavar.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/wifi/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_switch.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_thread.c#4 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#5 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#4 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/wifi/sys/sys/filedesc.h#6 integrate .. //depot/projects/wifi/sys/sys/proc.h#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/wifi/tools/tools/kttcp/kttcp.c#2 integrate .. //depot/projects/wifi/tools/tools/kttcp/sys/kttcp.c#2 integrate .. //depot/projects/wifi/usr.bin/rev/rev.c#2 integrate .. //depot/projects/wifi/usr.sbin/fwcontrol/fwcontrol.8#2 integrate Differences ... ==== //depot/projects/wifi/UPDATING#7 (text+ko) ==== @@ -23,6 +23,13 @@ developers choose to disable these features on build machines to maximize performance. +20041213: + The behaviour of ppp(8) has changed slightly. If lqr is enabled + (``enable lqr''), older versions would revert to LCP ECHO mode on + negotiation failure. Now, ``enable echo'' is required for this + behaviour. The ppp version number has been bumped to 3.4.2 to + reflect the change. + 20041201: The wlan support has been updated to split the crypto support into separate modules. For static WEP you must configure the @@ -1977,4 +1984,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.382 2004/12/12 07:22:16 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.383 2004/12/13 17:52:10 brian Exp $ ==== //depot/projects/wifi/etc/defaults/rc.conf#7 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.235 2004/12/15 12:39:28 brian Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -146,6 +146,7 @@ # User ppp configuration. ppp_enable="NO" # Start user-ppp (or NO). +ppp_program="/usr/sbin/ppp" # Path to user-ppp program. ppp_mode="auto" # Choice of "auto", "ddial", "direct" or "dedicated". # For details see man page for ppp(8). Default is auto. ppp_nat="YES" # Use PPP's internal network address translation or NO. @@ -493,7 +494,8 @@ #jail_example_rootdir="/usr/jail/default" # Jail's root directory #jail_example_hostname="default.domain.com" # Jail's hostname #jail_example_ip="192.168.0.10" # Jail's IP number -#jail_example_exec="/bin/sh /etc/rc" # command to execute in jail +#jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting +#jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping #jail_example_devfs_enable="NO" # mount devfs in the jail #jail_example_fdescfs_enable="NO" # mount fdescfs in the jail #jail_example_procfs_enable="NO" # mount procfs in jail ==== //depot/projects/wifi/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.93 2004/09/27 08:18:43 dougb Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.94 2004/12/15 13:58:28 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -54,8 +54,6 @@ .. .. fs - autofs - .. devfs .. fdescfs ==== //depot/projects/wifi/etc/rc.d/jail#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.19 2004/11/24 10:44:39 mux Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.20 2004/12/14 14:36:35 rse Exp $ # # PROVIDE: jail @@ -34,7 +34,21 @@ eval jail_hostname=\"\$jail_${_j}_hostname\" eval jail_ip=\"\$jail_${_j}_ip\" eval jail_exec=\"\$jail_${_j}_exec\" - [ -z "${jail_exec}" ] && jail_exec="/bin/sh /etc/rc" + eval jail_exec_start=\"\$jail_${_j}_exec_start\" + eval jail_exec_stop=\"\$jail_${_j}_exec_stop\" + if [ -n "${jail_exec}" ]; then + # simple/backward-compatible execution + jail_exec_start="${jail_exec}" + jail_exec_stop="" + else + # flexible execution + if [ -z "${jail_exec_start}" ]; then + jail_exec_start="/bin/sh /etc/rc" + if [ -z "${jail_exec_stop}" ]; then + jail_exec_stop="/bin/sh /etc/rc.shutdown" + fi + fi + fi # The default jail ruleset will be used by rc.subr if none is specified. eval jail_ruleset=\"\$jail_${_j}_devfs_ruleset\" @@ -65,6 +79,8 @@ debug "$_j procdir: $jail_procdir" debug "$_j ruleset: $jail_ruleset" debug "$_j fstab: $jail_fstab" + debug "$_j exec start: $jail_exec_start" + debug "$_j exec stop: $jail_exec_stop" } # set_sysctl rc_knob mib msg @@ -177,8 +193,8 @@ fi fi _tmp_jail=${_tmp_dir}/jail.$$ - jail -i ${jail_rootdir} ${jail_hostname} \ - ${jail_ip} ${jail_exec} > ${_tmp_jail} 2>&1 + eval jail -l -U root -i ${jail_rootdir} ${jail_hostname} \ + ${jail_ip} ${jail_exec_start} > ${_tmp_jail} 2>&1 [ "$?" -eq 0 ] && echo -n " $jail_hostname" _jail_id=$(head -1 ${_tmp_jail}) tail +2 ${_tmp_jail} >${jail_rootdir}/var/log/console.log @@ -198,7 +214,13 @@ _jail_id=$(cat /var/run/jail_${_jail}.id) if [ ! -z "${_jail_id}" ]; then init_variables $_jail + if [ -n "${jail_exec_stop}" ]; then + eval env -i /usr/sbin/jexec ${_jail_id} ${jail_exec_stop} \ + >> ${jail_rootdir}/var/log/console.log 2>&1 + fi killall -j ${_jail_id} -TERM > /dev/null 2>&1 + sleep 1 + killall -j ${_jail_id} -KILL > /dev/null 2>&1 jail_umount_fs echo -n " $jail_hostname" fi ==== //depot/projects/wifi/etc/rc.d/ppp-user#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp-user,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ppp-user,v 1.7 2004/12/15 12:39:28 brian Exp $ # # PROVIDE: ppp-user @@ -10,11 +10,11 @@ . /etc/rc.subr name="ppp" -rcvar="ppp_enable" -start_cmd="ppp_start" -stop_cmd=":" +rcvar=`set_rcvar` +start_precmd="ppp_precmd" +start_postcmd="ppp_postcmd" -ppp_start() +ppp_precmd() { # Establish ppp mode. # @@ -24,21 +24,21 @@ ppp_mode="auto" fi - ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}" + rc_flags="$rc_flags -quiet -${ppp_mode}" # Switch on NAT mode? # case ${ppp_nat} in [Yy][Ee][Ss]) - ppp_command="${ppp_command} -nat" + rc_flags="$rc_flags -nat" ;; esac - ppp_command="${ppp_command} ${ppp_profile}" + rc_flags="$rc_flags ${ppp_profile}" +} - echo "Starting ppp as \"${ppp_user}\"" - su -m ${ppp_user} -c "exec ${ppp_command}" - +ppp_postcmd() +{ # Re-Sync ipfilter so it picks up any new network interfaces # /etc/rc.d/ipfilter resync ==== //depot/projects/wifi/etc/rc.shutdown#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/etc/rc.shutdown,v 1.29 2004/10/17 13:39:42 schweikh Exp $ +# $FreeBSD: src/etc/rc.shutdown,v 1.30 2004/12/14 14:36:35 rse Exp $ # # Site-specific closing actions for daemons run by init on shutdown, @@ -80,7 +80,9 @@ # Determine the shutdown order of the /etc/rc.d scripts, # and perform the operation # -files=`rcorder -k shutdown /etc/rc.d/* 2>/dev/null` +rcorder_opts="-k shutdown" +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && rcorder_opts="$rcorder_opts -s nojail" +files=`rcorder ${rcorder_opts} /etc/rc.d/* 2>/dev/null` for _rc_elem in `reverse_list $files`; do debug "run_rc_script $_rc_elem faststop" ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.263 2004/11/27 13:57:22 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.266 2004/12/14 22:21:51 simon Exp $ Supported Devices @@ -182,8 +182,7 @@ &hwlist.nsp; - Adaptec AIC-7110 Parallel to SCSI interfaces (&man.vpo.4; driver) - + &hwlist.vpo; &hwlist.ida; @@ -191,9 +190,7 @@ &hwlist.iir; - Promise SuperTrak ATA RAID controllers (&man.pst.4; - driver) - + &hwlist.pst; &hwlist.hptmv; @@ -741,23 +738,13 @@ ES1868, ES1869, ES1879 and ES1888 (&man.sbc.4; driver) - - Maestro-1, Maestro-2, and Maestro-2E - - - Maestro-3/Allegro - - The Maestro-3/Allegro cannot be compiled into the - &os; kernel due to licensing restrictions. To use this - driver, add the following line to - /boot/loader.conf: - - snd_maestro3_load="YES" - - + &hwlist.snd.maestro; + + &hwlist.snd.maestro3; + ForteMedia fm801 &hwlist.snd.gusc; @@ -806,6 +793,8 @@ &hwlist.snd.ich; + &hwlist.snd.audiocs; + NEC PC-9801-73, 86 and compatibles (nss driver) ==== //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#5 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.46 2004/11/27 13:57:22 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.49 2004/12/14 22:21:51 simon Exp $ # # @@ -93,10 +93,12 @@ sbp i386,sparc64,ia64,amd64 sf i386,pc98,alpha,ia64,amd64 sis i386,pc98,alpha,ia64,amd64 +pst i386 sk i386,pc98,alpha,amd64 sn i386,amd64 snc pc98 snd_ad1816 i386,amd64 +snd_audiocs sparc64 snd_cmi i386,amd64 snd_cs4281 i386,amd64 snd_csa i386,amd64 @@ -106,6 +108,8 @@ snd_ess i386,amd64 snd_gusc i386,amd64 snd_ich i386,amd64 +snd_maestro i386,alpha,amd64 +snd_maestro3 i386,alpha,amd64 snd_solo i386,amd64 ste i386,pc98,alpha,amd64 stg i386,pc98 @@ -130,6 +134,7 @@ uvisor i386,pc98,amd64 uvscom i386,pc98,amd64 vge i386,pc98,amd64 +vpo i386 vr i386,pc98,alpha,amd64 vx i386,pc98,ia64,amd64 wb i386,pc98,alpha,amd64 ==== //depot/projects/wifi/release/doc/share/misc/man2hwnotes.pl#2 (text+ko) ==== @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.10 2004/09/11 15:14:13 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.11 2004/12/14 13:07:58 simon Exp $ # # Parse the list of supported hardware out of section 4 manual pages @@ -40,7 +40,8 @@ # arguments to the .It command, only the argument will be printed. # Usage: -# mdoc2sgml [-l] [-d 0-6] [-a ] [-o ] [ ...] +# man2hwnotes.pl [-l] [-d 0-6] [-a ] [-o ] +# [ ...] use strict; use Getopt::Std; @@ -172,11 +173,12 @@ dlog(3, "Setting Nm to $1"); $mdocvars{Nm} = $1; # "_" cannot be used for an entity name. - $mdocvars{Nm} =~ s,_,.,g; + $mdocvars{EntNm} = $1; + $mdocvars{EntNm} =~ s,_,.,g; } elsif (/^Nm$/) { if (defined($mdocvars{Nm}) && $mdocvars{Nm} ne "") { - parabuf_addline(\%mdocvars, "&man.".$mdocvars{Nm}.".$cur_mansection;"); + parabuf_addline(\%mdocvars, "&man.".$mdocvars{EntNm}.".$cur_mansection;"); } else { dlog(2, "Warning: Bad Nm call in $manpage"); } @@ -194,7 +196,7 @@ add_sgmltag(\%mdocvars, "&hwlist.preamble.pre; " . - "&man.".$mdocvars{Nm}.".$cur_mansection; " . + "&man.".$mdocvars{EntNm}.".$cur_mansection; " . "&hwlist.preamble.post;"); } } elsif ($mdocvars{isin_hwlist}) { ==== //depot/projects/wifi/share/examples/etc/make.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.240 2004/11/13 20:40:29 bz Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.241 2004/12/15 02:10:50 trhodes Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -108,38 +108,44 @@ #ENABLE_SUID_NEWGRP= # # To avoid building various parts of the base system: +#NOALIAS= # do not build ppp(8) with NAT support (see make.conf(5)) +#NOATM= # do not build ATM related programs and libraries +#NOCRYPT= # do not build any crypto code +#NOGAMES= # do not build games (games/ subdir) +#NOINET6= # do not build IPv6 related programs and libraries +#NOINFO= # do not make or install info files +#NOIPSEC= # do not build traceroute(8) with IPSEC support +#NOLIBC_R= # do not build libc_r (re-entrant version of libc) +#NOLIBPTHREAD= # do not build libpthread (M:N threading library) +#NOLIBTHR= # do not build libthr (1:1 threading library) +#NOMAN= # do not build manual pages +#NONAT= # do not build ppp(8) with NAT support (see make.conf(5)) +#NONETGRAPH= # do not build ppp(8) with NETGRAPH support +#NOPROFILE= # Avoid compiling profiled libraries +#NORADUIS= # do not build ppp(8) with RADUIS support +#NOSHARE= # do not go into the share subdir +#NOSHARED= # build /bin and /sbin dynamically linked (bad idea #NO_ACPI= # do not build acpiconf(8) and related programs -#NOATM= # do not build ATM related programs and libraries #NO_AUTHPF= # do not build and install authpf (setuid/gid) #NO_BLUETOOTH= # do not build Bluetooth related stuff #NO_BOOT= # do not build boot blocks and loader -#NOCRYPT= # do not build any crypto code #NO_CVS= # do not build CVS #NO_CXX= # do not build C++ and friends #NO_DYNAMICROOT= # do not link /bin and /sbin dynamically #NO_FORTRAN= # do not build g77 and related libraries -#NOGAMES= # do not build games (games/ subdir) #NO_GDB= # do not build GDB #NO_I4B= # do not build isdn4bsd package -#NOINET6= # do not build IPv6 related programs and libraries -#NOINFO= # do not make or install info files #NO_IPFILTER= # do not build IP Filter package #NO_KERBEROS= # do not build and install Kerberos 5 (KTH Heimdal) -#NOLIBC_R= # do not build libc_r (re-entrant version of libc) -#NOLIBPTHREAD= # do not build libpthread (M:N threading library) -#NOLIBTHR= # do not build libthr (1:1 threading library) #NO_LPR= # do not build lpr and related programs #NO_MAILWRAPPER= # do not build the mailwrapper(8) MTA selector -#NOMAN= # do not build manual pages #NO_MODULES= # do not build modules with the kernel #NO_NIS= # do not build NIS support and related programs #NO_OBJC= # do not build Objective C support #NO_OPENSSH= # do not build OpenSSH #NO_OPENSSL= # do not build OpenSSL (implies NO_KERBEROS/NO_OPENSSH) #NO_PF= # do not build PF firewall package -#NOPROFILE= # Avoid compiling profiled libraries #NO_SENDMAIL= # do not build sendmail and related programs -#NOSHARE= # do not go into the share subdir #NO_SHAREDOCS= # do not build the 4.4BSD legacy docs #NO_TCSH= # do not build and install /bin/csh (which is tcsh) #NO_TOOLCHAIN= # do not build programs for program development ==== //depot/projects/wifi/share/examples/ppp/ppp.conf.isdn#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/share/examples/ppp/ppp.conf.isdn,v 1.11 2003/04/10 21:33:02 keramida Exp $ +# $FreeBSD: src/share/examples/ppp/ppp.conf.isdn,v 1.12 2004/12/13 17:54:30 brian Exp $ # This is an example ppp profile for bringing up a multilink ppp connection # over ISDN. It needs at least version 0.83.0 of the i4b code. An example @@ -41,7 +41,7 @@ set enddisc mac # Assuming you have a LAN - enable lqr + enable lqr echo set reconnect 3 5 set redial 3 10 set lqrperiod 45 ==== //depot/projects/wifi/share/examples/ppp/ppp.conf.sample#3 (text+ko) ==== @@ -4,7 +4,7 @@ # # Originally written by Toshiharu OHNO # -# $FreeBSD: src/share/examples/ppp/ppp.conf.sample,v 1.34 2004/11/19 03:48:17 obrien Exp $ +# $FreeBSD: src/share/examples/ppp/ppp.conf.sample,v 1.35 2004/12/13 17:54:30 brian Exp $ # ################################################################# @@ -129,7 +129,7 @@ set authname "somename" # Replace these with your login name & password. set authkey "somepasswd" # This profile assumes you're using PAP or CHAP. - enable lqr + enable lqr echo set reconnect 3 5 set redial 3 10 set lqrperiod 45 @@ -479,7 +479,7 @@ set log Phase Chat LQM set login "ABORT NO\\sCARRIER TIMEOUT 5 ogin:--ogin: ppp word: ppp HELLO" set ifaddr 10.0.4.2 10.0.4.1 - enable lqr + enable lqr echo accept lqr direct-server: @@ -487,7 +487,7 @@ set lqrperiod 10 set log Phase LQM set ifaddr 10.0.4.1 10.0.4.2 - enable lqr + enable lqr echo accept lqr @@ -733,7 +733,7 @@ # pppoe: set device PPPoE:de0:pppoe-in - enable lqr + enable lqr echo set cd 5 set dial set login @@ -747,7 +747,7 @@ # pppoe-in: allow mode direct # Only for use on server-side - enable lqr proxy # Enable LQR and proxy-arp + enable lqr echo proxy # Enable LQR and proxy-arp enable chap pap passwdauth # Force client authentication set ifaddr 10.0.0.1 10.0.0.100-10.0.0.199 # Hand out up to 100 IP numbers accept dns # Allow DNS negotiation ==== //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp,v 1.6 2004/11/19 03:48:17 obrien Exp $ +# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp,v 1.7 2004/12/13 17:54:30 brian Exp $ # This advanced ppp configuration file explains how to implement # the following: @@ -110,7 +110,7 @@ set login set redial 3 5 set timeout 0 - enable lqr + enable lqr echo set lqrperiod 15 isp1: ==== //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp.working#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp.working,v 1.6 2003/04/10 21:33:02 keramida Exp $ +# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp.working,v 1.7 2004/12/13 17:54:30 brian Exp $ # This is a working example of ppp.conf.span-isp that uses ppp connections # to the same machine through 3 null-modem serial cables. @@ -46,7 +46,7 @@ set login set redial 3 5 set timeout 0 - enable lqr + enable lqr echo set lqrperiod 15 isp1: ==== //depot/projects/wifi/share/man/man4/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.297 2004/12/08 17:47:32 sam Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.298 2004/12/14 16:11:14 simon Exp $ MAN= aac.4 \ acpi.4 \ @@ -268,6 +268,7 @@ snd_ess.4 \ snd_gusc.4 \ snd_ich.4 \ + snd_maestro.4 \ snd_maestro3.4 \ snd_sbc.4 \ snd_solo.4 \ ==== //depot/projects/wifi/share/man/man4/aac.4#2 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aac.4,v 1.26 2004/10/22 04:17:28 scottl Exp $ -.Dd Augyst 12, 2004 +.\" $FreeBSD: src/share/man/man4/aac.4,v 1.28 2004/12/15 09:32:12 brueffer Exp $ +.Dd December 15, 2004 .Dt AAC 4 .Os .Sh NAME @@ -105,6 +105,8 @@ .It Adaptec SCSI RAID 2200S .It +Adaptec SCSI RAID 2230SLP +.It Adaptec SCSI RAID 2410SA .It Adaptec SCSI RAID 2810SA ==== //depot/projects/wifi/share/man/man4/acpi.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.41 2004/12/04 23:26:46 marks Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.45 2004/12/14 19:55:54 njl Exp $ .\" -.Dd June 30, 2004 +.Dd December 14, 2004 .Dt ACPI 4 .Os .Sh NAME @@ -48,166 +48,99 @@ .Pp Note that the .Nm -driver is automatically loaded by the bootloader, and should not normally -be compiled into the kernel. -.Sh ENVIRONMENT -This support is still experimental, and thus there are many debugging -and tuning options which are managed via the kernel environment. +driver is automatically loaded by the +.Xr loader 8 , +and should only be +compiled into the kernel on platforms where ACPI is mandatory. +.Sh SYSCTLS +The +.Nm +driver is intended to provide power management without user intervention. +Thus, some of these sysctls are controlled automatically by the +.Pa power_profile +.Xr rc 8 +script, which can be configured via +.Xr rc.conf 5 . +If values are specified manually, they may be overridden. +.Bl -tag -width indent +.It Va hw.acpi.cpu.throttle_max +Maximum value for CPU throttling, equal to 100% of the clock rate. +.It Va hw.acpi.cpu.throttle_state +Get or set the current throttling state, from 1 to +.Va hw.acpi.cpu.throttle_max . +This scales back the CPU clock rate and the corresponding power consumption. +.It Va hw.acpi.cpu.cx_usage +Debugging information listing the percent of total usage for each sleep state. +The values are reset when +.Va hw.acpi.cpu.cx_lowest +is modified. +.It Va hw.acpi.cpu.cx_lowest +Lowest Cx state to use for idling the CPU. +A scheduling algorithm will select states between C1 and this setting +as system load dictates. +To enable ACPI CPU idling control, +.Va machdep.cpu_idle_hlt +must be set to 1. +.It Va hw.acpi.cpu.cx_supported +List of supported CPU idle states and their transition latency +in microseconds. +Each state has a type (e.g., C2). +C1 is equivalent to the ia32 HLT instruction, C2 provides a deeper +sleep with the same semantics, and C3 provides the deepest sleep +but additionally requires bus mastering to be disabled. +States greater than C3 provide even more power savings with the same +semantics as the C3 state. +Deeper sleeps provide more power savings but increased transition +latency when an interrupt occurs. +.El +.Sh TUNABLES Tunables can be set at the .Xr loader 8 prompt before booting the kernel or stored in .Pa /boot/loader.conf . -.Pp -Debugging is separated between layers and levels, where a layer is -a portion of the ACPI subsystem, and a level is a particular kind -of debugging output. -.Pp -Both layers and levels are specified as a whitespace-separated list of -tokens, with layers listed in -.Va debug.acpi.layer -and levels in -.Va debug.acpi.level . -The supported layers are: -.Pp -.Bl -item -offset indent -compact -.It -.Li ACPI_UTILITIES -.It -.Li ACPI_HARDWARE -.It -.Li ACPI_EVENTS -.It -.Li ACPI_TABLES -.It -.Li ACPI_NAMESPACE -.It -.Li ACPI_PARSER -.It -.Li ACPI_DISPATCHER -.It -.Li ACPI_EXECUTER -.It -.Li ACPI_RESOURCES -.It -.Li ACPI_CA_DEBUGGER -.It -.Li ACPI_OS_SERVICES -.It -.Li ACPI_CA_DISASSEMBLER -.It -.Li ACPI_ALL_COMPONENTS -.It -.Li ACPI_AC_ADAPTER -.It -.Li ACPI_BATTERY -.It -.Li ACPI_BUS -.It -.Li ACPI_BUTTON -.It -.Li ACPI_EC -.It -.Li ACPI_FAN -.It -.Li ACPI_POWER -.It -.Li ACPI_PROCESSOR -.It -.Li ACPI_THERMAL -.It -.Li ACPI_TIMER -.It -.Li ACPI_ALL_DRIVERS +.Bl -tag -width indent +.It Va acpi_dsdt_load +Enables loading of a custom ACPI DSDT. +.It Va acpi_dsdt_name +Name of the DSDT table to load, if loading is enabled. +.It Va debug.acpi.disabled +Selectively disables portions of ACPI for debugging purposes. +.It Va hint.acpi.0.disabled +Set this to 1 to disable all of ACPI. +If ACPI has been disabled on your system due to a blacklist entry for your +BIOS, you can set this to 0 to re-enable ACPI for testing. +.It Va hw.acpi.ec.poll_timeout +Delay in milliseconds to wait for the EC to respond. +Try increasing this number if you get the error +.Qq Li AE_NO_HARDWARE_RESPONSE . +.It Va hw.acpi.osname +Some systems' ASL may have problems because they look for names +of Microsoft operating systems. +This tunable overrides the value of the +.Qq Li \e_OS +object from its default of +.Qq Li FreeBSD . +.It Va hw.acpi.pci.link.%d.%d.%d.irq +Override the interrupt to use. +.It Va hw.acpi.reset_video +Enables calling the VESA reset BIOS vector on the resume path. +Some graphic chips have problems such as LCD white-out after resume. +Try setting this to 0 if this causes problems for you. +.It Va hw.acpi.serialize_methods +Allow override of whether methods execute in parallel or not. +Enable this for serial behavior, which fixes +.Qq Li AE_ALREADY_EXISTS +errors for +AML that really cannot handle parallel method execution. +It is off by default since this breaks recursive methods and some IBMs use +such code. +.It Va hw.acpi.verbose +Turn on verbose debugging information about what ACPI is doing. .El -.Pp -The supported levels are: -.Pp -.Bl -item -offset indent -compact -.It -.Li ACPI_LV_ERROR -.It -.Li ACPI_LV_WARN -.It -.Li ACPI_LV_INIT -.It -.Li ACPI_LV_DEBUG_OBJECT -.It -.Li ACPI_LV_INFO -.It -.Li ACPI_LV_ALL_EXCEPTIONS -.It -.Li ACPI_LV_INIT_NAMES -.It -.Li ACPI_LV_PARSE -.It -.Li ACPI_LV_LOAD -.It -.Li ACPI_LV_DISPATCH -.It -.Li ACPI_LV_EXEC -.It -.Li ACPI_LV_NAMES -.It -.Li ACPI_LV_OPREGION -.It -.Li ACPI_LV_BFIELD -.It -.Li ACPI_LV_TABLES -.It -.Li ACPI_LV_VALUES -.It -.Li ACPI_LV_OBJECTS -.It -.Li ACPI_LV_RESOURCES -.It -.Li ACPI_LV_USER_REQUESTS -.It -.Li ACPI_LV_PACKAGE -.It -.Li ACPI_LV_VERBOSITY1 -.It -.Li ACPI_LV_ALLOCATIONS -.It -.Li ACPI_LV_FUNCTIONS -.It -.Li ACPI_LV_OPTIMIZATIONS -.It -.Li ACPI_LV_VERBOSITY2 -.It -.Li ACPI_LV_ALL -.It -.Li ACPI_LV_MUTEX -.It -.Li ACPI_LV_THREADS -.It -.Li ACPI_LV_IO -.It -.Li ACPI_LV_INTERRUPTS -.It -.Li ACPI_LV_VERBOSITY3 -.It -.Li ACPI_LV_AML_DISASSEMBLE -.It -.Li ACPI_LV_VERBOSE_INFO -.It -.Li ACPI_LV_FULL_TABLES -.It -.Li ACPI_LV_EVENTS -.It -.Li ACPI_LV_VERBOSE -.El -.Pp -Selection of the appropriate layer and level values is important -to avoid massive amounts of debugging output. -Check the code to see which you need. +.Sh DISABLING ACPI +Since ACPI support on different platforms varies greatly, there are many +debugging and tuning options available. .Pp -Debugging output by the ACPI CA subsystem is prefixed with the -module name in lowercase, followed by a source line number. -Output from the -.Fx Ns -local -code follows the same format, but -the module name is uppercased. -.Pp For machines known not to work with .Nm enabled, there is a BIOS blacklist. @@ -234,9 +167,8 @@ .Pp Some i386 machines totally fail to operate with some or all of ACPI disabled. Other i386 machines fail with ACPI enabled. -Non-i386 platforms do not support operating systems which do not use ACPI. -Disabling all or part of ACPI on non-i386 platforms may result in a -non-functional system. +Disabling all or part of ACPI on non-i386 platforms (i.e., platforms where +ACPI support is mandatory) may result in a non-functional system. .Pp The .Nm @@ -248,7 +180,7 @@ Multiple entries can be listed, separated by a space. .Pp ACPI sub-devices and features that can be disabled: -.Bl -tag -width sysresource +.Bl -tag -width ".Li sysresource" .It Li all Disable all ACPI features and devices. .It Li acad @@ -315,8 +247,153 @@ .Va debug.acpi.avoid . The object and all of its children will be ignored during the bus/children scan of the namespace. -The ACPI CA code will still -know about the avoided region. +The ACPI CA code will still know about the avoided region. +.Sh DEBUGGING OUTPUT +To enable debugging output, +.Nm +must be compiled with +.Cd "options ACPI_DEBUG" . +Debugging output is separated between layers and levels, where a layer is +a component of the ACPI subsystem, and a level is a particular kind +of debugging output. +.Pp +Both layers and levels are specified as a whitespace-separated list of +tokens, with layers listed in +.Va debug.acpi.layer +and levels in +.Va debug.acpi.level . +.Pp +The first set of layers is for ACPI-CA components, and the second is for +.Fx +drivers. +The ACPI-CA layer descriptions include the prefix for the files they +refer to. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 15 21:42:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF5016A525; Wed, 15 Dec 2004 21:42:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D97D916A526 for ; Wed, 15 Dec 2004 21:42:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 791EE43D48 for ; Wed, 15 Dec 2004 21:42:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBFLg0md080074 for ; Wed, 15 Dec 2004 21:42:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBFLfwX3080069 for perforce@freebsd.org; Wed, 15 Dec 2004 21:41:58 GMT (envelope-from jhb@freebsd.org) Date: Wed, 15 Dec 2004 21:41:58 GMT Message-Id: <200412152141.iBFLfwX3080069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 67149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 21:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=67149 Change 67149 by jhb@jhb_slimer on 2004/12/15 21:41:34 IFC of d00m part 2 @67144. I've kept the TPR dinking code though it isn't used for now. Need to fix the APIC timer first and then maybe revisit that. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#16 integrate .. //depot/projects/smpng/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#74 integrate .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#32 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#66 integrate .. //depot/projects/smpng/sys/alpha/alpha/prom.c#13 integrate .. //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#19 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#55 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#35 integrate .. //depot/projects/smpng/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#18 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#33 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#33 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#38 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#20 integrate .. //depot/projects/smpng/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#32 integrate .. //depot/projects/smpng/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#9 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/copy.c#5 integrate .. //depot/projects/smpng/sys/boot/ficl/ficl.h#3 integrate .. //depot/projects/smpng/sys/boot/ficl/loader.c#8 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#8 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#32 integrate .. //depot/projects/smpng/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo.c#9 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#17 integrate .. //depot/projects/smpng/sys/boot/i386/loader/help.i386#6 integrate .. //depot/projects/smpng/sys/boot/i386/loader/loader.rc#3 delete .. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/smpng/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/metadata.c#5 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#13 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#19 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#17 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.h#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#13 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#41 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#24 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#22 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#36 integrate .. //depot/projects/smpng/sys/conf/files#129 integrate .. //depot/projects/smpng/sys/conf/files.amd64#25 integrate .. //depot/projects/smpng/sys/conf/files.i386#72 integrate .. //depot/projects/smpng/sys/conf/files.pc98#66 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#41 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#38 integrate .. //depot/projects/smpng/sys/conf/options#90 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#7 delete .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/opt_ah.h#2 delete .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/version.h#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#20 integrate .. //depot/projects/smpng/sys/ddb/db_thread.c#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#46 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#13 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#15 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#22 integrate .. //depot/projects/smpng/sys/dev/aac/aac_ioctl.h#7 delete .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#34 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/smpng/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#75 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#24 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#24 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#50 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#24 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#9 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#15 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#65 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#33 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#46 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#46 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#21 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#51 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#52 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.h#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.h#1 branch .. //depot/projects/smpng/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/smpng/sys/dev/ath/if_athrate.h#1 branch .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#21 integrate .. //depot/projects/smpng/sys/dev/awi/awivar.h#6 integrate .. //depot/projects/smpng/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/smpng/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#10 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#15 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#17 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#7 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#19 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#16 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#17 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ida/idavar.h#7 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#12 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#11 integrate .. //depot/projects/smpng/sys/dev/mlx/mlxreg.h#3 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#1 branch .. //depot/projects/smpng/sys/dev/mse/mse_cbus.c#1 branch .. //depot/projects/smpng/sys/dev/mse/mse_isa.c#1 branch .. //depot/projects/smpng/sys/dev/mse/msevar.h#1 branch .. //depot/projects/smpng/sys/dev/pci/pci.c#47 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#15 integrate .. //depot/projects/smpng/sys/dev/ray/if_rayvar.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/es1888.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#45 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/FILES#5 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#44 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#66 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#13 integrate .. //depot/projects/smpng/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#28 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#65 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#19 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#10 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#16 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo.h#4 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#31 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs.h#9 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_subr.c#5 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#25 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#24 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#8 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#18 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#36 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#28 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs.h#8 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#25 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/nullfs/null.h#6 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#10 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#16 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs.h#4 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#11 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#18 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#10 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal.h#3 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#16 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#19 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#21 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#20 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#19 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#33 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs.h#8 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#16 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#27 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#18 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#22 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap.h#4 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#20 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#8 integrate .. //depot/projects/smpng/sys/fs/unionfs/union.h#10 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#20 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#20 integrate .. //depot/projects/smpng/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#11 integrate .. //depot/projects/smpng/sys/geom/geom.h#42 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#36 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#39 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#40 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#28 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#26 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#9 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#9 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#6 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#9 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#7 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.h#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#10 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#39 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#27 integrate .. //depot/projects/smpng/sys/i386/acpica/genwakecode.sh#3 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#93 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#10 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#10 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#21 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/gdb_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#32 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/longrun.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#84 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#77 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#79 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#36 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#56 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/smpng/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#13 integrate .. //depot/projects/smpng/sys/i386/isa/mse.c#13 delete .. //depot/projects/smpng/sys/i386/isa/npx.c#44 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#41 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#27 integrate .. //depot/projects/smpng/sys/ia64/ia64/gdb_machdep.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#89 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#66 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#70 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#42 integrate .. //depot/projects/smpng/sys/ia64/include/bootinfo.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/fpu.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/gdb_machdep.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#18 integrate .. //depot/projects/smpng/sys/isa/isavar.h#7 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#34 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#20 integrate .. //depot/projects/smpng/sys/isofs/cd9660/iso.h#9 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#24 integrate .. //depot/projects/smpng/sys/kern/init_main.c#52 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#88 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#86 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#12 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#42 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#44 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#18 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#41 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#49 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#50 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#31 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#13 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#10 delete .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#32 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#62 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#15 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#20 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#89 integrate .. //depot/projects/smpng/sys/modules/Makefile#87 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#24 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_ibm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ath_hal/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ath_rate_amrr/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/smpng/sys/modules/if_gif/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/mse/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/wlan_acl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan_ccmp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan_tkip/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan_wep/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan_xauth/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#42 integrate .. //depot/projects/smpng/sys/net/if.c#58 integrate .. //depot/projects/smpng/sys/net/if_sppp.h#3 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#22 integrate .. //depot/projects/smpng/sys/net/if_var.h#34 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_acl.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_none.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_tkip.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_wep.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_xauth.c#1 branch .. //depot/projects/smpng/sys/netatalk/ddp_input.c#13 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop_cust.h#4 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#9 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#28 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_cisco.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#26 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#14 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#31 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#12 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#34 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#10 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#67 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#10 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#64 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#35 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#7 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#5 integrate .. //depot/projects/smpng/sys/nfs/nfs_common.c#11 integrate .. //depot/projects/smpng/sys/nfs/nfs_common.h#6 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#10 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vn_subs.c#3 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#10 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#28 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#21 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#35 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#29 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.h#6 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#13 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#29 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#23 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#43 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#44 integrate .. //depot/projects/smpng/sys/nfsclient/nfsm_subs.h#7 integrate .. //depot/projects/smpng/sys/nfsclient/nfsmount.h#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#11 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#75 integrate .. //depot/projects/smpng/sys/pc98/pc98/mse.c#11 delete .. //depot/projects/smpng/sys/pci/if_pcn.c#29 integrate .. //depot/projects/smpng/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#40 integrate .. //depot/projects/smpng/sys/posix4/posix4_mib.c#6 integrate .. //depot/projects/smpng/sys/powerpc/include/psl.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/fpu.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#56 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#48 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#40 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#38 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/smpng/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#23 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#69 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#54 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/rwindow.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#59 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#44 integrate .. //depot/projects/smpng/sys/sys/aac_ioctl.h#1 branch .. //depot/projects/smpng/sys/sys/bio.h#23 integrate .. //depot/projects/smpng/sys/sys/bus.h#17 integrate .. //depot/projects/smpng/sys/sys/domain.h#7 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#21 integrate .. //depot/projects/smpng/sys/sys/file.h#20 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#25 integrate .. //depot/projects/smpng/sys/sys/jail.h#11 integrate .. //depot/projects/smpng/sys/sys/jumbo.h#4 delete .. //depot/projects/smpng/sys/sys/kernel.h#28 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#47 integrate .. //depot/projects/smpng/sys/sys/mount.h#34 integrate .. //depot/projects/smpng/sys/sys/mouse.h#4 integrate .. //depot/projects/smpng/sys/sys/param.h#75 integrate .. //depot/projects/smpng/sys/sys/pioctl.h#5 integrate .. //depot/projects/smpng/sys/sys/proc.h#135 integrate .. //depot/projects/smpng/sys/sys/reboot.h#7 integrate .. //depot/projects/smpng/sys/sys/socket.h#24 integrate .. //depot/projects/smpng/sys/sys/systm.h#59 integrate .. //depot/projects/smpng/sys/sys/uio.h#20 integrate .. //depot/projects/smpng/sys/sys/user.h#22 integrate .. //depot/projects/smpng/sys/sys/vnode.h#52 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#32 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#16 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#42 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#63 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#37 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#30 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#15 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#17 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#43 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#22 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#43 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#52 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#68 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#27 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#45 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#16 (text+ko) ==== @@ -42,17 +42,17 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.23 2004/11/27 06:51:32 das Exp $"); #include #include #include #include -#include #include #include #include +#include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/divrem.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.3 2000/05/01 20:17:45 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* $NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $ */ /* @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.15 2004/11/27 06:51:32 das Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -47,6 +46,7 @@ #include #include #include +#include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -59,7 +59,7 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { switch (regnum) { } ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#74 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.225 2004/11/20 02:29:36 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.226 2004/11/27 06:51:32 das Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -132,7 +132,6 @@ #include #include #include -#include #include #include #include @@ -141,6 +140,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#32 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.54 2004/11/20 02:29:36 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.55 2004/11/27 06:51:32 das Exp $"); #include "opt_kstack_pages.h" @@ -42,7 +42,6 @@ #include #include #include -#include #include #include @@ -51,6 +50,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#66 (text+ko) ==== @@ -148,11 +148,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.173 2004/10/03 00:16:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.175 2004/12/15 19:55:03 alc Exp $"); #include #include #include +#include #include #include #include @@ -173,9 +174,8 @@ #include #include -#include - #include +#include #include #ifndef PMAP_SHPGPERPROC @@ -335,7 +335,7 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); -static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); +static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags); static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP @@ -1039,24 +1039,28 @@ * mapped correctly. */ static vm_page_t -_pmap_allocpte(pmap, ptepindex) - pmap_t pmap; - unsigned ptepindex; +_pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags) { pt_entry_t* pte; vm_offset_t ptepa; vm_page_t m; + KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || + (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, + ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); + /* * Find or fabricate a new pagetable page */ if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { - PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); - VM_WAIT; - vm_page_lock_queues(); - PMAP_LOCK(pmap); + if (flags & M_WAITOK) { + PMAP_UNLOCK(pmap); + vm_page_unlock_queues(); + VM_WAIT; + vm_page_lock_queues(); + PMAP_LOCK(pmap); + } /* * Indicate the need to retry. While waiting, the page table @@ -1083,7 +1087,8 @@ pt_entry_t* l1pte = &pmap->pm_lev1[l1index]; pt_entry_t* l2map; if (!pmap_pte_v(l1pte)) { - if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) { + if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index, + flags) == NULL) { --m->wire_count; vm_page_free(m); return (NULL); @@ -1147,7 +1152,7 @@ * Here if the pte page isn't mapped, or if it has been * deallocated. */ - m = _pmap_allocpte(pmap, ptepindex); + m = _pmap_allocpte(pmap, ptepindex, M_WAITOK); if (m == NULL) goto retry; } @@ -1843,9 +1848,20 @@ } mpte->wire_count++; } else { - mpte = _pmap_allocpte(pmap, ptepindex); - if (mpte == NULL) + mpte = _pmap_allocpte(pmap, ptepindex, + M_NOWAIT); + if (mpte == NULL) { + PMAP_UNLOCK(pmap); + vm_page_busy(m); + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(m->object); + VM_WAIT; + VM_OBJECT_LOCK(m->object); + vm_page_lock_queues(); + vm_page_wakeup(m); + PMAP_LOCK(pmap); goto retry; + } } } } else { ==== //depot/projects/smpng/sys/alpha/alpha/prom.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.28 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.29 2004/11/27 06:51:32 das Exp $"); #include #include @@ -35,10 +35,10 @@ #include #include #include -#include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.27 2004/04/05 21:00:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.28 2004/11/27 06:51:32 das Exp $"); #include "opt_mac.h" @@ -42,7 +42,6 @@ #include #include #include -#include #include #include @@ -50,6 +49,7 @@ #include #include +#include #include #include /* for kernel_map */ ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#55 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.120 2004/08/31 07:34:53 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.121 2004/11/27 06:51:32 das Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -55,12 +55,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #ifdef KTRACE ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#35 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.104 2004/05/26 12:09:36 tmm Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.105 2004/11/27 06:51:32 das Exp $"); #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 16 23:41:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9031216A4D0; Thu, 16 Dec 2004 23:41:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4173216A4CE for ; Thu, 16 Dec 2004 23:41:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B346E43D41 for ; Thu, 16 Dec 2004 23:41:13 +0000 (GMT) (envelope-from arr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBGNfDK5075573 for ; Thu, 16 Dec 2004 23:41:13 GMT (envelope-from arr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBGNfDwX075559 for perforce@freebsd.org; Thu, 16 Dec 2004 23:41:13 GMT (envelope-from arr@freebsd.org) Date: Thu, 16 Dec 2004 23:41:13 GMT Message-Id: <200412162341.iBGNfDwX075559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" To: Perforce Change Reviews Subject: PERFORCE change 67200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Dec 2004 23:41:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=67200 Change 67200 by arr@arr_hfs on 2004/12/16 23:40:14 Populate the base HFS branch Affected files ... .. //depot/projects/hfs/sbin/Makefile#1 branch .. //depot/projects/hfs/sbin/Makefile.inc#1 branch .. //depot/projects/hfs/sbin/adjkerntz/Makefile#1 branch .. //depot/projects/hfs/sbin/adjkerntz/adjkerntz.8#1 branch .. //depot/projects/hfs/sbin/adjkerntz/adjkerntz.c#1 branch .. //depot/projects/hfs/sbin/adjkerntz/pathnames.h#1 branch .. //depot/projects/hfs/sbin/atacontrol/Makefile#1 branch .. //depot/projects/hfs/sbin/atacontrol/atacontrol.8#1 branch .. //depot/projects/hfs/sbin/atacontrol/atacontrol.c#1 branch .. //depot/projects/hfs/sbin/atm/Makefile#1 branch .. //depot/projects/hfs/sbin/atm/Makefile.inc#1 branch .. //depot/projects/hfs/sbin/atm/atm/Makefile#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm.8#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm.c#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm.h#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm_fore200.c#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm_inet.c#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm_print.c#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm_set.c#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm_show.c#1 branch .. //depot/projects/hfs/sbin/atm/atm/atm_subr.c#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/Makefile#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/atm_oid.list#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/atmconfig.8#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/atmconfig.h#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/atmconfig.help#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/atmconfig_device.c#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/atmconfig_device.h#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/atmconfig_device.help#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/diag.c#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/diag.h#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/main.c#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/natm.c#1 branch .. //depot/projects/hfs/sbin/atm/atmconfig/private.h#1 branch .. //depot/projects/hfs/sbin/atm/fore_dnld/COPYRIGHT#1 branch .. //depot/projects/hfs/sbin/atm/fore_dnld/Makefile#1 branch .. //depot/projects/hfs/sbin/atm/fore_dnld/fore_dnld.8#1 branch .. //depot/projects/hfs/sbin/atm/fore_dnld/fore_dnld.c#1 branch .. //depot/projects/hfs/sbin/atm/fore_dnld/pca200e.c#1 branch .. //depot/projects/hfs/sbin/atm/ilmid/Makefile#1 branch .. //depot/projects/hfs/sbin/atm/ilmid/ilmid.8#1 branch .. //depot/projects/hfs/sbin/atm/ilmid/ilmid.c#1 branch .. //depot/projects/hfs/sbin/badsect/Makefile#1 branch .. //depot/projects/hfs/sbin/badsect/badsect.8#1 branch .. //depot/projects/hfs/sbin/badsect/badsect.c#1 branch .. //depot/projects/hfs/sbin/bsdlabel/Makefile#1 branch .. //depot/projects/hfs/sbin/bsdlabel/bsdlabel.5#1 branch .. //depot/projects/hfs/sbin/bsdlabel/bsdlabel.8#1 branch .. //depot/projects/hfs/sbin/bsdlabel/bsdlabel.c#1 branch .. //depot/projects/hfs/sbin/bsdlabel/pathnames.h#1 branch .. //depot/projects/hfs/sbin/bsdlabel/runtest.sh#1 branch .. //depot/projects/hfs/sbin/camcontrol/Makefile#1 branch .. //depot/projects/hfs/sbin/camcontrol/camcontrol.8#1 branch .. //depot/projects/hfs/sbin/camcontrol/camcontrol.c#1 branch .. //depot/projects/hfs/sbin/camcontrol/camcontrol.h#1 branch .. //depot/projects/hfs/sbin/camcontrol/modeedit.c#1 branch .. //depot/projects/hfs/sbin/camcontrol/util.c#1 branch .. //depot/projects/hfs/sbin/ccdconfig/Makefile#1 branch .. //depot/projects/hfs/sbin/ccdconfig/ccdconfig.8#1 branch .. //depot/projects/hfs/sbin/ccdconfig/ccdconfig.c#1 branch .. //depot/projects/hfs/sbin/ccdconfig/pathnames.h#1 branch .. //depot/projects/hfs/sbin/clri/Makefile#1 branch .. //depot/projects/hfs/sbin/clri/clri.8#1 branch .. //depot/projects/hfs/sbin/clri/clri.c#1 branch .. //depot/projects/hfs/sbin/comcontrol/Makefile#1 branch .. //depot/projects/hfs/sbin/comcontrol/comcontrol.8#1 branch .. //depot/projects/hfs/sbin/comcontrol/comcontrol.c#1 branch .. //depot/projects/hfs/sbin/conscontrol/Makefile#1 branch .. //depot/projects/hfs/sbin/conscontrol/conscontrol.8#1 branch .. //depot/projects/hfs/sbin/conscontrol/conscontrol.c#1 branch .. //depot/projects/hfs/sbin/devd/Makefile#1 branch .. //depot/projects/hfs/sbin/devd/devd.8#1 branch .. //depot/projects/hfs/sbin/devd/devd.cc#1 branch .. //depot/projects/hfs/sbin/devd/devd.conf.5#1 branch .. //depot/projects/hfs/sbin/devd/devd.h#1 branch .. //depot/projects/hfs/sbin/devd/devd.hh#1 branch .. //depot/projects/hfs/sbin/devd/parse.y#1 branch .. //depot/projects/hfs/sbin/devd/token.l#1 branch .. //depot/projects/hfs/sbin/devfs/Makefile#1 branch .. //depot/projects/hfs/sbin/devfs/devfs.8#1 branch .. //depot/projects/hfs/sbin/devfs/devfs.c#1 branch .. //depot/projects/hfs/sbin/devfs/extern.h#1 branch .. //depot/projects/hfs/sbin/devfs/rule.c#1 branch .. //depot/projects/hfs/sbin/dhclient/Makefile#1 branch .. //depot/projects/hfs/sbin/dhclient/Makefile.inc#1 branch .. //depot/projects/hfs/sbin/dhclient/client/Makefile#1 branch .. //depot/projects/hfs/sbin/dhclient/common/Makefile#1 branch .. //depot/projects/hfs/sbin/dhclient/dhclient-script.sh#1 branch .. //depot/projects/hfs/sbin/dhclient/dhcpctl/Makefile#1 branch .. //depot/projects/hfs/sbin/dhclient/dst/Makefile#1 branch .. //depot/projects/hfs/sbin/dhclient/minires/Makefile#1 branch .. //depot/projects/hfs/sbin/dhclient/omapip/Makefile#1 branch .. //depot/projects/hfs/sbin/dhclient/omshell/Makefile#1 branch .. //depot/projects/hfs/sbin/dmesg/Makefile#1 branch .. //depot/projects/hfs/sbin/dmesg/dmesg.8#1 branch .. //depot/projects/hfs/sbin/dmesg/dmesg.c#1 branch .. //depot/projects/hfs/sbin/dump/Makefile#1 branch .. //depot/projects/hfs/sbin/dump/cache.c#1 branch .. //depot/projects/hfs/sbin/dump/dump.8#1 branch .. //depot/projects/hfs/sbin/dump/dump.h#1 branch .. //depot/projects/hfs/sbin/dump/dumprmt.c#1 branch .. //depot/projects/hfs/sbin/dump/itime.c#1 branch .. //depot/projects/hfs/sbin/dump/main.c#1 branch .. //depot/projects/hfs/sbin/dump/optr.c#1 branch .. //depot/projects/hfs/sbin/dump/pathnames.h#1 branch .. //depot/projects/hfs/sbin/dump/tape.c#1 branch .. //depot/projects/hfs/sbin/dump/traverse.c#1 branch .. //depot/projects/hfs/sbin/dump/unctime.c#1 branch .. //depot/projects/hfs/sbin/dumpfs/Makefile#1 branch .. //depot/projects/hfs/sbin/dumpfs/dumpfs.8#1 branch .. //depot/projects/hfs/sbin/dumpfs/dumpfs.c#1 branch .. //depot/projects/hfs/sbin/dumpon/Makefile#1 branch .. //depot/projects/hfs/sbin/dumpon/dumpon.8#1 branch .. //depot/projects/hfs/sbin/dumpon/dumpon.c#1 branch .. //depot/projects/hfs/sbin/fdisk/Makefile#1 branch .. //depot/projects/hfs/sbin/fdisk/fdisk.8#1 branch .. //depot/projects/hfs/sbin/fdisk/fdisk.c#1 branch .. //depot/projects/hfs/sbin/fdisk/runtest.sh#1 branch .. //depot/projects/hfs/sbin/fdisk_pc98/Makefile#1 branch .. //depot/projects/hfs/sbin/fdisk_pc98/fdisk.8#1 branch .. //depot/projects/hfs/sbin/fdisk_pc98/fdisk.c#1 branch .. //depot/projects/hfs/sbin/ffsinfo/Makefile#1 branch .. //depot/projects/hfs/sbin/ffsinfo/ffsinfo.8#1 branch .. //depot/projects/hfs/sbin/ffsinfo/ffsinfo.c#1 branch .. //depot/projects/hfs/sbin/fsck/Makefile#1 branch .. //depot/projects/hfs/sbin/fsck/fsck.8#1 branch .. //depot/projects/hfs/sbin/fsck/fsck.c#1 branch .. //depot/projects/hfs/sbin/fsck/fsutil.c#1 branch .. //depot/projects/hfs/sbin/fsck/fsutil.h#1 branch .. //depot/projects/hfs/sbin/fsck/preen.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/Makefile#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/SMM.doc/0.t#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/SMM.doc/1.t#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/SMM.doc/2.t#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/SMM.doc/3.t#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/SMM.doc/4.t#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/SMM.doc/Makefile#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/dir.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/ea.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/fsck.h#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/fsck_ffs.8#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/fsutil.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/inode.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/main.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/pass1.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/pass1b.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/pass2.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/pass3.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/pass4.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/pass5.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/setup.c#1 branch .. //depot/projects/hfs/sbin/fsck_ffs/utilities.c#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/Makefile#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/boot.c#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/check.c#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/dir.c#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/dosfs.h#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/ext.h#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/fat.c#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/fsck_msdosfs.8#1 branch .. //depot/projects/hfs/sbin/fsck_msdosfs/main.c#1 branch .. //depot/projects/hfs/sbin/fsdb/Makefile#1 branch .. //depot/projects/hfs/sbin/fsdb/fsdb.8#1 branch .. //depot/projects/hfs/sbin/fsdb/fsdb.c#1 branch .. //depot/projects/hfs/sbin/fsdb/fsdb.h#1 branch .. //depot/projects/hfs/sbin/fsdb/fsdbutil.c#1 branch .. //depot/projects/hfs/sbin/fsirand/Makefile#1 branch .. //depot/projects/hfs/sbin/fsirand/fsirand.8#1 branch .. //depot/projects/hfs/sbin/fsirand/fsirand.c#1 branch .. //depot/projects/hfs/sbin/gbde/Makefile#1 branch .. //depot/projects/hfs/sbin/gbde/gbde.8#1 branch .. //depot/projects/hfs/sbin/gbde/gbde.c#1 branch .. //depot/projects/hfs/sbin/gbde/image.uu#1 branch .. //depot/projects/hfs/sbin/gbde/template.txt#1 branch .. //depot/projects/hfs/sbin/gbde/test.sh#1 branch .. //depot/projects/hfs/sbin/geom/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/Makefile.inc#1 branch .. //depot/projects/hfs/sbin/geom/class/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/class/Makefile.inc#1 branch .. //depot/projects/hfs/sbin/geom/class/concat/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/class/concat/gconcat.8#1 branch .. //depot/projects/hfs/sbin/geom/class/concat/geom_concat.c#1 branch .. //depot/projects/hfs/sbin/geom/class/label/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/class/label/geom_label.c#1 branch .. //depot/projects/hfs/sbin/geom/class/label/glabel.8#1 branch .. //depot/projects/hfs/sbin/geom/class/mirror/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/class/mirror/geom_mirror.c#1 branch .. //depot/projects/hfs/sbin/geom/class/mirror/gmirror.8#1 branch .. //depot/projects/hfs/sbin/geom/class/nop/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/class/nop/geom_nop.c#1 branch .. //depot/projects/hfs/sbin/geom/class/nop/gnop.8#1 branch .. //depot/projects/hfs/sbin/geom/class/raid3/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/class/raid3/geom_raid3.c#1 branch .. //depot/projects/hfs/sbin/geom/class/raid3/graid3.8#1 branch .. //depot/projects/hfs/sbin/geom/class/stripe/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/class/stripe/geom_stripe.c#1 branch .. //depot/projects/hfs/sbin/geom/class/stripe/gstripe.8#1 branch .. //depot/projects/hfs/sbin/geom/core/Makefile#1 branch .. //depot/projects/hfs/sbin/geom/core/geom.8#1 branch .. //depot/projects/hfs/sbin/geom/core/geom.c#1 branch .. //depot/projects/hfs/sbin/geom/core/geom.h#1 branch .. //depot/projects/hfs/sbin/geom/misc/subr.c#1 branch .. //depot/projects/hfs/sbin/geom/misc/subr.h#1 branch .. //depot/projects/hfs/sbin/ggate/Makefile#1 branch .. //depot/projects/hfs/sbin/ggate/Makefile.inc#1 branch .. //depot/projects/hfs/sbin/ggate/ggatec/Makefile#1 branch .. //depot/projects/hfs/sbin/ggate/ggatec/ggatec.8#1 branch .. //depot/projects/hfs/sbin/ggate/ggatec/ggatec.c#1 branch .. //depot/projects/hfs/sbin/ggate/ggated/Makefile#1 branch .. //depot/projects/hfs/sbin/ggate/ggated/ggated.8#1 branch .. //depot/projects/hfs/sbin/ggate/ggated/ggated.c#1 branch .. //depot/projects/hfs/sbin/ggate/ggatel/Makefile#1 branch .. //depot/projects/hfs/sbin/ggate/ggatel/ggatel.8#1 branch .. //depot/projects/hfs/sbin/ggate/ggatel/ggatel.c#1 branch .. //depot/projects/hfs/sbin/ggate/shared/ggate.c#1 branch .. //depot/projects/hfs/sbin/ggate/shared/ggate.h#1 branch .. //depot/projects/hfs/sbin/gpt/Makefile#1 branch .. //depot/projects/hfs/sbin/gpt/add.c#1 branch .. //depot/projects/hfs/sbin/gpt/create.c#1 branch .. //depot/projects/hfs/sbin/gpt/destroy.c#1 branch .. //depot/projects/hfs/sbin/gpt/gpt.8#1 branch .. //depot/projects/hfs/sbin/gpt/gpt.c#1 branch .. //depot/projects/hfs/sbin/gpt/gpt.h#1 branch .. //depot/projects/hfs/sbin/gpt/map.c#1 branch .. //depot/projects/hfs/sbin/gpt/map.h#1 branch .. //depot/projects/hfs/sbin/gpt/migrate.c#1 branch .. //depot/projects/hfs/sbin/gpt/mkdisk.sh#1 branch .. //depot/projects/hfs/sbin/gpt/recover.c#1 branch .. //depot/projects/hfs/sbin/gpt/remove.c#1 branch .. //depot/projects/hfs/sbin/gpt/show.c#1 branch .. //depot/projects/hfs/sbin/growfs/Makefile#1 branch .. //depot/projects/hfs/sbin/growfs/debug.c#1 branch .. //depot/projects/hfs/sbin/growfs/debug.h#1 branch .. //depot/projects/hfs/sbin/growfs/growfs.8#1 branch .. //depot/projects/hfs/sbin/growfs/growfs.c#1 branch .. //depot/projects/hfs/sbin/gvinum/Makefile#1 branch .. //depot/projects/hfs/sbin/gvinum/gvinum.c#1 branch .. //depot/projects/hfs/sbin/gvinum/gvinum.h#1 branch .. //depot/projects/hfs/sbin/idmapd/Makefile#1 branch .. //depot/projects/hfs/sbin/idmapd/idmapd.8#1 branch .. //depot/projects/hfs/sbin/idmapd/idmapd.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/Makefile#1 branch .. //depot/projects/hfs/sbin/ifconfig/af_atalk.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/af_inet.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/af_inet6.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/af_ipx.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/af_link.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifclone.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifconfig.8#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifconfig.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifconfig.h#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifieee80211.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifmac.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifmedia.c#1 branch .. //depot/projects/hfs/sbin/ifconfig/ifvlan.c#1 branch .. //depot/projects/hfs/sbin/init/Makefile#1 branch .. //depot/projects/hfs/sbin/init/NOTES#1 branch .. //depot/projects/hfs/sbin/init/init.8#1 branch .. //depot/projects/hfs/sbin/init/init.c#1 branch .. //depot/projects/hfs/sbin/init/pathnames.h#1 branch .. //depot/projects/hfs/sbin/ip6fw/Makefile#1 branch .. //depot/projects/hfs/sbin/ip6fw/ip6fw.8#1 branch .. //depot/projects/hfs/sbin/ip6fw/ip6fw.c#1 branch .. //depot/projects/hfs/sbin/ip6fw/sample.sh#1 branch .. //depot/projects/hfs/sbin/ipf/Makefile#1 branch .. //depot/projects/hfs/sbin/ipfs/Makefile#1 branch .. //depot/projects/hfs/sbin/ipfstat/Makefile#1 branch .. //depot/projects/hfs/sbin/ipfw/Makefile#1 branch .. //depot/projects/hfs/sbin/ipfw/ipfw.8#1 branch .. //depot/projects/hfs/sbin/ipfw/ipfw2.c#1 branch .. //depot/projects/hfs/sbin/ipmon/Makefile#1 branch .. //depot/projects/hfs/sbin/ipnat/Makefile#1 branch .. //depot/projects/hfs/sbin/kldconfig/Makefile#1 branch .. //depot/projects/hfs/sbin/kldconfig/kldconfig.8#1 branch .. //depot/projects/hfs/sbin/kldconfig/kldconfig.c#1 branch .. //depot/projects/hfs/sbin/kldload/Makefile#1 branch .. //depot/projects/hfs/sbin/kldload/kldload.8#1 branch .. //depot/projects/hfs/sbin/kldload/kldload.c#1 branch .. //depot/projects/hfs/sbin/kldstat/Makefile#1 branch .. //depot/projects/hfs/sbin/kldstat/kldstat.8#1 branch .. //depot/projects/hfs/sbin/kldstat/kldstat.c#1 branch .. //depot/projects/hfs/sbin/kldunload/Makefile#1 branch .. //depot/projects/hfs/sbin/kldunload/kldunload.8#1 branch .. //depot/projects/hfs/sbin/kldunload/kldunload.c#1 branch .. //depot/projects/hfs/sbin/ldconfig/Makefile#1 branch .. //depot/projects/hfs/sbin/ldconfig/elfhints.c#1 branch .. //depot/projects/hfs/sbin/ldconfig/ldconfig.8#1 branch .. //depot/projects/hfs/sbin/ldconfig/ldconfig.c#1 branch .. //depot/projects/hfs/sbin/ldconfig/ldconfig.h#1 branch .. //depot/projects/hfs/sbin/mca/Makefile#1 branch .. //depot/projects/hfs/sbin/mca/mca.c#1 branch .. //depot/projects/hfs/sbin/md5/Makefile#1 branch .. //depot/projects/hfs/sbin/md5/md5.1#1 branch .. //depot/projects/hfs/sbin/md5/md5.c#1 branch .. //depot/projects/hfs/sbin/mdconfig/Makefile#1 branch .. //depot/projects/hfs/sbin/mdconfig/mdconfig.8#1 branch .. //depot/projects/hfs/sbin/mdconfig/mdconfig.c#1 branch .. //depot/projects/hfs/sbin/mdmfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mdmfs/mdmfs.8#1 branch .. //depot/projects/hfs/sbin/mdmfs/mdmfs.c#1 branch .. //depot/projects/hfs/sbin/mknod/Makefile#1 branch .. //depot/projects/hfs/sbin/mknod/mknod.8#1 branch .. //depot/projects/hfs/sbin/mknod/mknod.c#1 branch .. //depot/projects/hfs/sbin/mksnap_ffs/Makefile#1 branch .. //depot/projects/hfs/sbin/mksnap_ffs/mksnap_ffs.8#1 branch .. //depot/projects/hfs/sbin/mksnap_ffs/mksnap_ffs.c#1 branch .. //depot/projects/hfs/sbin/mount/Makefile#1 branch .. //depot/projects/hfs/sbin/mount/extern.h#1 branch .. //depot/projects/hfs/sbin/mount/getmntopts.3#1 branch .. //depot/projects/hfs/sbin/mount/getmntopts.c#1 branch .. //depot/projects/hfs/sbin/mount/mntopts.h#1 branch .. //depot/projects/hfs/sbin/mount/mount.8#1 branch .. //depot/projects/hfs/sbin/mount/mount.c#1 branch .. //depot/projects/hfs/sbin/mount/mount_ufs.c#1 branch .. //depot/projects/hfs/sbin/mount/pathnames.h#1 branch .. //depot/projects/hfs/sbin/mount/vfslist.c#1 branch .. //depot/projects/hfs/sbin/mount_autofs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_autofs/mount_autofs.8#1 branch .. //depot/projects/hfs/sbin/mount_autofs/mount_autofs.c#1 branch .. //depot/projects/hfs/sbin/mount_cd9660/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_cd9660/mount_cd9660.8#1 branch .. //depot/projects/hfs/sbin/mount_cd9660/mount_cd9660.c#1 branch .. //depot/projects/hfs/sbin/mount_ext2fs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_ext2fs/mount_ext2fs.8#1 branch .. //depot/projects/hfs/sbin/mount_ext2fs/mount_ext2fs.c#1 branch .. //depot/projects/hfs/sbin/mount_hpfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_hpfs/mount_hpfs.8#1 branch .. //depot/projects/hfs/sbin/mount_hpfs/mount_hpfs.c#1 branch .. //depot/projects/hfs/sbin/mount_msdosfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_msdosfs/mount_msdosfs.8#1 branch .. //depot/projects/hfs/sbin/mount_msdosfs/mount_msdosfs.c#1 branch .. //depot/projects/hfs/sbin/mount_nfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_nfs/mount_nfs.8#1 branch .. //depot/projects/hfs/sbin/mount_nfs/mount_nfs.c#1 branch .. //depot/projects/hfs/sbin/mount_nfs4/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_nfs4/mount_nfs4.8#1 branch .. //depot/projects/hfs/sbin/mount_nfs4/mount_nfs4.c#1 branch .. //depot/projects/hfs/sbin/mount_ntfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_ntfs/mount_ntfs.8#1 branch .. //depot/projects/hfs/sbin/mount_ntfs/mount_ntfs.c#1 branch .. //depot/projects/hfs/sbin/mount_nullfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_nullfs/mount_nullfs.8#1 branch .. //depot/projects/hfs/sbin/mount_nullfs/mount_nullfs.c#1 branch .. //depot/projects/hfs/sbin/mount_std/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_std/mount_std.8#1 branch .. //depot/projects/hfs/sbin/mount_std/mount_std.c#1 branch .. //depot/projects/hfs/sbin/mount_udf/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_udf/mount_udf.8#1 branch .. //depot/projects/hfs/sbin/mount_udf/mount_udf.c#1 branch .. //depot/projects/hfs/sbin/mount_ufs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_ufs/mount_ufs.c#1 branch .. //depot/projects/hfs/sbin/mount_umapfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_umapfs/mount_umapfs.8#1 branch .. //depot/projects/hfs/sbin/mount_umapfs/mount_umapfs.c#1 branch .. //depot/projects/hfs/sbin/mount_umapfs/sample.group.mapfile#1 branch .. //depot/projects/hfs/sbin/mount_umapfs/sample.user.mapfile#1 branch .. //depot/projects/hfs/sbin/mount_umapfs/umap_manual#1 branch .. //depot/projects/hfs/sbin/mount_unionfs/Makefile#1 branch .. //depot/projects/hfs/sbin/mount_unionfs/mount_unionfs.8#1 branch .. //depot/projects/hfs/sbin/mount_unionfs/mount_unionfs.c#1 branch .. //depot/projects/hfs/sbin/natd/HISTORY#1 branch .. //depot/projects/hfs/sbin/natd/Makefile#1 branch .. //depot/projects/hfs/sbin/natd/README#1 branch .. //depot/projects/hfs/sbin/natd/icmp.c#1 branch .. //depot/projects/hfs/sbin/natd/natd.8#1 branch .. //depot/projects/hfs/sbin/natd/natd.c#1 branch .. //depot/projects/hfs/sbin/natd/natd.h#1 branch .. //depot/projects/hfs/sbin/natd/samples/natd.cf.sample#1 branch .. //depot/projects/hfs/sbin/natd/samples/natd.test#1 branch .. //depot/projects/hfs/sbin/newfs/Makefile#1 branch .. //depot/projects/hfs/sbin/newfs/mkfs.c#1 branch .. //depot/projects/hfs/sbin/newfs/newfs.8#1 branch .. //depot/projects/hfs/sbin/newfs/newfs.c#1 branch .. //depot/projects/hfs/sbin/newfs/newfs.h#1 branch .. //depot/projects/hfs/sbin/newfs/ref.test#1 branch .. //depot/projects/hfs/sbin/newfs/runtest00.sh#1 branch .. //depot/projects/hfs/sbin/newfs/runtest01.sh#1 branch .. //depot/projects/hfs/sbin/newfs_msdos/Makefile#1 branch .. //depot/projects/hfs/sbin/newfs_msdos/newfs_msdos.8#1 branch .. //depot/projects/hfs/sbin/newfs_msdos/newfs_msdos.c#1 branch .. //depot/projects/hfs/sbin/nfsiod/Makefile#1 branch .. //depot/projects/hfs/sbin/nfsiod/nfsiod.8#1 branch .. //depot/projects/hfs/sbin/nfsiod/nfsiod.c#1 branch .. //depot/projects/hfs/sbin/nos-tun/Makefile#1 branch .. //depot/projects/hfs/sbin/nos-tun/nos-tun.8#1 branch .. //depot/projects/hfs/sbin/nos-tun/nos-tun.c#1 branch .. //depot/projects/hfs/sbin/pfctl/Makefile#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_cbq.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_classq.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_hfsc.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_priq.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_red.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_rio.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_rmclass.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_var.h#1 branch .. //depot/projects/hfs/sbin/pfctl/missing/altq/altq_wfq.h#1 branch .. //depot/projects/hfs/sbin/pflogd/Makefile#1 branch .. //depot/projects/hfs/sbin/ping/Makefile#1 branch .. //depot/projects/hfs/sbin/ping/ping.8#1 branch .. //depot/projects/hfs/sbin/ping/ping.c#1 branch .. //depot/projects/hfs/sbin/ping6/Makefile#1 branch .. //depot/projects/hfs/sbin/ping6/ping6.8#1 branch .. //depot/projects/hfs/sbin/ping6/ping6.c#1 branch .. //depot/projects/hfs/sbin/quotacheck/Makefile#1 branch .. //depot/projects/hfs/sbin/quotacheck/preen.c#1 branch .. //depot/projects/hfs/sbin/quotacheck/quotacheck.8#1 branch .. //depot/projects/hfs/sbin/quotacheck/quotacheck.c#1 branch .. //depot/projects/hfs/sbin/rcorder/Makefile#1 branch .. //depot/projects/hfs/sbin/rcorder/ealloc.c#1 branch .. //depot/projects/hfs/sbin/rcorder/ealloc.h#1 branch .. //depot/projects/hfs/sbin/rcorder/hash.c#1 branch .. //depot/projects/hfs/sbin/rcorder/hash.h#1 branch .. //depot/projects/hfs/sbin/rcorder/rcorder.8#1 branch .. //depot/projects/hfs/sbin/rcorder/rcorder.c#1 branch .. //depot/projects/hfs/sbin/rcorder/sprite.h#1 branch .. //depot/projects/hfs/sbin/reboot/Makefile#1 branch .. //depot/projects/hfs/sbin/reboot/boot_i386.8#1 branch .. //depot/projects/hfs/sbin/reboot/nextboot.8#1 branch .. //depot/projects/hfs/sbin/reboot/nextboot.sh#1 branch .. //depot/projects/hfs/sbin/reboot/reboot.8#1 branch .. //depot/projects/hfs/sbin/reboot/reboot.c#1 branch .. //depot/projects/hfs/sbin/restore/Makefile#1 branch .. //depot/projects/hfs/sbin/restore/dirs.c#1 branch .. //depot/projects/hfs/sbin/restore/extern.h#1 branch .. //depot/projects/hfs/sbin/restore/interactive.c#1 branch .. //depot/projects/hfs/sbin/restore/main.c#1 branch .. //depot/projects/hfs/sbin/restore/restore.8#1 branch .. //depot/projects/hfs/sbin/restore/restore.c#1 branch .. //depot/projects/hfs/sbin/restore/restore.h#1 branch .. //depot/projects/hfs/sbin/restore/symtab.c#1 branch .. //depot/projects/hfs/sbin/restore/tape.c#1 branch .. //depot/projects/hfs/sbin/restore/utilities.c#1 branch .. //depot/projects/hfs/sbin/route/Makefile#1 branch .. //depot/projects/hfs/sbin/route/keywords#1 branch .. //depot/projects/hfs/sbin/route/route.8#1 branch .. //depot/projects/hfs/sbin/route/route.c#1 branch .. //depot/projects/hfs/sbin/routed/Makefile#1 branch .. //depot/projects/hfs/sbin/routed/Makefile.inc#1 branch .. //depot/projects/hfs/sbin/routed/defs.h#1 branch .. //depot/projects/hfs/sbin/routed/if.c#1 branch .. //depot/projects/hfs/sbin/routed/input.c#1 branch .. //depot/projects/hfs/sbin/routed/main.c#1 branch .. //depot/projects/hfs/sbin/routed/output.c#1 branch .. //depot/projects/hfs/sbin/routed/parms.c#1 branch .. //depot/projects/hfs/sbin/routed/pathnames.h#1 branch .. //depot/projects/hfs/sbin/routed/radix.c#1 branch .. //depot/projects/hfs/sbin/routed/radix.h#1 branch .. //depot/projects/hfs/sbin/routed/rdisc.c#1 branch .. //depot/projects/hfs/sbin/routed/routed.8#1 branch .. //depot/projects/hfs/sbin/routed/rtquery/Makefile#1 branch .. //depot/projects/hfs/sbin/routed/rtquery/rtquery.8#1 branch .. //depot/projects/hfs/sbin/routed/rtquery/rtquery.c#1 branch .. //depot/projects/hfs/sbin/routed/table.c#1 branch .. //depot/projects/hfs/sbin/routed/trace.c#1 branch .. //depot/projects/hfs/sbin/rtsol/Makefile#1 branch .. //depot/projects/hfs/sbin/savecore/Makefile#1 branch .. //depot/projects/hfs/sbin/savecore/savecore.8#1 branch .. //depot/projects/hfs/sbin/savecore/savecore.c#1 branch .. //depot/projects/hfs/sbin/sconfig/Makefile#1 branch .. //depot/projects/hfs/sbin/sconfig/sconfig.8#1 branch .. //depot/projects/hfs/sbin/sconfig/sconfig.c#1 branch .. //depot/projects/hfs/sbin/shutdown/Makefile#1 branch .. //depot/projects/hfs/sbin/shutdown/shutdown.8#1 branch .. //depot/projects/hfs/sbin/shutdown/shutdown.c#1 branch .. //depot/projects/hfs/sbin/slattach/Makefile#1 branch .. //depot/projects/hfs/sbin/slattach/slattach.8#1 branch .. //depot/projects/hfs/sbin/slattach/slattach.c#1 branch .. //depot/projects/hfs/sbin/spppcontrol/Makefile#1 branch .. //depot/projects/hfs/sbin/spppcontrol/spppcontrol.8#1 branch .. //depot/projects/hfs/sbin/spppcontrol/spppcontrol.c#1 branch .. //depot/projects/hfs/sbin/startslip/Makefile#1 branch .. //depot/projects/hfs/sbin/startslip/startslip.1#1 branch .. //depot/projects/hfs/sbin/startslip/startslip.c#1 branch .. //depot/projects/hfs/sbin/sunlabel/Makefile#1 branch .. //depot/projects/hfs/sbin/sunlabel/runtest.sh#1 branch .. //depot/projects/hfs/sbin/sunlabel/sunlabel.8#1 branch .. //depot/projects/hfs/sbin/sunlabel/sunlabel.c#1 branch .. //depot/projects/hfs/sbin/swapon/Makefile#1 branch .. //depot/projects/hfs/sbin/swapon/swapon.8#1 branch .. //depot/projects/hfs/sbin/swapon/swapon.c#1 branch .. //depot/projects/hfs/sbin/sysctl/Makefile#1 branch .. //depot/projects/hfs/sbin/sysctl/sysctl.8#1 branch .. //depot/projects/hfs/sbin/sysctl/sysctl.c#1 branch .. //depot/projects/hfs/sbin/tunefs/Makefile#1 branch .. //depot/projects/hfs/sbin/tunefs/tunefs.8#1 branch .. //depot/projects/hfs/sbin/tunefs/tunefs.c#1 branch .. //depot/projects/hfs/sbin/umount/Makefile#1 branch .. //depot/projects/hfs/sbin/umount/umount.8#1 branch .. //depot/projects/hfs/sbin/umount/umount.c#1 branch .. //depot/projects/hfs/sys/Makefile#1 branch .. //depot/projects/hfs/sys/alpha/Makefile#1 branch .. //depot/projects/hfs/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/hfs/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/hfs/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/hfs/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/hfs/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/hfs/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/hfs/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/hfs/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/hfs/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/hfs/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/support.s#1 branch .. //depot/projects/hfs/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/hfs/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/timerreg.h#1 branch .. //depot/projects/hfs/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/hfs/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/hfs/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/hfs/sys/alpha/conf/Makefile#1 branch .. //depot/projects/hfs/sys/alpha/conf/NOTES#1 branch .. //depot/projects/hfs/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/hfs/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/hfs/sys/alpha/include/_limits.h#1 branch .. //depot/projects/hfs/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/hfs/sys/alpha/include/_types.h#1 branch .. //depot/projects/hfs/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/hfs/sys/alpha/include/asm.h#1 branch .. //depot/projects/hfs/sys/alpha/include/atomic.h#1 branch .. //depot/projects/hfs/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/hfs/sys/alpha/include/bus.h#1 branch .. //depot/projects/hfs/sys/alpha/include/bus_memio.h#1 branch .. //depot/projects/hfs/sys/alpha/include/bus_pio.h#1 branch .. //depot/projects/hfs/sys/alpha/include/bwx.h#1 branch .. //depot/projects/hfs/sys/alpha/include/chipset.h#1 branch .. //depot/projects/hfs/sys/alpha/include/clock.h#1 branch .. //depot/projects/hfs/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/hfs/sys/alpha/include/cpu.h#1 branch .. //depot/projects/hfs/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/hfs/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/hfs/sys/alpha/include/critical.h#1 branch .. //depot/projects/hfs/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/hfs/sys/alpha/include/elf.h#1 branch .. //depot/projects/hfs/sys/alpha/include/endian.h#1 branch .. //depot/projects/hfs/sys/alpha/include/exec.h#1 branch .. //depot/projects/hfs/sys/alpha/include/float.h#1 branch .. //depot/projects/hfs/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/hfs/sys/alpha/include/fpu.h#1 branch .. //depot/projects/hfs/sys/alpha/include/frame.h#1 branch .. //depot/projects/hfs/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/hfs/sys/alpha/include/ieee.h#1 branch .. //depot/projects/hfs/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/hfs/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/hfs/sys/alpha/include/inst.h#1 branch .. //depot/projects/hfs/sys/alpha/include/intr.h#1 branch .. //depot/projects/hfs/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/hfs/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/hfs/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/hfs/sys/alpha/include/kdb.h#1 branch .. //depot/projects/hfs/sys/alpha/include/limits.h#1 branch .. //depot/projects/hfs/sys/alpha/include/md_var.h#1 branch .. //depot/projects/hfs/sys/alpha/include/memdev.h#1 branch .. //depot/projects/hfs/sys/alpha/include/mutex.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pal.h#1 branch .. //depot/projects/hfs/sys/alpha/include/param.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pc/msdos.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pcb.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pmap.h#1 branch .. //depot/projects/hfs/sys/alpha/include/proc.h#1 branch .. //depot/projects/hfs/sys/alpha/include/profile.h#1 branch .. //depot/projects/hfs/sys/alpha/include/prom.h#1 branch .. //depot/projects/hfs/sys/alpha/include/pte.h#1 branch .. //depot/projects/hfs/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/hfs/sys/alpha/include/reg.h#1 branch .. //depot/projects/hfs/sys/alpha/include/reloc.h#1 branch .. //depot/projects/hfs/sys/alpha/include/resource.h#1 branch .. //depot/projects/hfs/sys/alpha/include/rpb.h#1 branch .. //depot/projects/hfs/sys/alpha/include/runq.h#1 branch .. //depot/projects/hfs/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/hfs/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/hfs/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/hfs/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/hfs/sys/alpha/include/signal.h#1 branch .. //depot/projects/hfs/sys/alpha/include/smp.h#1 branch .. //depot/projects/hfs/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/hfs/sys/alpha/include/swiz.h#1 branch .. //depot/projects/hfs/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/hfs/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/hfs/sys/alpha/include/varargs.h#1 branch .. //depot/projects/hfs/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/hfs/sys/alpha/isa/isa.c#1 branch .. //depot/projects/hfs/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/hfs/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/hfs/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/hfs/sys/alpha/linux/Makefile#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux.h#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/hfs/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/hfs/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/hfs/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/hfs/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/hfs/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/hfs/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/hfs/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/hfs/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/hfs/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/hfs/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/hfs/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/hfs/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/hfs/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/hfs/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/hfs/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/hfs/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/hfs/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/hfs/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/hfs/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/cia.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/lca.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/hfs/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/hfs/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/t2.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/hfs/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/hfs/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/hfs/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/hfs/sys/amd64/Makefile#1 branch .. //depot/projects/hfs/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/hfs/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/hfs/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/hfs/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/hfs/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/hfs/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/io.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/hfs/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/hfs/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/hfs/sys/amd64/amd64/support.S#1 branch .. //depot/projects/hfs/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/hfs/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/hfs/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/hfs/sys/amd64/conf/Makefile#1 branch .. //depot/projects/hfs/sys/amd64/conf/NOTES#1 branch .. //depot/projects/hfs/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/hfs/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/hfs/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/hfs/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/hfs/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/hfs/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/hfs/sys/amd64/include/_limits.h#1 branch .. //depot/projects/hfs/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/hfs/sys/amd64/include/_types.h#1 branch .. //depot/projects/hfs/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/hfs/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/hfs/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/hfs/sys/amd64/include/asm.h#1 branch .. //depot/projects/hfs/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/hfs/sys/amd64/include/atomic.h#1 branch .. //depot/projects/hfs/sys/amd64/include/bus.h#1 branch .. //depot/projects/hfs/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/hfs/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/hfs/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/hfs/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/hfs/sys/amd64/include/clock.h#1 branch .. //depot/projects/hfs/sys/amd64/include/cpu.h#1 branch .. //depot/projects/hfs/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/hfs/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/hfs/sys/amd64/include/critical.h#1 branch .. //depot/projects/hfs/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/hfs/sys/amd64/include/elf.h#1 branch .. //depot/projects/hfs/sys/amd64/include/endian.h#1 branch .. //depot/projects/hfs/sys/amd64/include/exec.h#1 branch .. //depot/projects/hfs/sys/amd64/include/float.h#1 branch .. //depot/projects/hfs/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/hfs/sys/amd64/include/fpu.h#1 branch .. //depot/projects/hfs/sys/amd64/include/frame.h#1 branch .. //depot/projects/hfs/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/hfs/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/hfs/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/hfs/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/hfs/sys/amd64/include/iodev.h#1 branch .. //depot/projects/hfs/sys/amd64/include/kdb.h#1 branch .. //depot/projects/hfs/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/hfs/sys/amd64/include/limits.h#1 branch .. //depot/projects/hfs/sys/amd64/include/md_var.h#1 branch .. //depot/projects/hfs/sys/amd64/include/memdev.h#1 branch .. //depot/projects/hfs/sys/amd64/include/metadata.h#1 branch .. //depot/projects/hfs/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/hfs/sys/amd64/include/mptable.h#1 branch .. //depot/projects/hfs/sys/amd64/include/mutex.h#1 branch .. //depot/projects/hfs/sys/amd64/include/param.h#1 branch .. //depot/projects/hfs/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/hfs/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/hfs/sys/amd64/include/pcb.h#1 branch .. //depot/projects/hfs/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/hfs/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/hfs/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/hfs/sys/amd64/include/pmap.h#1 branch .. //depot/projects/hfs/sys/amd64/include/proc.h#1 branch .. //depot/projects/hfs/sys/amd64/include/profile.h#1 branch .. //depot/projects/hfs/sys/amd64/include/psl.h#1 branch .. //depot/projects/hfs/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/hfs/sys/amd64/include/reg.h#1 branch .. //depot/projects/hfs/sys/amd64/include/reloc.h#1 branch .. //depot/projects/hfs/sys/amd64/include/resource.h#1 branch .. //depot/projects/hfs/sys/amd64/include/runq.h#1 branch .. //depot/projects/hfs/sys/amd64/include/segments.h#1 branch .. //depot/projects/hfs/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/hfs/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/hfs/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/hfs/sys/amd64/include/signal.h#1 branch .. //depot/projects/hfs/sys/amd64/include/smp.h#1 branch .. //depot/projects/hfs/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/hfs/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/hfs/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/hfs/sys/amd64/include/trap.h#1 branch .. //depot/projects/hfs/sys/amd64/include/tss.h#1 branch .. //depot/projects/hfs/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/hfs/sys/amd64/include/varargs.h#1 branch .. //depot/projects/hfs/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/hfs/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/hfs/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/hfs/sys/amd64/isa/clock.c#1 branch .. //depot/projects/hfs/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/hfs/sys/amd64/isa/icu.h#1 branch .. //depot/projects/hfs/sys/amd64/isa/isa.c#1 branch .. //depot/projects/hfs/sys/amd64/isa/isa.h#1 branch .. //depot/projects/hfs/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/hfs/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/hfs/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/hfs/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/hfs/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/hfs/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/hfs/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/hfs/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/hfs/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/hfs/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/hfs/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/hfs/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/hfs/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/hfs/sys/arm/arm/blockio.S#1 branch .. //depot/projects/hfs/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/hfs/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/hfs/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/hfs/sys/arm/arm/copystr.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/hfs/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/hfs/sys/arm/arm/critical.c#1 branch .. //depot/projects/hfs/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/hfs/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/hfs/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/hfs/sys/arm/arm/disassem.c#1 branch .. //depot/projects/hfs/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/hfs/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/hfs/sys/arm/arm/exception.S#1 branch .. //depot/projects/hfs/sys/arm/arm/fiq.c#1 branch .. //depot/projects/hfs/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/hfs/sys/arm/arm/fusu.S#1 branch .. //depot/projects/hfs/sys/arm/arm/genassym.c#1 branch .. //depot/projects/hfs/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/hfs/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/hfs/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/hfs/sys/arm/arm/intr.c#1 branch .. //depot/projects/hfs/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/hfs/sys/arm/arm/locore.S#1 branch .. //depot/projects/hfs/sys/arm/arm/machdep.c#1 branch .. //depot/projects/hfs/sys/arm/arm/mem.c#1 branch .. //depot/projects/hfs/sys/arm/arm/nexus.c#1 branch .. //depot/projects/hfs/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/hfs/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/hfs/sys/arm/arm/pmap.c#1 branch .. //depot/projects/hfs/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/hfs/sys/arm/arm/setstack.s#1 branch .. //depot/projects/hfs/sys/arm/arm/support.S#1 branch .. //depot/projects/hfs/sys/arm/arm/swtch.S#1 branch .. //depot/projects/hfs/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/hfs/sys/arm/arm/trap.c#1 branch .. //depot/projects/hfs/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/hfs/sys/arm/arm/undefined.c#1 branch .. //depot/projects/hfs/sys/arm/arm/vectors.S#1 branch .. //depot/projects/hfs/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/hfs/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/hfs/sys/arm/conf/IQ31244#1 branch .. //depot/projects/hfs/sys/arm/conf/SIMICS#1 branch .. //depot/projects/hfs/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/hfs/sys/arm/include/_limits.h#1 branch .. //depot/projects/hfs/sys/arm/include/_stdint.h#1 branch .. //depot/projects/hfs/sys/arm/include/_types.h#1 branch .. //depot/projects/hfs/sys/arm/include/armreg.h#1 branch .. //depot/projects/hfs/sys/arm/include/asm.h#1 branch .. //depot/projects/hfs/sys/arm/include/asmacros.h#1 branch .. //depot/projects/hfs/sys/arm/include/atomic.h#1 branch .. //depot/projects/hfs/sys/arm/include/blockio.h#1 branch .. //depot/projects/hfs/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/hfs/sys/arm/include/bus.h#1 branch .. //depot/projects/hfs/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/hfs/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/hfs/sys/arm/include/clock.h#1 branch .. //depot/projects/hfs/sys/arm/include/cpu.h#1 branch .. //depot/projects/hfs/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/hfs/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/hfs/sys/arm/include/critical.h#1 branch .. //depot/projects/hfs/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/hfs/sys/arm/include/disassem.h#1 branch .. //depot/projects/hfs/sys/arm/include/elf.h#1 branch .. //depot/projects/hfs/sys/arm/include/endian.h#1 branch .. //depot/projects/hfs/sys/arm/include/exec.h#1 branch .. //depot/projects/hfs/sys/arm/include/fiq.h#1 branch .. //depot/projects/hfs/sys/arm/include/float.h#1 branch .. //depot/projects/hfs/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/hfs/sys/arm/include/fp.h#1 branch .. //depot/projects/hfs/sys/arm/include/frame.h#1 branch .. //depot/projects/hfs/sys/arm/include/ieee.h#1 branch .. //depot/projects/hfs/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/hfs/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/hfs/sys/arm/include/intr.h#1 branch .. //depot/projects/hfs/sys/arm/include/katelib.h#1 branch .. //depot/projects/hfs/sys/arm/include/kdb.h#1 branch .. //depot/projects/hfs/sys/arm/include/limits.h#1 branch .. //depot/projects/hfs/sys/arm/include/machdep.h#1 branch .. //depot/projects/hfs/sys/arm/include/md_var.h#1 branch .. //depot/projects/hfs/sys/arm/include/memdev.h#1 branch .. //depot/projects/hfs/sys/arm/include/metadata.h#1 branch .. //depot/projects/hfs/sys/arm/include/mutex.h#1 branch .. //depot/projects/hfs/sys/arm/include/param.h#1 branch .. //depot/projects/hfs/sys/arm/include/pcb.h#1 branch .. //depot/projects/hfs/sys/arm/include/pcpu.h#1 branch .. //depot/projects/hfs/sys/arm/include/pmap.h#1 branch .. //depot/projects/hfs/sys/arm/include/proc.h#1 branch .. //depot/projects/hfs/sys/arm/include/profile.h#1 branch .. //depot/projects/hfs/sys/arm/include/psl.h#1 branch .. //depot/projects/hfs/sys/arm/include/pte.h#1 branch .. //depot/projects/hfs/sys/arm/include/ptrace.h#1 branch .. //depot/projects/hfs/sys/arm/include/reg.h#1 branch .. //depot/projects/hfs/sys/arm/include/reloc.h#1 branch .. //depot/projects/hfs/sys/arm/include/resource.h#1 branch .. //depot/projects/hfs/sys/arm/include/runq.h#1 branch .. //depot/projects/hfs/sys/arm/include/setjmp.h#1 branch .. //depot/projects/hfs/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/hfs/sys/arm/include/sigframe.h#1 branch .. //depot/projects/hfs/sys/arm/include/signal.h#1 branch .. //depot/projects/hfs/sys/arm/include/smp.h#1 branch .. //depot/projects/hfs/sys/arm/include/stdarg.h#1 branch .. //depot/projects/hfs/sys/arm/include/swi.h#1 branch .. //depot/projects/hfs/sys/arm/include/sysarch.h#1 branch .. //depot/projects/hfs/sys/arm/include/trap.h#1 branch .. //depot/projects/hfs/sys/arm/include/ucontext.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 17 17:19:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8FF416A4D0; Fri, 17 Dec 2004 17:19:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A6C916A4CE for ; Fri, 17 Dec 2004 17:19:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31C6343D5E for ; Fri, 17 Dec 2004 17:19:09 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBHHJ9PI075834 for ; Fri, 17 Dec 2004 17:19:09 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBHHJ8T5075831 for perforce@freebsd.org; Fri, 17 Dec 2004 17:19:08 GMT (envelope-from areisse@nailabs.com) Date: Fri, 17 Dec 2004 17:19:08 GMT Message-Id: <200412171719.iBHHJ8T5075831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 67241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Dec 2004 17:19:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=67241 Change 67241 by areisse@areisse_tislabs on 2004/12/17 17:18:37 Fix problems with policy that prevented it from building: -Type differences from selinux -netlink security classes -building (still requires gmake) -file:poll permission Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#14 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/assert.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#6 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#7 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unconfined.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/apache.te#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sendmail.te#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/usbd.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#7 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/initial_sids#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/security_classes#6 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/fs_use#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genfs_contexts#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/base_user_macros.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/core_macros.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/global_macros.te#7 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/selinux_macros.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/file.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#14 (text+ko) ==== @@ -114,9 +114,9 @@ mv $@.tmp $@ install-src: /etc/security/sebsd - rm -rf $(INSTALLDIR)/policy.old - -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old - cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) + rm -rf $(INSTALLDIR)/policy.old + -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old + cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) tmp/program_used_flags.te: $(wildcard domains/program/*.te) domains/program mkdir -p tmp @@ -155,7 +155,3 @@ rm -f tmp/* rm -f $(FC) -install-src: /etc/security/sebsd - rm -rf $(INSTALLDIR)/policy.old - -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old - cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/assert.te#5 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#5 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#5 (text+ko) ==== @@ -9,7 +9,7 @@ type atrun_t, domain, privlog; role system_r types atrun_t; role sysadm_r types atrun_t; -every_domain(atrun_t) +base_file_read_access(atrun_t) type atrun_exec_t, file_type, sysadmfile, exec_type; domain_auto_trans({ crond_t system_crond_t sysadm_t }, atrun_exec_t, atrun_t) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#6 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#7 (text+ko) ==== @@ -64,7 +64,7 @@ allow $1_t { null_device_t zero_device_t }:chr_file rw_file_perms; # Read /dev/random and /dev/zero. -allow $1 random_device_t:{ lnk_file chr_file } r_file_perms; +allow $1_t random_device_t:{ lnk_file chr_file } r_file_perms; can_network($1_t) @@ -226,11 +226,6 @@ allow sshd_t sshd_devpts_t:chr_file { setattr getattr relabelfrom relabelto }; allow sshd_t userpty_type:chr_file { setattr relabelto rw_file_perms }; -# ssh_keygen_t is the type of the ssh-keygen program when run at install time -# and by sysadm_t -daemon_base_domain(ssh_keygen) -allow ssh_keygen_t etc_t:file { getattr read }; -file_type_auto_trans(ssh_keygen_t, etc_t, sshd_key_t, file) # # Author: Stephen Smalley # ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unconfined.te#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/apache.te#3 (text+ko) ==== @@ -158,7 +158,7 @@ r_dir_file(initrc_t, httpd_config_t) ################################################## -file_type_auto_trans(httpd_t, var_log_t, httpd_log_files_t) +file_type_auto_trans(httpd_t, var_log_t, httpd_log_t) ######################################## # Allow httpd_t to bind to the HTTP port ######################################## ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sendmail.te#3 (text+ko) ==== @@ -13,9 +13,6 @@ # daemon started by the init rc scripts. # -# etc_mail_t is the type of /etc/mail. -type etc_mail_t, file_type, sysadmfile; - daemon_domain(sendmail, `, mta_delivery_agent, mail_server_domain, mail_server_sender', nosysadm) tmp_domain(sendmail) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/usbd.te#5 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#7 (text+ko) ==== @@ -160,13 +160,20 @@ connectto newconn acceptfrom + node_bind } class udp_socket inherits socket +{ + node_bind +} class rawip_socket inherits socket +{ + node_bind +} class node { @@ -269,6 +276,9 @@ class shm inherits ipc +{ + lock +} class posix_sem { @@ -375,4 +385,6 @@ passwd chfn chsh + rootok + crontab } ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/initial_sids#5 (text+ko) ==== @@ -28,10 +28,8 @@ sid sysctl_vm sid sysctl_dev sid kmod -sid devfs -sid devpts -sid nfs sid policy -sid tmpfs +sid scmp_packet +sid devnull # FLASK ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/security_classes#6 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/fs_use#5 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genfs_contexts#5 (text+ko) ==== @@ -54,7 +54,7 @@ # driverfs -genfscon driverfs / system_u:object_r:driverfs_t +#genfscon driverfs / system_u:object_r:driverfs_t # usbdevfs genfscon usbdevfs / system_u:object_r:usbdevfs_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#5 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/base_user_macros.te#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/core_macros.te#2 (text+ko) ==== @@ -81,7 +81,7 @@ # # Permissions for reading and writing files and their attributes. # -define(`rw_file_perms', `{ ioctl read getattr lock write append }') +define(`rw_file_perms', `{ ioctl read getattr lock write append poll }') # # Permissions for reading and appending to files. @@ -558,7 +558,7 @@ allow $1_t devpts_t:dir { getattr read search }; # ignore old BSD pty devices -dontaudit $1_t bsdpty_device_t:chr_file { getattr read write }; +#dontaudit $1_t bsdpty_device_t:chr_file { getattr read write }; ') ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/global_macros.te#7 (text+ko) ==== @@ -599,6 +599,6 @@ # Set user information and skip authentication. allow $1 self:passwd *; -allow $1 self:dbus *; -allow $1 self:nscd *; +#allow $1 self:dbus *; +#allow $1 self:nscd *; ') ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/selinux_macros.te#2 (text+ko) ==== @@ -1,1 +1,15 @@ define(`dac_override', `{ dac_read_search dac_execute dac_write }') + +# FreeBSD doesn't use netlink sockets for administering networks. +# Instead of using rules directly, those parts of the policy should use macros. +define(`netlink_route_socket', `netlink_socket') +define(`netlink_firewall_socket', `netlink_socket') +define(`netlink_xfrm_socket', `netlink_socket') +define(`netlink_ip6fw_socket', `netlink_socket') +define(`netlink_selinux_socket', `netlink_socket') +define(`netlink_audit_socket', `netlink_socket') +define(`netlink_tcpdiag_socket', `netlink_socket') +define(`netlink_nflog_socket', `netlink_socket') +define(`netlink_dnrt_socket', `netlink_socket') +define(`nlmsg_read', `read') +define(`nlmsg_write', `write') ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#5 (text+ko) ==== @@ -131,7 +131,7 @@ type mtrr_device_t, device_type; # Type for /dev/bpf* -type bpf_device_t, file_type; +type bpf_device_t, device_type; # Type for /dev/apm_bios type apm_bios_t, device_type; @@ -150,7 +150,6 @@ # for other device nodes such as the NVidia binary-only driver type xserver_misc_device_t, device_type; -type v4l_device_t, file_type; # Type for /dev/klog -type klog_device_t, file_type; +type klog_device_t, device_type; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/file.te#5 (text+ko) ==== @@ -113,6 +113,7 @@ # etc_aliases_t is the type of the aliases database. # type etc_aliases_t, file_type, sysadmfile; +type etc_mail_t, file_type, sysadmfile; # net_conf_t is the type of the /etc/resolv.conf file. # all DHCP clients and PPP need write access to this file. @@ -271,6 +272,8 @@ type usbdevfs_t, fs_type, root_dir_type, noexattrfile, sysadmfile; allow usbdevfs_t usbdevfs_t:filesystem associate; +type usbdevfs_device_t, device_type, noexattrfile, sysadmfile; +allow usbdevfs_device_t usbdevfs_t:filesystem associate; type sysfs_t, fs_type, root_dir_type, sysadmfile; allow sysfs_t sysfs_t:filesystem associate; From owner-p4-projects@FreeBSD.ORG Sat Dec 18 15:46:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D0ED16A4D0; Sat, 18 Dec 2004 15:46:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B41EE16A4CE for ; Sat, 18 Dec 2004 15:46:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 341F243D48 for ; Sat, 18 Dec 2004 15:46:39 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBIFkd8F059343 for ; Sat, 18 Dec 2004 15:46:39 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBIFkbfE059340 for perforce@freebsd.org; Sat, 18 Dec 2004 15:46:37 GMT (envelope-from gnn@neville-neil.com) Date: Sat, 18 Dec 2004 15:46:37 GMT Message-Id: <200412181546.iBIFkbfE059340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Subject: PERFORCE change 67305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Dec 2004 15:46:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=67305 Change 67305 by gnn@gnn_dingo_integ on 2004/12/18 15:41:34 Integrate the FreeBSD vendor branch into the dingo branch. This is the first such integration. Affected files ... .. //depot/projects/dingo/COPYRIGHT#1 branch .. //depot/projects/dingo/MAINTAINERS#1 branch .. //depot/projects/dingo/Makefile#1 branch .. //depot/projects/dingo/Makefile.inc1#1 branch .. //depot/projects/dingo/README#1 branch .. //depot/projects/dingo/UPDATING#1 branch .. //depot/projects/dingo/bin/Makefile#1 branch .. //depot/projects/dingo/bin/Makefile.inc#1 branch .. //depot/projects/dingo/bin/cat/Makefile#1 branch .. //depot/projects/dingo/bin/cat/cat.1#1 branch .. //depot/projects/dingo/bin/cat/cat.c#1 branch .. //depot/projects/dingo/bin/chflags/Makefile#1 branch .. //depot/projects/dingo/bin/chflags/chflags.1#1 branch .. //depot/projects/dingo/bin/chflags/chflags.c#1 branch .. //depot/projects/dingo/bin/chio/Makefile#1 branch .. //depot/projects/dingo/bin/chio/chio.1#1 branch .. //depot/projects/dingo/bin/chio/chio.c#1 branch .. //depot/projects/dingo/bin/chio/defs.h#1 branch .. //depot/projects/dingo/bin/chio/pathnames.h#1 branch .. //depot/projects/dingo/bin/chmod/Makefile#1 branch .. //depot/projects/dingo/bin/chmod/chmod.1#1 branch .. //depot/projects/dingo/bin/chmod/chmod.c#1 branch .. //depot/projects/dingo/bin/cp/Makefile#1 branch .. //depot/projects/dingo/bin/cp/cp.1#1 branch .. //depot/projects/dingo/bin/cp/cp.c#1 branch .. //depot/projects/dingo/bin/cp/extern.h#1 branch .. //depot/projects/dingo/bin/cp/utils.c#1 branch .. //depot/projects/dingo/bin/csh/Makefile#1 branch .. //depot/projects/dingo/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/dingo/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/dingo/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/dingo/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/dingo/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/dingo/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/dingo/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/dingo/bin/csh/config.h#1 branch .. //depot/projects/dingo/bin/csh/host.defs#1 branch .. //depot/projects/dingo/bin/date/Makefile#1 branch .. //depot/projects/dingo/bin/date/date.1#1 branch .. //depot/projects/dingo/bin/date/date.c#1 branch .. //depot/projects/dingo/bin/date/extern.h#1 branch .. //depot/projects/dingo/bin/date/netdate.c#1 branch .. //depot/projects/dingo/bin/date/vary.c#1 branch .. //depot/projects/dingo/bin/date/vary.h#1 branch .. //depot/projects/dingo/bin/dd/Makefile#1 branch .. //depot/projects/dingo/bin/dd/args.c#1 branch .. //depot/projects/dingo/bin/dd/conv.c#1 branch .. //depot/projects/dingo/bin/dd/conv_tab.c#1 branch .. //depot/projects/dingo/bin/dd/dd.1#1 branch .. //depot/projects/dingo/bin/dd/dd.c#1 branch .. //depot/projects/dingo/bin/dd/dd.h#1 branch .. //depot/projects/dingo/bin/dd/extern.h#1 branch .. //depot/projects/dingo/bin/dd/gen.c#1 branch .. //depot/projects/dingo/bin/dd/misc.c#1 branch .. //depot/projects/dingo/bin/dd/position.c#1 branch .. //depot/projects/dingo/bin/dd/ref.ascii#1 branch .. //depot/projects/dingo/bin/dd/ref.ebcdic#1 branch .. //depot/projects/dingo/bin/dd/ref.ibm#1 branch .. //depot/projects/dingo/bin/dd/ref.lcase#1 branch .. //depot/projects/dingo/bin/dd/ref.oldascii#1 branch .. //depot/projects/dingo/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/dingo/bin/dd/ref.oldibm#1 branch .. //depot/projects/dingo/bin/dd/ref.pareven#1 branch .. //depot/projects/dingo/bin/dd/ref.parnone#1 branch .. //depot/projects/dingo/bin/dd/ref.parodd#1 branch .. //depot/projects/dingo/bin/dd/ref.parset#1 branch .. //depot/projects/dingo/bin/dd/ref.swab#1 branch .. //depot/projects/dingo/bin/dd/ref.ucase#1 branch .. //depot/projects/dingo/bin/df/Makefile#1 branch .. //depot/projects/dingo/bin/df/df.1#1 branch .. //depot/projects/dingo/bin/df/df.c#1 branch .. //depot/projects/dingo/bin/domainname/Makefile#1 branch .. //depot/projects/dingo/bin/domainname/domainname.1#1 branch .. //depot/projects/dingo/bin/domainname/domainname.c#1 branch .. //depot/projects/dingo/bin/echo/Makefile#1 branch .. //depot/projects/dingo/bin/echo/echo.1#1 branch .. //depot/projects/dingo/bin/echo/echo.c#1 branch .. //depot/projects/dingo/bin/ed/Makefile#1 branch .. //depot/projects/dingo/bin/ed/POSIX#1 branch .. //depot/projects/dingo/bin/ed/README#1 branch .. //depot/projects/dingo/bin/ed/buf.c#1 branch .. //depot/projects/dingo/bin/ed/cbc.c#1 branch .. //depot/projects/dingo/bin/ed/ed.1#1 branch .. //depot/projects/dingo/bin/ed/ed.h#1 branch .. //depot/projects/dingo/bin/ed/glbl.c#1 branch .. //depot/projects/dingo/bin/ed/io.c#1 branch .. //depot/projects/dingo/bin/ed/main.c#1 branch .. //depot/projects/dingo/bin/ed/re.c#1 branch .. //depot/projects/dingo/bin/ed/sub.c#1 branch .. //depot/projects/dingo/bin/ed/test/=.err#1 branch .. //depot/projects/dingo/bin/ed/test/Makefile#1 branch .. //depot/projects/dingo/bin/ed/test/README#1 branch .. //depot/projects/dingo/bin/ed/test/TODO#1 branch .. //depot/projects/dingo/bin/ed/test/a.d#1 branch .. //depot/projects/dingo/bin/ed/test/a.r#1 branch .. //depot/projects/dingo/bin/ed/test/a.t#1 branch .. //depot/projects/dingo/bin/ed/test/a1.err#1 branch .. //depot/projects/dingo/bin/ed/test/a2.err#1 branch .. //depot/projects/dingo/bin/ed/test/addr.d#1 branch .. //depot/projects/dingo/bin/ed/test/addr.r#1 branch .. //depot/projects/dingo/bin/ed/test/addr.t#1 branch .. //depot/projects/dingo/bin/ed/test/addr1.err#1 branch .. //depot/projects/dingo/bin/ed/test/addr2.err#1 branch .. //depot/projects/dingo/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/dingo/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/dingo/bin/ed/test/ascii.t#1 branch .. //depot/projects/dingo/bin/ed/test/bang1.d#1 branch .. //depot/projects/dingo/bin/ed/test/bang1.err#1 branch .. //depot/projects/dingo/bin/ed/test/bang1.r#1 branch .. //depot/projects/dingo/bin/ed/test/bang1.t#1 branch .. //depot/projects/dingo/bin/ed/test/bang2.err#1 branch .. //depot/projects/dingo/bin/ed/test/c.d#1 branch .. //depot/projects/dingo/bin/ed/test/c.r#1 branch .. //depot/projects/dingo/bin/ed/test/c.t#1 branch .. //depot/projects/dingo/bin/ed/test/c1.err#1 branch .. //depot/projects/dingo/bin/ed/test/c2.err#1 branch .. //depot/projects/dingo/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/dingo/bin/ed/test/d.d#1 branch .. //depot/projects/dingo/bin/ed/test/d.err#1 branch .. //depot/projects/dingo/bin/ed/test/d.r#1 branch .. //depot/projects/dingo/bin/ed/test/d.t#1 branch .. //depot/projects/dingo/bin/ed/test/e1.d#1 branch .. //depot/projects/dingo/bin/ed/test/e1.err#1 branch .. //depot/projects/dingo/bin/ed/test/e1.r#1 branch .. //depot/projects/dingo/bin/ed/test/e1.t#1 branch .. //depot/projects/dingo/bin/ed/test/e2.d#1 branch .. //depot/projects/dingo/bin/ed/test/e2.err#1 branch .. //depot/projects/dingo/bin/ed/test/e2.r#1 branch .. //depot/projects/dingo/bin/ed/test/e2.t#1 branch .. //depot/projects/dingo/bin/ed/test/e3.d#1 branch .. //depot/projects/dingo/bin/ed/test/e3.err#1 branch .. //depot/projects/dingo/bin/ed/test/e3.r#1 branch .. //depot/projects/dingo/bin/ed/test/e3.t#1 branch .. //depot/projects/dingo/bin/ed/test/e4.d#1 branch .. //depot/projects/dingo/bin/ed/test/e4.r#1 branch .. //depot/projects/dingo/bin/ed/test/e4.t#1 branch .. //depot/projects/dingo/bin/ed/test/f1.err#1 branch .. //depot/projects/dingo/bin/ed/test/f2.err#1 branch .. //depot/projects/dingo/bin/ed/test/g1.d#1 branch .. //depot/projects/dingo/bin/ed/test/g1.err#1 branch .. //depot/projects/dingo/bin/ed/test/g1.r#1 branch .. //depot/projects/dingo/bin/ed/test/g1.t#1 branch .. //depot/projects/dingo/bin/ed/test/g2.d#1 branch .. //depot/projects/dingo/bin/ed/test/g2.err#1 branch .. //depot/projects/dingo/bin/ed/test/g2.r#1 branch .. //depot/projects/dingo/bin/ed/test/g2.t#1 branch .. //depot/projects/dingo/bin/ed/test/g3.d#1 branch .. //depot/projects/dingo/bin/ed/test/g3.err#1 branch .. //depot/projects/dingo/bin/ed/test/g3.r#1 branch .. //depot/projects/dingo/bin/ed/test/g3.t#1 branch .. //depot/projects/dingo/bin/ed/test/g4.d#1 branch .. //depot/projects/dingo/bin/ed/test/g4.r#1 branch .. //depot/projects/dingo/bin/ed/test/g4.t#1 branch .. //depot/projects/dingo/bin/ed/test/g5.d#1 branch .. //depot/projects/dingo/bin/ed/test/g5.r#1 branch .. //depot/projects/dingo/bin/ed/test/g5.t#1 branch .. //depot/projects/dingo/bin/ed/test/h.err#1 branch .. //depot/projects/dingo/bin/ed/test/i.d#1 branch .. //depot/projects/dingo/bin/ed/test/i.r#1 branch .. //depot/projects/dingo/bin/ed/test/i.t#1 branch .. //depot/projects/dingo/bin/ed/test/i1.err#1 branch .. //depot/projects/dingo/bin/ed/test/i2.err#1 branch .. //depot/projects/dingo/bin/ed/test/i3.err#1 branch .. //depot/projects/dingo/bin/ed/test/j.d#1 branch .. //depot/projects/dingo/bin/ed/test/j.r#1 branch .. //depot/projects/dingo/bin/ed/test/j.t#1 branch .. //depot/projects/dingo/bin/ed/test/k.d#1 branch .. //depot/projects/dingo/bin/ed/test/k.r#1 branch .. //depot/projects/dingo/bin/ed/test/k.t#1 branch .. //depot/projects/dingo/bin/ed/test/k1.err#1 branch .. //depot/projects/dingo/bin/ed/test/k2.err#1 branch .. //depot/projects/dingo/bin/ed/test/k3.err#1 branch .. //depot/projects/dingo/bin/ed/test/k4.err#1 branch .. //depot/projects/dingo/bin/ed/test/l.d#1 branch .. //depot/projects/dingo/bin/ed/test/l.r#1 branch .. //depot/projects/dingo/bin/ed/test/l.t#1 branch .. //depot/projects/dingo/bin/ed/test/m.d#1 branch .. //depot/projects/dingo/bin/ed/test/m.err#1 branch .. //depot/projects/dingo/bin/ed/test/m.r#1 branch .. //depot/projects/dingo/bin/ed/test/m.t#1 branch .. //depot/projects/dingo/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/dingo/bin/ed/test/n.d#1 branch .. //depot/projects/dingo/bin/ed/test/n.r#1 branch .. //depot/projects/dingo/bin/ed/test/n.t#1 branch .. //depot/projects/dingo/bin/ed/test/nl.err#1 branch .. //depot/projects/dingo/bin/ed/test/nl1.d#1 branch .. //depot/projects/dingo/bin/ed/test/nl1.r#1 branch .. //depot/projects/dingo/bin/ed/test/nl1.t#1 branch .. //depot/projects/dingo/bin/ed/test/nl2.d#1 branch .. //depot/projects/dingo/bin/ed/test/nl2.r#1 branch .. //depot/projects/dingo/bin/ed/test/nl2.t#1 branch .. //depot/projects/dingo/bin/ed/test/p.d#1 branch .. //depot/projects/dingo/bin/ed/test/p.r#1 branch .. //depot/projects/dingo/bin/ed/test/p.t#1 branch .. //depot/projects/dingo/bin/ed/test/q.d#1 branch .. //depot/projects/dingo/bin/ed/test/q.r#1 branch .. //depot/projects/dingo/bin/ed/test/q.t#1 branch .. //depot/projects/dingo/bin/ed/test/q1.err#1 branch .. //depot/projects/dingo/bin/ed/test/r1.d#1 branch .. //depot/projects/dingo/bin/ed/test/r1.err#1 branch .. //depot/projects/dingo/bin/ed/test/r1.r#1 branch .. //depot/projects/dingo/bin/ed/test/r1.t#1 branch .. //depot/projects/dingo/bin/ed/test/r2.d#1 branch .. //depot/projects/dingo/bin/ed/test/r2.err#1 branch .. //depot/projects/dingo/bin/ed/test/r2.r#1 branch .. //depot/projects/dingo/bin/ed/test/r2.t#1 branch .. //depot/projects/dingo/bin/ed/test/r3.d#1 branch .. //depot/projects/dingo/bin/ed/test/r3.r#1 branch .. //depot/projects/dingo/bin/ed/test/r3.t#1 branch .. //depot/projects/dingo/bin/ed/test/s1.d#1 branch .. //depot/projects/dingo/bin/ed/test/s1.err#1 branch .. //depot/projects/dingo/bin/ed/test/s1.r#1 branch .. //depot/projects/dingo/bin/ed/test/s1.t#1 branch .. //depot/projects/dingo/bin/ed/test/s10.err#1 branch .. //depot/projects/dingo/bin/ed/test/s2.d#1 branch .. //depot/projects/dingo/bin/ed/test/s2.err#1 branch .. //depot/projects/dingo/bin/ed/test/s2.r#1 branch .. //depot/projects/dingo/bin/ed/test/s2.t#1 branch .. //depot/projects/dingo/bin/ed/test/s3.d#1 branch .. //depot/projects/dingo/bin/ed/test/s3.err#1 branch .. //depot/projects/dingo/bin/ed/test/s3.r#1 branch .. //depot/projects/dingo/bin/ed/test/s3.t#1 branch .. //depot/projects/dingo/bin/ed/test/s4.err#1 branch .. //depot/projects/dingo/bin/ed/test/s5.err#1 branch .. //depot/projects/dingo/bin/ed/test/s6.err#1 branch .. //depot/projects/dingo/bin/ed/test/s7.err#1 branch .. //depot/projects/dingo/bin/ed/test/s8.err#1 branch .. //depot/projects/dingo/bin/ed/test/s9.err#1 branch .. //depot/projects/dingo/bin/ed/test/t.d#1 branch .. //depot/projects/dingo/bin/ed/test/t.r#1 branch .. //depot/projects/dingo/bin/ed/test/t1.d#1 branch .. //depot/projects/dingo/bin/ed/test/t1.err#1 branch .. //depot/projects/dingo/bin/ed/test/t1.r#1 branch .. //depot/projects/dingo/bin/ed/test/t1.t#1 branch .. //depot/projects/dingo/bin/ed/test/t2.d#1 branch .. //depot/projects/dingo/bin/ed/test/t2.err#1 branch .. //depot/projects/dingo/bin/ed/test/t2.r#1 branch .. //depot/projects/dingo/bin/ed/test/t2.t#1 branch .. //depot/projects/dingo/bin/ed/test/u.d#1 branch .. //depot/projects/dingo/bin/ed/test/u.err#1 branch .. //depot/projects/dingo/bin/ed/test/u.r#1 branch .. //depot/projects/dingo/bin/ed/test/u.t#1 branch .. //depot/projects/dingo/bin/ed/test/v.d#1 branch .. //depot/projects/dingo/bin/ed/test/v.r#1 branch .. //depot/projects/dingo/bin/ed/test/v.t#1 branch .. //depot/projects/dingo/bin/ed/test/w.d#1 branch .. //depot/projects/dingo/bin/ed/test/w.r#1 branch .. //depot/projects/dingo/bin/ed/test/w.t#1 branch .. //depot/projects/dingo/bin/ed/test/w1.err#1 branch .. //depot/projects/dingo/bin/ed/test/w2.err#1 branch .. //depot/projects/dingo/bin/ed/test/w3.err#1 branch .. //depot/projects/dingo/bin/ed/test/x.err#1 branch .. //depot/projects/dingo/bin/ed/test/z.err#1 branch .. //depot/projects/dingo/bin/ed/undo.c#1 branch .. //depot/projects/dingo/bin/expr/Makefile#1 branch .. //depot/projects/dingo/bin/expr/expr.1#1 branch .. //depot/projects/dingo/bin/expr/expr.y#1 branch .. //depot/projects/dingo/bin/getfacl/Makefile#1 branch .. //depot/projects/dingo/bin/getfacl/getfacl.1#1 branch .. //depot/projects/dingo/bin/getfacl/getfacl.c#1 branch .. //depot/projects/dingo/bin/hostname/Makefile#1 branch .. //depot/projects/dingo/bin/hostname/hostname.1#1 branch .. //depot/projects/dingo/bin/hostname/hostname.c#1 branch .. //depot/projects/dingo/bin/kenv/Makefile#1 branch .. //depot/projects/dingo/bin/kenv/kenv.1#1 branch .. //depot/projects/dingo/bin/kenv/kenv.c#1 branch .. //depot/projects/dingo/bin/kill/Makefile#1 branch .. //depot/projects/dingo/bin/kill/kill.1#1 branch .. //depot/projects/dingo/bin/kill/kill.c#1 branch .. //depot/projects/dingo/bin/ln/Makefile#1 branch .. //depot/projects/dingo/bin/ln/ln.1#1 branch .. //depot/projects/dingo/bin/ln/ln.c#1 branch .. //depot/projects/dingo/bin/ln/symlink.7#1 branch .. //depot/projects/dingo/bin/ls/Makefile#1 branch .. //depot/projects/dingo/bin/ls/cmp.c#1 branch .. //depot/projects/dingo/bin/ls/extern.h#1 branch .. //depot/projects/dingo/bin/ls/ls.1#1 branch .. //depot/projects/dingo/bin/ls/ls.c#1 branch .. //depot/projects/dingo/bin/ls/ls.h#1 branch .. //depot/projects/dingo/bin/ls/print.c#1 branch .. //depot/projects/dingo/bin/ls/util.c#1 branch .. //depot/projects/dingo/bin/mkdir/Makefile#1 branch .. //depot/projects/dingo/bin/mkdir/mkdir.1#1 branch .. //depot/projects/dingo/bin/mkdir/mkdir.c#1 branch .. //depot/projects/dingo/bin/mv/Makefile#1 branch .. //depot/projects/dingo/bin/mv/mv.1#1 branch .. //depot/projects/dingo/bin/mv/mv.c#1 branch .. //depot/projects/dingo/bin/pax/Makefile#1 branch .. //depot/projects/dingo/bin/pax/ar_io.c#1 branch .. //depot/projects/dingo/bin/pax/ar_subs.c#1 branch .. //depot/projects/dingo/bin/pax/buf_subs.c#1 branch .. //depot/projects/dingo/bin/pax/cache.c#1 branch .. //depot/projects/dingo/bin/pax/cache.h#1 branch .. //depot/projects/dingo/bin/pax/cpio.1#1 branch .. //depot/projects/dingo/bin/pax/cpio.c#1 branch .. //depot/projects/dingo/bin/pax/cpio.h#1 branch .. //depot/projects/dingo/bin/pax/extern.h#1 branch .. //depot/projects/dingo/bin/pax/file_subs.c#1 branch .. //depot/projects/dingo/bin/pax/ftree.c#1 branch .. //depot/projects/dingo/bin/pax/ftree.h#1 branch .. //depot/projects/dingo/bin/pax/gen_subs.c#1 branch .. //depot/projects/dingo/bin/pax/getoldopt.c#1 branch .. //depot/projects/dingo/bin/pax/options.c#1 branch .. //depot/projects/dingo/bin/pax/options.h#1 branch .. //depot/projects/dingo/bin/pax/pat_rep.c#1 branch .. //depot/projects/dingo/bin/pax/pat_rep.h#1 branch .. //depot/projects/dingo/bin/pax/pax.1#1 branch .. //depot/projects/dingo/bin/pax/pax.c#1 branch .. //depot/projects/dingo/bin/pax/pax.h#1 branch .. //depot/projects/dingo/bin/pax/sel_subs.c#1 branch .. //depot/projects/dingo/bin/pax/sel_subs.h#1 branch .. //depot/projects/dingo/bin/pax/tables.c#1 branch .. //depot/projects/dingo/bin/pax/tables.h#1 branch .. //depot/projects/dingo/bin/pax/tar.1#1 branch .. //depot/projects/dingo/bin/pax/tar.c#1 branch .. //depot/projects/dingo/bin/pax/tar.h#1 branch .. //depot/projects/dingo/bin/pax/tty_subs.c#1 branch .. //depot/projects/dingo/bin/ps/Makefile#1 branch .. //depot/projects/dingo/bin/ps/extern.h#1 branch .. //depot/projects/dingo/bin/ps/fmt.c#1 branch .. //depot/projects/dingo/bin/ps/keyword.c#1 branch .. //depot/projects/dingo/bin/ps/nlist.c#1 branch .. //depot/projects/dingo/bin/ps/print.c#1 branch .. //depot/projects/dingo/bin/ps/ps.1#1 branch .. //depot/projects/dingo/bin/ps/ps.c#1 branch .. //depot/projects/dingo/bin/ps/ps.h#1 branch .. //depot/projects/dingo/bin/pwd/Makefile#1 branch .. //depot/projects/dingo/bin/pwd/pwd.1#1 branch .. //depot/projects/dingo/bin/pwd/pwd.c#1 branch .. //depot/projects/dingo/bin/rcp/Makefile#1 branch .. //depot/projects/dingo/bin/rcp/extern.h#1 branch .. //depot/projects/dingo/bin/rcp/rcp.1#1 branch .. //depot/projects/dingo/bin/rcp/rcp.c#1 branch .. //depot/projects/dingo/bin/rcp/util.c#1 branch .. //depot/projects/dingo/bin/realpath/Makefile#1 branch .. //depot/projects/dingo/bin/realpath/realpath.1#1 branch .. //depot/projects/dingo/bin/realpath/realpath.c#1 branch .. //depot/projects/dingo/bin/rm/Makefile#1 branch .. //depot/projects/dingo/bin/rm/rm.1#1 branch .. //depot/projects/dingo/bin/rm/rm.c#1 branch .. //depot/projects/dingo/bin/rmail/Makefile#1 branch .. //depot/projects/dingo/bin/rmdir/Makefile#1 branch .. //depot/projects/dingo/bin/rmdir/rmdir.1#1 branch .. //depot/projects/dingo/bin/rmdir/rmdir.c#1 branch .. //depot/projects/dingo/bin/setfacl/Makefile#1 branch .. //depot/projects/dingo/bin/setfacl/file.c#1 branch .. //depot/projects/dingo/bin/setfacl/mask.c#1 branch .. //depot/projects/dingo/bin/setfacl/merge.c#1 branch .. //depot/projects/dingo/bin/setfacl/remove.c#1 branch .. //depot/projects/dingo/bin/setfacl/setfacl.1#1 branch .. //depot/projects/dingo/bin/setfacl/setfacl.c#1 branch .. //depot/projects/dingo/bin/setfacl/setfacl.h#1 branch .. //depot/projects/dingo/bin/setfacl/util.c#1 branch .. //depot/projects/dingo/bin/sh/Makefile#1 branch .. //depot/projects/dingo/bin/sh/TOUR#1 branch .. //depot/projects/dingo/bin/sh/alias.c#1 branch .. //depot/projects/dingo/bin/sh/alias.h#1 branch .. //depot/projects/dingo/bin/sh/arith.h#1 branch .. //depot/projects/dingo/bin/sh/arith.y#1 branch .. //depot/projects/dingo/bin/sh/arith_lex.l#1 branch .. //depot/projects/dingo/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/dingo/bin/sh/bltin/echo.1#1 branch .. //depot/projects/dingo/bin/sh/bltin/echo.c#1 branch .. //depot/projects/dingo/bin/sh/builtins.def#1 branch .. //depot/projects/dingo/bin/sh/cd.c#1 branch .. //depot/projects/dingo/bin/sh/cd.h#1 branch .. //depot/projects/dingo/bin/sh/error.c#1 branch .. //depot/projects/dingo/bin/sh/error.h#1 branch .. //depot/projects/dingo/bin/sh/eval.c#1 branch .. //depot/projects/dingo/bin/sh/eval.h#1 branch .. //depot/projects/dingo/bin/sh/exec.c#1 branch .. //depot/projects/dingo/bin/sh/exec.h#1 branch .. //depot/projects/dingo/bin/sh/expand.c#1 branch .. //depot/projects/dingo/bin/sh/expand.h#1 branch .. //depot/projects/dingo/bin/sh/funcs/cmv#1 branch .. //depot/projects/dingo/bin/sh/funcs/dirs#1 branch .. //depot/projects/dingo/bin/sh/funcs/kill#1 branch .. //depot/projects/dingo/bin/sh/funcs/login#1 branch .. //depot/projects/dingo/bin/sh/funcs/newgrp#1 branch .. //depot/projects/dingo/bin/sh/funcs/popd#1 branch .. //depot/projects/dingo/bin/sh/funcs/pushd#1 branch .. //depot/projects/dingo/bin/sh/funcs/suspend#1 branch .. //depot/projects/dingo/bin/sh/histedit.c#1 branch .. //depot/projects/dingo/bin/sh/init.h#1 branch .. //depot/projects/dingo/bin/sh/input.c#1 branch .. //depot/projects/dingo/bin/sh/input.h#1 branch .. //depot/projects/dingo/bin/sh/jobs.c#1 branch .. //depot/projects/dingo/bin/sh/jobs.h#1 branch .. //depot/projects/dingo/bin/sh/mail.c#1 branch .. //depot/projects/dingo/bin/sh/mail.h#1 branch .. //depot/projects/dingo/bin/sh/main.c#1 branch .. //depot/projects/dingo/bin/sh/main.h#1 branch .. //depot/projects/dingo/bin/sh/memalloc.c#1 branch .. //depot/projects/dingo/bin/sh/memalloc.h#1 branch .. //depot/projects/dingo/bin/sh/miscbltin.c#1 branch .. //depot/projects/dingo/bin/sh/mkbuiltins#1 branch .. //depot/projects/dingo/bin/sh/mkinit.c#1 branch .. //depot/projects/dingo/bin/sh/mknodes.c#1 branch .. //depot/projects/dingo/bin/sh/mksyntax.c#1 branch .. //depot/projects/dingo/bin/sh/mktokens#1 branch .. //depot/projects/dingo/bin/sh/myhistedit.h#1 branch .. //depot/projects/dingo/bin/sh/mystring.c#1 branch .. //depot/projects/dingo/bin/sh/mystring.h#1 branch .. //depot/projects/dingo/bin/sh/nodes.c.pat#1 branch .. //depot/projects/dingo/bin/sh/nodetypes#1 branch .. //depot/projects/dingo/bin/sh/options.c#1 branch .. //depot/projects/dingo/bin/sh/options.h#1 branch .. //depot/projects/dingo/bin/sh/output.c#1 branch .. //depot/projects/dingo/bin/sh/output.h#1 branch .. //depot/projects/dingo/bin/sh/parser.c#1 branch .. //depot/projects/dingo/bin/sh/parser.h#1 branch .. //depot/projects/dingo/bin/sh/redir.c#1 branch .. //depot/projects/dingo/bin/sh/redir.h#1 branch .. //depot/projects/dingo/bin/sh/sh.1#1 branch .. //depot/projects/dingo/bin/sh/shell.h#1 branch .. //depot/projects/dingo/bin/sh/show.c#1 branch .. //depot/projects/dingo/bin/sh/show.h#1 branch .. //depot/projects/dingo/bin/sh/trap.c#1 branch .. //depot/projects/dingo/bin/sh/trap.h#1 branch .. //depot/projects/dingo/bin/sh/var.c#1 branch .. //depot/projects/dingo/bin/sh/var.h#1 branch .. //depot/projects/dingo/bin/sleep/Makefile#1 branch .. //depot/projects/dingo/bin/sleep/sleep.1#1 branch .. //depot/projects/dingo/bin/sleep/sleep.c#1 branch .. //depot/projects/dingo/bin/stty/Makefile#1 branch .. //depot/projects/dingo/bin/stty/cchar.c#1 branch .. //depot/projects/dingo/bin/stty/extern.h#1 branch .. //depot/projects/dingo/bin/stty/gfmt.c#1 branch .. //depot/projects/dingo/bin/stty/key.c#1 branch .. //depot/projects/dingo/bin/stty/modes.c#1 branch .. //depot/projects/dingo/bin/stty/print.c#1 branch .. //depot/projects/dingo/bin/stty/stty.1#1 branch .. //depot/projects/dingo/bin/stty/stty.c#1 branch .. //depot/projects/dingo/bin/stty/stty.h#1 branch .. //depot/projects/dingo/bin/stty/util.c#1 branch .. //depot/projects/dingo/bin/sync/Makefile#1 branch .. //depot/projects/dingo/bin/sync/sync.8#1 branch .. //depot/projects/dingo/bin/sync/sync.c#1 branch .. //depot/projects/dingo/bin/test/Makefile#1 branch .. //depot/projects/dingo/bin/test/TEST.README#1 branch .. //depot/projects/dingo/bin/test/TEST.csh#1 branch .. //depot/projects/dingo/bin/test/TEST.sh#1 branch .. //depot/projects/dingo/bin/test/test.1#1 branch .. //depot/projects/dingo/bin/test/test.c#1 branch .. //depot/projects/dingo/contrib/amd/AUTHORS#1 branch .. //depot/projects/dingo/contrib/amd/BUGS#1 branch .. //depot/projects/dingo/contrib/amd/COPYING#1 branch .. //depot/projects/dingo/contrib/amd/ChangeLog#1 branch .. //depot/projects/dingo/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/dingo/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/dingo/contrib/amd/INSTALL#1 branch .. //depot/projects/dingo/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/dingo/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/dingo/contrib/amd/NEWS#1 branch .. //depot/projects/dingo/contrib/amd/README#1 branch .. //depot/projects/dingo/contrib/amd/README.ldap#1 branch .. //depot/projects/dingo/contrib/amd/README.y2k#1 branch .. //depot/projects/dingo/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amd.8#1 branch .. //depot/projects/dingo/contrib/amd/amd/amd.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amd.h#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/autil.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/clock.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/conf.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/dingo/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/dingo/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/map.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/opts.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/restart.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/sched.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/dingo/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/dingo/contrib/amd/amq/amq.8#1 branch .. //depot/projects/dingo/contrib/amd/amq/amq.c#1 branch .. //depot/projects/dingo/contrib/amd/amq/amq.h#1 branch .. //depot/projects/dingo/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/dingo/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/dingo/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/dingo/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/dingo/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/dingo/contrib/amd/bootstrap#1 branch .. //depot/projects/dingo/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/dingo/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/dingo/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/dingo/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/dingo/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/dingo/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/dingo/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/dingo/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/dingo/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/dingo/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/dingo/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/dingo/contrib/amd/doc/version.texi#1 branch .. //depot/projects/dingo/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/dingo/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/dingo/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/dingo/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/dingo/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/dingo/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/dingo/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/dingo/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/dingo/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/dingo/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/dingo/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/dingo/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/dingo/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/dingo/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/dingo/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/dingo/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/dingo/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/dingo/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/dingo/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/dingo/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/util.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/dingo/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/dingo/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/dingo/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/dingo/contrib/amd/m4/amindent#1 branch .. //depot/projects/dingo/contrib/amd/m4/autopat#1 branch .. //depot/projects/dingo/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/dingo/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/dingo/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/dingo/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/dingo/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/dingo/contrib/amd/m4/mkconf#1 branch .. //depot/projects/dingo/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/dingo/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/dingo/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/dingo/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/dingo/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/dingo/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/dingo/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/dingo/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/dingo/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/dingo/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/dingo/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/dingo/contrib/amd/tasks#1 branch .. //depot/projects/dingo/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/dingo/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/dingo/contrib/bc/AUTHORS#1 branch .. //depot/projects/dingo/contrib/bc/ChangeLog#1 branch .. //depot/projects/dingo/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/dingo/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/dingo/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/dingo/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/dingo/contrib/bc/FAQ#1 branch .. //depot/projects/dingo/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/dingo/contrib/bc/INSTALL#1 branch .. //depot/projects/dingo/contrib/bc/Makefile.am#1 branch .. //depot/projects/dingo/contrib/bc/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bc/NEWS#1 branch .. //depot/projects/dingo/contrib/bc/README#1 branch .. //depot/projects/dingo/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/dingo/contrib/bc/Test/array.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/atan.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/div.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/exp.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/fact.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/jn.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/ln.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/mul.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/raise.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/signum#1 branch .. //depot/projects/dingo/contrib/bc/Test/sine.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/dingo/contrib/bc/Test/timetest#1 branch .. //depot/projects/dingo/contrib/bc/acconfig.h#1 branch .. //depot/projects/dingo/contrib/bc/aclocal.m4#1 branch .. //depot/projects/dingo/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/dingo/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bc/bc/bc.y#1 branch .. //depot/projects/dingo/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/dingo/contrib/bc/bc/const.h#1 branch .. //depot/projects/dingo/contrib/bc/bc/execute.c#1 branch .. //depot/projects/dingo/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/dingo/contrib/bc/bc/global.c#1 branch .. //depot/projects/dingo/contrib/bc/bc/global.h#1 branch .. //depot/projects/dingo/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/dingo/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/dingo/contrib/bc/bc/load.c#1 branch .. //depot/projects/dingo/contrib/bc/bc/main.c#1 branch .. //depot/projects/dingo/contrib/bc/bc/proto.h#1 branch .. //depot/projects/dingo/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/dingo/contrib/bc/bc/scan.l#1 branch .. //depot/projects/dingo/contrib/bc/bc/storage.c#1 branch .. //depot/projects/dingo/contrib/bc/bc/util.c#1 branch .. //depot/projects/dingo/contrib/bc/config.h.in#1 branch .. //depot/projects/dingo/contrib/bc/configure#1 branch .. //depot/projects/dingo/contrib/bc/configure.in#1 branch .. //depot/projects/dingo/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/dingo/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bc/dc/array.c#1 branch .. //depot/projects/dingo/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/dingo/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/dingo/contrib/bc/dc/dc.c#1 branch .. //depot/projects/dingo/contrib/bc/dc/dc.h#1 branch .. //depot/projects/dingo/contrib/bc/dc/eval.c#1 branch .. //depot/projects/dingo/contrib/bc/dc/misc.c#1 branch .. //depot/projects/dingo/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/dingo/contrib/bc/dc/stack.c#1 branch .. //depot/projects/dingo/contrib/bc/dc/string.c#1 branch .. //depot/projects/dingo/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/dingo/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bc/doc/bc.1#1 branch .. //depot/projects/dingo/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/dingo/contrib/bc/doc/dc.1#1 branch .. //depot/projects/dingo/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/dingo/contrib/bc/h/number.h#1 branch .. //depot/projects/dingo/contrib/bc/install-sh#1 branch .. //depot/projects/dingo/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/dingo/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bc/lib/number.c#1 branch .. //depot/projects/dingo/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/dingo/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/dingo/contrib/bc/missing#1 branch .. //depot/projects/dingo/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/dingo/contrib/bc/stamp-h.in#1 branch .. //depot/projects/dingo/contrib/bind9/CHANGES#1 branch .. //depot/projects/dingo/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/dingo/contrib/bind9/FAQ#1 branch .. //depot/projects/dingo/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/dingo/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/dingo/contrib/bind9/KNOWN_DEFECTS#1 branch .. //depot/projects/dingo/contrib/bind9/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/README#1 branch .. //depot/projects/dingo/contrib/bind9/acconfig.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signkey.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signkey.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signkey.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/dingo/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/dingo/contrib/bind9/config.guess#1 branch .. //depot/projects/dingo/contrib/bind9/config.sub#1 branch .. //depot/projects/dingo/contrib/bind9/configure.in#1 branch .. //depot/projects/dingo/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/isc.color.gif#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#1 branch .. //depot/projects/dingo/contrib/bind9/doc/arm/validate.sh.in#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/dingo/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3513.txt#1 branch .. //depot/projects/dingo/contrib/bind9/doc/rfc/rfc3596.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<<