From owner-p4-projects@FreeBSD.ORG Sun Feb 24 00:06:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EAE616A405; Sun, 24 Feb 2008 00:06:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C018416A404 for ; Sun, 24 Feb 2008 00:06:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFB4013C448 for ; Sun, 24 Feb 2008 00:06:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1O06vAA052234 for ; Sun, 24 Feb 2008 00:06:57 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1O06vCf052231 for perforce@freebsd.org; Sun, 24 Feb 2008 00:06:57 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Feb 2008 00:06:57 GMT Message-Id: <200802240006.m1O06vCf052231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 00:06:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=136049 Change 136049 by marcel@marcel_cluster on 2008/02/24 00:06:00 IFC @136044 Affected files ... .. //depot/projects/e500/sys/libkern/quad.h#3 integrate Differences ... ==== //depot/projects/e500/sys/libkern/quad.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)quad.h 8.1 (Berkeley) 6/4/93 - * $FreeBSD: src/sys/libkern/quad.h,v 1.18 2004/05/05 15:12:55 bde Exp $ + * $FreeBSD: src/sys/libkern/quad.h,v 1.19 2008/02/23 22:40:05 marcel Exp $ */ #ifndef _LIBKERN_QUAD_H_ From owner-p4-projects@FreeBSD.ORG Sun Feb 24 01:21:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1517816A404; Sun, 24 Feb 2008 01:21:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83FCE16A403 for ; Sun, 24 Feb 2008 01:21:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8DED213C45D for ; Sun, 24 Feb 2008 01:21:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1O1LHZQ067166 for ; Sun, 24 Feb 2008 01:21:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1O1LHRn067163 for perforce@freebsd.org; Sun, 24 Feb 2008 01:21:17 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Feb 2008 01:21:17 GMT Message-Id: <200802240121.m1O1LHRn067163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 01:21:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=136055 Change 136055 by marcel@marcel_xcllnt on 2008/02/24 01:20:18 Unify o Move the FAULTBUF_* defines to booke/trap.c. That's the only place they're used. o Make the faultbuf 25 registers big for all CPUs. o Put CPU-specific fields in a union, like what is from for o Remove pcb_pmreal for AIM. It's not used. As such, the PCB doesn't change size due to the union. Affected files ... .. //depot/projects/e500/sys/powerpc/aim/swtch.S#4 edit .. //depot/projects/e500/sys/powerpc/aim/vm_machdep.c#8 edit .. //depot/projects/e500/sys/powerpc/booke/swtch.S#2 edit .. //depot/projects/e500/sys/powerpc/booke/trap.c#5 edit .. //depot/projects/e500/sys/powerpc/include/pcb.h#4 edit .. //depot/projects/e500/sys/powerpc/powerpc/genassym.c#5 edit Differences ... ==== //depot/projects/e500/sys/powerpc/aim/swtch.S#4 (text+ko) ==== @@ -88,7 +88,7 @@ stw %r16,PCB_LR(%r5) mfsr %r16,USER_SR /* Save USER_SR for copyin/out */ isync - stw %r16,PCB_USR(%r5) + stw %r16,PCB_AIM_USR(%r5) stw %r1,PCB_SP(%r5) /* Save the stack pointer */ mr %r14,%r3 /* Copy the old thread ptr... */ @@ -125,7 +125,7 @@ mtcr %r5 lwz %r5,PCB_LR(%r3) /* Load the link register */ mtlr %r5 - lwz %r5,PCB_USR(%r3) /* Load the USER_SR segment reg */ + lwz %r5,PCB_AIM_USR(%r3) /* Load the USER_SR segment reg */ mtsr USER_SR,%r5 isync lwz %r1,PCB_SP(%r3) /* Load the stack pointer */ ==== //depot/projects/e500/sys/powerpc/aim/vm_machdep.c#8 (text+ko) ==== @@ -152,7 +152,7 @@ pcb->pcb_sp = (register_t)cf; pcb->pcb_lr = (register_t)fork_trampoline; - pcb->pcb_usr = kernel_pmap->pm_sr[USER_SR]; + pcb->pcb_cpu.aim.usr = kernel_pmap->pm_sr[USER_SR]; /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; @@ -330,7 +330,7 @@ pcb2->pcb_sp = (register_t)cf; pcb2->pcb_lr = (register_t)fork_trampoline; - pcb2->pcb_usr = kernel_pmap->pm_sr[USER_SR]; + pcb2->pcb_cpu.aim.usr = kernel_pmap->pm_sr[USER_SR]; /* Setup to release spin count in fork_exit(). */ td->td_md.md_spinlock_count = 1; ==== //depot/projects/e500/sys/powerpc/booke/swtch.S#2 (text+ko) ==== @@ -82,9 +82,9 @@ mflr %r16 /* Save the link register */ stw %r16, PCB_LR(%r5) mfctr %r16 - stw %r16, PCB_CTR(%r5) + stw %r16, PCB_BOOKE_CTR(%r5) mfxer %r16 - stw %r16, PCB_XER(%r5) + stw %r16, PCB_BOOKE_XER(%r5) stw %r1, PCB_SP(%r5) /* Save the stack pointer */ @@ -108,9 +108,9 @@ mtcr %r5 lwz %r5, PCB_LR(%r3) /* Load the link register */ mtlr %r5 - lwz %r5, PCB_CTR(%r3) + lwz %r5, PCB_BOOKE_CTR(%r3) mtctr %r5 - lwz %r5, PCB_XER(%r3) + lwz %r5, PCB_BOOKE_XER(%r3) mtxer %r5 lwz %r1, PCB_SP(%r3) /* Load the stack pointer */ ==== //depot/projects/e500/sys/powerpc/booke/trap.c#5 (text+ko) ==== @@ -79,6 +79,14 @@ #include #endif +#define FAULTBUF_LR 0 +#define FAULTBUF_R1 1 +#define FAULTBUF_R2 2 +#define FAULTBUF_CR 3 +#define FAULTBUF_CTR 4 +#define FAULTBUF_XER 5 +#define FAULTBUF_R13 6 + void trap(struct trapframe *); static void trap_fatal(struct trapframe *frame); ==== //depot/projects/e500/sys/powerpc/include/pcb.h#4 (text+ko) ==== @@ -35,38 +35,14 @@ #ifndef _MACHINE_PCB_H_ #define _MACHINE_PCB_H_ -#if defined(AIM) - -typedef int faultbuf[23]; - -#else - -#define FAULTBUF_LR 0 -#define FAULTBUF_R1 1 -#define FAULTBUF_R2 2 -#define FAULTBUF_CR 3 -#define FAULTBUF_CTR 4 -#define FAULTBUF_XER 5 -#define FAULTBUF_R13 6 typedef int faultbuf[25]; -#endif - struct pcb { register_t pcb_context[20]; /* non-volatile r14-r31 */ register_t pcb_cr; /* Condition register */ register_t pcb_sp; /* stack pointer */ register_t pcb_lr; /* link register */ -#if defined(AIM) - register_t pcb_usr; /* USER_SR segment register */ -#else - register_t pcb_ctr; - register_t pcb_xer; -#endif struct pmap *pcb_pm; /* pmap of our vmspace */ -#if defined(AIM) - struct pmap *pcb_pmreal; /* real address of above */ -#endif faultbuf *pcb_onfault; /* For use during copyin/copyout */ int pcb_flags; @@ -77,6 +53,16 @@ } pcb_fpu; /* Floating point processor */ unsigned int pcb_fpcpu; /* which CPU had our FPU stuff. */ + + union { + struct { + register_t usr; /* USER_SR segment */ + } aim; + struct { + register_t ctr; + register_t xer; + } booke; + } pcb_cpu; }; #ifdef _KERNEL ==== //depot/projects/e500/sys/powerpc/powerpc/genassym.c#5 (text+ko) ==== @@ -173,23 +173,15 @@ ASSYM(PCB_CONTEXT, offsetof(struct pcb, pcb_context)); ASSYM(PCB_CR, offsetof(struct pcb, pcb_cr)); -#if defined(E500) -ASSYM(PCB_CTR, offsetof(struct pcb, pcb_ctr)); -ASSYM(PCB_XER, offsetof(struct pcb, pcb_xer)); -#endif -#if defined(AIM) -ASSYM(PCB_PMR, offsetof(struct pcb, pcb_pmreal)); -#endif ASSYM(PCB_SP, offsetof(struct pcb, pcb_sp)); ASSYM(PCB_LR, offsetof(struct pcb, pcb_lr)); -#if defined(AIM) -ASSYM(PCB_USR, offsetof(struct pcb, pcb_usr)); -#endif ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); -#if defined(AIM) ASSYM(PCB_FPU, PCB_FPU); -#endif + +ASSYM(PCB_AIM_USR, offsetof(struct pcb, pcb_cpu.aim.usr)); +ASSYM(PCB_BOOKE_CTR, offsetof(struct pcb, pcb_cpu.booke.ctr)); +ASSYM(PCB_BOOKE_XER, offsetof(struct pcb, pcb_cpu.booke.xer)); ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); From owner-p4-projects@FreeBSD.ORG Sun Feb 24 03:10:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C14016A403; Sun, 24 Feb 2008 03:10:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 213ED16A401 for ; Sun, 24 Feb 2008 03:10:19 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B37513C43E for ; Sun, 24 Feb 2008 03:10:19 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1O3AINh074701 for ; Sun, 24 Feb 2008 03:10:18 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1O3AITV074698 for perforce@freebsd.org; Sun, 24 Feb 2008 03:10:18 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Feb 2008 03:10:18 GMT Message-Id: <200802240310.m1O3AITV074698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 03:10:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136061 Change 136061 by marcel@marcel_cluster on 2008/02/24 03:09:54 IFC @136060 Affected files ... .. //depot/projects/e500/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_add.c#6 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_emu.c#7 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_emu.h#5 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_extern.h#5 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_subr.c#6 integrate .. //depot/projects/e500/usr.bin/find/function.c#3 integrate Differences ... ==== //depot/projects/e500/sys/kern/uipc_syscalls.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.268 2008/02/23 01:01:48 des Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.269 2008/02/24 00:07:00 cperciva Exp $"); #include "opt_sctp.h" #include "opt_compat.h" @@ -2209,7 +2209,9 @@ } /* Quit outer loop on error or when we're done. */ - if (error || done) + if (done) + break; + if (error) goto done; } ==== //depot/projects/e500/sys/powerpc/fpu/fpu_add.c#6 (text+ko) ==== @@ -47,7 +47,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); #include #include @@ -58,7 +58,6 @@ #include #include -#include struct fpn * fpu_add(struct fpemu *fe) ==== //depot/projects/e500/sys/powerpc/fpu/fpu_emu.c#7 (text+ko) ==== @@ -76,7 +76,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); #include "opt_ddb.h" @@ -328,7 +328,7 @@ /* Store as integer */ ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - DPRINTF(FPE_INSN, ("reg %d has %lx reg %d has %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n", ra, tf->fixreg[ra], rb, tf->fixreg[rb])); addr = tf->fixreg[rb]; @@ -358,7 +358,7 @@ /* calculate EA of load/store */ ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - DPRINTF(FPE_INSN, ("reg %d has %lx reg %d has %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n", ra, tf->fixreg[ra], rb, tf->fixreg[rb])); addr = tf->fixreg[rb]; if (ra != 0) @@ -375,7 +375,7 @@ /* calculate EA of load/store */ ra = instr.i_d.i_ra; addr = instr.i_d.i_d; - DPRINTF(FPE_INSN, ("reg %d has %lx displ %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x displ %x\n", ra, tf->fixreg[ra], addr)); if (ra != 0) addr += tf->fixreg[ra]; ==== //depot/projects/e500/sys/powerpc/fpu/fpu_emu.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: fpu_emu.h,v 1.3 2005/12/11 12:18:42 christos Exp $ */ -/* $FreeBSD: src/sys/powerpc/fpu/fpu_emu.h,v 1.1 2008/02/23 20:05:26 marcel Exp $ */ +/* $FreeBSD: src/sys/powerpc/fpu/fpu_emu.h,v 1.2 2008/02/24 03:01:26 marcel Exp $ */ /* * Copyright (c) 1992, 1993 @@ -167,6 +167,8 @@ /* Build a new Quiet NaN (sign=0, frac=all 1's). */ struct fpn *fpu_newnan(struct fpemu *); +void fpu_norm(struct fpn *); + /* * Shift a number right some number of bits, taking care of round/sticky. * Note that the result is probably not a well-formed number (it will lack ==== //depot/projects/e500/sys/powerpc/fpu/fpu_extern.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: fpu_extern.h,v 1.3 2005/12/11 12:18:42 christos Exp $ */ -/* $FreeBSD: src/sys/powerpc/fpu/fpu_extern.h,v 1.1 2008/02/23 20:05:26 marcel Exp $ */ +/* $FreeBSD: src/sys/powerpc/fpu/fpu_extern.h,v 1.2 2008/02/24 03:01:26 marcel Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -48,36 +48,15 @@ int fpu_emulate(struct trapframe *, struct fpreg *); int fpu_execute(struct trapframe *, struct fpemu *, union instr *); -/* fpu_add.c */ -struct fpn *fpu_add(struct fpemu *); - -/* fpu_compare.c */ -void fpu_compare(struct fpemu *, int); - -/* fpu_div.c */ -struct fpn *fpu_div(struct fpemu *); - /* fpu_explode.c */ int fpu_itof(struct fpn *, u_int); int fpu_xtof(struct fpn *, u_int64_t); int fpu_stof(struct fpn *, u_int); int fpu_dtof(struct fpn *, u_int, u_int); -void fpu_explode(struct fpemu *, struct fpn *, int, int); /* fpu_implode.c */ u_int fpu_ftoi(struct fpemu *, struct fpn *); u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *); u_int fpu_ftos(struct fpemu *, struct fpn *); u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *); -void fpu_implode(struct fpemu *, struct fpn *, int, u_int *); - -/* fpu_mul.c */ -struct fpn *fpu_mul(struct fpemu *); -/* fpu_sqrt.c */ -struct fpn *fpu_sqrt(struct fpemu *); - -/* fpu_subr.c */ -int fpu_shr(struct fpn *, int); -void fpu_norm(struct fpn *); -struct fpn *fpu_newnan(struct fpemu *); ==== //depot/projects/e500/sys/powerpc/fpu/fpu_subr.c#6 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); #include #include @@ -55,7 +55,6 @@ #include #include -#include /* * Shift the given number right rsh bits. Any bits that `fall off' will get ==== //depot/projects/e500/usr.bin/find/function.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.59 2008/02/23 16:29:04 imp Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.60 2008/02/24 00:01:06 imp Exp $"); #include #include @@ -1087,9 +1087,16 @@ int f_name(PLAN *plan, FTSENT *entry) { - if ((plan->flags & F_LINK) && !S_ISLNK(entry->fts_statp->st_mode)) - return 0; - return !fnmatch(plan->c_data, entry->fts_name, + char fn[PATH_MAX]; + const char *name; + + if (plan->flags & F_LINK) { + name = fn; + if (readlink(entry->fts_path, fn, sizeof(fn)) == -1) + return 0; + } else + name = entry->fts_name; + return !fnmatch(plan->c_data, name, plan->flags & F_IGNCASE ? FNM_CASEFOLD : 0); } @@ -1102,8 +1109,6 @@ pattern = nextarg(option, argvp); new = palloc(option); new->c_data = pattern; - if (new->flags & F_LINK) - ftsoptions &= ~FTS_NOSTAT; return new; } From owner-p4-projects@FreeBSD.ORG Sun Feb 24 05:43:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13CB816A404; Sun, 24 Feb 2008 05:43:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC1C216A400 for ; Sun, 24 Feb 2008 05:43:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8BCE13C442 for ; Sun, 24 Feb 2008 05:43:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1O5h7Y1000593 for ; Sun, 24 Feb 2008 05:43:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1O5h7U5000589 for perforce@freebsd.org; Sun, 24 Feb 2008 05:43:07 GMT (envelope-from sam@freebsd.org) Date: Sun, 24 Feb 2008 05:43:07 GMT Message-Id: <200802240543.m1O5h7U5000589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 05:43:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=136065 Change 136065 by sam@sam_ebb on 2008/02/24 05:43:02 o split probe response frame construction into a new ieee80211_alloc_proberesp routine for use by drivers o add missing classification of probe response frames Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#36 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#36 (text+ko) ==== @@ -2037,43 +2037,21 @@ } /* - * Send a probe response frame to the specified mac address. - * This does not go through the normal mgt frame api so we - * can specify the destination address and re-use the bss node - * for the sta reference. + * Return an mbuf with a probe response frame in it. + * Space is left to prepend and 802.11 header at the + * front but it's left to the caller to fill in. */ -int -ieee80211_send_proberesp(struct ieee80211vap *vap, - const uint8_t da[IEEE80211_ADDR_LEN], int legacy) +struct mbuf * +ieee80211_alloc_proberesp(struct ieee80211_node *bss, int legacy) { - struct ieee80211_node *bss = vap->iv_bss; - struct ieee80211com *ic = vap->iv_ic; - struct ieee80211_frame *wh; + struct ieee80211vap *vap = bss->ni_vap; + struct ieee80211com *ic = bss->ni_ic; const struct ieee80211_rateset *rs; struct mbuf *m; uint16_t capinfo; uint8_t *frm; - if (vap->iv_state == IEEE80211_S_CAC) { - IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT, bss, - "block %s frame in CAC state", "probe response"); - vap->iv_stats.is_tx_badstate++; - return EIO; /* XXX */ - } - /* - * Hold a reference on the node so it doesn't go away until after - * the xmit is complete all the way in the driver. On error we - * will remove our reference. - */ - IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, - "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", - __func__, __LINE__, - bss, ether_sprintf(bss->ni_macaddr), - ieee80211_node_refcnt(bss)+1); - ieee80211_ref_node(bss); - - /* * probe response frame format * [8] time stamp * [2] beacon interval @@ -2123,8 +2101,7 @@ ); if (m == NULL) { vap->iv_stats.is_tx_nobuf++; - ieee80211_free_node(bss); - return ENOMEM; + return NULL; } memset(frm, 0, 8); /* timestamp should be filled later */ @@ -2207,6 +2184,48 @@ frm = add_appie(frm, vap->iv_appie_proberesp); m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); + return m; +} + +/* + * Send a probe response frame to the specified mac address. + * This does not go through the normal mgt frame api so we + * can specify the destination address and re-use the bss node + * for the sta reference. + */ +int +ieee80211_send_proberesp(struct ieee80211vap *vap, + const uint8_t da[IEEE80211_ADDR_LEN], int legacy) +{ + struct ieee80211_node *bss = vap->iv_bss; + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_frame *wh; + struct mbuf *m; + + if (vap->iv_state == IEEE80211_S_CAC) { + IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT, bss, + "block %s frame in CAC state", "probe response"); + vap->iv_stats.is_tx_badstate++; + return EIO; /* XXX */ + } + + /* + * Hold a reference on the node so it doesn't go away until after + * the xmit is complete all the way in the driver. On error we + * will remove our reference. + */ + IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, + "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", + __func__, __LINE__, bss, ether_sprintf(bss->ni_macaddr), + ieee80211_node_refcnt(bss)+1); + ieee80211_ref_node(bss); + + m = ieee80211_alloc_proberesp(bss, legacy); + if (m == NULL) { + ieee80211_free_node(bss); + return ENOMEM; + } + M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT); KASSERT(m != NULL, ("no room for header")); @@ -2216,11 +2235,12 @@ vap->iv_myaddr, da, bss->ni_bssid); /* XXX power management? */ - IEEE80211_NODE_STAT(bss, tx_mgmt); + M_WME_SETAC(m, WME_AC_BE); IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_DUMPPKTS, wh->i_addr1, "send probe resp on channel %u", ieee80211_chan2ieee(ic, ic->ic_curchan)); + IEEE80211_NODE_STAT(bss, tx_mgmt); return ic->ic_raw_xmit(bss, m, NULL); } ==== //depot/projects/vap/sys/net80211/ieee80211_proto.h#16 (text+ko) ==== @@ -47,16 +47,6 @@ #define IEEE80211_SEND_MGMT(_ni,_type,_arg) \ ((*(_ni)->ni_ic->ic_send_mgmt)(_ni, _type, _arg)) -/* - * The formation of some management frames requires guidance to - * deal with legacy clients. When the client is identified as - * "legacy 11b" this parameter can be passed in the arg param of a - * IEEE80211_SEND_MGMT call. - */ -#define IEEE80211_SEND_LEGACY_11B 0x1 /* legacy 11b client */ -#define IEEE80211_SEND_LEGACY_11 0x2 /* other legacy client */ -#define IEEE80211_SEND_LEGACY 0x3 /* any legacy client */ - extern const char *ieee80211_mgt_subtype_name[]; extern const char *ieee80211_phymode_name[]; @@ -82,6 +72,7 @@ void ieee80211_start(struct ifnet *); int ieee80211_send_nulldata(struct ieee80211_node *); int ieee80211_classify(struct ieee80211_node *, struct mbuf *m); +struct mbuf *ieee80211_encap(struct ieee80211_node *, struct mbuf *); int ieee80211_send_mgmt(struct ieee80211_node *, int, int); struct ieee80211_appie; int ieee80211_send_probereq(struct ieee80211_node *ni, @@ -89,9 +80,17 @@ const uint8_t da[IEEE80211_ADDR_LEN], const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t *ssid, size_t ssidlen); +/* + * The formation of ProbeResponse frames requires guidance to + * deal with legacy clients. When the client is identified as + * "legacy 11b" ieee80211_send_proberesp is passed this token. + */ +#define IEEE80211_SEND_LEGACY_11B 0x1 /* legacy 11b client */ +#define IEEE80211_SEND_LEGACY_11 0x2 /* other legacy client */ +#define IEEE80211_SEND_LEGACY 0x3 /* any legacy client */ +struct mbuf *ieee80211_alloc_proberesp(struct ieee80211_node *, int); int ieee80211_send_proberesp(struct ieee80211vap *, const uint8_t da[IEEE80211_ADDR_LEN], int); -struct mbuf *ieee80211_encap(struct ieee80211_node *, struct mbuf *); void ieee80211_reset_erp(struct ieee80211com *); void ieee80211_set_shortslottime(struct ieee80211com *, int onoff); From owner-p4-projects@FreeBSD.ORG Sun Feb 24 05:49:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AFB516A402; Sun, 24 Feb 2008 05:49:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FAB816A400 for ; Sun, 24 Feb 2008 05:49:14 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C40F13C447 for ; Sun, 24 Feb 2008 05:49:14 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1O5nEPN000897 for ; Sun, 24 Feb 2008 05:49:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1O5nEJH000894 for perforce@freebsd.org; Sun, 24 Feb 2008 05:49:14 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Feb 2008 05:49:14 GMT Message-Id: <200802240549.m1O5nEJH000894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 05:49:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=136066 Change 136066 by marcel@marcel_xcllnt on 2008/02/24 05:48:57 Unify This is a bit tricky. The PCPU on Book E is much bigger then the PCPU on AIM. The union trick would pessimize AIM too much. On top of that, PCPU_MD_FIELDS needs to be defined for MI code. We're going to have to test for AIM or E500 here. So, we define all fields separately for AIM and BOOKE so that the co-exist and then test the CPU type for how to define PCPU_MD_FIELDS. To support LINT, we check for COMPILING_LINT and define PCPU_MD_FIELDS to be the union of AIM and BOOKE fields. Affected files ... .. //depot/projects/e500/sys/powerpc/aim/trap_subr.S#5 edit .. //depot/projects/e500/sys/powerpc/booke/trap_subr.S#5 edit .. //depot/projects/e500/sys/powerpc/include/pcpu.h#4 edit .. //depot/projects/e500/sys/powerpc/powerpc/genassym.c#6 edit Differences ... ==== //depot/projects/e500/sys/powerpc/aim/trap_subr.S#5 (text+ko) ==== @@ -140,8 +140,8 @@ stw %r29, FRAME_29+8(%r1); \ stw %r30, FRAME_30+8(%r1); \ stw %r31, FRAME_31+8(%r1); \ - lwz %r28,(savearea+CPUSAVE_DAR)(%r2); /* saved DAR */ \ - lwz %r29,(savearea+CPUSAVE_DSISR)(%r2);/* saved DSISR */ \ + lwz %r28,(savearea+CPUSAVE_AIM_DAR)(%r2); /* saved DAR */ \ + lwz %r29,(savearea+CPUSAVE_AIM_DSISR)(%r2);/* saved DSISR */\ lwz %r30,(savearea+CPUSAVE_SRR0)(%r2); /* saved SRR0 */ \ lwz %r31,(savearea+CPUSAVE_SRR1)(%r2); /* saved SRR1 */ \ mfxer %r3; \ @@ -272,8 +272,8 @@ stw %r31,(PC_TEMPSAVE+CPUSAVE_R31)(%r1) mfdar %r30 mfdsisr %r31 - stw %r30,(PC_TEMPSAVE+CPUSAVE_DAR)(%r1) - stw %r31,(PC_TEMPSAVE+CPUSAVE_DSISR)(%r1) + stw %r30,(PC_TEMPSAVE+CPUSAVE_AIM_DAR)(%r1) + stw %r31,(PC_TEMPSAVE+CPUSAVE_AIM_DSISR)(%r1) mfsprg1 %r1 /* restore SP, in case of branch */ mflr %r28 /* save LR */ mfcr %r29 /* save CR */ @@ -356,8 +356,8 @@ stw %r31,(PC_TEMPSAVE+CPUSAVE_R31)(%r1) mfdar %r30 mfdsisr %r31 - stw %r30,(PC_TEMPSAVE+CPUSAVE_DAR)(%r1) - stw %r31,(PC_TEMPSAVE+CPUSAVE_DSISR)(%r1) + stw %r30,(PC_TEMPSAVE+CPUSAVE_AIM_DAR)(%r1) + stw %r31,(PC_TEMPSAVE+CPUSAVE_AIM_DSISR)(%r1) #ifdef KDB /* Try and detect a kernel stack overflow */ @@ -373,10 +373,10 @@ /* Now convert this DSI into a DDB trap. */ GET_CPUINFO(%r1) - lwz %r30,(PC_TEMPSAVE+CPUSAVE_DAR)(%r1) /* get DAR */ - stw %r30,(PC_DBSAVE +CPUSAVE_DAR)(%r1) /* save DAR */ - lwz %r30,(PC_TEMPSAVE+CPUSAVE_DSISR)(%r1) /* get DSISR */ - lwz %r30,(PC_DBSAVE +CPUSAVE_DSISR)(%r1) /* save DSISR */ + lwz %r30,(PC_TEMPSAVE+CPUSAVE_AIM_DAR)(%r1) /* get DAR */ + stw %r30,(PC_DBSAVE +CPUSAVE_AIM_DAR)(%r1) /* save DAR */ + lwz %r30,(PC_TEMPSAVE+CPUSAVE_AIM_DSISR)(%r1) /* get DSISR */ + lwz %r30,(PC_DBSAVE +CPUSAVE_AIM_DSISR)(%r1) /* save DSISR */ lwz %r30,(PC_DISISAVE+CPUSAVE_R28)(%r1) /* get r28 */ stw %r30,(PC_DBSAVE +CPUSAVE_R28)(%r1) /* save r28 */ lwz %r31,(PC_DISISAVE+CPUSAVE_R29)(%r1) /* get r29 */ ==== //depot/projects/e500/sys/powerpc/booke/trap_subr.S#5 (text+ko) ==== @@ -113,8 +113,8 @@ stw %r31, (savearea+CPUSAVE_R31)(%r1); \ mfdear %r30; \ mfesr %r31; \ - stw %r30, (savearea+CPUSAVE_DEAR)(%r1); \ - stw %r31, (savearea+CPUSAVE_ESR)(%r1) ; \ + stw %r30, (savearea+CPUSAVE_BOOKE_DEAR)(%r1); \ + stw %r31, (savearea+CPUSAVE_BOOKE_ESR)(%r1); \ mfspr %r30, isrr0; \ mfspr %r31, isrr1; /* MSR at interrupt time */ \ stw %r30, (savearea+CPUSAVE_SRR0)(%r1); \ @@ -136,8 +136,8 @@ stw %r31, (savearea+CPUSAVE_R31)(%r1); \ mfdear %r30; \ mfesr %r31; \ - stw %r30, (savearea+CPUSAVE_DEAR)(%r1); \ - stw %r31, (savearea+CPUSAVE_ESR)(%r1) ; \ + stw %r30, (savearea+CPUSAVE_BOOKE_DEAR)(%r1); \ + stw %r31, (savearea+CPUSAVE_BOOKE_ESR)(%r1); \ mfspr %r30, isrr0; \ mfspr %r31, isrr1; /* MSR at interrupt time */ \ stw %r30, (savearea+CPUSAVE_SRR0)(%r1); \ @@ -196,8 +196,8 @@ /* save R3-31 */ \ stmw %r3, FRAME_3+8(%r1) ; \ /* save DEAR, ESR */ \ - lwz %r28, (savearea+CPUSAVE_DEAR)(%r2); \ - lwz %r29, (savearea+CPUSAVE_ESR)(%r2); \ + lwz %r28, (savearea+CPUSAVE_BOOKE_DEAR)(%r2); \ + lwz %r29, (savearea+CPUSAVE_BOOKE_ESR)(%r2); \ stw %r28, FRAME_BOOKE_DEAR+8(1); \ stw %r29, FRAME_BOOKE_ESR+8(1); \ /* save XER, CTR, exc number */ \ @@ -259,27 +259,27 @@ mtsprg6 %r29; \ /* calculate TLB nesting level and TLBSAVE instance address */ \ GET_CPUINFO(%r1); /* Per-cpu structure */ \ - lwz %r28, PC_TLB_LEVEL(%r1); \ + lwz %r28, PC_BOOKE_TLB_LEVEL(%r1); \ rlwinm %r29, %r28, 6, 24, 25; /* 4 x TLBSAVE_LEN */ \ addi %r28, %r28, 1; \ - stw %r28, PC_TLB_LEVEL(%r1); \ - addi %r29, %r29, PC_TLBSAVE@l; \ + stw %r28, PC_BOOKE_TLB_LEVEL(%r1); \ + addi %r29, %r29, PC_BOOKE_TLBSAVE@l; \ add %r1, %r1, %r29; /* current TLBSAVE ptr */ \ \ /* save R20-31 */ \ mfsprg5 %r28; \ mfsprg6 %r29; \ - stmw %r20, (TLBSAVE_R20)(%r1); \ + stmw %r20, (TLBSAVE_BOOKE_R20)(%r1); \ /* save LR, CR */ \ mflr %r30; \ mfcr %r31; \ - stw %r30, (TLBSAVE_LR)(%r1); \ - stw %r31, (TLBSAVE_CR)(%r1); \ + stw %r30, (TLBSAVE_BOOKE_LR)(%r1); \ + stw %r31, (TLBSAVE_BOOKE_CR)(%r1); \ /* save SRR0-1 */ \ mfsrr0 %r30; /* execution addr at interrupt time */ \ mfsrr1 %r31; /* MSR at interrupt time*/ \ - stw %r30, (TLBSAVE_SRR0)(%r1); /* save SRR0 */ \ - stw %r31, (TLBSAVE_SRR1)(%r1); /* save SRR1 */ \ + stw %r30, (TLBSAVE_BOOKE_SRR0)(%r1); /* save SRR0 */ \ + stw %r31, (TLBSAVE_BOOKE_SRR1)(%r1); /* save SRR1 */ \ isync; \ mfsprg4 %r1 @@ -292,25 +292,25 @@ mtsprg4 %r1; /* Save SP */ \ GET_CPUINFO(%r1); /* Per-cpu structure */ \ /* calculate TLB nesting level and TLBSAVE instance addr */ \ - lwz %r28, PC_TLB_LEVEL(%r1); \ + lwz %r28, PC_BOOKE_TLB_LEVEL(%r1); \ subi %r28, %r28, 1; \ - stw %r28, PC_TLB_LEVEL(%r1); \ + stw %r28, PC_BOOKE_TLB_LEVEL(%r1); \ rlwinm %r29, %r28, 6, 24, 25; /* 4 x TLBSAVE_LEN */ \ - addi %r29, %r29, PC_TLBSAVE@l; \ + addi %r29, %r29, PC_BOOKE_TLBSAVE@l; \ add %r1, %r1, %r29; \ \ /* restore LR, CR */ \ - lwz %r30, (TLBSAVE_LR)(%r1); \ - lwz %r31, (TLBSAVE_CR)(%r1); \ + lwz %r30, (TLBSAVE_BOOKE_LR)(%r1); \ + lwz %r31, (TLBSAVE_BOOKE_CR)(%r1); \ mtlr %r30; \ mtcr %r31; \ /* restore SRR0-1 */ \ - lwz %r30, (TLBSAVE_SRR0)(%r1); \ - lwz %r31, (TLBSAVE_SRR1)(%r1); \ + lwz %r30, (TLBSAVE_BOOKE_SRR0)(%r1); \ + lwz %r31, (TLBSAVE_BOOKE_SRR1)(%r1); \ mtsrr0 %r30; \ mtsrr1 %r31; \ /* restore R20-31 */ \ - lmw %r20, (TLBSAVE_R20)(%r1); \ + lmw %r20, (TLBSAVE_BOOKE_R20)(%r1); \ mfsprg4 %r1 @@ -338,8 +338,8 @@ * Critical input interrupt ****************************************/ INTERRUPT(int_critical_input) - STANDARD_PROLOG(SPR_SPRG2, PC_CRITSAVE, SPR_CSRR0, SPR_CSRR1) - FRAME_SETUP(SPR_SPRG2, PC_CRITSAVE, EXC_CRIT) + STANDARD_PROLOG(SPR_SPRG2, PC_BOOKE_CRITSAVE, SPR_CSRR0, SPR_CSRR1) + FRAME_SETUP(SPR_SPRG2, PC_BOOKE_CRITSAVE, EXC_CRIT) addi %r3, %r1, 8 bl CNAME(powerpc_crit_interrupt) FRAME_LEAVE(SPR_CSRR0, SPR_CSRR1) @@ -350,8 +350,8 @@ * Machine check interrupt ****************************************/ INTERRUPT(int_machine_check) - STANDARD_PROLOG(SPR_SPRG3, PC_MCHKSAVE, SPR_MCSRR0, SPR_MCSRR1) - FRAME_SETUP(SPR_SPRG3, PC_MCHKSAVE, EXC_MCHK) + STANDARD_PROLOG(SPR_SPRG3, PC_BOOKE_MCHKSAVE, SPR_MCSRR0, SPR_MCSRR1) + FRAME_SETUP(SPR_SPRG3, PC_BOOKE_MCHKSAVE, EXC_MCHK) addi %r3, %r1, 8 bl CNAME(powerpc_mchk_interrupt) FRAME_LEAVE(SPR_MCSRR0, SPR_MCSRR1) @@ -718,9 +718,9 @@ * Debug interrupt ****************************************/ INTERRUPT(int_debug) - STANDARD_CRIT_PROLOG(SPR_SPRG2, PC_CRITSAVE, SPR_CSRR0, SPR_CSRR1) - FRAME_SETUP(SPR_SPRG2, PC_CRITSAVE, EXC_DEBUG) - lwz %r3, (PC_CRITSAVE+CPUSAVE_SRR0)(%r2); + STANDARD_CRIT_PROLOG(SPR_SPRG2, PC_BOOKE_CRITSAVE, SPR_CSRR0, SPR_CSRR1) + FRAME_SETUP(SPR_SPRG2, PC_BOOKE_CRITSAVE, EXC_DEBUG) + lwz %r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0)(%r2); lis %r4, interrupt_vector_base@ha addi %r4, %r4, interrupt_vector_base@l cmplw cr0, %r3, %r4 @@ -734,9 +734,9 @@ rlwinm %r3,%r3,0,23,21 stw %r3, FRAME_SRR1+8(%r1); /* Restore srr0 and srr1 as they could have been clobbered. */ - lwz %r3, (PC_CRITSAVE+CPUSAVE_SRR0+8)(%r2); + lwz %r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0+8)(%r2); mtspr SPR_SRR0, %r3 - lwz %r4, (PC_CRITSAVE+CPUSAVE_SRR1+8)(%r2); + lwz %r4, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR1+8)(%r2); mtspr SPR_SRR1, %r4 b 9f 1: @@ -812,8 +812,8 @@ mfdear %r30 mfesr %r31 - stw %r30, (PC_DBSAVE+CPUSAVE_DEAR)(%r3) - stw %r31, (PC_DBSAVE+CPUSAVE_ESR)(%r3) + stw %r30, (PC_DBSAVE+CPUSAVE_BOOKE_DEAR)(%r3) + stw %r31, (PC_DBSAVE+CPUSAVE_BOOKE_ESR)(%r3) mfsrr0 %r30 mfsrr1 %r31 ==== //depot/projects/e500/sys/powerpc/include/pcpu.h#4 (text+ko) ==== @@ -39,59 +39,70 @@ #define PCPU_MD_COMMON_FIELDS \ int pc_inside_intr; \ struct pmap *pc_curpmap; /* current pmap */ \ - struct thread *pc_fputhread; /* current fpu user */ \ + struct thread *pc_fputhread; /* current fpu user */ \ register_t pc_tempsave[CPUSAVE_LEN]; \ register_t pc_disisave[CPUSAVE_LEN]; \ register_t pc_dbsave[CPUSAVE_LEN]; -#if defined(AIM) -#define PCPU_MD_FIELDS PCPU_MD_COMMON_FIELDS -#else +#define PCPU_MD_AIM_FIELDS -#define TLBSAVE_LEN 16 -#define TLB_NESTED_MAX 3 +#define BOOKE_CRITSAVE_LEN (CPUSAVE_LEN + 2) +#define BOOKE_TLB_MAXNEST 3 +#define BOOKE_TLB_SAVELEN 16 +#define BOOKE_TLBSAVE_LEN (BOOKE_TLB_SAVELEN * BOOKE_TLB_MAXNEST) -#define PCPU_MD_FIELDS \ - PCPU_MD_COMMON_FIELDS \ - register_t pc_critsave[CPUSAVE_LEN + 2]; \ - register_t pc_mchksave[CPUSAVE_LEN]; \ - register_t pc_tlbsave[TLBSAVE_LEN*TLB_NESTED_MAX]; \ - register_t pc_tlb_level; -#endif +#define PCPU_MD_BOOKE_FIELDS \ + register_t pc_booke_critsave[BOOKE_CRITSAVE_LEN]; \ + register_t pc_booke_mchksave[CPUSAVE_LEN]; \ + register_t pc_booke_tlbsave[BOOKE_TLBSAVE_LEN]; \ + register_t pc_booke_tlb_level; /* Definitions for register offsets within the exception tmp save areas */ #define CPUSAVE_R28 0 /* where r28 gets saved */ #define CPUSAVE_R29 1 /* where r29 gets saved */ #define CPUSAVE_R30 2 /* where r30 gets saved */ #define CPUSAVE_R31 3 /* where r31 gets saved */ -#if defined(AIM) -#define CPUSAVE_DAR 4 /* where SPR_DAR gets saved */ -#define CPUSAVE_DSISR 5 /* where SPR_DSISR gets saved */ -#else -#define CPUSAVE_DEAR 4 /* where SPR_DEAR gets saved */ -#define CPUSAVE_ESR 5 /* where SPR_ESR gets saved */ -#endif +#define CPUSAVE_AIM_DAR 4 /* where SPR_DAR gets saved */ +#define CPUSAVE_AIM_DSISR 5 /* where SPR_DSISR gets saved */ +#define CPUSAVE_BOOKE_DEAR 4 /* where SPR_DEAR gets saved */ +#define CPUSAVE_BOOKE_ESR 5 /* where SPR_ESR gets saved */ #define CPUSAVE_SRR0 6 /* where SRR0 gets saved */ #define CPUSAVE_SRR1 7 /* where SRR1 gets saved */ -/* TLBSAVE is more elaborate */ -#if !defined(AIM) -#define TLBSAVE_LR 0 -#define TLBSAVE_CR 1 -#define TLBSAVE_SRR0 2 -#define TLBSAVE_SRR1 3 -#define TLBSAVE_R20 4 -#define TLBSAVE_R21 5 -#define TLBSAVE_R22 6 -#define TLBSAVE_R23 7 -#define TLBSAVE_R24 8 -#define TLBSAVE_R25 9 -#define TLBSAVE_R26 10 -#define TLBSAVE_R27 11 -#define TLBSAVE_R28 12 -#define TLBSAVE_R29 13 -#define TLBSAVE_R30 14 -#define TLBSAVE_R31 15 +/* Book-E TLBSAVE is more elaborate */ +#define TLBSAVE_BOOKE_LR 0 +#define TLBSAVE_BOOKE_CR 1 +#define TLBSAVE_BOOKE_SRR0 2 +#define TLBSAVE_BOOKE_SRR1 3 +#define TLBSAVE_BOOKE_R20 4 +#define TLBSAVE_BOOKE_R21 5 +#define TLBSAVE_BOOKE_R22 6 +#define TLBSAVE_BOOKE_R23 7 +#define TLBSAVE_BOOKE_R24 8 +#define TLBSAVE_BOOKE_R25 9 +#define TLBSAVE_BOOKE_R26 10 +#define TLBSAVE_BOOKE_R27 11 +#define TLBSAVE_BOOKE_R28 12 +#define TLBSAVE_BOOKE_R29 13 +#define TLBSAVE_BOOKE_R30 14 +#define TLBSAVE_BOOKE_R31 15 + +#ifndef COMPILING_LINT +#ifdef AIM +#define PCPU_MD_FIELDS \ + PCPU_MD_COMMON_FIELDS \ + PCPU_MD_AIM_FIELDS +#endif +#ifdef E500 +#define PCPU_MD_FIELDS \ + PCPU_MD_COMMON_FIELDS \ + PCPU_MD_BOOKE_FIELDS +#endif +#else +#define PCPU_MD_FIELDS \ + PCPU_MD_COMMON_FIELDS \ + PCPU_MD_AIM_FIELDS \ + PCPU_MD_BOOKE_FIELDS #endif #define PCPUP ((struct pcpu *) powerpc_get_pcpup()) ==== //depot/projects/e500/sys/powerpc/powerpc/genassym.c#6 (text+ko) ==== @@ -61,44 +61,41 @@ ASSYM(PC_TEMPSAVE, offsetof(struct pcpu, pc_tempsave)); ASSYM(PC_DISISAVE, offsetof(struct pcpu, pc_disisave)); ASSYM(PC_DBSAVE, offsetof(struct pcpu, pc_dbsave)); -#if defined(E500) -ASSYM(PC_CRITSAVE, offsetof(struct pcpu, pc_critsave)); -ASSYM(PC_MCHKSAVE, offsetof(struct pcpu, pc_mchksave)); -ASSYM(PC_TLBSAVE, offsetof(struct pcpu, pc_tlbsave)); -ASSYM(PC_TLB_LEVEL, offsetof(struct pcpu, pc_tlb_level)); + +#ifdef E500 +ASSYM(PC_BOOKE_CRITSAVE, offsetof(struct pcpu, pc_booke_critsave)); +ASSYM(PC_BOOKE_MCHKSAVE, offsetof(struct pcpu, pc_booke_mchksave)); +ASSYM(PC_BOOKE_TLBSAVE, offsetof(struct pcpu, pc_booke_tlbsave)); +ASSYM(PC_BOOKE_TLB_LEVEL, offsetof(struct pcpu, pc_booke_tlb_level)); #endif ASSYM(CPUSAVE_R28, CPUSAVE_R28*4); ASSYM(CPUSAVE_R29, CPUSAVE_R29*4); ASSYM(CPUSAVE_R30, CPUSAVE_R30*4); ASSYM(CPUSAVE_R31, CPUSAVE_R31*4); -#if defined(AIM) -ASSYM(CPUSAVE_DAR, CPUSAVE_DAR*4); -ASSYM(CPUSAVE_DSISR, CPUSAVE_DSISR*4); -#elif defined(E500) -ASSYM(CPUSAVE_DEAR, CPUSAVE_DEAR*4); -ASSYM(CPUSAVE_ESR, CPUSAVE_ESR*4); -#endif ASSYM(CPUSAVE_SRR0, CPUSAVE_SRR0*4); ASSYM(CPUSAVE_SRR1, CPUSAVE_SRR1*4); -#if defined(E500) -ASSYM(TLBSAVE_LR, TLBSAVE_LR*4); -ASSYM(TLBSAVE_CR, TLBSAVE_CR*4); -ASSYM(TLBSAVE_SRR0, TLBSAVE_SRR0*4); -ASSYM(TLBSAVE_SRR1, TLBSAVE_SRR1*4); -ASSYM(TLBSAVE_R20, TLBSAVE_R20*4); -ASSYM(TLBSAVE_R21, TLBSAVE_R21*4); -ASSYM(TLBSAVE_R22, TLBSAVE_R22*4); -ASSYM(TLBSAVE_R23, TLBSAVE_R23*4); -ASSYM(TLBSAVE_R24, TLBSAVE_R24*4); -ASSYM(TLBSAVE_R25, TLBSAVE_R25*4); -ASSYM(TLBSAVE_R26, TLBSAVE_R26*4); -ASSYM(TLBSAVE_R27, TLBSAVE_R27*4); -ASSYM(TLBSAVE_R28, TLBSAVE_R28*4); -ASSYM(TLBSAVE_R29, TLBSAVE_R29*4); -ASSYM(TLBSAVE_R30, TLBSAVE_R30*4); -ASSYM(TLBSAVE_R31, TLBSAVE_R31*4); -#endif +ASSYM(CPUSAVE_AIM_DAR, CPUSAVE_AIM_DAR*4); +ASSYM(CPUSAVE_AIM_DSISR, CPUSAVE_AIM_DSISR*4); +ASSYM(CPUSAVE_BOOKE_DEAR, CPUSAVE_BOOKE_DEAR*4); +ASSYM(CPUSAVE_BOOKE_ESR, CPUSAVE_BOOKE_ESR*4); + +ASSYM(TLBSAVE_BOOKE_LR, TLBSAVE_BOOKE_LR*4); +ASSYM(TLBSAVE_BOOKE_CR, TLBSAVE_BOOKE_CR*4); +ASSYM(TLBSAVE_BOOKE_SRR0, TLBSAVE_BOOKE_SRR0*4); +ASSYM(TLBSAVE_BOOKE_SRR1, TLBSAVE_BOOKE_SRR1*4); +ASSYM(TLBSAVE_BOOKE_R20, TLBSAVE_BOOKE_R20*4); +ASSYM(TLBSAVE_BOOKE_R21, TLBSAVE_BOOKE_R21*4); +ASSYM(TLBSAVE_BOOKE_R22, TLBSAVE_BOOKE_R22*4); +ASSYM(TLBSAVE_BOOKE_R23, TLBSAVE_BOOKE_R23*4); +ASSYM(TLBSAVE_BOOKE_R24, TLBSAVE_BOOKE_R24*4); +ASSYM(TLBSAVE_BOOKE_R25, TLBSAVE_BOOKE_R25*4); +ASSYM(TLBSAVE_BOOKE_R26, TLBSAVE_BOOKE_R26*4); +ASSYM(TLBSAVE_BOOKE_R27, TLBSAVE_BOOKE_R27*4); +ASSYM(TLBSAVE_BOOKE_R28, TLBSAVE_BOOKE_R28*4); +ASSYM(TLBSAVE_BOOKE_R29, TLBSAVE_BOOKE_R29*4); +ASSYM(TLBSAVE_BOOKE_R30, TLBSAVE_BOOKE_R30*4); +ASSYM(TLBSAVE_BOOKE_R31, TLBSAVE_BOOKE_R31*4); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); From owner-p4-projects@FreeBSD.ORG Sun Feb 24 06:00:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 602A016A404; Sun, 24 Feb 2008 06:00:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D5BF16A400 for ; Sun, 24 Feb 2008 06:00:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B5D013C4CE for ; Sun, 24 Feb 2008 06:00:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1O60PsP003697 for ; Sun, 24 Feb 2008 06:00:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1O60PGU003694 for perforce@freebsd.org; Sun, 24 Feb 2008 06:00:25 GMT (envelope-from sam@freebsd.org) Date: Sun, 24 Feb 2008 06:00:25 GMT Message-Id: <200802240600.m1O60PGU003694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 06:00:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=136067 Change 136067 by sam@sam_ebb on 2008/02/24 06:00:01 bring in bwi for conversion Affected files ... .. //depot/projects/vap/sys/contrib/dev/bwi/README#1 branch .. //depot/projects/vap/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/vap/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/vap/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/vap/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/vap/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/vap/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/vap/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/vap/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/vap/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/vap/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/COPYING#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/README#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/b43-fwcutter.1#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/fwcutter.c#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/fwcutter.h#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/fwcutter_list.h#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/md5.c#1 branch .. //depot/projects/vap/sys/gnu/dev/bwi/md5.h#1 branch .. //depot/projects/vap/sys/modules/bwi/Makefile#1 branch .. //depot/projects/vap/sys/modules/bwifw/Makefile#1 branch .. //depot/projects/vap/sys/modules/bwifw/fwcutter/Makefile#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Feb 24 10:21:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56F9516A403; Sun, 24 Feb 2008 10:21:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0715616A400 for ; Sun, 24 Feb 2008 10:21:30 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E25A713C442 for ; Sun, 24 Feb 2008 10:21:29 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OALTt2025144 for ; Sun, 24 Feb 2008 10:21:29 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OALT0C025141 for perforce@freebsd.org; Sun, 24 Feb 2008 10:21:29 GMT (envelope-from peter-gmail@wemm.org) Date: Sun, 24 Feb 2008 10:21:29 GMT Message-Id: <200802241021.m1OALT0C025141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 10:21:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=136071 Change 136071 by peter@peter_daintree on 2008/02/24 10:21:20 Test submit Affected files ... .. //depot/projects/hammer/TODO.txt#19 edit Differences ... ==== //depot/projects/hammer/TODO.txt#19 (text+ko) ==== @@ -1,4 +1,5 @@ -$P4: //depot/projects/hammer/TODO.txt#18 $ + +$P4: //depot/projects/hammer/TODO.txt#19 $ reread the logs etc and check out the "XXX worry about this later" stuff From owner-p4-projects@FreeBSD.ORG Sun Feb 24 12:32:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A646C16A404; Sun, 24 Feb 2008 12:32:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 695C916A401 for ; Sun, 24 Feb 2008 12:32:58 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 573D513C46E for ; Sun, 24 Feb 2008 12:32:58 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OCWwwR031592 for ; Sun, 24 Feb 2008 12:32:58 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OCWvp1031589 for perforce@freebsd.org; Sun, 24 Feb 2008 12:32:57 GMT (envelope-from rrs@cisco.com) Date: Sun, 24 Feb 2008 12:32:57 GMT Message-Id: <200802241232.m1OCWvp1031589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 12:32:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=136075 Change 136075 by rrs@rrs-mips2-jnpr on 2008/02/24 12:32:19 Adds a missing trap type. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/trap.h#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/trap.h#6 (text+ko) ==== @@ -64,6 +64,7 @@ #define T_VCEI 14 /* Virtual coherency instruction */ #define T_FPE 15 /* Floating point exception */ #define T_IWATCH 16 /* Inst. Watch address reference */ +#define T_C2E 18 /* Exception from coprocessor 2 */ #define T_DWATCH 23 /* Data Watch address reference */ #define T_MCHECK 24 /* Received an MCHECK */ #define T_VCED 31 /* Virtual coherency data */ From owner-p4-projects@FreeBSD.ORG Sun Feb 24 12:32:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63DD616A52F; Sun, 24 Feb 2008 12:32:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06BF016A502 for ; Sun, 24 Feb 2008 12:32:58 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C736213C45D for ; Sun, 24 Feb 2008 12:32:58 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OCWwPw031598 for ; Sun, 24 Feb 2008 12:32:58 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OCWwAX031595 for perforce@freebsd.org; Sun, 24 Feb 2008 12:32:58 GMT (envelope-from rrs@cisco.com) Date: Sun, 24 Feb 2008 12:32:58 GMT Message-Id: <200802241232.m1OCWwAX031595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 12:32:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=136076 Change 136076 by rrs@rrs-mips2-jnpr on 2008/02/24 12:32:57 More alignment please. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/ucontext.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/ucontext.h#4 (text+ko) ==== @@ -48,7 +48,8 @@ int mc_onstack; /* sigstack state to restore */ register_t mc_pc; /* pc at time of signal */ register_t mc_regs[32]; /* processor regs 0 to 31 */ - register_t mullo, mulhi; /* mullo and mulhi registers... */ + register_t sr; /* status register */ + register_t mullo, mulhi; /* mullo and mulhi registers... */ int mc_fpused; /* fp has been used */ f_register_t mc_fpregs[33]; /* fp regs 0 to 31 and csr */ register_t mc_fpc_eir; /* fp exception instruction reg */ @@ -93,7 +94,8 @@ #define UCR_SP UCTX_REG(29) #define UCR_S8 UCTX_REG(30) #define UCR_RA UCTX_REG(31) -#define UCR_MDLO UCTX_REG(32) -#define UCR_MDHI UCTX_REG(33) +#define UCR_SR UCTX_REG(32) +#define UCR_MDLO UCTX_REG(33) +#define UCR_MDHI UCTX_REG(34) #endif /* !_MACHINE_UCONTEXT_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Feb 24 12:42:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5EC716A403; Sun, 24 Feb 2008 12:42:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F20916A400 for ; Sun, 24 Feb 2008 12:42:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B18A13C46E for ; Sun, 24 Feb 2008 12:42:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OCgDWS032028 for ; Sun, 24 Feb 2008 12:42:13 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OCgCGQ032025 for perforce@freebsd.org; Sun, 24 Feb 2008 12:42:12 GMT (envelope-from rrs@cisco.com) Date: Sun, 24 Feb 2008 12:42:12 GMT Message-Id: <200802241242.m1OCgCGQ032025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 12:42:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=136077 Change 136077 by rrs@rrs-mips2-jnpr on 2008/02/24 12:41:22 Fixes signal handling code. When a system call completes we need to check to see if a ast() is needed, just like the out: label does. Now a caught signal handler no longer causes an infinite loop of syscall/intr/syscall/intr... Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#13 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#13 (text+ko) ==== @@ -98,6 +98,7 @@ #ifdef TRAP_DEBUG int trap_debug = 1; + #endif extern unsigned onfault_table[]; @@ -113,82 +114,84 @@ static void log_bad_page_fault(char *, struct trapframe *, int); static void log_frame_dump(struct trapframe *frame); static void get_mapping_info(vm_offset_t, pd_entry_t **, pt_entry_t **); + #ifdef TRAP_DEBUG static void trap_frame_dump(struct trapframe *frame); + #endif extern char edata[]; -void (*machExceptionTable[])(void) = { +void (*machExceptionTable[]) (void)= { /* * The kernel exception handlers. */ - MipsKernIntr, /* external interrupt */ - MipsKernGenException, /* TLB modification */ + MipsKernIntr, /* external interrupt */ + MipsKernGenException, /* TLB modification */ MipsKernTLBInvalidException, /* TLB miss (load or instr. fetch) */ MipsKernTLBInvalidException, /* TLB miss (store) */ - MipsKernGenException, /* address error (load or I-fetch) */ - MipsKernGenException, /* address error (store) */ - MipsKernGenException, /* bus error (I-fetch) */ - MipsKernGenException, /* bus error (load or store) */ - MipsKernGenException, /* system call */ - MipsKernGenException, /* breakpoint */ - MipsKernGenException, /* reserved instruction */ - MipsKernGenException, /* coprocessor unusable */ - MipsKernGenException, /* arithmetic overflow */ - MipsKernGenException, /* trap exception */ - MipsKernGenException, /* viritual coherence exception inst */ - MipsKernGenException, /* floating point exception */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* watch exception */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* reserved */ - MipsKernGenException, /* viritual coherence exception data */ + MipsKernGenException, /* address error (load or I-fetch) */ + MipsKernGenException, /* address error (store) */ + MipsKernGenException, /* bus error (I-fetch) */ + MipsKernGenException, /* bus error (load or store) */ + MipsKernGenException, /* system call */ + MipsKernGenException, /* breakpoint */ + MipsKernGenException, /* reserved instruction */ + MipsKernGenException, /* coprocessor unusable */ + MipsKernGenException, /* arithmetic overflow */ + MipsKernGenException, /* trap exception */ + MipsKernGenException, /* viritual coherence exception inst */ + MipsKernGenException, /* floating point exception */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* watch exception */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* reserved */ + MipsKernGenException, /* viritual coherence exception data */ /* * The user exception handlers. */ - MipsUserIntr, /* 0 */ - MipsUserGenException, /* 1 */ - MipsUserTLBInvalidException, /* 2 */ - MipsUserTLBInvalidException, /* 3 */ - MipsUserGenException, /* 4 */ - MipsUserGenException, /* 5 */ - MipsUserGenException, /* 6 */ - MipsUserGenException, /* 7 */ - MipsUserGenException, /* 8 */ - MipsUserGenException, /* 9 */ - MipsUserGenException, /* 10 */ - MipsUserGenException, /* 11 */ - MipsUserGenException, /* 12 */ - MipsUserGenException, /* 13 */ - MipsUserGenException, /* 14 */ - MipsUserGenException, /* 15 */ - MipsUserGenException, /* 16 */ - MipsUserGenException, /* 17 */ - MipsUserGenException, /* 18 */ - MipsUserGenException, /* 19 */ - MipsUserGenException, /* 20 */ - MipsUserGenException, /* 21 */ - MipsUserGenException, /* 22 */ - MipsUserGenException, /* 23 */ - MipsUserGenException, /* 24 */ - MipsUserGenException, /* 25 */ - MipsUserGenException, /* 26 */ - MipsUserGenException, /* 27 */ - MipsUserGenException, /* 28 */ - MipsUserGenException, /* 29 */ - MipsUserGenException, /* 20 */ - MipsUserGenException, /* 31 */ + MipsUserIntr, /* 0 */ + MipsUserGenException, /* 1 */ + MipsUserTLBInvalidException, /* 2 */ + MipsUserTLBInvalidException, /* 3 */ + MipsUserGenException, /* 4 */ + MipsUserGenException, /* 5 */ + MipsUserGenException, /* 6 */ + MipsUserGenException, /* 7 */ + MipsUserGenException, /* 8 */ + MipsUserGenException, /* 9 */ + MipsUserGenException, /* 10 */ + MipsUserGenException, /* 11 */ + MipsUserGenException, /* 12 */ + MipsUserGenException, /* 13 */ + MipsUserGenException, /* 14 */ + MipsUserGenException, /* 15 */ + MipsUserGenException, /* 16 */ + MipsUserGenException, /* 17 */ + MipsUserGenException, /* 18 */ + MipsUserGenException, /* 19 */ + MipsUserGenException, /* 20 */ + MipsUserGenException, /* 21 */ + MipsUserGenException, /* 22 */ + MipsUserGenException, /* 23 */ + MipsUserGenException, /* 24 */ + MipsUserGenException, /* 25 */ + MipsUserGenException, /* 26 */ + MipsUserGenException, /* 27 */ + MipsUserGenException, /* 28 */ + MipsUserGenException, /* 29 */ + MipsUserGenException, /* 20 */ + MipsUserGenException, /* 31 */ }; char *trap_type[] = { @@ -228,18 +231,21 @@ #if !defined(SMP) && (defined(DDB) || defined(DEBUG)) struct trapdebug trapdebug[TRAPSIZE], *trp = trapdebug; + #endif #if defined(DDB) || defined(DEBUG) void stacktrace(struct trapframe *); void logstacktrace(struct trapframe *); -int kdbpeek(int *); +int kdbpeek(int *); + /* extern functions printed by name in stack backtraces */ extern void MipsTLBMiss(void); extern void MipsUserSyscallException(void); extern char _locore[]; extern char _locoreEnd[]; -#endif /* DDB || DEBUG */ + +#endif /* DDB || DEBUG */ extern void MipsSwitchFPState(struct thread *, struct trapframe *); extern void MipsFPTrap(u_int, u_int, u_int); @@ -328,12 +334,12 @@ } /* - * Enable hardware interrupts if they were on before the trap. - * If it was off disable all (splhigh) so we don't accidently - * enable it when doing a spllower(). + * Enable hardware interrupts if they were on before the trap. If it + * was off disable all (splhigh) so we don't accidently enable it + * when doing a spllower(). */ /*XXX do in locore? */ - if(trapframe->sr & SR_INT_ENAB) { + if (trapframe->sr & SR_INT_ENAB) { set_intr_mask(~(trapframe->sr & ALL_INT_MASK)); enableintr(); } else { @@ -348,7 +354,7 @@ u_int32_t pid; printf("trap type %x (%s - ", type, - trap_type[type & (~T_USER)]); + trap_type[type & (~T_USER)]); if (type & T_USER) printf("user mode)\n"); @@ -359,12 +365,12 @@ printf("cpuid = %d\n", PCPU_GET(cpuid)); #endif MachTLBGetPID(pid); - printf("badaddr = %p, pc = %p, ra = %p, sp = %p, sr = 0x%x, pid = %d, ASID = 0x%x\n", + printf("badaddr = %p, pc = %p, ra = %p, sp = %p, sr = 0x%x, pid = %d, ASID = 0x%x\n", trapframe->badvaddr, trapframe->pc, trapframe->ra, trapframe->sp, trapframe->sr, (curproc ? curproc->p_pid : -1), pid); - switch(type & ~T_USER) { + switch (type & ~T_USER) { case T_TLB_MOD: case T_TLB_LD_MISS: case T_TLB_ST_MISS: @@ -380,7 +386,7 @@ break; } if ((last_badvaddr == this_badvaddr) && - ((type & ~T_USER) != T_SYSCALL)) { + ((type & ~T_USER) != T_SYSCALL)) { if (++count == 3) { trap_frame_dump(trapframe); panic("too many faults at %p\n", last_badvaddr); @@ -391,14 +397,13 @@ } } #endif - switch (type) { case T_MCHECK: #ifdef DDB - kdb_trap(type, 0, trapframe); + kdb_trap(type, 0, trapframe); #endif - panic("MCHECK\n"); - break; + panic("MCHECK\n"); + break; case T_TLB_MOD: /* check for kernel address */ if (KERNLAND(trapframe->badvaddr)) { @@ -406,7 +411,7 @@ PMAP_LOCK(kernel_pmap); if (!(pte = pmap_segmap(kernel_pmap, - trapframe->badvaddr))) + trapframe->badvaddr))) panic("trap: ktlbmod: invalid segmap"); pte += (trapframe->badvaddr >> PGSHIFT) & (NPTEPG - 1); entry = *pte; @@ -442,52 +447,54 @@ } /* FALLTHROUGH */ - case T_TLB_MOD+T_USER: - { - vm_offset_t pa; - pmap = &p->p_vmspace->vm_pmap; + case T_TLB_MOD + T_USER: + { + vm_offset_t pa; + + pmap = &p->p_vmspace->vm_pmap; - PMAP_LOCK(pmap); - if (!(pte = pmap_segmap(pmap, trapframe->badvaddr))) - panic("trap: utlbmod: invalid segmap"); - pte += (trapframe->badvaddr >> PGSHIFT) & (NPTEPG - 1); - entry = *pte; + PMAP_LOCK(pmap); + if (!(pte = pmap_segmap(pmap, trapframe->badvaddr))) + panic("trap: utlbmod: invalid segmap"); + pte += (trapframe->badvaddr >> PGSHIFT) & (NPTEPG - 1); + entry = *pte; #ifdef SMP - /* It is possible that some other CPU changed m-bit */ - if (!mips_pg_v(entry) || (entry & mips_pg_m_bit())) { + /* It is possible that some other CPU changed m-bit */ + if (!mips_pg_v(entry) || (entry & mips_pg_m_bit())) { + trapframe->badvaddr = (trapframe->badvaddr & ~PGOFSET); + pmap_update_page(pmap, trapframe->badvaddr, entry); + PMAP_UNLOCK(pmap); + goto out; + } +#else + if (!mips_pg_v(entry) || (entry & mips_pg_m_bit())) { + panic("trap: utlbmod: invalid pte"); + } +#endif + + if (entry & mips_pg_ro_bit()) { + /* write to read only page */ + ftype = VM_PROT_WRITE; + PMAP_UNLOCK(pmap); + goto dofault; + } + entry |= mips_pg_m_bit(); + *pte = entry; trapframe->badvaddr = (trapframe->badvaddr & ~PGOFSET); pmap_update_page(pmap, trapframe->badvaddr, entry); + trapframe->badvaddr |= (pmap->pm_asid[PCPU_GET(cpuid)].asid << VMTLB_PID_SHIFT); + pa = mips_tlbpfn_to_paddr(entry); + if (!page_is_managed(pa)) + panic("trap: utlbmod: unmanaged page"); + pmap_set_modified(pa); + PMAP_UNLOCK(pmap); + if (!usermode) { + return (trapframe->pc); + } goto out; } -#else - if (!mips_pg_v(entry) || (entry & mips_pg_m_bit())) { - panic("trap: utlbmod: invalid pte"); - } -#endif - if (entry & mips_pg_ro_bit()) { - /* write to read only page */ - ftype = VM_PROT_WRITE; - PMAP_UNLOCK(pmap); - goto dofault; - } - entry |= mips_pg_m_bit(); - *pte = entry; - trapframe->badvaddr = (trapframe->badvaddr & ~PGOFSET); - pmap_update_page(pmap, trapframe->badvaddr, entry); - trapframe->badvaddr |= (pmap->pm_asid[PCPU_GET(cpuid)].asid << VMTLB_PID_SHIFT); - pa = mips_tlbpfn_to_paddr(entry); - if (!page_is_managed(pa)) - panic("trap: utlbmod: unmanaged page"); - pmap_set_modified(pa); - - PMAP_UNLOCK(pmap); - if (!usermode) - return (trapframe->pc); - goto out; - } - case T_TLB_LD_MISS: case T_TLB_ST_MISS: ftype = (type == T_TLB_ST_MISS) ? VM_PROT_WRITE : VM_PROT_READ; @@ -496,7 +503,7 @@ vm_offset_t va; int rv; - kernel_fault: + kernel_fault: va = trunc_page((vm_offset_t)trapframe->badvaddr); rv = vm_fault(kernel_map, va, ftype, VM_FAULT_NORMAL); if (rv == KERN_SUCCESS) @@ -514,96 +521,98 @@ if ((i = td->td_pcb->pcb_onfault) == 0) goto err; /* check for fuswintr() or suswintr() getting a page fault */ - if (i == 4) + if (i == 4) { return (onfault_table[i]); + } goto dofault; - case T_TLB_LD_MISS+T_USER: + case T_TLB_LD_MISS + T_USER: ftype = VM_PROT_READ; goto dofault; - case T_TLB_ST_MISS+T_USER: + case T_TLB_ST_MISS + T_USER: ftype = VM_PROT_WRITE; - dofault: - { - vm_offset_t va; - struct vmspace *vm; - vm_map_t map; - int rv = 0; - int flag; +dofault: + { + vm_offset_t va; + struct vmspace *vm; + vm_map_t map; + int rv = 0; + int flag; + + vm = p->p_vmspace; + map = &vm->vm_map; + va = trunc_page((vm_offset_t)trapframe->badvaddr); + if ((vm_offset_t)trapframe->badvaddr < VM_MIN_KERNEL_ADDRESS) { + if (ftype & VM_PROT_WRITE) + flag = VM_FAULT_DIRTY; + else + flag = VM_FAULT_NORMAL; + } else { + /* + * Don't allow user-mode faults in kernel + * address space. + */ + goto nogo; + } - vm = p->p_vmspace; - map = &vm->vm_map; - va = trunc_page((vm_offset_t)trapframe->badvaddr); - if ((vm_offset_t)trapframe->badvaddr < VM_MIN_KERNEL_ADDRESS) { - if (ftype & VM_PROT_WRITE) - flag = VM_FAULT_DIRTY; - else - flag = VM_FAULT_NORMAL; - } else { /* - * Don't allow user-mode faults in kernel address space. + * Keep swapout from messing with us during this + * critical time. */ - goto nogo; - } + PROC_LOCK(p); + ++p->p_lock; + PROC_UNLOCK(p); - /* - * Keep swapout from messing with us during this - * critical time. - */ - PROC_LOCK(p); - ++p->p_lock; - PROC_UNLOCK(p); + rv = vm_fault(map, va, ftype, flag); - rv = vm_fault(map, va, ftype, flag); - - PROC_LOCK(p); - --p->p_lock; - PROC_UNLOCK(p); + PROC_LOCK(p); + --p->p_lock; + PROC_UNLOCK(p); #ifdef VMFAULT_TRACE - printf("vm_fault(%x (pmap %x), %x (%x), %x, %d) -> %x at pc %x\n", - map, &vm->vm_pmap, va, trapframe->badvaddr, ftype, flag, - rv, trapframe->pc); + printf("vm_fault(%x (pmap %x), %x (%x), %x, %d) -> %x at pc %x\n", + map, &vm->vm_pmap, va, trapframe->badvaddr, ftype, flag, + rv, trapframe->pc); #endif - if (rv == KERN_SUCCESS) { - if (!usermode) - return (trapframe->pc); - goto out; - } -nogo: - if (!usermode) { - if ((i = td->td_pcb->pcb_onfault) != 0) { - td->td_pcb->pcb_onfault = 0; - return (onfault_table[i]); + if (rv == KERN_SUCCESS) { + if (!usermode) { + return (trapframe->pc); + } + goto out; + } + nogo: + if (!usermode) { + if ((i = td->td_pcb->pcb_onfault) != 0) { + td->td_pcb->pcb_onfault = 0; + return (onfault_table[i]); + } + goto err; } - goto err; - } + ucode = ftype; + i = ((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); + addr = trapframe->pc; - ucode = ftype; - i = ((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); - addr = trapframe->pc; + msg = "BAD_PAGE_FAULT"; + log_bad_page_fault(msg, trapframe, type); - msg = "BAD_PAGE_FAULT"; - log_bad_page_fault(msg, trapframe, type); + break; + } - break; - } - - case T_ADDR_ERR_LD+T_USER: /* misaligned or kseg access */ - case T_ADDR_ERR_ST+T_USER: /* misaligned or kseg access */ + case T_ADDR_ERR_LD + T_USER: /* misaligned or kseg access */ + case T_ADDR_ERR_ST + T_USER: /* misaligned or kseg access */ if (allow_unaligned_acc) { int mode; - if (type == (T_ADDR_ERR_LD+T_USER)) + if (type == (T_ADDR_ERR_LD + T_USER)) mode = VM_PROT_READ; else mode = VM_PROT_WRITE; /* - * ADDR_ERR faults have higher priority than - * TLB Miss faults. Therefore, it is necessary - * to verify that the faulting address is a valid + * ADDR_ERR faults have higher priority than TLB + * Miss faults. Therefore, it is necessary to + * verify that the faulting address is a valid * virtual address within the process' address space * before trying to emulate the unaligned access. */ @@ -620,9 +629,9 @@ /* FALL THROUGH */ - case T_BUS_ERR_IFETCH+T_USER: /* BERR asserted to cpu */ - case T_BUS_ERR_LD_ST+T_USER: /* BERR asserted to cpu */ - ucode = 0; /* XXX should be VM_PROT_something */ + case T_BUS_ERR_IFETCH + T_USER: /* BERR asserted to cpu */ + case T_BUS_ERR_LD_ST + T_USER: /* BERR asserted to cpu */ + ucode = 0; /* XXX should be VM_PROT_something */ i = SIGBUS; addr = trapframe->pc; if (!msg) @@ -630,288 +639,299 @@ log_bad_page_fault(msg, trapframe, type); break; - case T_SYSCALL+T_USER: + case T_SYSCALL + T_USER: { - struct trapframe *locr0 = td->td_frame; - struct sysent *callp; - unsigned int code; - unsigned int tpc; - int nargs, nsaved; - register_t args[8]; + struct trapframe *locr0 = td->td_frame; + struct sysent *callp; + unsigned int code; + unsigned int tpc; + int nargs, nsaved; + register_t args[8]; - /* - * note: PCPU_LAZY_INC() can only be used if we can afford - * occassional inaccuracy in the count. - */ - PCPU_LAZY_INC(cnt.v_syscall); - if (td->td_ucred != p->p_ucred) - cred_update_thread(td); -#ifdef KSE - if (p->p_flag & P_SA) - thread_user_enter(td); -#endif - /* compute next PC after syscall instruction */ - tpc = trapframe->pc; /* Remember if restart */ - if (DELAYBRANCH(trapframe->cause)) { /* Check BD bit */ - locr0->pc = MipsEmulateBranch(locr0, trapframe->pc, 0, - 0); - } else { - locr0->pc += sizeof(int); - } - code = locr0->v0; - - switch (code) { - case SYS_syscall: /* - * Code is first argument, followed by actual args. + * note: PCPU_LAZY_INC() can only be used if we can + * afford occassional inaccuracy in the count. */ - code = locr0->a0; - args[0] = locr0->a1; - args[1] = locr0->a2; - args[2] = locr0->a3; - nsaved = 3; - break; + PCPU_LAZY_INC(cnt.v_syscall); + if (td->td_ucred != p->p_ucred) + cred_update_thread(td); +#ifdef KSE + if (p->p_flag & P_SA) + thread_user_enter(td); +#endif + /* compute next PC after syscall instruction */ + tpc = trapframe->pc; /* Remember if restart */ + if (DELAYBRANCH(trapframe->cause)) { /* Check BD bit */ + locr0->pc = MipsEmulateBranch(locr0, trapframe->pc, 0, + 0); + } else { + locr0->pc += sizeof(int); + } + code = locr0->v0; - case SYS___syscall: - /* - * Like syscall, but code is a quad, so as to maintain - * quad alignment for the rest of the arguments. - */ - if (_QUAD_LOWWORD == 0) { + switch (code) { + case SYS_syscall: + /* + * Code is first argument, followed by + * actual args. + */ code = locr0->a0; - } else { - code = locr0->a1; + args[0] = locr0->a1; + args[1] = locr0->a2; + args[2] = locr0->a3; + nsaved = 3; + break; + + case SYS___syscall: + /* + * Like syscall, but code is a quad, so as + * to maintain quad alignment for the rest + * of the arguments. + */ + if (_QUAD_LOWWORD == 0) { + code = locr0->a0; + } else { + code = locr0->a1; + } + args[0] = locr0->a2; + args[1] = locr0->a3; + nsaved = 2; + quad_syscall = 1; + break; + + default: + args[0] = locr0->a0; + args[1] = locr0->a1; + args[2] = locr0->a2; + args[3] = locr0->a3; + nsaved = 4; } - args[0] = locr0->a2; - args[1] = locr0->a3; - nsaved = 2; - quad_syscall = 1; - break; - - default: - args[0] = locr0->a0; - args[1] = locr0->a1; - args[2] = locr0->a2; - args[3] = locr0->a3; - nsaved = 4; - } -#if TRAP_DEBUG - printf("SYSCALL #%d pid:%u\n", code, p->p_pid); +#ifdef TRAP_DEBUG + printf("SYSCALL #%d pid:%u\n", code, p->p_pid); #endif - if (p->p_sysent->sv_mask) - code &= p->p_sysent->sv_mask; + if (p->p_sysent->sv_mask) + code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + callp = &p->p_sysent->sv_table[0]; + else + callp = &p->p_sysent->sv_table[code]; - nargs = callp->sy_narg; + nargs = callp->sy_narg; - if (nargs > nsaved) { - i = copyin((caddr_t)(locr0->sp + - 4 * sizeof(register_t)), (caddr_t)&args[nsaved], - (u_int)(nargs - nsaved) * sizeof(register_t)); - if (i) { - locr0->v0 = i; - locr0->a3 = 1; + if (nargs > nsaved) { + i = copyin((caddr_t)(locr0->sp + + 4 * sizeof(register_t)), (caddr_t)&args[nsaved], + (u_int)(nargs - nsaved) * sizeof(register_t)); + if (i) { + locr0->v0 = i; + locr0->a3 = 1; #ifdef KTRACE - if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(code, nargs, args); + if (KTRPOINT(td, KTR_SYSCALL)) + ktrsyscall(code, nargs, args); #endif - goto done; + goto done; + } } - } - #ifdef KTRACE - if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(code, nargs, args); + if (KTRPOINT(td, KTR_SYSCALL)) + ktrsyscall(code, nargs, args); #endif - td->td_retval[0] = 0; - td->td_retval[1] = locr0->v1; + td->td_retval[0] = 0; + td->td_retval[1] = locr0->v1; #if !defined(SMP) && (defined(DDB) || defined(DEBUG)) - if (trp == trapdebug) - trapdebug[TRAPSIZE - 1].code = code; - else - trp[-1].code = code; + if (trp == trapdebug) + trapdebug[TRAPSIZE - 1].code = code; + else + trp[-1].code = code; #endif - STOPEVENT(p, S_SCE, nargs); + STOPEVENT(p, S_SCE, nargs); - PTRACESTOP_SC(p, td, S_PT_SCE); - - i = (*callp->sy_call)(td, args); - + PTRACESTOP_SC(p, td, S_PT_SCE); + i = (*callp->sy_call) (td, args); #if 0 - /* - * Reinitialize proc pointer `p' as it may be different - * if this is a child returning from fork syscall. - */ - td = curthread; - locr0 = td->td_frame; + /* + * Reinitialize proc pointer `p' as it may be + * different if this is a child returning from fork + * syscall. + */ + td = curthread; + locr0 = td->td_frame; #endif - trapdebug_enter(locr0, -code); - switch (i) { - case 0: - if (quad_syscall && code != SYS_lseek) { - /* - * System call invoked through the SYS___syscall - * interface but the return value is really - * just 32 bits. - */ - locr0->v0 = td->td_retval[0]; - if (_QUAD_LOWWORD) - locr0->v1 = td->td_retval[0]; - locr0->a3 = 0; - } else { - locr0->v0 = td->td_retval[0]; - locr0->v1 = td->td_retval[1]; - locr0->a3 = 0; - } - break; + trapdebug_enter(locr0, -code); + switch (i) { + case 0: + if (quad_syscall && code != SYS_lseek) { + /* + * System call invoked through the + * SYS___syscall interface but the + * return value is really just 32 + * bits. + */ + locr0->v0 = td->td_retval[0]; + if (_QUAD_LOWWORD) + locr0->v1 = td->td_retval[0]; + locr0->a3 = 0; + } else { + locr0->v0 = td->td_retval[0]; + locr0->v1 = td->td_retval[1]; + locr0->a3 = 0; + } + break; - case ERESTART: - locr0->pc = tpc; - break; + case ERESTART: + locr0->pc = tpc; + break; - case EJUSTRETURN: - break; /* nothing to do */ + case EJUSTRETURN: + break; /* nothing to do */ - default: - if (quad_syscall && code != SYS_lseek) { - locr0->v0 = i; - if (_QUAD_LOWWORD) - locr0->v1 = i; - locr0->a3 = 1; - } else { - locr0->v0 = i; - locr0->a3 = 1; + default: + if (quad_syscall && code != SYS_lseek) { + locr0->v0 = i; + if (_QUAD_LOWWORD) + locr0->v1 = i; + locr0->a3 = 1; + } else { + locr0->v0 = i; + locr0->a3 = 1; + } } - } - /* - * The sync'ing of I & D caches for SYS_ptrace() is - * done by procfs_domem() through procfs_rwmem() instead - * of being done here under a special check for SYS_ptrace(). - */ + /* + * The sync'ing of I & D caches for SYS_ptrace() is + * done by procfs_domem() through procfs_rwmem() + * instead of being done here under a special check + * for SYS_ptrace(). + */ done: - /* - * Check for misbehavior. - */ - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? - syscallnames[code] : "???"); - KASSERT(td->td_critnest == 0, - ("System call %s returning in a critical section", - (code >= 0 && code < SYS_MAXSYSCALL) ? - syscallnames[code] : "???")); - KASSERT(td->td_locks == 0, - ("System call %s returning with %d locks held", - (code >= 0 && code < SYS_MAXSYSCALL) ? - syscallnames[code] : "???", - td->td_locks)); - - userret(td, trapframe); - + /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? + syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? + syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? + syscallnames[code] : "???", + td->td_locks)); + userret(td, trapframe); #ifdef KTRACE - if (KTRPOINT(p, KTR_SYSRET)) - ktrsysret(code, i, td->td_retval[0]); + if (KTRPOINT(p, KTR_SYSRET)) + ktrsysret(code, i, td->td_retval[0]); #endif - /* - * This works because errno is findable through the - * register set. If we ever support an emulation where this - * is not the case, this code will need to be revisited. - */ - STOPEVENT(p, S_SCX, code); + /* + * This works because errno is findable through the + * register set. If we ever support an emulation + * where this is not the case, this code will need + * to be revisited. + */ + STOPEVENT(p, S_SCX, code); - PTRACESTOP_SC(p, td, S_PT_SCX); + PTRACESTOP_SC(p, td, S_PT_SCX); - return (trapframe->pc); - } + mtx_assert(&Giant, MA_NOTOWNED); + if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) { + ast(trapframe); + } + return (trapframe->pc); + } #ifdef DDB case T_BREAK: kdb_trap(type, 0, trapframe); - return(trapframe->pc); + return (trapframe->pc); #endif - case T_BREAK+T_USER: - { - unsigned int va, instr; + case T_BREAK + T_USER: + { + unsigned int va, instr; - /* compute address of break instruction */ - va = trapframe->pc; - if (DELAYBRANCH(trapframe->cause)) - va += sizeof(int); + /* compute address of break instruction */ + va = trapframe->pc; + if (DELAYBRANCH(trapframe->cause)) + va += sizeof(int); - /* read break instruction */ - instr = fuword((caddr_t)va); + /* read break instruction */ + instr = fuword((caddr_t)va); #if 0 - printf("trap: %s (%d) breakpoint %x at %x: (adr %x ins %x)\n", - p->p_comm, p->p_pid, instr, trapframe->pc, - p->p_md.md_ss_addr, p->p_md.md_ss_instr); /* XXX */ + printf("trap: %s (%d) breakpoint %x at %x: (adr %x ins %x)\n", + p->p_comm, p->p_pid, instr, trapframe->pc, + p->p_md.md_ss_addr, p->p_md.md_ss_instr); /* XXX */ #endif - if (td->td_md.md_ss_addr != va || instr != BREAK_SSTEP) { + if (td->td_md.md_ss_addr != va || instr != BREAK_SSTEP) { + i = SIGTRAP; + addr = trapframe->pc; + break; + } + /* + * The restoration of the original instruction and + * the clearing of the berakpoint will be done later + * by the call to ptrace_clear_single_step() in + * issignal() when SIGTRAP is processed. + */ + addr = trapframe->pc; i = SIGTRAP; - addr = trapframe->pc; break; } - /* - * The restoration of the original instruction and the - * clearing of the berakpoint will be done later by the - * call to ptrace_clear_single_step() in issignal() - * when SIGTRAP is processed. - */ - addr = trapframe->pc; - i = SIGTRAP; - break; - } + case T_IWATCH + T_USER: + case T_DWATCH + T_USER: + { + unsigned int va; - case T_IWATCH+T_USER: - case T_DWATCH+T_USER: - { - unsigned int va; - /* compute address of trapped instruction */ - va = trapframe->pc; - if (DELAYBRANCH(trapframe->cause)) - va += sizeof(int); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 24 13:33:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFA6316A40A; Sun, 24 Feb 2008 13:33:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70D4E16A407 for ; Sun, 24 Feb 2008 13:33:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57C9813C4EB for ; Sun, 24 Feb 2008 13:33:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1ODXgL8043779 for ; Sun, 24 Feb 2008 13:33:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1ODXehp043776 for perforce@freebsd.org; Sun, 24 Feb 2008 13:33:40 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 24 Feb 2008 13:33:40 GMT Message-Id: <200802241333.m1ODXehp043776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 136080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 13:33:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=136080 Change 136080 by pgj@disznohal on 2008/02/24 13:32:54 Add initial Hungarian translation of Chapter 28: Firewalls. Affected files ... .. //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#4 (text+ko) ==== @@ -4,581 +4,790 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.80 2008/01/17 17:50:30 remko Exp $ --> - + + + Joseph J. Barbish - Contributed by + Írta: Brad Davis - Converted to SGML and updated by + SGML formátumra alakította és + aktualizálta: - Firewalls + Tûzfalak - firewall + tûzfalak - security - - firewalls + biztonság + tûzfalak - Introduction + Bevezetés - Firewalls make it possible to filter - incoming and outgoing traffic that flows through your system. - A firewall can use one or more sets of rules to - inspect the network packets as they come in or go out of your - network connections and either allows the traffic through or - blocks it. The rules of a firewall can inspect one or more - characteristics of the packets, including but not limited to the - protocol type, the source or destination host address, and the - source or destination port. + A tûzfalakkal a rendszerünkön + keresztülfolyó bejövõ és kimenõ + forgalmat tudjuk szûrni. A tûzfalak egy vagy több + szabályrendszer alapján + vizsgálják az éppen érkezõ vagy + távozó hálózati csomagokat, és + vagy továbbengedik ezeket vagy + megállítják. A tûzfalak + szabályai a csomagok egy vagy több + jellemzõjét veszik szemügyre, amik lehetnek + mondjuk a protokoll típusa, a forrás vagy cél + hálózati címe, esetleg a forrás- vagy + a célport. - Firewalls can greatly enhance the security of a host or a - network. They can be used to do one or more of - the following things: + A tûzfalak jelentõs mértékben + képesek gyarapítani egy gép vagy egy + hálózat védelmét. Leginkább a + következõkre tudjuk felhasználni ezeket: - To protect and insulate the applications, services and - machines of your internal network from unwanted traffic - coming in from the public Internet. + a belsõ hálózatunkban futó + alkalmazások, szolgáltatások, gépek + megvédésére és + elszigetelésére az internetrõl + érkezõ nem kívánt forgalom + ellen - To limit or disable access from hosts of the internal - network to services of the public Internet. + a belsõ hálózatban levõ + gépek elérését tudjuk + korlátozni vagy letiltani az interneten + elérhetõ szolgáltatások + felé - To support network address translation - (NAT), which allows your internal network - to use private IP addresses and share a - single connection to the public Internet (either with a - single IP address or by a shared pool of - automatically assigned public addresses). + a hálózati címfordítás + (Network Address Translation, NAT) + beállításához, ahol a belsõ + hálózatunk privát + IP-címeket használnak + és egy közös kapcsolaton keresztül + érik el az internetet (vagy egyetlen + IP-cím, vagy pedig automatikusan + kiosztott publikus címekkel). - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - How to properly define packet filtering rules. + hogyan adjuk meg helyesen a csomagok + szûrését leíró + szabályokat - The differences between the firewalls - built into &os;. + a &os;-be épített tûzfalak közti + különbségeket - How to use and configure the OpenBSD - PF firewall. + hogyan állítsuk be és + használjuk az OpenBSD PF + tûzfalát - How to use and configure - IPFILTER. + hogyan állítsuk be és + használjuk az IPFILTER + tûzfalat - How to use and configure - IPFW. + hogyan állítsuk be és + használjuk az IPFW + tûzfalat - Before reading this chapter, you should: + A fejezet elolvasása elõtt ajánlott: - Understand basic &os; and Internet concepts. + a &os;-hez és az internethez kötõdõ + alapvetõ fogalmak ismerete - Firewall Concepts + Röviden a tûzfalakról - firewall + tûzfalak + szabályrendszerei + - rulesets - + A tûzfalak szabályrendszereit alapvetõen + kétféleképpen tudjuk + összeállítani: inkluzív, + vagyis megengedõ, illetve exkluzív + vagyis kizáró módon. Az exkluzív + tûzfalak minden forgalmat átengednek, amirõl nem + rendelkeznek a tûzfal szabályai. Az inkluzív + tûzfalak ennek pontosan az ellenkezõjét teszik. + Csak azt a forgalmat engedik át, amirõl van + szabály és minden mást blokkolnak. - There are two basic ways to create firewall rulesets: - inclusive or exclusive. An - exclusive firewall allows all traffic through except for the - traffic matching the ruleset. An inclusive firewall does the - reverse. It only allows traffic matching the rules through and - blocks everything else. + Az inkluzív tûzfalak általában + biztonságosabbak az exkluzív társaiknál, + mivel esetükben jelentõs mértékben + visszaszorul az átfolyó nem kívánatos + forgalom. - Inclusive firewalls are generally safer than exclusive - firewalls because they significantly reduce the risk of allowing - unwanted traffic to pass through the firewall. + A védelem még tovább fokozható az + állapottartó tûzfalak (stateful + firewall) használatával. Ilyenkor a tûzfal + szemmel tartja a rajta keresztül megnyitott kapcsolatokat, + és vagy csak a már meglevõ kapcsolathoz + tartozó forgalmat engedi át vagy nyit egy + újat. Az állapottartó tûzfalak + hátránya, hogy a Denial of Service + (DoS) típusú + támadásokkal szemben sokkal + sérülékenyebbek, amikor az új + kapcsolatok nagyon gyorsan jönnek létre. A + legtöbb tûzfal esetében azonban tudjuk + vegyíteni az állapottartó és nem + állapottartó viselkedést, és ezzel egy + ideális beállítást + kialakítani. - Security can be tightened further using a stateful - firewall. With a stateful firewall the firewall keeps - track of which connections are opened through the firewall and - will only allow traffic through which either matches an existing - connection or opens a new one. The disadvantage of a stateful - firewall is that it can be vulnerable to Denial of Service - (DoS) attacks if a lot of new connections are - opened very fast. With most firewalls it is possible to use a - combination of stateful and non-stateful behavior to make an - optimal firewall for the site. - Firewall Packages + Tûzfalak + + A &os; alaprendszerébe három + különbözõ tûzfalat építettek + be. Ezek: az IPFILTER (másik + nevén IPF), az + IPFIREWALL (más néven + IPFW) és az OpenBSD + csomagszûrõje (Packet Filter, azaz + PF). A forgalom + szabályozására (vagyis alapvetõen a + sávszélesség + kihasználtságának + vezérlésére) a &os; két + beépített csomagot tartalmaz: ez az &man.altq.4; + és a &man.dummynet.4;. Általában a Dummynet + az IPFW, míg az ALTQ + a PF partnere. Az IPFILTER + esetében maga az IPFILTER végzi a + címfordítást és a szûrést, + a sávszélességet pedig az + IPFW a &man.dummynet.4; + vagy a PF az + ALTQ segítségével. Az + IPFW és a PF + szabályokkal rendelkezik a rendszerünkbe + érkezõ vagy onnan távozó + csomagokról, habár megoldásaik teljesen + máshogy mûködnek és a szabályok + felírási módja is eltér. - &os; has three different firewall packages built - into the base system. They are: IPFILTER - (also known as IPF), - IPFIREWALL (also known as IPFW), - and OpenBSD's PacketFilter (also known as - PF). &os; also has two built in packages for - traffic shaping (basically controlling bandwidth usage): - &man.altq.4; and &man.dummynet.4;. Dummynet has traditionally been - closely tied with IPFW, and - ALTQ with - PF. Traffic shaping for IPFILTER can currently - be done with IPFILTER for NAT and filtering and - IPFW with &man.dummynet.4; - or by using PF with - ALTQ. - IPFW, and PF all use rules to control the access of packets to and - from your system, although they go about it different ways and - have different rule syntaxes. + A &os; azért tartalmaz egyszerre ennyi tûzfalat, + mert az emberek elvárásai és igényei + egyénenként eltérnek. Egyikõjük + sem tekinthetõ a legjobbnak. - The reason that &os; has multiple built in firewall packages - is that different people have different requirements and - preferences. No single firewall package is the best. + A szerzõ egyébként az IPFILTER + megoldását részesíti elõnyben, + mivel egy hálózati címfordítást + alkalmazó környezetben sokkal könnyebb vele + megfogalmazni az állapottartó szabályokat, + valamint tartalmaz egy beépített FTP proxy-t is, + amivel a kimenõ FTP kapcsolatok + beállítása tovább + egyszerûsödik. - The author prefers IPFILTER because its stateful rules are - much less complicated to use in a NAT - environment and it has a built in ftp proxy that simplifies the - rules to allow secure outbound FTP usage. + Mivel az összes tûzfal a csomagok + fejlécének bizonyos mezõinek alapján + dolgozik, ezért a tûzfal + szabályrendszerét megalkotó egyénnek + teljesen tisztában kell lennie a + TCP/IP + mûködésével, továbbá azzal, + hogy ezekben a mezõkben milyen értékek + szerepelhetnek és ezeket hogyan használják + egy átlagos kapcsolat alatt. Ebben a témában + a + címen találhatunk egy remek ismertetõt + (angolul). - Since all firewalls are based on inspecting the values of - selected packet control fields, the creator of the firewall - rulesets must have an understanding of how - TCP/IP works, what the different values in - the packet control fields are and how these values are used in a - normal session conversation. For a good explanation go to: - . - The OpenBSD Packet Filter (PF) and + <title>Az OpenBSD csomagszûrõje (PF) és az <acronym>ALTQ</acronym> - firewall - + tûzfalak PF - As of July 2003 the OpenBSD firewall software application - known as PF was ported to &os; and was made - available in the &os; Ports Collection; the first release that - contained PF as an integrated part of the - base system was &os; 5.3 in November 2004. - PF is a complete, fully featured firewall - that has optional support for ALTQ (Alternate - Queuing). ALTQ provides Quality of Service - (QoS) bandwidth shaping that allows - guaranteeing bandwidth to different services based on filtering - rules. The OpenBSD Project does an outstanding job of - maintaining the PF User's Guide that it will not be made part of - this handbook firewall section as that would just be duplicated - effort. + 2003. júliusában az OpenBSD + PF néven ismert + csomagszûrõjét átírták + &os;-re és elérhetõvé tették a + &os; Portgyûjteményének + részeként. A PF programot + beépítetten tartalmazó elsõ + kiadás pedig 2004. novemberében a &os; 5.3 + volt. A PF egy teljes, mindentudó + tûzfal, ami támogatja az ún. + ALTQ (Alternate Queuing, vagyis a + váltóbesorolás) + megoldást. Az ALTQ lehetõvé + teszi a sávszélesség + korlátozását a szolgáltatás + minõsége (Quality of Service, QoS) + alapján, aminek köszönhetõen a + különbözõ szolgáltatások a + szûrési szabályok mentén garanált + sávszélességhez juthatnak. Az OpenBSD + projekt kiváló munkát végez a PF + felhasználói útmutatójának + karbantartásával, amit így most nem is + teszük be a kézikönyvbe, mivel ezzel csak + feleslegesen másolnánk. - More info can be found at the PF for &os; web site: . + A PF &os;-n történõ + használatáról a honlapon + olvashatunk többet (angolul). - Enabling PF + A PF engedélyezése - PF is included in the basic &os; install for versions newer - than 5.3 as a separate run time loadable module. The system - will dynamically load the PF kernel loadable module when the - rc.conf statement pf_enable="YES" is used. - The loadable module was created with &man.pflog.4; logging - enabled. + A PF a &os; 5.3 verziója utáni + kiadásokban az alaprendszer része, amit a rendszer + mûködése közben egy külön modul + betöltésével aktiválhatunk. Ha az + rc.conf állományban megadjuk + a pf_enable="YES" sort, akkor a rendszer + magától be is tölti a PF-hez tartozó + rendszermag modult. Ez a betölthetõ modul + egyébként még a &man.pflog.4; + felületen keresztüli naplózást is + engedélyezi. - The module assumes the presence of options - INET and device bpf. Unless - NOINET6 for &os; prior to 6.0-RELEASE and - NO_INET6 for later releases (for example in - &man.make.conf.5;) was defined during the build, it also - requires options INET6. + A modul feltételezi a options + INET és device bpf sorok + jelenlétét. Hacsak nem adtuk meg &os; + 6.0-RELEASE elõtti verzióban a + NOINET6, ill. az utáni + következõ verziókban a + NO_INET6 beállítást + (például a &man.make.conf.5; + állományban) a rendszer + fordítására vonatkozóan, akkor a + options INET6 + beállításra is szükség + lesz. - Once the kernel module is loaded or the kernel is statically - built with PF support, it is possible to enable or disable - pf with the pfctl - command. + Ahogy betöltõdött a modul, vagy ha már + eleve a rendszermagba építettük a PF + támogatását, a + pf használatát a + pfctl paranccsal tudjuk engedélyezni + vagy letiltani. - This example demonstrates how to enable - pf: + Ebben a példában a + pf engedélyezését + láthatjuk: &prompt.root; pfctl -e - The pfctl command provides a way to work - with the pf firewall. It is a good - idea to check the &man.pfctl.8; manual page to find out more - information about using it. + A pfctl parancs + segítségével könnyedén lehet + irányítani a pf + mûködését. A + használatáról többet úgy + tudhatunk meg, ha elolvassuk a &man.pfctl.8; man oldalt. + - Kernel options + A rendszermag beállításai - kernel options - + a rendszermag + beállításai device pf - kernel options - + a rendszermag + beállításai device pflog - kernel options - + a rendszermag + beállításai device pfsync - It is not a mandatory requirement that you enable PF by - compiling the following options into the &os; kernel. It is - only presented here as background information. Compiling PF - into the kernel causes the loadable module to never be - used. + Egyáltalán nem fontos a PF + támogatását beépíteni a + rendszermagba. Az itt szereplõ információk + csupán kiegészítésként + szerepelnek. Ha a PF használatát beletesszük + a rendszermagba, akkor a modulra már nincs + szükségünk. - Sample kernel config PF option statements are in the - /usr/src/sys/conf/NOTES kernel source and - are reproduced here: + A rendszermag forrásai között + található + /usr/src/sys/conf/NOTES + állományban a PF + beállításaira vonatkozó + utasítások így foglalhatóak + össze: device pf device pflog device pfsync - device pf enables support for the - Packet Filter firewall. + A device pf engedélyezi a + csomagszûrõ tûzfalat. + + A device pflog megadásával + keletkezik egy &man.pflog.4; pszeudo hálózati + eszköz, amivel egy &man.bpf.4; leíróra + érkezõ forgalmat tudunk naplózni. A + &man.pflogd.8; démon használható + ezután tõle származó naplózott + adatok rögzítésére. - device pflog enables the optional - &man.pflog.4; pseudo network device which can be used to log - traffic to a &man.bpf.4; descriptor. The &man.pflogd.8; daemon - can be used to store the logging information to disk. + A device pfsync engedélyezi a + &man.pfsync.4; pszeudo hálózati eszköz + létrejöttét, ami az ún. + állapotváltások + megfigyelésére alkalmas. Mivel ez nem + része a betölthetõ modulnak, ezért egy + saját rendszermagot kell készíteni a + használatához. - device pfsync enables the optional - &man.pfsync.4; pseudo network device that is used to monitor - state changes. As this is not part of the - loadable module one has to build a custom kernel to use - it. + Ezek a beállítások csak akkor + lépnek érvénybe, ha fordítunk + velük egy saját rendszermagot és + telepítjük azt. - These settings will take effect only after you have built - and installed a kernel with them set. - Available rc.conf Options + Az <filename>rc.conf</filename> állományban + elérhetõ beállítások + + Az /etc/rc.conf + állományba a következõket kell + betennünk ahhoz, hogy a PF a rendszer + indítása során + aktivizálódjon: - You need the following statements in - /etc/rc.conf to activate PF at boot - time: + pf_enable="YES" # a PF engedélyezése (a modul betöltése, ha kell) +pf_rules="/etc/pf.conf" # a pf szabályait tartalmazó állomány +pf_flags="" # a pfctl indításához szükséges további paraméterek +pflog_enable="YES" # a pflogd(8) elindítása +pflog_logfile="/var/log/pflog" # hol tartsa a pflogd az naplóit +pflog_flags="" # a pflogd indításához szükséges paraméterek - pf_enable="YES" # Enable PF (load module if required) -pf_rules="/etc/pf.conf" # rules definition file for pf -pf_flags="" # additional flags for pfctl startup -pflog_enable="YES" # start pflogd(8) -pflog_logfile="/var/log/pflog" # where pflogd should store the logfile -pflog_flags="" # additional flags for pflogd startup + Ha a tûzfalunk mögött egy helyi + hálózat is meghúzódik, akkor az ott + levõ gépek számára valamilyen + módon tudni kell továbbítani a csomagokat + vagy címfordítást kell végezni, + így ez a beállítás is + mindenképpen kelleni fog: - If you have a LAN behind this firewall and have to forward - packets for the computers in the LAN or want to do NAT, you - have to enable the following option as well: + gateway_enable="YES" # az átjárói funkciók engedélyezése - gateway_enable="YES" # Enable as LAN gateway - Enabling <acronym>ALTQ</acronym> + Az <acronym>ALTQ</acronym> engedélyezése - ALTQ is only available by compiling the - options into the &os; Kernel. ALTQ is not - supported by all of the available network card drivers. Please - see the &man.altq.4; manual page for a list of drivers that are - supported in your release of &os;. The following options will - enable ALTQ and add additional - functionality. + Az ALTQ kizárólag csak + úgy érhetõ el, ha belefordítjuk a &os; + rendszermagjába. Az ALTQ nem minden + hálózati kártya részérõl + támogatott. Az &man.altq.4; man oldalán + megtalálhatjuk a &os; aktuális + kiadásában szereplõ támogató + meghajtók listáját. A következõ + beállítások az ALTQ + további lehetõségeit igyekeznek + engedélyezni. options ALTQ -options ALTQ_CBQ # Class Bases Queuing (CBQ) -options ALTQ_RED # Random Early Detection (RED) -options ALTQ_RIO # RED In/Out -options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC) -options ALTQ_PRIQ # Priority Queuing (PRIQ) -options ALTQ_NOPCC # Required for SMP build +options ALTQ_CBQ # osztályozás alapú besorolás (Class Bases Queuing, CBQ) +options ALTQ_RED # véletlen korai észlelés (Random Early Detection, RED) +options ALTQ_RIO # RED befele/kifele +options ALTQ_HFSC # hiearchikus csomagütemezõ (Hierarchical Packet Scheduler, HFSC) +options ALTQ_PRIQ # prioritásos besorolás (Priority Queuing, PRIQ) +options ALTQ_NOPCC # az SMP esetén kell + + Az options ALTQ az + ALTQ rendszert engedélyezi. - options ALTQ enables the - ALTQ framework. + Az options ALTQ_CBQ engedélyezi a + osztályozás alapú besorolást (Class + Based Queuing, CBQ). A + CBQ használatával a + kapcsolatunkhoz tartozó + sávszélességet + különbözõ osztályokra vagy sorokra + tudjuk szedni, és a szûrési + szabályoknak megfelelõen osztályozni + segítségükkel a forgalmat. - options ALTQ_CBQ enables Class Based - Queuing (CBQ). CBQ - allows you to divide a connection's bandwidth into different - classes or queues to prioritize traffic based on filter - rules. + Az options ALTQ_RED a véletlen + korai észlelés (Random Early Detection, + RED) használatát + engedélyezi. A RED a + hálózati forgalomban keletkezõ + torlódások elkerülésére + alkalmas. A RED ezt a + problémát úgy oldja meg, hogy méri a + sorok hosszát és összeveti a + hozzátartozó minimális és + maximális küszöbértékekkel. Ha a + sor hossza meghaladja a számára elõírt + maximális értéket, akkor az új + csomagokat eldobja. Nevéhez hûen a + RED az eldobásra ítélt + csomagokat véletlenszerûen választja + ki. - options ALTQ_RED enables Random Early - Detection (RED). RED is - used to avoid network congestion. RED does - this by measuring the length of the queue and comparing it to - the minimum and maximum thresholds for the queue. If the - queue is over the maximum all new packets will be dropped. - True to its name, RED drops packets from - different connections randomly. + Az options ALTQ_RIO engedélyezi a + RED használatát mind a + két irányba, tehát be- és + kifelé. - options ALTQ_RIO enables Random Early - Detection In and Out. + Az options ALTQ_HFSC a pártatlan + hierachikus szolgáltatási görbe alapú + csomagütemezõt (Hierarchical Fair Service Curve Packet + Scheduler, HFSC) engedélyezi. Vele + kapcsolatban a + címen találhatunk bõvebben + olvasnivalót (angolul). - options ALTQ_HFSC enables the - Hierarchical Fair Service Curve Packet Scheduler. For more - information about HFSC see: . + Az options ALTQ_PRIQ a prioritásos + besorolást (Priority Queuing, PRIQ) + teszi elérhetõvé. A PRIQ + mindig elsõként a nagyobb értékû + sorban levõ forgalmat továbbítja. - options ALTQ_PRIQ enables Priority - Queuing (PRIQ). PRIQ - will always pass traffic that is in a higher queue - first. + Az options ALTQ_NOPCC az + ALTQ SMP, vagyis + többprocesszoros támogatását adja meg. + Ilyen típusú rendszerekben ez + kötelezõ. - options ALTQ_NOPCC enables - SMP support for ALTQ. - This option is required on SMP - systems. - Creating Filtering Rules + A szûrési szabályok + megfogalmazása - The Packet Filter reads its configuration rules from the - &man.pf.conf.5; file and it modifies, drops or passes packets - according to the rules or definitions specified there. The &os; - installation comes with a default - /etc/pf.conf which contains useful examples - and explanations. + A csomagszûrõ a &man.pf.conf.5; + állományból olvassa be a szabályokat + és a benne szereplõ szabályok vagy + definíciók alapján módosítja, + eldobja vagy átengedi a csomagokat. A &os; + telepítésében alapértelmezés + szerint az /etc/pf.conf + állomány látja el ennek szerepét, + ami számos hasznos példát és + magyarázatot tartalmaz. - Although &os; has its own /etc/pf.conf - the syntax is the same as one used in OpenBSD. A great - resource for configuring the pf - firewall has been written by OpenBSD team and is available at - . + Noha a &os; saját /etc/pf.conf + állománnyal rendelkezik, a + felépítése mégis + tökéletesen megegyezik az OpenBSD-ben + használatossal. A pf + tûzfal beállításával az OpenBSD + csapat által írt nagyszerû írás + foglalkozik, ami a címrõl + érhetõ el (angolul). - When browsing the pf user's guide, please keep in mind that - different versions of &os; contain different versions of pf. The - pf firewall in &os; 5.X is at the level - of OpenBSD version 3.5 and in &os; 6.X is at the level of OpenBSD - version 3.7. + A pf felhasználói + útmutatóját olvasgatva azonban soha nem + szabad elfelejtenünk, hogy &os; egyes változatai a + pf különbözõ + verzióit tartalmazzák. A &os; 5.X + ágában az OpenBSD 3.5 + pf tûzfalát, míg + a &os; 6.X változataiban az OpenBSD 3.7 szerinti + verzióját találjuk. - The &a.pf; is a good place to ask questions about - configuring and running the pf - firewall. Do not forget to check the mailing list archives - before asking questions. + A &a.pf; kitûnõ hely a + pf + beállításával és + mûködtetésével kapcsolatos + kérdések feltevésére. Viszont + mielõtt itt kérdeznénk, ne felejtsük el + átnézni a levelezési lista + archívumait sem. + - The IPFILTER (IPF) Firewall + Az IPFILTER (IPF) tûzfal - firewall - + tûzfalak IPFILTER - This section is work in progress. The contents might - not be accurate at all times. + Ez a szakasz fejlesztés alatt áll. Ennek + megfelelõen a tartalma nem minden esetben pontos. - The author of IPFILTER is Darren Reed. IPFILTER is not - operating system dependent: it is an open source application and - has been ported to &os;, NetBSD, OpenBSD, &sunos;, HP/UX, and - &solaris; operating systems. IPFILTER is actively being - supported and maintained, with updated versions being released - regularly. + Az IPFILTER szerzõje Darren Reed. Az IPFILTER nem + kötõdik egyik rendszerhez sem: ez egy olyan nyílt + forráskódú alkalmazás, amit + átírtak &os;, NetBSD, OpenBSD, &sunos;, HP/UX + és &solaris; operációs rendszerekre. Az + IPFILTER karbantartása és támogatása + pillanatnyilag is aktív, folyamatosan jelennek meg + újabb változatai. - IPFILTER is based on a kernel-side firewall and - NAT mechanism that can be controlled and - monitored by userland interface programs. The firewall rules can - be set or deleted with the &man.ipf.8; utility. The - NAT rules can be set or deleted with the - &man.ipnat.1; utility. The &man.ipfstat.8; utility can print - run-time statistics for the kernel parts of IPFILTER. The - &man.ipmon.8; program can log IPFILTER actions to the system log - files. + Az IPFILTER egy rendszermag oldalán + mûködõ tûzfalazási és egy + címfordítási mechanizmusra alapszik, amit + felhasználói programokkal tudunk felügyelni + és vezérelni. A tûzfal szabályai a + &man.ipf.8; segédprogrammal + állíthatóak be vagy + törölhetõek. A hálózati + címfordításra vonatkozó + szabályokat a &man.ipnat.1; segédprogrammal + állíthatjuk be vagy törölhetjük. A + &man.ipfstat.8; segédprogram képes futás + közben statisztikákat készíteni az + IPFILTER rendszermagban elhelyezkedõ részeinek + viselkedésérõl. A &man.ipmon.8; program pedig + az IPFILTER cselekvéseit képes a + rendszernaplókba feljegyezni. - IPF was originally written using a rule processing logic of - the last matching rule wins and used only - stateless type of rules. Over time IPF has been enhanced to - include a quick option and a stateful keep - state option which drastically modernized the rules - processing logic. IPF's official documentation covers the legacy - rule coding parameters and the legacy rule file processing - logic. The modernized functions are only included as additional - options, completely understating their benefits in producing a - far superior secure firewall. + Az IPF eredetileg olyan szabályfeldolgozási + módszer szerint készült, amiben az + utolsó egyezõ szabály nyer és + csak állapotnélküli szabályokat ismert. + Az idõ múlásával az IPF + részévé vált a quick + opció és a keep state opción + keresztül az állapottartás is, melyek + drámai mértékben + korszerûsítették a szabályok + feldolgozásának elvét. Az IPF hivatalos + dokumentációja tartalmazza a régi + szabályok létrehozását és azok + feldolgozásának leírását. A + korszerûsített funkciók csak + kiegészítésképpen jelennek meg, + és az általuk felkínált + elõnyök megértése egy sokkal magasabb + szintû és biztonságosabb tûzfal + megépítését teszik + lehetõvé. - The instructions contained in this section are based on - using rules that contain the quick option and the - stateful keep state option. This is the basic - framework for coding an inclusive firewall rule set. + A szakaszban szereplõ utasításokban olyan + szabályok szerepelnek, amik kihasználják a + quick és keep state + opciókat. Ezek az inkluzív + tûzfalszabályok létrehozásának + alapjai. - + Az inkluzív tûzfalak csak olyan csomagokat + engednek keresztül, amik megfelelnek a szabályoknak. + Ezen módon képesek vagyunk megmondani, hogy a + tûzfal mögül milyen szolgáltatások + érhetõek el az interneten és + segítségével azt is megadhatjuk, hogy az + internetrõl a belsõ hálózatunkon milyen + szolgáltatásokat érhetnek el. A tûzfal + alapból minden mást visszautasít és + naplóz. Az inkluzív tûzfalak sokkal de sokkal + megbízhatóbbak az exkluzív + tûzfalaknál, ezért itt most csak ilyenekkel + foglalkozunk. - An inclusive firewall only allows packets matching the rules - to pass through. This way you can control what services can - originate behind the firewall destined for the public Internet - and also control the services which can originate from the - public Internet accessing your private network. Everything else - is blocked and logged by default design. Inclusive firewalls are - much, much more secure than exclusive firewall rule sets and is - the only rule set type covered herein. + A régi típusú szabályokról + a + és + címeken olvashatunk (angolul). - For detailed explanation of the legacy rules processing - method see: - and . + Az IPF gyakran ismételt kérdései a címen + érhetõek el (angolul). - The IPF FAQ is at . - - A searchable archive of the open-source IPFilter mailing list is - available at . + A nyílt forrású IPFilter + levelezési list kereshetõ archívumait a + címen találjuk (angolul). - Enabling IPF + Az IPF engedélyezése IPFILTER + engedélyezés + - enabling - + Az IPF megtalálható a &os; + alaptelepítésében mint menet közben + külön betölthetõ modul. Ha az + rc.conf állományba + beírjuk a ipfilter_enable="YES" sort, + akkor ez a modul dinamikusan betöltõdik. A + betölthetõ modul alapból naplóz + és a default pass all + beállítást tartalmazza. Ha helyette a >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 24 14:13:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEA4416A404; Sun, 24 Feb 2008 14:13:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91BD016A400 for ; Sun, 24 Feb 2008 14:13:41 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 761CF13C4D3 for ; Sun, 24 Feb 2008 14:13:41 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OEDfuQ046357 for ; Sun, 24 Feb 2008 14:13:41 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OEDev0046354 for perforce@freebsd.org; Sun, 24 Feb 2008 14:13:40 GMT (envelope-from raj@freebsd.org) Date: Sun, 24 Feb 2008 14:13:40 GMT Message-Id: <200802241413.m1OEDev0046354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 136083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 14:13:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=136083 Change 136083 by raj@raj_mimi on 2008/02/24 14:13:27 Eliminate unused code. Affected files ... .. //depot/projects/e500/sys/powerpc/booke/interrupt.c#5 edit .. //depot/projects/e500/sys/powerpc/include/trap.h#5 edit Differences ... ==== //depot/projects/e500/sys/powerpc/booke/interrupt.c#5 (text+ko) ==== @@ -71,8 +71,6 @@ static void dump_frame(struct trapframe *framep); -void unserviced_intr(struct trapframe *); - static void dump_frame(struct trapframe *frame) { @@ -138,46 +136,3 @@ PIC_DISPATCH(pic, framep); atomic_subtract_int(&td->td_intr_nesting_level, 1); } - -#ifdef INTR_DEBUG - -/* XXX temporary handler for development purposes - DELETEME LATER */ -void -unserviced_intr(struct trapframe *framep) -{ - printf("\n#### Unhandled interrupt ####\n"); - dump_frame(framep); - while(1); -} - -void -dump_savearea(register_t *sa) -{ - int i, j; - - for (i = 0; i < TLB_NESTED_MAX; i++) { - printf(" tlb_nested_level = %d\n", i); - - printf(" LR = 0x%08x\n", sa[TLBSAVE_LR]); - printf(" CR = 0x%08x\n", sa[TLBSAVE_CR]); - printf(" SRR0 = 0x%08x\n", sa[TLBSAVE_SRR0]); - printf(" SRR1 = 0x%08x\n", sa[TLBSAVE_SRR1]); - for (j = TLBSAVE_R20; j <= TLBSAVE_R31; j++) { - printf(" R%02d = 0x%08x", j - TLBSAVE_R20 + 20, sa[j]); - if ((i & 0x3) == 3) - printf("\n"); - } - printf("\n"); - sa = sa + TLBSAVE_LEN; - } -} - -void -dump_pcpu(struct pcpu *pc) -{ - printf("pc_tlbsave:\n"); - printf(" current pc_tlb_level = %d\n", pc->pc_tlb_level); - dump_savearea(pc->pc_tlbsave); -} - -#endif ==== //depot/projects/e500/sys/powerpc/include/trap.h#5 (text+ko) ==== @@ -1,119 +1,9 @@ -/*- - * Copyright (C) 1995, 1996 Wolfgang Solfrank. - * Copyright (C) 1995, 1996 TooLs GmbH. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by TooLs GmbH. - * 4. The name of TooLs GmbH may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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. - * - * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $ - * $FreeBSD: src/sys/powerpc/include/trap.h,v 1.5 2007/08/07 18:39:28 marcel Exp $ - */ - #if defined(AIM) #include #elif defined(E500) #include #endif -#if 0 -#ifndef _POWERPC_TRAP_H_ -#define _POWERPC_TRAP_H_ - -#define EXC_RSVD 0x0000 /* Reserved */ -#define EXC_RST 0x0100 /* Reset; all but IBM4xx */ -#define EXC_MCHK 0x0200 /* Machine Check */ -#define EXC_DSI 0x0300 /* Data Storage Interrupt */ -#define EXC_ISI 0x0400 /* Instruction Storage Interrupt */ -#define EXC_EXI 0x0500 /* External Interrupt */ -#define EXC_ALI 0x0600 /* Alignment Interrupt */ -#define EXC_PGM 0x0700 /* Program Interrupt */ -#define EXC_FPU 0x0800 /* Floating-point Unavailable */ -#define EXC_DECR 0x0900 /* Decrementer Interrupt */ -#define EXC_SC 0x0c00 /* System Call */ -#define EXC_TRC 0x0d00 /* Trace */ -#define EXC_FPA 0x0e00 /* Floating-point Assist */ - -/* The following is only available on the 601: */ -#define EXC_RUNMODETRC 0x2000 /* Run Mode/Trace Exception */ - -/* The following are only available on 7400(G4): */ -#define EXC_VEC 0x0f20 /* AltiVec Unavailable */ -#define EXC_VECAST 0x1600 /* AltiVec Assist */ - -/* The following are only available on 604/750/7400: */ -#define EXC_PERF 0x0f00 /* Performance Monitoring */ -#define EXC_BPT 0x1300 /* Instruction Breakpoint */ -#define EXC_SMI 0x1400 /* System Managment Interrupt */ - -/* The following are only available on 750/7400: */ -#define EXC_THRM 0x1700 /* Thermal Management Interrupt */ - -/* And these are only on the 603: */ -#define EXC_IMISS 0x1000 /* Instruction translation miss */ -#define EXC_DLMISS 0x1100 /* Data load translation miss */ -#define EXC_DSMISS 0x1200 /* Data store translation miss */ - -/* The following are only available on 405 (and 403?) */ -#define EXC_CII 0x0100 /* Critical Input Interrupt */ -#define EXC_PIT 0x1000 /* Programmable Interval Timer */ -#define EXC_FIT 0x1010 /* Fixed Interval Timer */ -#define EXC_WDOG 0x1020 /* Watchdog Timer */ -#define EXC_DTMISS 0x1100 /* Data TLB Miss */ -#define EXC_ITMISS 0x1200 /* Instruction TLB Miss */ -#define EXC_DEBUG 0x2000 /* Debug trap */ - -#define EXC_LAST 0x2f00 /* Last possible exception vector */ - -#define EXC_AST 0x3000 /* Fake AST vector */ - -/* Trap was in user mode */ -#define EXC_USER 0x10000 - - -/* - * EXC_ALI sets bits in the DSISR and DAR to provide enough - * information to recover from the unaligned access without needing to - * parse the offending instruction. This includes certain bits of the - * opcode, and information about what registers are used. The opcode - * indicator values below come from Appendix F of Book III of "The - * PowerPC Architecture". - */ - -#define EXC_ALI_OPCODE_INDICATOR(dsisr) ((dsisr >> 10) & 0x7f) -#define EXC_ALI_LFD 0x09 -#define EXC_ALI_STFD 0x0b - -/* Macros to extract register information */ -#define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f) /* source or target */ -#define EXC_ALI_RA(dsisr) (dsisr & 0x1f) - -#endif /* _POWERPC_TRAP_H_ */ - -#endif /* if 0 commenting all the above out */ - #ifndef LOCORE struct trapframe; void trap(struct trapframe *); From owner-p4-projects@FreeBSD.ORG Sun Feb 24 14:30:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 933B716A402; Sun, 24 Feb 2008 14:30:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 556F016A400 for ; Sun, 24 Feb 2008 14:30:11 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2082813C465 for ; Sun, 24 Feb 2008 14:30:11 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OEUB30046978 for ; Sun, 24 Feb 2008 14:30:11 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OEUAVv046975 for perforce@freebsd.org; Sun, 24 Feb 2008 14:30:10 GMT (envelope-from raj@freebsd.org) Date: Sun, 24 Feb 2008 14:30:10 GMT Message-Id: <200802241430.m1OEUAVv046975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 136085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 14:30:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=136085 Change 136085 by raj@raj_mimi on 2008/02/24 14:29:16 Clean up kernel config files for the Freescale MPC85XX. We now have a KERNCONF=MPC85XX Affected files ... .. //depot/projects/e500/sys/powerpc/conf/JUNIPER#5 delete .. //depot/projects/e500/sys/powerpc/conf/MORNINGSTAR#2 delete .. //depot/projects/e500/sys/powerpc/conf/MPC85XX#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Feb 24 14:31:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62D2416A403; Sun, 24 Feb 2008 14:31:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 241DC16A405 for ; Sun, 24 Feb 2008 14:31:16 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05BDA13C45D for ; Sun, 24 Feb 2008 14:31:16 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OEVFFW047019 for ; Sun, 24 Feb 2008 14:31:15 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OEVCUs047016 for perforce@freebsd.org; Sun, 24 Feb 2008 14:31:12 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 24 Feb 2008 14:31:12 GMT Message-Id: <200802241431.m1OEVCUs047016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 136086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 14:31:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=136086 Change 136086 by sephe@sephe_enigma:sam_wifi on 2008/02/24 14:31:01 IFC Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#27 integrate .. //depot/projects/wifi/UPDATING#40 integrate .. //depot/projects/wifi/bin/sh/mksyntax.c#3 integrate .. //depot/projects/wifi/contrib/traceroute/as.c#1 branch .. //depot/projects/wifi/contrib/traceroute/as.h#1 branch .. //depot/projects/wifi/contrib/traceroute/traceroute.8#5 integrate .. //depot/projects/wifi/contrib/traceroute/traceroute.c#8 integrate .. //depot/projects/wifi/etc/mail/access.sample#2 integrate .. //depot/projects/wifi/etc/sendmail/freebsd.mc#7 integrate .. //depot/projects/wifi/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#11 integrate .. //depot/projects/wifi/gnu/usr.bin/man/man/man.c#4 integrate .. //depot/projects/wifi/gnu/usr.bin/man/manpath/manpath.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry_strmode.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_platform.h#15 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_filename.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#10 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_gzip.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#14 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_disk.c#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_open_filename.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_gzip.c#9 integrate .. //depot/projects/wifi/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/wifi/lib/libarchive/test/main.c#9 integrate .. //depot/projects/wifi/lib/libarchive/test/test.h#7 integrate .. //depot/projects/wifi/lib/libc/db/test/btree.tests/main.c#3 integrate .. //depot/projects/wifi/lib/libc/db/test/dbtest.c#3 integrate .. //depot/projects/wifi/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/wifi/lib/libc/resolv/res_comp.c#4 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.3#10 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#13 integrate .. //depot/projects/wifi/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/wifi/lib/libdisk/disk.c#7 integrate .. //depot/projects/wifi/lib/libmilter/Makefile#5 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_mutex.c#12 integrate .. //depot/projects/wifi/lib/msun/Makefile#19 integrate .. //depot/projects/wifi/lib/msun/Symbol.map#6 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_exp.c#3 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_log.c#4 integrate .. //depot/projects/wifi/lib/msun/bsdsrc/b_tgamma.c#5 integrate .. //depot/projects/wifi/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/wifi/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/wifi/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/wifi/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/wifi/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/wifi/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/wifi/lib/msun/man/cos.3#3 integrate .. //depot/projects/wifi/lib/msun/man/j0.3#4 integrate .. //depot/projects/wifi/lib/msun/man/lgamma.3#5 integrate .. //depot/projects/wifi/lib/msun/man/sin.3#3 integrate .. //depot/projects/wifi/lib/msun/man/tan.3#3 integrate .. //depot/projects/wifi/lib/msun/src/e_acos.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_acosh.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_asin.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_asinf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_atan2.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_atanh.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_cosh.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_coshf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_exp.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_expf.c#8 integrate .. //depot/projects/wifi/lib/msun/src/e_fmod.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_gamma.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_gamma_r.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_j0.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_j1.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_jn.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_lgamma.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_lgamma_r.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_lgammaf_r.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_log.c#5 integrate .. //depot/projects/wifi/lib/msun/src/e_log10.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_logf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_pow.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_rem_pio2.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_rem_pio2f.c#5 integrate .. //depot/projects/wifi/lib/msun/src/e_scalb.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_scalbf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_sinh.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_sinhf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/k_cos.c#5 integrate .. //depot/projects/wifi/lib/msun/src/k_cosf.c#5 integrate .. //depot/projects/wifi/lib/msun/src/k_rem_pio2.c#4 integrate .. //depot/projects/wifi/lib/msun/src/k_sin.c#4 integrate .. //depot/projects/wifi/lib/msun/src/k_sinf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/k_tan.c#4 integrate .. //depot/projects/wifi/lib/msun/src/k_tanf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/math.h#12 integrate .. //depot/projects/wifi/lib/msun/src/math_private.h#7 integrate .. //depot/projects/wifi/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_cbrt.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_cbrtf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_ceill.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_cos.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_cosf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_exp2.c#5 integrate .. //depot/projects/wifi/lib/msun/src/s_exp2f.c#5 integrate .. //depot/projects/wifi/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_floorl.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_frexp.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_ilogb.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_ilogbf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_logbf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_nextafter.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_nextafterf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_rint.c#5 integrate .. //depot/projects/wifi/lib/msun/src/s_rintf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_significand.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_sin.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_sinf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_sinl.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_tan.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_tanf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/s_tanh.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_tanhf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_tanl.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_tgammaf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_trunc.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_truncl.c#4 integrate .. //depot/projects/wifi/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/Makefile#10 integrate .. //depot/projects/wifi/release/Makefile#23 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#20 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#26 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#24 integrate .. //depot/projects/wifi/sbin/mount/getmntopts.3#3 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/wifi/sbin/sconfig/sconfig.c#4 integrate .. //depot/projects/wifi/secure/usr.bin/bdes/bdes.c#4 integrate .. //depot/projects/wifi/share/man/man4/Makefile#47 integrate .. //depot/projects/wifi/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/wifi/share/man/man4/geom_lvm.4#2 delete .. //depot/projects/wifi/share/man/man4/hptrr.4#3 integrate .. //depot/projects/wifi/share/man/man4/ip6.4#6 integrate .. //depot/projects/wifi/share/man/man4/sk.4#9 integrate .. //depot/projects/wifi/share/man/man9/Makefile#27 integrate .. //depot/projects/wifi/share/man/man9/lock.9#10 integrate .. //depot/projects/wifi/share/man/man9/pci.9#5 integrate .. //depot/projects/wifi/share/misc/committers-src.dot#8 integrate .. //depot/projects/wifi/share/mk/bsd.libnames.mk#14 integrate .. //depot/projects/wifi/sys/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#27 integrate .. //depot/projects/wifi/sys/boot/Makefile#6 integrate .. //depot/projects/wifi/sys/boot/common/bootstrap.h#4 integrate .. //depot/projects/wifi/sys/boot/common/load_elf.c#5 integrate .. //depot/projects/wifi/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/wifi/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/wifi/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/wifi/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/wifi/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/wifi/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/wifi/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/wifi/sys/boot/uboot/Makefile#1 branch .. //depot/projects/wifi/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/wifi/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/wifi/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/wifi/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/wifi/sys/conf/NOTES#51 integrate .. //depot/projects/wifi/sys/conf/files#66 integrate .. //depot/projects/wifi/sys/conf/files.powerpc#13 integrate .. //depot/projects/wifi/sys/conf/options#45 integrate .. //depot/projects/wifi/sys/conf/options.powerpc#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cpu.c#15 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_thermal.c#10 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_osm.c#11 integrate .. //depot/projects/wifi/sys/dev/bce/if_bce.c#12 integrate .. //depot/projects/wifi/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/wifi/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/wifi/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#11 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_l2t.c#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_l2t.h#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_offload.c#7 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#14 integrate .. //depot/projects/wifi/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/sys/mvec.h#7 integrate .. //depot/projects/wifi/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/wifi/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/wifi/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#1 branch .. //depot/projects/wifi/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/wifi/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#19 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/wifi/sys/dev/mxge/mxge_lro.c#5 integrate .. //depot/projects/wifi/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/wifi/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/wifi/sys/dev/sk/if_sk.c#10 integrate .. //depot/projects/wifi/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/wifi/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/wifi/sys/dev/ti/if_ti.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/umass.c#20 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/wifi/sys/fs/coda/TODO#2 integrate .. //depot/projects/wifi/sys/fs/coda/cnode.h#5 integrate .. //depot/projects/wifi/sys/fs/coda/coda_kernel.h#3 delete .. //depot/projects/wifi/sys/fs/coda/coda_psdev.c#5 integrate .. //depot/projects/wifi/sys/fs/coda/coda_subr.c#4 integrate .. //depot/projects/wifi/sys/fs/coda/coda_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#24 integrate .. //depot/projects/wifi/sys/geom/geom_disk.c#12 integrate .. //depot/projects/wifi/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/wifi/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/wifi/sys/geom/lvm/g_lvm.c#2 delete .. //depot/projects/wifi/sys/geom/lvm/g_lvm.h#2 delete .. //depot/projects/wifi/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/wifi/sys/ia64/conf/GENERIC#14 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#23 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#21 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#33 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#26 integrate .. //depot/projects/wifi/sys/kern/kern_ktrace.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#25 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_module.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_mutex.c#19 integrate .. //depot/projects/wifi/sys/kern/kern_tc.c#9 integrate .. //depot/projects/wifi/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#19 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#31 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#27 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#38 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#30 integrate .. //depot/projects/wifi/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/wifi/sys/libkern/quad.h#2 integrate .. //depot/projects/wifi/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/geom/Makefile#8 integrate .. //depot/projects/wifi/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/wifi/sys/modules/geom/geom_lvm/Makefile#2 delete .. //depot/projects/wifi/sys/modules/hwpmc/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/wifi/sys/net/route.c#13 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#21 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#25 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#26 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#19 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#23 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#29 integrate .. //depot/projects/wifi/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/wifi/sys/powerpc/conf/NOTES#8 integrate .. //depot/projects/wifi/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/wifi/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/wifi/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/wifi/sys/powerpc/include/metadata.h#3 integrate .. //depot/projects/wifi/sys/sys/buf.h#19 integrate .. //depot/projects/wifi/sys/sys/conf.h#21 integrate .. //depot/projects/wifi/sys/sys/ktrace.h#5 integrate .. //depot/projects/wifi/sys/sys/lock.h#11 integrate .. //depot/projects/wifi/sys/sys/lockmgr.h#15 integrate .. //depot/projects/wifi/sys/sys/module.h#3 integrate .. //depot/projects/wifi/sys/sys/param.h#37 integrate .. //depot/projects/wifi/sys/sys/priv.h#10 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#23 integrate .. //depot/projects/wifi/tools/regression/fsx/fsx.c#4 integrate .. //depot/projects/wifi/tools/regression/lib/msun/Makefile#7 integrate .. //depot/projects/wifi/tools/regression/lib/msun/test-exponential.c#2 integrate .. //depot/projects/wifi/tools/regression/lib/msun/test-trig.c#1 branch .. //depot/projects/wifi/tools/regression/lib/msun/test-trig.t#1 branch .. //depot/projects/wifi/tools/regression/security/open_to_operation/Makefile#1 branch .. //depot/projects/wifi/tools/regression/security/open_to_operation/open_to_operation.c#1 branch .. //depot/projects/wifi/usr.bin/Makefile#16 integrate .. //depot/projects/wifi/usr.bin/ar/Makefile#1 branch .. //depot/projects/wifi/usr.bin/ar/ar.1#1 branch .. //depot/projects/wifi/usr.bin/ar/ar.c#1 branch .. //depot/projects/wifi/usr.bin/ar/ar.h#1 branch .. //depot/projects/wifi/usr.bin/ar/read.c#1 branch .. //depot/projects/wifi/usr.bin/ar/util.c#1 branch .. //depot/projects/wifi/usr.bin/ar/write.c#1 branch .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.dutch#4 integrate .. //depot/projects/wifi/usr.bin/find/extern.h#3 integrate .. //depot/projects/wifi/usr.bin/find/find.1#8 integrate .. //depot/projects/wifi/usr.bin/find/find.h#3 integrate .. //depot/projects/wifi/usr.bin/find/function.c#5 integrate .. //depot/projects/wifi/usr.bin/find/option.c#3 integrate .. //depot/projects/wifi/usr.bin/kdump/kdump.1#4 integrate .. //depot/projects/wifi/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/wifi/usr.bin/kdump/mksubr#6 integrate .. //depot/projects/wifi/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/wifi/usr.bin/ktrace/ktrace.h#2 integrate .. //depot/projects/wifi/usr.bin/ktrace/subr.c#3 integrate .. //depot/projects/wifi/usr.bin/ncplogin/ncplogin.c#3 integrate .. //depot/projects/wifi/usr.bin/netstat/route.c#10 integrate .. //depot/projects/wifi/usr.bin/quota/quota.c#8 integrate .. //depot/projects/wifi/usr.bin/tar/write.c#17 integrate .. //depot/projects/wifi/usr.sbin/cdcontrol/cdcontrol.c#3 integrate .. //depot/projects/wifi/usr.sbin/pmcstat/Makefile#5 integrate .. //depot/projects/wifi/usr.sbin/portsnap/phttpget/phttpget.c#9 integrate .. //depot/projects/wifi/usr.sbin/powerd/powerd.c#11 integrate .. //depot/projects/wifi/usr.sbin/pw/pw.8#6 integrate .. //depot/projects/wifi/usr.sbin/pw/pw.c#4 integrate .. //depot/projects/wifi/usr.sbin/pw/pw_group.c#2 integrate .. //depot/projects/wifi/usr.sbin/rpcbind/rpcbind.c#6 integrate .. //depot/projects/wifi/usr.sbin/sa/db.c#3 integrate .. //depot/projects/wifi/usr.sbin/syslogd/syslogd.c#15 integrate .. //depot/projects/wifi/usr.sbin/traceroute/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate .. //depot/projects/wifi/usr.sbin/zic/zdump.c#2 integrate Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#27 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.130 2008/02/06 19:45:25 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080220: geom_lvm rename to geom_linux_lvm +OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal OLD_FILES+=usr/share/man/man4/card.4.gz OLD_FILES+=usr/share/man/man4/oldcard.4.gz ==== //depot/projects/wifi/UPDATING#40 (text+ko) ==== @@ -22,6 +22,10 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080220: + The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), + likewise the kernel option is now GEOM_LINUX_LVM. + 20080211: The default NFS mount mode has changed from UDP to TCP for increased reliability. If you rely on (insecurely) NFS @@ -979,4 +983,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.519 2008/02/11 23:23:20 kris Exp $ +$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ ==== //depot/projects/wifi/bin/sh/mksyntax.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.24 2005/08/13 15:47:13 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.25 2008/02/18 20:01:33 marcel Exp $"); /* * This program creates syntax.h and syntax.c. @@ -139,10 +139,7 @@ /* Determine the characteristics of chars. */ c = -1; - if (c < 0) - sign = 1; - else - sign = 0; + sign = (c > 0) ? 0 : 1; for (nbits = 1 ; ; nbits++) { d = (1 << nbits) - 1; if (d == c) ==== //depot/projects/wifi/contrib/traceroute/traceroute.8#5 (text+ko) ==== @@ -14,9 +14,9 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.17 2008/02/20 23:29:52 rpaulo Exp $ .\" -.TH TRACEROUTE 8 "21 September 2000" +.TH TRACEROUTE 8 "19 February 2008" .UC 6 .SH NAME traceroute \- print the route packets take to network host @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dDeFISnrvx +.B \-adDeFISnrvx ] [ .B \-f .I first_ttl @@ -71,6 +71,9 @@ .B \-w .I waittime ] [ +.B \-A +.I as_server +] [ .B \-z .I pausemsecs ] @@ -98,6 +101,13 @@ .PP Other options are: .TP +.B \-a +Turn on AS# lookups for each hop encountered. +.TP +.B -A +Turn on AS# lookups and use the given server instead of the +default. +.TP .B \-e Firewall evasion mode. Use fixed destination ports for UDP and TCP probes. @@ -443,3 +453,7 @@ router that's filtering packets), but this is not implemented yet. .PP Please send bug reports to traceroute@ee.lbl.gov. +.PP +The AS number capability reports information that may sometimes be +inaccurate due to discrepancies between the contents of the +routing database server and the current state of the Internet. ==== //depot/projects/wifi/contrib/traceroute/traceroute.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34 2007/07/01 12:08:05 gnn Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $"; #endif /* @@ -263,6 +263,7 @@ #include "findsaddr.h" #include "ifaddrlist.h" +#include "as.h" #include "traceroute.h" /* Maximum number of gateways (include room for one noop) */ @@ -350,6 +351,9 @@ int verbose; int waittime = 5; /* time to wait for response (in seconds) */ int nflag; /* print addresses numerically */ +int as_path; /* print as numbers for each hop */ +char *as_server = NULL; +void *asn; #ifdef CANT_HACK_IPCKSUM int doipcksum = 0; /* don't calculate ip checksums by default */ #else @@ -535,9 +539,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "aA:edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { - + case 'a': + as_path = 1; + break; + + case 'A': + as_path = 1; + as_server = optarg; + break; + case 'd': options |= SO_DEBUG; break; @@ -913,6 +925,16 @@ exit (1); } + if (as_path) { + asn = as_setup(as_server); + if (asn == NULL) { + Fprintf(stderr, "%s: as_setup failed, AS# lookups" + " disabled\n", prog); + (void)fflush(stderr); + as_path = 0; + } + } + #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) if (setpolicy(sndsock, "in bypass") < 0) errx(1, "%s", ipsec_strerror()); @@ -1118,6 +1140,8 @@ (unreachable > 0 && unreachable >= nprobes - 1)) break; } + if (as_path) + as_shutdown(asn); exit(0); } @@ -1458,6 +1482,9 @@ hlen = ip->ip_hl << 2; cc -= hlen; + if (as_path) + Printf(" [AS%d]", as_lookup(asn, &from->sin_addr)); + if (nflag) Printf(" %s", inet_ntoa(from->sin_addr)); else @@ -1764,8 +1791,8 @@ Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" + "Usage: %s [-adDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" - "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog); + "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog); exit(1); } ==== //depot/projects/wifi/etc/mail/access.sample#2 (text+ko) ==== @@ -1,10 +1,17 @@ -# $FreeBSD: src/etc/mail/access.sample,v 1.3 2000/11/02 23:40:40 dirk Exp $ +# $FreeBSD: src/etc/mail/access.sample,v 1.4 2008/02/17 05:22:08 gshapiro Exp $ # # Mail relay access control list. Default is to reject mail unless the # destination is local, or listed in /etc/mail/local-host-names # -cyberspammer.com 550 We don't accept mail from spammers -FREE.STEALTH.MAILER@ 550 We don't accept mail from spammers -another.source.of.spam REJECT -okay.cyberspammer.com OK -128.32 RELAY + +## Examples (commented out for safety) +#From:cyberspammer.com ERROR:"550 We don't accept mail from spammers" +#From:okay.cyberspammer.com OK +#Connect:sendmail.org RELAY +#To:sendmail.org RELAY +#Connect:128.32 RELAY +#Connect:128.32.2 SKIP +#Connect:IPv6:1:2:3:4:5:6:7 RELAY +#Connect:suspicious.example.com QUARANTINE:Mail from suspicious host +#Connect:[127.0.0.3] OK +#Connect:[IPv6:1:2:3:4:5:6:7:8] OK ==== //depot/projects/wifi/etc/sendmail/freebsd.mc#7 (text+ko) ==== @@ -44,7 +44,7 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.35 2007/11/05 00:18:06 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.36 2008/02/17 05:38:29 gshapiro Exp $') OSTYPE(freebsd6) DOMAIN(generic) @@ -71,7 +71,7 @@ dnl NOTE: This is a subscription service as of July 31, 2001 dnl FEATURE(dnsbl) dnl Alternatively, you can provide your own server and rejection message: -dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', `"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}') +dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', ``"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}'') dnl Dialup users should uncomment and define this appropriately dnl define(`SMART_HOST', `your.isp.mail.server') ==== //depot/projects/wifi/games/fortune/strfile/strfile.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.28 2005/02/17 18:06:37 ru Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.29 2008/02/19 07:09:17 ru Exp $"); # include # include @@ -270,7 +270,7 @@ { int ch; - while ((ch = getopt(argc, argv, "Cc:iorsx")) != EOF) + while ((ch = getopt(argc, argv, "Cc:iorsx")) != -1) switch(ch) { case 'C': /* embedded comments */ Cflag++; ==== //depot/projects/wifi/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,10 +1,15 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if defined(WITH_BSDAR) +PROG= gnu-ar +#MAN= gnu-ar.1 +.else PROG= ar +.endif SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/wifi/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,10 +1,15 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if defined(WITH_BSDAR) +PROG= gnu-ranlib +#MAN= gnu-ranlib.1 +.else PROG= ranlib +.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.62 2007/11/27 10:00:33 jkoshy Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.63 2008/02/23 19:27:54 ru Exp $ .\" .\" %beginstrip% . @@ -64,7 +64,7 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~7.0 +.ds doc-default-operating-system FreeBSD\~8.0 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 ==== //depot/projects/wifi/gnu/usr.bin/man/man/man.c#4 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.66 2008/02/19 07:09:17 ru Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -324,7 +324,7 @@ extern void downcase (); extern char *manpath (); - while ((c = getopt (argc, argv, args)) != EOF) + while ((c = getopt (argc, argv, args)) != -1) { switch (c) { ==== //depot/projects/wifi/gnu/usr.bin/man/manpath/manpath.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ * The University of Texas at Austin * Austin, Texas 78712 * - * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.13 2002/10/27 02:12:52 kris Exp $ + * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.14 2008/02/19 07:09:18 ru Exp $ */ #define MANPATH_MAIN @@ -78,7 +78,7 @@ prognam = mkprogname (argv[0]); - while ((c = getopt (argc, argv, "dhLq?")) != EOF) + while ((c = getopt (argc, argv, "dhLq?")) != -1) { switch (c) { ==== //depot/projects/wifi/lib/libarchive/archive_entry_strmode.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.1 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.2 2008/02/19 05:49:02 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -65,15 +65,15 @@ bp[i+1] = '-'; if (mode & S_ISUID) { - if (mode & S_IXUSR) bp[3] = 's'; + if (mode & 0100) bp[3] = 's'; else bp[3] = 'S'; } if (mode & S_ISGID) { - if (mode & S_IXGRP) bp[6] = 's'; + if (mode & 0010) bp[6] = 's'; else bp[6] = 'S'; } if (mode & S_ISVTX) { - if (mode & S_IXOTH) bp[9] = 't'; + if (mode & 0001) bp[9] = 't'; else bp[9] = 'T'; } if (archive_entry_acl_count(entry, ARCHIVE_ENTRY_ACL_TYPE_ACCESS)) ==== //depot/projects/wifi/lib/libarchive/archive_platform.h#15 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.28 2007/12/30 04:58:21 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.29 2008/02/19 06:06:13 kientzle Exp $ */ /* @@ -36,7 +36,10 @@ #ifndef ARCHIVE_PLATFORM_H_INCLUDED #define ARCHIVE_PLATFORM_H_INCLUDED -#if defined(PLATFORM_CONFIG_H) +#ifdef _WIN32 +#include "config_windows.h" +#include "archive_windows.h" +#elif defined(PLATFORM_CONFIG_H) /* Use hand-built config.h in environments that need it. */ #include PLATFORM_CONFIG_H #elif defined(HAVE_CONFIG_H) ==== //depot/projects/wifi/lib/libarchive/archive_read_open_filename.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.21 2008/02/19 06:10:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -47,6 +47,10 @@ #include "archive.h" +#ifndef O_BINARY +#define O_BINARY 0 +#endif + struct read_file_data { int fd; size_t block_size; @@ -113,7 +117,7 @@ return (ARCHIVE_FATAL); } if (mine->filename[0] != '\0') - mine->fd = open(mine->filename, O_RDONLY); + mine->fd = open(mine->filename, O_RDONLY | O_BINARY); else mine->fd = 0; /* Fake "open" for stdin. */ if (mine->fd < 0) { ==== //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.16 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.17 2008/02/19 05:44:59 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -145,7 +145,7 @@ (void)buff; /* UNUSED */ (void)n; /* UNUSED */ - archive_set_error(a, -1, + archive_set_error(&a->archive, -1, "This version of libarchive was compiled without bzip2 support"); return (ARCHIVE_FATAL); } ==== //depot/projects/wifi/lib/libarchive/archive_read_support_compression_gzip.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.15 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.16 2008/02/19 05:44:59 kientzle Exp $"); #ifdef HAVE_ERRNO_H @@ -146,7 +146,7 @@ (void)buff; /* UNUSED */ (void)n; /* UNUSED */ - archive_set_error(a, -1, + archive_set_error(&a->archive, -1, "This version of libarchive was compiled without gzip support"); return (ARCHIVE_FATAL); } ==== //depot/projects/wifi/lib/libarchive/archive_read_support_format_ar.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.7 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -268,8 +268,7 @@ /* This must come before any call to _read_ahead. */ ar_parse_common_header(ar, entry, h); archive_entry_copy_pathname(entry, filename); - archive_entry_set_mode(entry, - S_IFREG | (archive_entry_mode(entry) & 0777)); + archive_entry_set_filetype(entry, AE_IFREG); /* Get the size of the filename table. */ number = ar_atol10(h + AR_size_offset, AR_size_size); if (number > SIZE_MAX) { @@ -375,8 +374,7 @@ /* Parse the time, owner, mode, size fields. */ r = ar_parse_common_header(ar, entry, h); /* Force the file type to a regular file. */ - archive_entry_set_mode(entry, - S_IFREG | (archive_entry_mode(entry) & 0777)); + archive_entry_set_filetype(entry, AE_IFREG); return (r); } ==== //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.24 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.25 2008/02/19 06:02:01 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1064,24 +1064,28 @@ if (t->tm_isdst) t->tm_hour -= 1; return (mktime(t)); /* Re-convert. */ -#else - /* - * If you don't have tm_gmtoff, let's try resetting the timezone - * (yecch!). - */ +#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV) && defined(HAVE_TZSET) + /* No timegm() and no tm_gmtoff, let's try forcing mktime() to UTC. */ time_t ret; char *tz; + /* Reset the timezone, remember the old one. */ tz = getenv("TZ"); setenv("TZ", "UTC 0", 1); tzset(); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 24 14:38:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BAFD16A405; Sun, 24 Feb 2008 14:38:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E2C316A402 for ; Sun, 24 Feb 2008 14:38:30 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4088C13C442 for ; Sun, 24 Feb 2008 14:38:30 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OEcTCP047352 for ; Sun, 24 Feb 2008 14:38:29 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OEcS2P047349 for perforce@freebsd.org; Sun, 24 Feb 2008 14:38:28 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 24 Feb 2008 14:38:28 GMT Message-Id: <200802241438.m1OEcS2P047349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 136088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 14:38:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=136088 Change 136088 by brueffer@brueffer_haakonia on 2008/02/24 14:38:02 Fixed for the Socket Token section. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#17 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#17 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -556,13 +556,14 @@ .Ss Socket Token The .Dq socket -token contains informations about UNIX domain and Internet sockets. +token contains information about UNIX domain and Internet sockets. Each token has four or eight fields. -Depend on type of socket a socket token may be created using +Depending on the type of socket, a socket token may be created using .Xr au_to_sock_unix 3 , -.Xr au_to_sock_inet32 3 or +.Xr au_to_sock_inet32 3 +or .Xr au_to_sock_inet128 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" +.Bl -column -offset 3n ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" .It Li "Socket family" Ta "2 bytes" Ta "Socket family" @@ -572,13 +573,13 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -+.It Li "Socket domain" Ta "4 bytes" Ta "Socket domain" -+.It Li "Socket family" Ta "2 bytes" Ta "Socket family" -+.It Li "Address type" Ta "1 byte" Ta "Address type (IPv4/IPv6)" -+.It Li "Local port" Ta "2 bytes" Ta "Local port" -+.It Li "Local IP address" Ta "4/16 bytes" Ta "Local IP address" -+.It Li "Remote port" Ta "2 bytes" Ta "Remote port" -+.It Li "Remote IP address" Ta "4/16 bytes" Ta "Remote IP address" +.It Li "Socket domain" Ta "4 bytes" Ta "Socket domain" +.It Li "Socket family" Ta "2 bytes" Ta "Socket family" +.It Li "Address type" Ta "1 byte" Ta "Address type (IPv4/IPv6)" +.It Li "Local port" Ta "2 bytes" Ta "Local port" +.It Li "Local IP address" Ta "4/16 bytes" Ta "Local IP address" +.It Li "Remote port" Ta "2 bytes" Ta "Remote port" +.It Li "Remote IP address" Ta "4/16 bytes" Ta "Remote IP address" .El .Ss Expanded Socket Token The From owner-p4-projects@FreeBSD.ORG Sun Feb 24 17:03:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76AB416A406; Sun, 24 Feb 2008 17:03:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3890A16A402; Sun, 24 Feb 2008 17:03:45 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.78]) by mx1.freebsd.org (Postfix) with ESMTP id EA8C913C457; Sun, 24 Feb 2008 17:03:44 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (asmtp006-s [10.150.69.69]) by smtpoutm.mac.com (Xserve/smtpout015/MantshX 4.0) with ESMTP id m1OH3iCS009149; Sun, 24 Feb 2008 09:03:44 -0800 (PST) Received: from [10.20.1.111] (dsl093-166-098.sfo2.dsl.speakeasy.net [66.93.166.98]) (authenticated bits=0) by mac.com (Xserve/asmtp006/MantshX 4.0) with ESMTP id m1OH3h5v011613 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sun, 24 Feb 2008 09:03:43 -0800 (PST) Message-Id: From: Marcel Moolenaar To: Rafal Jaworowski In-Reply-To: <200802241430.m1OEUAVv046975@repoman.freebsd.org> Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v919.2) Date: Sun, 24 Feb 2008 09:03:42 -0800 References: <200802241430.m1OEUAVv046975@repoman.freebsd.org> X-Mailer: Apple Mail (2.919.2) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 136085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 17:03:45 -0000 On Feb 24, 2008, at 6:30 AM, Rafal Jaworowski wrote: > http://perforce.freebsd.org/chv.cgi?CH=136085 > > Change 136085 by raj@raj_mimi on 2008/02/24 14:29:16 > > Clean up kernel config files for the Freescale MPC85XX. We now have a > KERNCONF=MPC85XX Thanks! -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Sun Feb 24 17:24:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 556A116A405; Sun, 24 Feb 2008 17:24:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1844816A402 for ; Sun, 24 Feb 2008 17:24:51 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF12513C45E for ; Sun, 24 Feb 2008 17:24:50 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OHOov7066197 for ; Sun, 24 Feb 2008 17:24:50 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OHOoOb066194 for perforce@freebsd.org; Sun, 24 Feb 2008 17:24:50 GMT (envelope-from csjp@freebsd.org) Date: Sun, 24 Feb 2008 17:24:50 GMT Message-Id: <200802241724.m1OHOoOb066194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 17:24:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=136101 Change 136101 by csjp@ibm01 on 2008/02/24 17:24:45 Check for EINTR instead of EAGAIN, the intent is to identify interrupted system calls that was a result of signal delivery. Affected files ... .. //depot/projects/trustedbsd/netauditd/netauditd.c#6 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/netauditd.c#6 (text+ko) ==== @@ -410,7 +410,7 @@ memcpy(&rfds, &srfds, sizeof(rfds)); ret = select(FD_SETSIZE, &rfds, NULL, NULL, &tv); if (ret == -1) { - if (errno != EAGAIN) + if (errno != EINTR) exit(2); else continue; From owner-p4-projects@FreeBSD.ORG Sun Feb 24 17:34:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E9A116A40B; Sun, 24 Feb 2008 17:34:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 928F716A409 for ; Sun, 24 Feb 2008 17:34:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6AF9E13C455 for ; Sun, 24 Feb 2008 17:34:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OHYQjt066536 for ; Sun, 24 Feb 2008 17:34:26 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OHY8wc066531 for perforce@freebsd.org; Sun, 24 Feb 2008 17:34:08 GMT (envelope-from peter-gmail@wemm.org) Date: Sun, 24 Feb 2008 17:34:08 GMT Message-Id: <200802241734.m1OHY8wc066531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 17:34:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=136104 Change 136104 by peter@peter_overcee on 2008/02/24 17:33:50 IFC @136100 Affected files ... .. //depot/projects/hammer/LOCKS#3 integrate .. //depot/projects/hammer/MAINTAINERS#46 integrate .. //depot/projects/hammer/Makefile#46 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#45 integrate .. //depot/projects/hammer/UPDATING#112 integrate .. //depot/projects/hammer/bin/date/date.c#8 integrate .. //depot/projects/hammer/bin/sh/mksyntax.c#6 integrate .. //depot/projects/hammer/contrib/binutils/libiberty/cp-demangle.c#4 integrate .. //depot/projects/hammer/contrib/file/FREEBSD-upgrade#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/hammer/contrib/file/Magdir/chi#2 delete .. //depot/projects/hammer/contrib/file/Magdir/cvs#2 delete .. //depot/projects/hammer/contrib/file/Magdir/hdf#2 delete .. //depot/projects/hammer/contrib/file/Magdir/impulse#2 delete .. //depot/projects/hammer/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/hammer/contrib/file/acconfig.h#4 delete .. //depot/projects/hammer/contrib/file/magic.c#6 integrate .. //depot/projects/hammer/contrib/file/missing#2 delete .. //depot/projects/hammer/contrib/file/stamp-h.in#2 delete .. //depot/projects/hammer/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/hammer/contrib/libiberty/cp-demangle.c#2 delete .. //depot/projects/hammer/contrib/ncurses/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/hammer/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/hammer/contrib/ncurses/NEWS#4 integrate .. //depot/projects/hammer/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_driver.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/hammer/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_clear.3x#3 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/hammer/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/manlinks.sed#3 integrate .. //depot/projects/hammer/contrib/ncurses/man/toe.1m#4 integrate .. //depot/projects/hammer/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_insch.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkclear.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkinit.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_data.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/progs/infocmp.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/progs/toe.c#4 integrate .. //depot/projects/hammer/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#10 integrate .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#13 integrate .. //depot/projects/hammer/contrib/top/display.c#5 integrate .. //depot/projects/hammer/contrib/top/layout.h#3 integrate .. //depot/projects/hammer/contrib/top/machine.h#6 integrate .. //depot/projects/hammer/contrib/top/top.c#12 integrate .. //depot/projects/hammer/contrib/top/top.h#5 integrate .. //depot/projects/hammer/contrib/traceroute/as.c#1 branch .. //depot/projects/hammer/contrib/traceroute/as.h#1 branch .. //depot/projects/hammer/contrib/traceroute/traceroute.8#6 integrate .. //depot/projects/hammer/contrib/traceroute/traceroute.c#10 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-Xlist#4 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#12 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/hammer/etc/defaults/rc.conf#82 integrate .. //depot/projects/hammer/etc/devd.conf#31 integrate .. //depot/projects/hammer/etc/mail/access.sample#2 integrate .. //depot/projects/hammer/etc/namedb/named.root#6 integrate .. //depot/projects/hammer/etc/netstart#8 integrate .. //depot/projects/hammer/etc/periodic/security/100.chksetuid#7 integrate .. //depot/projects/hammer/etc/rc#21 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#21 integrate .. //depot/projects/hammer/etc/rc.d/hostid#4 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#15 integrate .. //depot/projects/hammer/etc/rc.d/kerberos#7 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#15 integrate .. //depot/projects/hammer/etc/rc.d/netif#21 integrate .. //depot/projects/hammer/etc/rc.d/ppp#8 integrate .. //depot/projects/hammer/etc/rc.firewall#8 integrate .. //depot/projects/hammer/etc/rc.subr#41 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.mc#11 integrate .. //depot/projects/hammer/games/fortune/strfile/strfile.c#7 integrate .. //depot/projects/hammer/gnu/lib/csu/Makefile#11 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ar/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/contrib/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.h#7 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kthr.c#8 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#12 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt.c#6 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_i386.c#6 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#30 integrate .. //depot/projects/hammer/gnu/usr.bin/man/man/man.c#7 integrate .. //depot/projects/hammer/gnu/usr.bin/man/manpath/manpath.c#3 integrate .. //depot/projects/hammer/include/fts.h#5 integrate .. //depot/projects/hammer/include/pthread_np.h#7 integrate .. //depot/projects/hammer/include/unistd.h#20 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#46 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_strmode.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#35 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#22 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#40 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_filename.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ar.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/hammer/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#8 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#9 integrate .. //depot/projects/hammer/lib/libarchive/test/test.h#6 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#11 integrate .. //depot/projects/hammer/lib/libc/db/test/btree.tests/main.c#3 integrate .. //depot/projects/hammer/lib/libc/db/test/dbtest.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#32 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/hammer/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#10 integrate .. //depot/projects/hammer/lib/libc/gen/fts.c#9 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.c#5 integrate .. //depot/projects/hammer/lib/libc/i386/_fpmath.h#6 integrate .. //depot/projects/hammer/lib/libc/ia64/_fpmath.h#6 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#11 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#10 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#25 integrate .. //depot/projects/hammer/lib/libc/locale/ascii.c#1 branch .. //depot/projects/hammer/lib/libc/locale/mblocal.h#7 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#21 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#33 integrate .. //depot/projects/hammer/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/hammer/lib/libc/resolv/res_comp.c#4 integrate .. //depot/projects/hammer/lib/libc/sparc64/_fpmath.h#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#9 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#19 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#41 integrate .. //depot/projects/hammer/lib/libc/sys/access.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/extattr_get_file.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/flock.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mq_notify.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#15 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.h#6 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#24 integrate .. //depot/projects/hammer/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/hammer/lib/libfetch/common.c#11 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#15 integrate .. //depot/projects/hammer/lib/libfetch/ftp.c#14 integrate .. //depot/projects/hammer/lib/libfetch/http.c#16 integrate .. //depot/projects/hammer/lib/libkse/Makefile#4 integrate .. //depot/projects/hammer/lib/libkse/kse.map#3 integrate .. //depot/projects/hammer/lib/libkse/sys/lock.c#4 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_mutex.c#6 integrate .. //depot/projects/hammer/lib/libmilter/Makefile#7 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#14 integrate .. //depot/projects/hammer/lib/librpcsvc/Makefile#10 integrate .. //depot/projects/hammer/lib/librpcsvc/xcrypt.c#3 integrate .. //depot/projects/hammer/lib/libthr/Makefile#25 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libthr/arch/arm/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libthr/arch/arm/include/pthread_md.h#5 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libthr/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libthr/arch/powerpc/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libthr/arch/sparc64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libthr/arch/sparc64/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#17 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#40 integrate .. //depot/projects/hammer/lib/libutil/pty.3#4 integrate .. //depot/projects/hammer/lib/libutil/pty.c#9 integrate .. //depot/projects/hammer/lib/msun/Makefile#38 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#8 integrate .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/hammer/lib/msun/bsdsrc/b_exp.c#4 integrate .. //depot/projects/hammer/lib/msun/bsdsrc/b_log.c#5 integrate .. //depot/projects/hammer/lib/msun/bsdsrc/b_tgamma.c#5 integrate .. //depot/projects/hammer/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/hammer/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/hammer/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/hammer/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/hammer/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/hammer/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/hammer/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/hammer/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/hammer/lib/msun/man/cos.3#3 integrate .. //depot/projects/hammer/lib/msun/man/exp.3#8 integrate .. //depot/projects/hammer/lib/msun/man/j0.3#4 integrate .. //depot/projects/hammer/lib/msun/man/lgamma.3#6 integrate .. //depot/projects/hammer/lib/msun/man/log.3#1 branch .. //depot/projects/hammer/lib/msun/man/sin.3#3 integrate .. //depot/projects/hammer/lib/msun/man/tan.3#3 integrate .. //depot/projects/hammer/lib/msun/src/e_acos.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_acosh.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_asin.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_asinf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_atan2.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_atan2f.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_atanh.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_cosh.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_coshf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_exp.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_expf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_fmod.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_gamma.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_gamma_r.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_j0.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_j1.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_jn.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_lgamma.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_lgamma_r.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_lgammaf_r.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_log.c#6 integrate .. //depot/projects/hammer/lib/msun/src/e_log10.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_logf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_pow.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_powf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#7 integrate .. //depot/projects/hammer/lib/msun/src/e_remainder.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_remainderf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_scalb.c#6 integrate .. //depot/projects/hammer/lib/msun/src/e_scalbf.c#6 integrate .. //depot/projects/hammer/lib/msun/src/e_sinh.c#3 integrate .. //depot/projects/hammer/lib/msun/src/e_sinhf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_cos.c#5 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#8 integrate .. //depot/projects/hammer/lib/msun/src/k_rem_pio2.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_rem_pio2f.c#4 delete .. //depot/projects/hammer/lib/msun/src/k_sin.c#5 integrate .. //depot/projects/hammer/lib/msun/src/k_sinf.c#7 integrate .. //depot/projects/hammer/lib/msun/src/k_tan.c#6 integrate .. //depot/projects/hammer/lib/msun/src/k_tanf.c#6 integrate .. //depot/projects/hammer/lib/msun/src/math.h#34 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#9 integrate .. //depot/projects/hammer/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_atan.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrt.c#6 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrtf.c#7 integrate .. //depot/projects/hammer/lib/msun/src/s_ceil.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_ceill.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_copysign.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_copysignf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_cos.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_cosf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_expm1.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_expm1f.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_finite.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_floor.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_floorl.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_frexp.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogb.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogbf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_logb.c#5 integrate .. //depot/projects/hammer/lib/msun/src/s_logbf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_nextafter.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_nextafterf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_rint.c#6 integrate .. //depot/projects/hammer/lib/msun/src/s_rintf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_significand.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_sin.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_sinf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_sinl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_tan.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_tanf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_tanh.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_tanhf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_tanl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_tgammaf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_trunc.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_truncl.c#3 integrate .. //depot/projects/hammer/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/hammer/lib/ncurses/ncurses/Makefile#9 integrate .. //depot/projects/hammer/lib/ncurses/ncurses/ncurses_cfg.h#4 integrate .. //depot/projects/hammer/release/Makefile#99 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#10 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#28 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#49 integrate .. //depot/projects/hammer/release/fixit.profile#4 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#8 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#10 integrate .. //depot/projects/hammer/release/pc98/boot_crunch.conf#9 integrate .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#4 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#7 integrate .. //depot/projects/hammer/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#12 integrate .. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.c#9 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/boot.c#6 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/fat.c#5 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#14 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#20 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#15 integrate .. //depot/projects/hammer/sbin/gpt/gpt.c#14 integrate .. //depot/projects/hammer/sbin/gpt/migrate.c#12 integrate .. //depot/projects/hammer/sbin/gpt/show.c#11 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#32 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#63 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#62 integrate .. //depot/projects/hammer/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/hammer/sbin/md5/md5.c#9 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.3#5 integrate .. //depot/projects/hammer/sbin/mount/mount.c#31 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#15 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#15 integrate .. //depot/projects/hammer/sbin/natd/natd.8#10 integrate .. //depot/projects/hammer/sbin/quotacheck/Makefile#3 integrate .. //depot/projects/hammer/sbin/quotacheck/preen.c#6 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.8#7 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#13 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/hammer/sbin/sconfig/sconfig.c#5 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/bdes.c#6 integrate .. //depot/projects/hammer/share/colldef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#102 integrate .. //depot/projects/hammer/share/man/man4/ath.4#35 integrate .. //depot/projects/hammer/share/man/man4/atkbd.4#8 integrate .. //depot/projects/hammer/share/man/man4/awi.4#12 integrate .. //depot/projects/hammer/share/man/man4/axe.4#13 integrate .. //depot/projects/hammer/share/man/man4/ciss.4#12 integrate .. //depot/projects/hammer/share/man/man4/coda.4#1 branch .. //depot/projects/hammer/share/man/man4/dcons.4#8 integrate .. //depot/projects/hammer/share/man/man4/ed.4#16 integrate .. //depot/projects/hammer/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/hammer/share/man/man4/hptiop.4#2 integrate .. //depot/projects/hammer/share/man/man4/hptrr.4#2 integrate .. //depot/projects/hammer/share/man/man4/ip6.4#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/snc.4#5 integrate .. //depot/projects/hammer/share/man/man4/mfi.4#5 integrate .. //depot/projects/hammer/share/man/man4/mxge.4#5 integrate .. //depot/projects/hammer/share/man/man4/oldcard.4#7 delete .. //depot/projects/hammer/share/man/man4/pcib.4#3 integrate .. //depot/projects/hammer/share/man/man4/puc.4#4 integrate .. //depot/projects/hammer/share/man/man4/rr232x.4#3 delete .. //depot/projects/hammer/share/man/man4/sched_4bsd.4#5 integrate .. //depot/projects/hammer/share/man/man4/sched_ule.4#6 integrate .. //depot/projects/hammer/share/man/man4/sf.4#8 integrate .. //depot/projects/hammer/share/man/man4/sk.4#13 integrate .. //depot/projects/hammer/share/man/man4/syncache.4#5 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#19 integrate .. //depot/projects/hammer/share/man/man4/wi.4#30 integrate .. //depot/projects/hammer/share/man/man4/xl.4#16 integrate .. //depot/projects/hammer/share/man/man5/fstab.5#5 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#85 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#15 integrate .. //depot/projects/hammer/share/man/man7/clocks.7#6 integrate .. //depot/projects/hammer/share/man/man7/ports.7#22 integrate .. //depot/projects/hammer/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/hammer/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/hammer/share/man/man9/BUF_REFCNT.9#3 delete .. //depot/projects/hammer/share/man/man9/Makefile#78 integrate .. //depot/projects/hammer/share/man/man9/VOP_LOCK.9#9 integrate .. //depot/projects/hammer/share/man/man9/lock.9#11 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#28 integrate .. //depot/projects/hammer/share/man/man9/pci.9#9 integrate .. //depot/projects/hammer/share/man/man9/style.9#27 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#41 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#9 integrate .. //depot/projects/hammer/share/misc/pci_vendors#17 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#12 integrate .. //depot/projects/hammer/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/hammer/share/msgdef/Makefile#20 integrate .. //depot/projects/hammer/share/msgdef/ko_KR.UTF-8.src#1 branch .. //depot/projects/hammer/share/msgdef/ko_KR.eucKR.src#2 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#12 integrate .. //depot/projects/hammer/sys/Makefile#19 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#50 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#58 integrate .. //depot/projects/hammer/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#173 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#104 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#108 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#27 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#67 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#20 integrate .. //depot/projects/hammer/sys/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/genassym.c#10 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#17 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#49 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#20 integrate .. //depot/projects/hammer/sys/arm/include/asmacros.h#8 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#20 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#23 integrate .. //depot/projects/hammer/sys/arm/include/sysarch.h#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/hammer/sys/boot/Makefile#20 integrate .. //depot/projects/hammer/sys/boot/common/bootstrap.h#9 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#19 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf.5#9 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#7 integrate .. //depot/projects/hammer/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/hammer/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/hammer/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/hammer/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/hammer/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/hammer/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/hammer/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/hammer/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/hammer/sys/boot/uboot/Makefile#1 branch .. //depot/projects/hammer/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/hammer/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/hammer/sys/cam/cam_periph.c#23 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#37 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#15 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#51 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#48 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#48 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#48 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#53 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#45 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#42 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#24 integrate .. //depot/projects/hammer/sys/conf/NOTES#137 integrate .. //depot/projects/hammer/sys/conf/files#173 integrate .. //depot/projects/hammer/sys/conf/files.amd64#102 integrate .. //depot/projects/hammer/sys/conf/files.i386#89 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#28 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#43 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#42 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#51 integrate .. //depot/projects/hammer/sys/conf/options#122 integrate .. //depot/projects/hammer/sys/conf/options.powerpc#9 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/hammer/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_capture.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#80 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#40 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#33 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#22 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#38 integrate .. //depot/projects/hammer/sys/dev/amr/amrreg.h#8 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#22 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#39 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/an/if_anreg.h#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#56 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#30 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfereg.h#9 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#78 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#41 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#48 integrate .. //depot/projects/hammer/sys/dev/coretemp/coretemp.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#15 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#16 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/t3cdev.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/hammer/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#32 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#13 integrate .. //depot/projects/hammer/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/hammer/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/array.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/him.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/list.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/hammer/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#59 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#36 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/hammer/sys/dev/mfi/mfireg.h#7 integrate .. //depot/projects/hammer/sys/dev/mii/amphy.c#13 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#32 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#20 integrate .. //depot/projects/hammer/sys/dev/mii/nsphy.c#13 integrate .. //depot/projects/hammer/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/hammer/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/hammer/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/hammer/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/hammer/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge_var.h#9 integrate .. //depot/projects/hammer/sys/dev/mxge/mxge_lro.c#4 integrate .. //depot/projects/hammer/sys/dev/mxge/mxge_mcp.h#7 integrate .. //depot/projects/hammer/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/hammer/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/hammer/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/hammer/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#9 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_rx.c#7 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#65 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#16 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560.c#12 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560var.h#4 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#56 integrate .. //depot/projects/hammer/sys/dev/rr232x/LICENSE#2 delete .. //depot/projects/hammer/sys/dev/rr232x/README#2 delete .. //depot/projects/hammer/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/hammer/sys/dev/rr232x/array.h#2 delete .. //depot/projects/hammer/sys/dev/rr232x/him.h#2 delete .. //depot/projects/hammer/sys/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/hammer/sys/dev/rr232x/hptintf.h#2 delete .. //depot/projects/hammer/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/hammer/sys/dev/rr232x/ldm.h#2 delete .. //depot/projects/hammer/sys/dev/rr232x/list.h#2 delete .. //depot/projects/hammer/sys/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/hammer/sys/dev/rr232x/os_bsd.h#3 delete .. //depot/projects/hammer/sys/dev/rr232x/osm.h#2 delete .. //depot/projects/hammer/sys/dev/rr232x/osm_bsd.c#6 delete .. //depot/projects/hammer/sys/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/hammer/sys/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/hammer/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/hammer/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/hammer/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/hammer/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/hammer/sys/dev/sk/if_sk.c#9 integrate .. //depot/projects/hammer/sys/dev/sk/if_skreg.h#5 integrate .. //depot/projects/hammer/sys/dev/stge/if_stge.c#7 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#44 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#15 integrate .. //depot/projects/hammer/sys/dev/ti/if_ti.c#8 integrate .. //depot/projects/hammer/sys/dev/twe/twe.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/uark.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/uftdireg.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#48 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#94 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#18 integrate .. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/coda/TODO#2 integrate .. //depot/projects/hammer/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_kernel.h#2 delete .. //depot/projects/hammer/sys/fs/coda/coda_namecache.c#2 delete .. //depot/projects/hammer/sys/fs/coda/coda_namecache.h#2 delete .. //depot/projects/hammer/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vnops.c#5 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#43 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_subr.h#4 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#27 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#29 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#51 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#17 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#28 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#30 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#17 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#19 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#24 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#33 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#28 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#39 integrate .. //depot/projects/hammer/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/hammer/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#17 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_inode.c#5 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#3 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#23 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#62 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#98 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#36 integrate .. //depot/projects/hammer/sys/i386/i386/dump_machdep.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/geode.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#108 integrate .. //depot/projects/hammer/sys/i386/include/proc.h#10 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#41 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#29 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#33 integrate .. //depot/projects/hammer/sys/ia64/ia64/dump_machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.S#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#67 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#65 integrate .. //depot/projects/hammer/sys/ia64/include/md_var.h#17 integrate .. //depot/projects/hammer/sys/kern/genassym.sh#2 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#64 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#75 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#71 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#27 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#91 integrate .. //depot/projects/hammer/sys/kern/subr_autoconf.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#57 integrate .. //depot/projects/hammer/sys/kern/subr_lock.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#27 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#27 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#62 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#64 integrate .. //depot/projects/hammer/sys/kern/systrace_args.c#8 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#29 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#37 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#47 integrate .. //depot/projects/hammer/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/hammer/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#77 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#70 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#56 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#55 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#84 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#52 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#32 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#89 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#123 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#79 integrate .. //depot/projects/hammer/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/hammer/sys/libkern/quad.h#7 integrate .. //depot/projects/hammer/sys/modules/Makefile#120 integrate .. //depot/projects/hammer/sys/modules/coda/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/coda5/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#17 integrate .. //depot/projects/hammer/sys/modules/geom/geom_eli/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/hammer/sys/modules/hwpmc/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/mii/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/mxge/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/hammer/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/hammer/sys/modules/rr232x/Makefile#3 delete .. //depot/projects/hammer/sys/modules/sf/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/hammer/sys/net/bpf.c#56 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#40 integrate .. //depot/projects/hammer/sys/net/route.c#32 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#41 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#17 integrate .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#11 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#32 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#53 integrate .. //depot/projects/hammer/sys/netgraph/ng_bpf.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#24 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#27 integrate .. //depot/projects/hammer/sys/netgraph/ng_pred1.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_tee.c#10 integrate .. //depot/projects/hammer/sys/netinet/in.c#29 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#15 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#27 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#31 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#91 integrate .. //depot/projects/hammer/sys/netinet/ip_id.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_options.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#67 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#18 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#19 integrate .. //depot/projects/hammer/sys/netinet/sctp_peeloff.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#24 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#54 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#52 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#31 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#26 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#48 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#21 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#34 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#35 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#20 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#14 integrate .. //depot/projects/hammer/sys/netipsec/ipsec6.h#4 integrate .. //depot/projects/hammer/sys/netncp/ncp_conn.c#11 integrate .. //depot/projects/hammer/sys/netsmb/smb_conn.c#12 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_idmap.c#5 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#24 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#29 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#45 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#16 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#26 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#45 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#52 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#57 integrate .. //depot/projects/hammer/sys/nfsclient/nfsm_subs.h#7 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#20 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#31 integrate .. //depot/projects/hammer/sys/pci/amdsmb.c#5 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#30 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#44 delete .. //depot/projects/hammer/sys/pci/if_sfreg.h#11 delete .. //depot/projects/hammer/sys/pci/if_wb.c#39 integrate .. //depot/projects/hammer/sys/pci/nfsmb.c#6 integrate .. //depot/projects/hammer/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/hammer/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#37 integrate .. //depot/projects/hammer/sys/powerpc/conf/NOTES#8 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/hammer/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/hammer/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#11 integrate .. //depot/projects/hammer/sys/powerpc/include/metadata.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/hammer/sys/powerpc/include/openpicvar.h#7 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#15 integrate .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#15 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#14 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pic_if.m#5 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#13 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#11 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#44 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#58 integrate .. //depot/projects/hammer/sys/sparc64/include/md_var.h#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/dump_machdep.c#10 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/dump_machdep.c#3 integrate .. //depot/projects/hammer/sys/sys/buf.h#33 integrate .. //depot/projects/hammer/sys/sys/bus.h#25 integrate .. //depot/projects/hammer/sys/sys/conf.h#42 integrate .. //depot/projects/hammer/sys/sys/event.h#16 integrate .. //depot/projects/hammer/sys/sys/ipc.h#6 integrate .. //depot/projects/hammer/sys/sys/ktrace.h#9 integrate .. //depot/projects/hammer/sys/sys/lock.h#22 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#16 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#65 integrate .. //depot/projects/hammer/sys/sys/module.h#4 integrate .. //depot/projects/hammer/sys/sys/param.h#104 integrate .. //depot/projects/hammer/sys/sys/priv.h#8 integrate .. //depot/projects/hammer/sys/sys/proc.h#114 integrate .. //depot/projects/hammer/sys/sys/rwlock.h#10 integrate .. //depot/projects/hammer/sys/sys/shm.h#8 integrate .. //depot/projects/hammer/sys/sys/signal.h#18 integrate .. //depot/projects/hammer/sys/sys/socket.h#26 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#41 integrate .. //depot/projects/hammer/sys/sys/syscall.h#61 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#61 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#30 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#62 integrate .. //depot/projects/hammer/sys/sys/time.h#13 integrate .. //depot/projects/hammer/sys/sys/user.h#24 integrate .. //depot/projects/hammer/sys/sys/vnode.h#75 integrate .. //depot/projects/hammer/sys/tools/embed_mfs.sh#1 branch .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#52 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#49 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#71 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#48 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#26 integrate .. //depot/projects/hammer/tools/build/Makefile#8 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_FORTRAN#2 delete .. //depot/projects/hammer/tools/regression/fsx/fsx.c#6 integrate .. //depot/projects/hammer/tools/regression/lib/msun/Makefile#9 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-exponential.c#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-exponential.t#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-trig.c#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-trig.t#1 branch .. //depot/projects/hammer/tools/regression/netinet/ip_id_period/ip_id_period.py#1 branch .. //depot/projects/hammer/tools/regression/posixshm/Makefile#1 branch .. //depot/projects/hammer/tools/regression/posixshm/posixshm.c#1 branch .. //depot/projects/hammer/tools/regression/posixshm/posixshm.t#1 branch .. //depot/projects/hammer/tools/regression/posixshm/test.c#1 branch .. //depot/projects/hammer/tools/regression/posixshm/test.h#1 branch .. //depot/projects/hammer/tools/regression/pthread/mutex_isowned_np/Makefile#1 branch .. //depot/projects/hammer/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c#1 branch .. //depot/projects/hammer/tools/regression/security/open_to_operation/Makefile#1 branch .. //depot/projects/hammer/tools/regression/security/open_to_operation/open_to_operation.c#1 branch .. //depot/projects/hammer/tools/regression/sockets/unix_sorflush/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/unix_sorflush/unix_sorflush.c#1 branch .. //depot/projects/hammer/tools/sched/schedgraph.py#11 integrate .. //depot/projects/hammer/tools/tools/aac/aac_checkq.c#3 integrate .. //depot/projects/hammer/tools/tools/crypto/cryptostats.c#3 integrate .. //depot/projects/hammer/tools/tools/crypto/cryptotest.c#8 integrate .. //depot/projects/hammer/usr.bin/ar/Makefile#3 branch .. //depot/projects/hammer/usr.bin/ar/ar.1#3 branch .. //depot/projects/hammer/usr.bin/ar/ar.c#3 branch .. //depot/projects/hammer/usr.bin/ar/ar.h#1 branch .. //depot/projects/hammer/usr.bin/ar/read.c#1 branch .. //depot/projects/hammer/usr.bin/ar/util.c#1 branch .. //depot/projects/hammer/usr.bin/ar/write.c#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.dutch#4 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#60 integrate .. //depot/projects/hammer/usr.bin/file/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/file/file.1#10 delete .. //depot/projects/hammer/usr.bin/file/magic.5#9 delete .. //depot/projects/hammer/usr.bin/find/extern.h#7 integrate .. //depot/projects/hammer/usr.bin/find/find.1#23 integrate .. //depot/projects/hammer/usr.bin/find/find.h#5 integrate .. //depot/projects/hammer/usr.bin/find/function.c#11 integrate .. //depot/projects/hammer/usr.bin/find/option.c#10 integrate .. //depot/projects/hammer/usr.bin/fstat/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/fstat/zfs/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/gzip/znew#2 integrate .. //depot/projects/hammer/usr.bin/kdump/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#11 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#23 integrate .. //depot/projects/hammer/usr.bin/kdump/mkioctls#9 integrate .. //depot/projects/hammer/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.h#2 integrate .. //depot/projects/hammer/usr.bin/ktrace/subr.c#4 integrate .. //depot/projects/hammer/usr.bin/logger/logger.c#6 integrate .. //depot/projects/hammer/usr.bin/ministat/ministat.c#2 integrate .. //depot/projects/hammer/usr.bin/mklocale/mklocale.1#14 integrate .. //depot/projects/hammer/usr.bin/mklocale/yacc.y#15 integrate .. //depot/projects/hammer/usr.bin/mt/mt.1#11 integrate .. //depot/projects/hammer/usr.bin/ncplogin/ncplogin.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#20 integrate .. //depot/projects/hammer/usr.bin/netstat/route.c#15 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat.c#2 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_files.c#3 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_kstack.c#2 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_threads.c#2 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_vm.c#2 integrate .. //depot/projects/hammer/usr.bin/quota/quota.c#10 integrate .. //depot/projects/hammer/usr.bin/sed/compile.c#9 integrate .. //depot/projects/hammer/usr.bin/sed/defs.h#5 integrate .. //depot/projects/hammer/usr.bin/sed/main.c#12 integrate .. //depot/projects/hammer/usr.bin/sed/process.c#16 integrate .. //depot/projects/hammer/usr.bin/systat/cmds.c#3 integrate .. //depot/projects/hammer/usr.bin/systat/convtbl.c#6 integrate .. //depot/projects/hammer/usr.bin/systat/devs.c#4 integrate .. //depot/projects/hammer/usr.bin/systat/fetch.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 24 17:37:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33F0616A405; Sun, 24 Feb 2008 17:37:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D26E616A400 for ; Sun, 24 Feb 2008 17:37:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC61C13C469 for ; Sun, 24 Feb 2008 17:37:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OHbYwR066665 for ; Sun, 24 Feb 2008 17:37:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OHbWqv066662 for perforce@freebsd.org; Sun, 24 Feb 2008 17:37:32 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Feb 2008 17:37:32 GMT Message-Id: <200802241737.m1OHbWqv066662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136105 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 17:37:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=136105 Change 136105 by marcel@marcel_xcllnt on 2008/02/24 17:37:18 IFC @136100 Affected files ... .. //depot/projects/e500/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/e500/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/e500/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/e500/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/e500/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/e500/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/e500/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/e500/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/e500/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/e500/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/e500/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/e500/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_emu.c#8 integrate .. //depot/projects/e500/sys/sys/vnode.h#6 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_vfsops.c#6 integrate Differences ... ==== //depot/projects/e500/sbin/ipfw/ipfw.8#7 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.209 2008/02/18 19:56:09 julian Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.210 2008/02/24 15:37:45 piso Exp $ .\" .Dd November 26, 2007 .Dt IPFW 8 @@ -1609,7 +1609,7 @@ The .Cm tablearg argument can be used with the following actions: -.Cm pipe , queue, divert, tee, netgraph, ngtee, fwd +.Cm nat, pipe , queue, divert, tee, netgraph, ngtee, fwd action parameters: .Cm tag, untag, rule options: ==== //depot/projects/e500/sbin/ipfw/ipfw2.c#10 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.116 2008/02/21 22:55:54 piso Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.117 2008/02/24 15:37:45 piso Exp $ */ #include @@ -1612,7 +1612,7 @@ break; case O_NAT: - printf("nat %u", cmd->arg1); + PRINT_UINT_ARG("nat ", cmd->arg1); break; default: @@ -4848,6 +4848,10 @@ action->opcode = O_COUNT; break; + case TOK_NAT: + action->opcode = O_NAT; + action->len = F_INSN_SIZE(ipfw_insn_nat); + goto chkarg; case TOK_QUEUE: action->opcode = O_QUEUE; goto chkarg; @@ -4929,14 +4933,6 @@ action->opcode = O_COUNT; ac++; av--; /* go back... */ break; - - case TOK_NAT: - action->opcode = O_NAT; - action->len = F_INSN_SIZE(ipfw_insn_nat); - NEED1("missing nat number"); - action->arg1 = strtoul(*av, NULL, 10); - ac--; av++; - break; default: errx(EX_DATAERR, "invalid action %s\n", av[-1]); ==== //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 (text+ko) ==== @@ -119,8 +119,8 @@ ASSERT(error == 0); zp->z_vnode = vp; vp->v_data = (caddr_t)zp; - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); } else { zp->z_vnode = NULL; } @@ -604,8 +604,8 @@ ASSERT(err == 0); vp = ZTOV(zp); vp->v_data = (caddr_t)zp; - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); vp->v_type = IFTOVT((mode_t)zp->z_phys->zp_mode); if (vp->v_type == VDIR) zp->z_zn_prefetch = B_TRUE; /* z_prefetch default is enabled */ ==== //depot/projects/e500/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -1,7 +1,8 @@ /* $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ */ /*- - * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . + * Copyright (c) 2001-2003, 2005, 2008 + * Shunsuke Akiyama . * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.64 2007/06/25 06:40:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.65 2008/02/24 12:16:01 akiyama Exp $"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -113,6 +114,7 @@ #define DPRINTFN(n, x) #endif +static int ucom_modevent(module_t, int, void *); static void ucom_cleanup(struct ucom_softc *); static int ucomparam(struct tty *, struct termios *); static void ucomstart(struct tty *); @@ -135,7 +137,7 @@ static moduledata_t ucom_mod = { "ucom", - NULL, + ucom_modevent, NULL }; @@ -143,6 +145,21 @@ MODULE_DEPEND(ucom, usb, 1, 1, 1); MODULE_VERSION(ucom, UCOM_MODVER); +static int +ucom_modevent(module_t mod, int type, void *data) +{ + switch (type) { + case MOD_LOAD: + break; + case MOD_UNLOAD: + break; + default: + return (EOPNOTSUPP); + break; + } + return (0); +} + int ucom_attach(struct ucom_softc *sc) { ==== //depot/projects/e500/sys/fs/nwfs/nwfs_node.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.41 2008/01/24 12:34:27 attilio Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.42 2008/02/24 16:38:56 attilio Exp $ */ #include #include @@ -188,7 +188,7 @@ if (dvp) { np->n_parent = VTONW(dvp)->n_fid; } - vp->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(vp); lockmgr(&nwhashlock, LK_EXCLUSIVE, NULL); /* * Another process can create vnode while we blocked in malloc() or ==== //depot/projects/e500/sys/fs/pseudofs/pseudofs_vncache.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.40 2008/01/13 14:44:05 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.41 2008/02/24 16:38:56 attilio Exp $"); #include "opt_pseudofs.h" @@ -196,7 +196,7 @@ if ((pn->pn_flags & PFS_PROCDEP) != 0) (*vpp)->v_vflag |= VV_PROCDEP; pvd->pvd_vnode = *vpp; - (*vpp)->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(*vpp); vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); error = insmntque(*vpp, mp); if (error != 0) { ==== //depot/projects/e500/sys/fs/smbfs/smbfs_node.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.36 2008/01/24 12:34:27 attilio Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.37 2008/02/24 16:38:57 attilio Exp $ */ #include #include @@ -261,7 +261,7 @@ } else if (vp->v_type == VREG) SMBERROR("new vnode '%s' born without parent ?\n", np->n_name); - vp->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); smbfs_hash_lock(smp, td); ==== //depot/projects/e500/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 (text+ko) ==== @@ -389,7 +389,7 @@ return (error); } - vp->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = insmntque(vp, XVFSTOMNT(XFS_MTOVFS(mp))); if (error != 0) { ==== //depot/projects/e500/sys/kern/vfs_lookup.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.105 2008/01/13 14:44:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.106 2008/02/24 16:38:57 attilio Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -84,7 +84,7 @@ error = getnewvnode("crossmp", NULL, &dead_vnodeops, &vp_crossmp); if (error != 0) panic("nameiinit: getnewvnode"); - vp_crossmp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_ASHARE(vp_crossmp); } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL) ==== //depot/projects/e500/sys/netinet/ip_fw2.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.180 2008/01/25 14:38:27 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.181 2008/02/24 15:37:45 piso Exp $"); #define DEB(x) #define DDB(x) x @@ -3486,7 +3486,7 @@ struct cfg_nat *t; struct mbuf *mcl; /* XXX - libalias duct tape */ - int ldt; + int ldt, nat_id; char *c; ldt = 0; @@ -3494,7 +3494,9 @@ retval = 0; t = ((ipfw_insn_nat *)cmd)->nat; if (t == NULL) { - t = lookup_nat(cmd->arg1); + nat_id = (cmd->arg1 == IP_FW_TABLEARG) ? + tablearg : cmd->arg1; + t = lookup_nat(nat_id); if (t == NULL) { retval = IP_FW_DENY; goto done; ==== //depot/projects/e500/sys/netinet/tcp_var.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.160 2007/12/12 23:31:49 kmacy Exp $ + * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.161 2008/02/24 05:13:20 silby Exp $ */ #ifndef _NETINET_TCP_VAR_H_ @@ -238,14 +238,17 @@ * to tcp_dooptions and tcp_addoptions. * The binary order of the to_flags is relevant for packing of the * options in tcp_addoptions. + * SACK should be kept after TS; some broken cable modem / router + * devices were found in the field that ignore SYN-ACKs with + * SACK before TS. */ struct tcpopt { u_long to_flags; /* which options are present */ #define TOF_MSS 0x0001 /* maximum segment size */ #define TOF_SCALE 0x0002 /* window scaling */ -#define TOF_SACKPERM 0x0004 /* SACK permitted */ #define TOF_TS 0x0010 /* timestamp */ -#define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */ +#define TOF_SIGNATURE 0x0020 /* TCP-MD5 signature option (RFC2385) */ +#define TOF_SACKPERM 0x0040 /* SACK permitted */ #define TOF_SACK 0x0080 /* Peer sent SACK option */ #define TOF_MAXOPT 0x0100 u_int32_t to_tsval; /* new timestamp */ ==== //depot/projects/e500/sys/netncp/ncp_conn.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netncp/ncp_conn.c,v 1.31 2008/01/24 12:34:28 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/netncp/ncp_conn.c,v 1.32 2008/02/24 16:38:57 attilio Exp $"); #include #include @@ -193,7 +193,7 @@ int ncp_conn_assert_locked(struct ncp_conn *conn, const char *checker, struct thread *td) { - if (conn->nc_lock.lk_flags & LK_HAVE_EXCL) return 0; + if (lockstatus(&conn->nc_lock, curthread) == LK_EXCLUSIVE) return 0; printf("%s: connection isn't locked!\n", checker); return EIO; } ==== //depot/projects/e500/sys/netsmb/smb_conn.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.19 2008/01/24 12:34:29 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.20 2008/02/24 16:26:52 attilio Exp $"); #include #include @@ -62,8 +62,8 @@ MALLOC_DEFINE(M_SMBCONN, "smb_conn", "SMB connection"); -static void smb_co_init(struct smb_connobj *cp, int level, char *objname, - struct thread *td); +static void smb_co_init(struct smb_connobj *cp, int level, char *ilockname, + char *lockname, struct thread *td); static void smb_co_done(struct smb_connobj *cp); static int smb_co_lockstatus(struct smb_connobj *cp, struct thread *td); @@ -82,7 +82,7 @@ smb_sm_init(void) { - smb_co_init(&smb_vclist, SMBL_SM, "smbsm", curthread); + smb_co_init(&smb_vclist, SMBL_SM, "smbsm ilock", "smbsm", curthread); smb_co_unlock(&smb_vclist, 0, curthread); return 0; } @@ -227,11 +227,12 @@ * Common code for connection object */ static void -smb_co_init(struct smb_connobj *cp, int level, char *objname, struct thread *td) +smb_co_init(struct smb_connobj *cp, int level, char *ilockname, char *lockname, + struct thread *td) { SLIST_INIT(&cp->co_children); - smb_sl_init(&cp->co_interlock, objname); - lockinit(&cp->co_lock, PZERO, objname, 0, 0); + smb_sl_init(&cp->co_interlock, ilockname); + lockinit(&cp->co_lock, PZERO, lockname, 0, 0); cp->co_level = level; cp->co_usecount = 1; if (smb_co_lock(cp, LK_EXCLUSIVE, td) != 0) @@ -398,7 +399,7 @@ return EPERM; vcp = smb_zmalloc(sizeof(*vcp), M_SMBCONN, M_WAITOK); - smb_co_init(VCTOCP(vcp), SMBL_VC, "smb_vc", td); + smb_co_init(VCTOCP(vcp), SMBL_VC, "smb_vc ilock", "smb_vc", td); vcp->obj.co_free = smb_vc_free; vcp->obj.co_gone = smb_vc_gone; vcp->vc_number = smb_vcnext++; @@ -716,7 +717,7 @@ if (gid == SMBM_ANY_GROUP) gid = cred->cr_groups[0]; ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, M_WAITOK); - smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss", td); + smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss ilock", "smbss", td); ssp->obj.co_free = smb_share_free; ssp->obj.co_gone = smb_share_gone; smb_sl_init(&ssp->ss_stlock, "ssstlock"); ==== //depot/projects/e500/sys/nfsclient/nfs_node.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.87 2008/01/24 12:34:29 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.88 2008/02/24 16:38:57 attilio Exp $"); #include #include @@ -158,8 +158,8 @@ /* * NFS supports recursive and shared locking. */ - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); if (fhsize > NFS_SMALLFH) { MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK); } else ==== //depot/projects/e500/sys/powerpc/fpu/fpu_emu.c#8 (text+ko) ==== @@ -76,12 +76,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.3 2008/02/24 17:10:30 marcel Exp $"); #include "opt_ddb.h" -#define DEBUG - #include #include #include ==== //depot/projects/e500/sys/sys/vnode.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.329 2008/01/13 14:44:13 attilio Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.330 2008/02/24 16:38:57 attilio Exp $ */ #ifndef _SYS_VNODE_H_ @@ -400,6 +400,9 @@ #define VI_UNLOCK(vp) mtx_unlock(&(vp)->v_interlock) #define VI_MTX(vp) (&(vp)->v_interlock) +#define VN_LOCK_AREC(vp) ((vp)->v_vnlock->lk_flags |= LK_CANRECURSE) +#define VN_LOCK_ASHARE(vp) ((vp)->v_vnlock->lk_flags &= ~LK_NOSHARE) + #endif /* _KERNEL */ /* ==== //depot/projects/e500/sys/ufs/ffs/ffs_softdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.216 2008/01/13 14:44:13 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.217 2008/02/24 16:38:58 attilio Exp $"); /* * For now we want the safety net that the DEBUG flag provides. @@ -564,6 +564,9 @@ #define ACQUIRE_LOCK(lk) mtx_lock(lk) #define FREE_LOCK(lk) mtx_unlock(lk) +#define BUF_AREC(bp) ((bp)->b_lock.lk_flags |= LK_CANRECURSE) +#define BUF_NOREC(bp) ((bp)->b_lock.lk_flags &= ~LK_CANRECURSE) + /* * Worklist queue management. * These routines require that the lock be held. @@ -5251,7 +5254,7 @@ return (0); loop: /* While syncing snapshots, we must allow recursive lookups */ - bp->b_lock.lk_flags |= LK_CANRECURSE; + BUF_AREC(bp); ACQUIRE_LOCK(&lk); /* * As we hold the buffer locked, none of its dependencies @@ -5393,7 +5396,7 @@ /* We reach here only in error and unlocked */ if (error == 0) panic("softdep_sync_metadata: zero error"); - bp->b_lock.lk_flags &= ~LK_CANRECURSE; + BUF_NOREC(bp); bawrite(bp); return (error); } @@ -5405,7 +5408,7 @@ break; } VI_UNLOCK(vp); - bp->b_lock.lk_flags &= ~LK_CANRECURSE; + BUF_NOREC(bp); bawrite(bp); if (nbp != NULL) { bp = nbp; ==== //depot/projects/e500/sys/ufs/ffs/ffs_vfsops.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.335 2008/01/24 12:34:29 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.336 2008/02/24 16:38:58 attilio Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -1363,8 +1363,8 @@ /* * FFS supports recursive and shared locking. */ - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); vp->v_data = ip; vp->v_bufobj.bo_bsize = fs->fs_bsize; ip->i_vnode = vp; From owner-p4-projects@FreeBSD.ORG Sun Feb 24 17:45:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6198E16A409; Sun, 24 Feb 2008 17:45:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CB3416A406 for ; Sun, 24 Feb 2008 17:45:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E960113C45E for ; Sun, 24 Feb 2008 17:45:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OHjtTj066946 for ; Sun, 24 Feb 2008 17:45:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OHjrN6066926 for perforce@freebsd.org; Sun, 24 Feb 2008 17:45:53 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Feb 2008 17:45:53 GMT Message-Id: <200802241745.m1OHjrN6066926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 17:45:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=136107 Change 136107 by marcel@marcel_cluster on 2008/02/24 17:45:36 IFC @136100 Affected files ... .. //depot/projects/powerpc/ObsoleteFiles.inc#15 integrate .. //depot/projects/powerpc/UPDATING#15 integrate .. //depot/projects/powerpc/bin/sh/mksyntax.c#2 integrate .. //depot/projects/powerpc/contrib/traceroute/as.c#1 branch .. //depot/projects/powerpc/contrib/traceroute/as.h#1 branch .. //depot/projects/powerpc/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/powerpc/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/powerpc/etc/mail/access.sample#2 integrate .. //depot/projects/powerpc/etc/sendmail/freebsd.mc#4 integrate .. //depot/projects/powerpc/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/powerpc/gnu/usr.bin/man/man/man.c#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/man/manpath/manpath.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry_strmode.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_disk.c#8 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_open_filename.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_gzip.c#6 integrate .. //depot/projects/powerpc/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/powerpc/lib/libarchive/test/main.c#7 integrate .. //depot/projects/powerpc/lib/libarchive/test/test.h#6 integrate .. //depot/projects/powerpc/lib/libc/db/test/btree.tests/main.c#3 integrate .. //depot/projects/powerpc/lib/libc/db/test/dbtest.c#3 integrate .. //depot/projects/powerpc/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/powerpc/lib/libc/resolv/res_comp.c#4 integrate .. //depot/projects/powerpc/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/powerpc/lib/libc/stdlib/malloc.c#11 integrate .. //depot/projects/powerpc/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/powerpc/lib/libdisk/disk.c#2 integrate .. //depot/projects/powerpc/lib/libmilter/Makefile#3 integrate .. //depot/projects/powerpc/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/powerpc/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libthr/arch/sparc64/include/pthread_md.h#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/powerpc/lib/msun/Makefile#8 integrate .. //depot/projects/powerpc/lib/msun/Symbol.map#8 integrate .. //depot/projects/powerpc/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/powerpc/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/powerpc/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/powerpc/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/powerpc/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/powerpc/lib/msun/bsdsrc/b_tgamma.c#3 integrate .. //depot/projects/powerpc/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/powerpc/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/powerpc/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/powerpc/lib/msun/ld128/s_exp2l.c#3 integrate .. //depot/projects/powerpc/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/powerpc/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/powerpc/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/powerpc/lib/msun/ld80/s_exp2l.c#3 integrate .. //depot/projects/powerpc/lib/msun/man/cos.3#3 integrate .. //depot/projects/powerpc/lib/msun/man/j0.3#3 integrate .. //depot/projects/powerpc/lib/msun/man/lgamma.3#3 integrate .. //depot/projects/powerpc/lib/msun/man/sin.3#3 integrate .. //depot/projects/powerpc/lib/msun/man/tan.3#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_exp.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_expf.c#4 integrate .. //depot/projects/powerpc/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_lgamma_r.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_lgammaf_r.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_log.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/k_cos.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/k_rem_pio2.c#4 integrate .. //depot/projects/powerpc/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/math.h#5 integrate .. //depot/projects/powerpc/lib/msun/src/math_private.h#4 integrate .. //depot/projects/powerpc/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_cos.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_cosf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/powerpc/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_exp2.c#4 integrate .. //depot/projects/powerpc/lib/msun/src/s_exp2f.c#4 integrate .. //depot/projects/powerpc/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_frexp.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_ilogb.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_ilogbf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_nextafter.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_nextafterf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_rintf.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_significand.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_sin.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_sinf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_sinl.c#1 branch .. //depot/projects/powerpc/lib/msun/src/s_tan.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_tanf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_tanh.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_tanl.c#1 branch .. //depot/projects/powerpc/lib/msun/src/s_tgammaf.c#1 branch .. //depot/projects/powerpc/lib/msun/src/s_trunc.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_truncl.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/powerpc/lib/ncurses/ncurses/Makefile#11 integrate .. //depot/projects/powerpc/release/Makefile#7 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/powerpc/sbin/mount/getmntopts.3#2 integrate .. //depot/projects/powerpc/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/powerpc/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/powerpc/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/powerpc/share/man/man4/Makefile#17 integrate .. //depot/projects/powerpc/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/powerpc/share/man/man4/geom_lvm.4#2 delete .. //depot/projects/powerpc/share/man/man4/hptrr.4#3 integrate .. //depot/projects/powerpc/share/man/man4/ip6.4#2 integrate .. //depot/projects/powerpc/share/man/man4/mxge.4#4 integrate .. //depot/projects/powerpc/share/man/man4/sk.4#3 integrate .. //depot/projects/powerpc/share/man/man9/Makefile#11 integrate .. //depot/projects/powerpc/share/man/man9/lock.9#6 integrate .. //depot/projects/powerpc/share/man/man9/pci.9#3 integrate .. //depot/projects/powerpc/share/misc/committers-src.dot#9 integrate .. //depot/projects/powerpc/share/mk/bsd.libnames.mk#7 integrate .. //depot/projects/powerpc/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/powerpc/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/powerpc/sys/boot/Makefile#5 integrate .. //depot/projects/powerpc/sys/boot/common/bootstrap.h#6 integrate .. //depot/projects/powerpc/sys/boot/common/load_elf.c#5 integrate .. //depot/projects/powerpc/sys/boot/powerpc/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/powerpc/ofw/Makefile#4 integrate .. //depot/projects/powerpc/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/powerpc/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/powerpc/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/powerpc/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/powerpc/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/powerpc/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/powerpc/sys/boot/uboot/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/powerpc/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/powerpc/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/powerpc/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/powerpc/sys/conf/NOTES#19 integrate .. //depot/projects/powerpc/sys/conf/files#22 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#16 integrate .. //depot/projects/powerpc/sys/conf/options#22 integrate .. //depot/projects/powerpc/sys/conf/options.powerpc#5 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_cpu.c#11 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_thermal.c#8 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/powerpc/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_l2t.c#5 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_l2t.h#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_sge.c#12 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/mvec.h#7 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/powerpc/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/powerpc/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#1 branch .. //depot/projects/powerpc/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/powerpc/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/powerpc/sys/dev/mxge/mxge_lro.c#5 integrate .. //depot/projects/powerpc/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/powerpc/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/powerpc/sys/dev/sk/if_sk.c#10 integrate .. //depot/projects/powerpc/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/powerpc/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/powerpc/sys/dev/ti/if_ti.c#6 integrate .. //depot/projects/powerpc/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/umass.c#9 integrate .. //depot/projects/powerpc/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/powerpc/sys/fs/coda/TODO#2 integrate .. //depot/projects/powerpc/sys/fs/coda/cnode.h#4 integrate .. //depot/projects/powerpc/sys/fs/coda/coda_kernel.h#3 delete .. //depot/projects/powerpc/sys/fs/coda/coda_namecache.c#3 delete .. //depot/projects/powerpc/sys/fs/coda/coda_namecache.h#4 delete .. //depot/projects/powerpc/sys/fs/coda/coda_psdev.c#4 integrate .. //depot/projects/powerpc/sys/fs/coda/coda_subr.c#3 integrate .. //depot/projects/powerpc/sys/fs/coda/coda_subr.h#3 integrate .. //depot/projects/powerpc/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/powerpc/sys/fs/coda/coda_vnops.h#3 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/powerpc/sys/fs/ntfs/ntfs_subr.c#7 integrate .. //depot/projects/powerpc/sys/fs/nwfs/nwfs_node.c#8 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_vncache.c#11 integrate .. //depot/projects/powerpc/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/powerpc/sys/geom/geom_disk.c#5 integrate .. //depot/projects/powerpc/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/powerpc/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/powerpc/sys/geom/lvm/g_lvm.c#2 delete .. //depot/projects/powerpc/sys/geom/lvm/g_lvm.h#2 delete .. //depot/projects/powerpc/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/powerpc/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/powerpc/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/powerpc/sys/ia64/ia64/machdep.c#14 integrate .. //depot/projects/powerpc/sys/ia64/ia64/pmap.c#13 integrate .. //depot/projects/powerpc/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/powerpc/sys/kern/kern_exit.c#11 integrate .. //depot/projects/powerpc/sys/kern/kern_ktrace.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_lock.c#10 integrate .. //depot/projects/powerpc/sys/kern/kern_mib.c#10 integrate .. //depot/projects/powerpc/sys/kern/kern_module.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/powerpc/sys/kern/kern_tc.c#6 integrate .. //depot/projects/powerpc/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/powerpc/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/powerpc/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/powerpc/sys/kern/vfs_default.c#9 integrate .. //depot/projects/powerpc/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/powerpc/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/powerpc/sys/libkern/cmpdi2.c#3 branch .. //depot/projects/powerpc/sys/libkern/quad.h#4 integrate .. //depot/projects/powerpc/sys/modules/coda/Makefile#5 integrate .. //depot/projects/powerpc/sys/modules/coda5/Makefile#3 integrate .. //depot/projects/powerpc/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/powerpc/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/powerpc/sys/modules/geom/Makefile#6 integrate .. //depot/projects/powerpc/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/geom/geom_lvm/Makefile#2 delete .. //depot/projects/powerpc/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/powerpc/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/powerpc/sys/net/route.c#11 integrate .. //depot/projects/powerpc/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/powerpc/sys/netinet/tcp_var.h#16 integrate .. //depot/projects/powerpc/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/powerpc/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_node.c#7 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_socket.c#12 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/powerpc/sys/nfsclient/nfsm_subs.h#5 integrate .. //depot/projects/powerpc/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/powerpc/sys/powerpc/conf/NOTES#9 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/powerpc/sys/powerpc/include/bootinfo.h#4 integrate .. //depot/projects/powerpc/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/powerpc/sys/sys/buf.h#9 integrate .. //depot/projects/powerpc/sys/sys/conf.h#9 integrate .. //depot/projects/powerpc/sys/sys/ktrace.h#4 integrate .. //depot/projects/powerpc/sys/sys/lock.h#10 integrate .. //depot/projects/powerpc/sys/sys/lockmgr.h#9 integrate .. //depot/projects/powerpc/sys/sys/module.h#5 integrate .. //depot/projects/powerpc/sys/sys/param.h#15 integrate .. //depot/projects/powerpc/sys/sys/priv.h#11 integrate .. //depot/projects/powerpc/sys/sys/vnode.h#13 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vnops.c#14 integrate .. //depot/projects/powerpc/tools/regression/fsx/fsx.c#3 integrate .. //depot/projects/powerpc/tools/regression/lib/msun/Makefile#4 integrate .. //depot/projects/powerpc/tools/regression/lib/msun/test-exponential.c#2 integrate .. //depot/projects/powerpc/tools/regression/lib/msun/test-trig.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/msun/test-trig.t#1 branch .. //depot/projects/powerpc/tools/regression/security/open_to_operation/Makefile#1 branch .. //depot/projects/powerpc/tools/regression/security/open_to_operation/open_to_operation.c#1 branch .. //depot/projects/powerpc/usr.bin/Makefile#7 integrate .. //depot/projects/powerpc/usr.bin/ar/Makefile#1 branch .. //depot/projects/powerpc/usr.bin/ar/ar.1#1 branch .. //depot/projects/powerpc/usr.bin/ar/ar.c#1 branch .. //depot/projects/powerpc/usr.bin/ar/ar.h#1 branch .. //depot/projects/powerpc/usr.bin/ar/read.c#1 branch .. //depot/projects/powerpc/usr.bin/ar/util.c#1 branch .. //depot/projects/powerpc/usr.bin/ar/write.c#1 branch .. //depot/projects/powerpc/usr.bin/calendar/calendars/calendar.dutch#3 integrate .. //depot/projects/powerpc/usr.bin/find/extern.h#2 integrate .. //depot/projects/powerpc/usr.bin/find/find.1#4 integrate .. //depot/projects/powerpc/usr.bin/find/find.h#2 integrate .. //depot/projects/powerpc/usr.bin/find/function.c#2 integrate .. //depot/projects/powerpc/usr.bin/find/option.c#2 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/powerpc/usr.bin/kdump/mksubr#5 integrate .. //depot/projects/powerpc/usr.bin/ktrace/ktrace.1#2 integrate .. //depot/projects/powerpc/usr.bin/ktrace/ktrace.h#2 integrate .. //depot/projects/powerpc/usr.bin/ktrace/subr.c#2 integrate .. //depot/projects/powerpc/usr.bin/ncplogin/ncplogin.c#3 integrate .. //depot/projects/powerpc/usr.bin/netstat/route.c#6 integrate .. //depot/projects/powerpc/usr.bin/quota/quota.c#4 integrate .. //depot/projects/powerpc/usr.bin/tar/write.c#9 integrate .. //depot/projects/powerpc/usr.sbin/cdcontrol/cdcontrol.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pmcstat/Makefile#5 integrate .. //depot/projects/powerpc/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate .. //depot/projects/powerpc/usr.sbin/powerd/powerd.c#3 integrate .. //depot/projects/powerpc/usr.sbin/pw/pw.8#4 integrate .. //depot/projects/powerpc/usr.sbin/pw/pw.c#3 integrate .. //depot/projects/powerpc/usr.sbin/pw/pw_group.c#2 integrate .. //depot/projects/powerpc/usr.sbin/rpcbind/rpcbind.c#5 integrate .. //depot/projects/powerpc/usr.sbin/sa/db.c#3 integrate .. //depot/projects/powerpc/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/powerpc/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate .. //depot/projects/powerpc/usr.sbin/zic/zdump.c#2 integrate Differences ... ==== //depot/projects/powerpc/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.130 2008/02/06 19:45:25 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080220: geom_lvm rename to geom_linux_lvm +OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal OLD_FILES+=usr/share/man/man4/card.4.gz OLD_FILES+=usr/share/man/man4/oldcard.4.gz ==== //depot/projects/powerpc/UPDATING#15 (text+ko) ==== @@ -22,6 +22,10 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080220: + The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), + likewise the kernel option is now GEOM_LINUX_LVM. + 20080211: The default NFS mount mode has changed from UDP to TCP for increased reliability. If you rely on (insecurely) NFS @@ -979,4 +983,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.519 2008/02/11 23:23:20 kris Exp $ +$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ ==== //depot/projects/powerpc/bin/sh/mksyntax.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.24 2005/08/13 15:47:13 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.25 2008/02/18 20:01:33 marcel Exp $"); /* * This program creates syntax.h and syntax.c. @@ -139,10 +139,7 @@ /* Determine the characteristics of chars. */ c = -1; - if (c < 0) - sign = 1; - else - sign = 0; + sign = (c > 0) ? 0 : 1; for (nbits = 1 ; ; nbits++) { d = (1 << nbits) - 1; if (d == c) ==== //depot/projects/powerpc/contrib/traceroute/traceroute.8#2 (text+ko) ==== @@ -14,9 +14,9 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.17 2008/02/20 23:29:52 rpaulo Exp $ .\" -.TH TRACEROUTE 8 "21 September 2000" +.TH TRACEROUTE 8 "19 February 2008" .UC 6 .SH NAME traceroute \- print the route packets take to network host @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dDeFISnrvx +.B \-adDeFISnrvx ] [ .B \-f .I first_ttl @@ -71,6 +71,9 @@ .B \-w .I waittime ] [ +.B \-A +.I as_server +] [ .B \-z .I pausemsecs ] @@ -98,6 +101,13 @@ .PP Other options are: .TP +.B \-a +Turn on AS# lookups for each hop encountered. +.TP +.B -A +Turn on AS# lookups and use the given server instead of the +default. +.TP .B \-e Firewall evasion mode. Use fixed destination ports for UDP and TCP probes. @@ -443,3 +453,7 @@ router that's filtering packets), but this is not implemented yet. .PP Please send bug reports to traceroute@ee.lbl.gov. +.PP +The AS number capability reports information that may sometimes be +inaccurate due to discrepancies between the contents of the +routing database server and the current state of the Internet. ==== //depot/projects/powerpc/contrib/traceroute/traceroute.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34 2007/07/01 12:08:05 gnn Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $"; #endif /* @@ -263,6 +263,7 @@ #include "findsaddr.h" #include "ifaddrlist.h" +#include "as.h" #include "traceroute.h" /* Maximum number of gateways (include room for one noop) */ @@ -350,6 +351,9 @@ int verbose; int waittime = 5; /* time to wait for response (in seconds) */ int nflag; /* print addresses numerically */ +int as_path; /* print as numbers for each hop */ +char *as_server = NULL; +void *asn; #ifdef CANT_HACK_IPCKSUM int doipcksum = 0; /* don't calculate ip checksums by default */ #else @@ -535,9 +539,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "aA:edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { - + case 'a': + as_path = 1; + break; + + case 'A': + as_path = 1; + as_server = optarg; + break; + case 'd': options |= SO_DEBUG; break; @@ -913,6 +925,16 @@ exit (1); } + if (as_path) { + asn = as_setup(as_server); + if (asn == NULL) { + Fprintf(stderr, "%s: as_setup failed, AS# lookups" + " disabled\n", prog); + (void)fflush(stderr); + as_path = 0; + } + } + #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) if (setpolicy(sndsock, "in bypass") < 0) errx(1, "%s", ipsec_strerror()); @@ -1118,6 +1140,8 @@ (unreachable > 0 && unreachable >= nprobes - 1)) break; } + if (as_path) + as_shutdown(asn); exit(0); } @@ -1458,6 +1482,9 @@ hlen = ip->ip_hl << 2; cc -= hlen; + if (as_path) + Printf(" [AS%d]", as_lookup(asn, &from->sin_addr)); + if (nflag) Printf(" %s", inet_ntoa(from->sin_addr)); else @@ -1764,8 +1791,8 @@ Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" + "Usage: %s [-adDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" - "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog); + "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog); exit(1); } ==== //depot/projects/powerpc/etc/mail/access.sample#2 (text+ko) ==== @@ -1,10 +1,17 @@ -# $FreeBSD: src/etc/mail/access.sample,v 1.3 2000/11/02 23:40:40 dirk Exp $ +# $FreeBSD: src/etc/mail/access.sample,v 1.4 2008/02/17 05:22:08 gshapiro Exp $ # # Mail relay access control list. Default is to reject mail unless the # destination is local, or listed in /etc/mail/local-host-names # -cyberspammer.com 550 We don't accept mail from spammers -FREE.STEALTH.MAILER@ 550 We don't accept mail from spammers -another.source.of.spam REJECT -okay.cyberspammer.com OK -128.32 RELAY + +## Examples (commented out for safety) +#From:cyberspammer.com ERROR:"550 We don't accept mail from spammers" +#From:okay.cyberspammer.com OK +#Connect:sendmail.org RELAY +#To:sendmail.org RELAY +#Connect:128.32 RELAY +#Connect:128.32.2 SKIP +#Connect:IPv6:1:2:3:4:5:6:7 RELAY +#Connect:suspicious.example.com QUARANTINE:Mail from suspicious host +#Connect:[127.0.0.3] OK +#Connect:[IPv6:1:2:3:4:5:6:7:8] OK ==== //depot/projects/powerpc/etc/sendmail/freebsd.mc#4 (text+ko) ==== @@ -44,7 +44,7 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.35 2007/11/05 00:18:06 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.36 2008/02/17 05:38:29 gshapiro Exp $') OSTYPE(freebsd6) DOMAIN(generic) @@ -71,7 +71,7 @@ dnl NOTE: This is a subscription service as of July 31, 2001 dnl FEATURE(dnsbl) dnl Alternatively, you can provide your own server and rejection message: -dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', `"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}') +dnl FEATURE(dnsbl, `blackholes.mail-abuse.org', ``"550 Mail from " $&{client_addr} " rejected, see http://mail-abuse.org/cgi-bin/lookup?" $&{client_addr}'') dnl Dialup users should uncomment and define this appropriately dnl define(`SMART_HOST', `your.isp.mail.server') ==== //depot/projects/powerpc/games/fortune/strfile/strfile.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.28 2005/02/17 18:06:37 ru Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.29 2008/02/19 07:09:17 ru Exp $"); # include # include @@ -270,7 +270,7 @@ { int ch; - while ((ch = getopt(argc, argv, "Cc:iorsx")) != EOF) + while ((ch = getopt(argc, argv, "Cc:iorsx")) != -1) switch(ch) { case 'C': /* embedded comments */ Cflag++; ==== //depot/projects/powerpc/gnu/usr.bin/binutils/ar/Makefile#2 (text+ko) ==== @@ -1,10 +1,15 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if defined(WITH_BSDAR) +PROG= gnu-ar +#MAN= gnu-ar.1 +.else PROG= ar +.endif SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/powerpc/gnu/usr.bin/binutils/ranlib/Makefile#2 (text+ko) ==== @@ -1,10 +1,15 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if defined(WITH_BSDAR) +PROG= gnu-ranlib +#MAN= gnu-ranlib.1 +.else PROG= ranlib +.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/powerpc/gnu/usr.bin/groff/tmac/mdoc.local#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.62 2007/11/27 10:00:33 jkoshy Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.63 2008/02/23 19:27:54 ru Exp $ .\" .\" %beginstrip% . @@ -64,7 +64,7 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~7.0 +.ds doc-default-operating-system FreeBSD\~8.0 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 ==== //depot/projects/powerpc/gnu/usr.bin/man/man/man.c#3 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.66 2008/02/19 07:09:17 ru Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -324,7 +324,7 @@ extern void downcase (); extern char *manpath (); - while ((c = getopt (argc, argv, args)) != EOF) + while ((c = getopt (argc, argv, args)) != -1) { switch (c) { ==== //depot/projects/powerpc/gnu/usr.bin/man/manpath/manpath.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ * The University of Texas at Austin * Austin, Texas 78712 * - * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.13 2002/10/27 02:12:52 kris Exp $ + * $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.c,v 1.14 2008/02/19 07:09:18 ru Exp $ */ #define MANPATH_MAIN @@ -78,7 +78,7 @@ prognam = mkprogname (argv[0]); - while ((c = getopt (argc, argv, "dhLq?")) != EOF) + while ((c = getopt (argc, argv, "dhLq?")) != -1) { switch (c) { ==== //depot/projects/powerpc/lib/libarchive/archive_entry_strmode.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.1 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.2 2008/02/19 05:49:02 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -65,15 +65,15 @@ bp[i+1] = '-'; if (mode & S_ISUID) { - if (mode & S_IXUSR) bp[3] = 's'; + if (mode & 0100) bp[3] = 's'; else bp[3] = 'S'; } if (mode & S_ISGID) { - if (mode & S_IXGRP) bp[6] = 's'; + if (mode & 0010) bp[6] = 's'; else bp[6] = 'S'; } if (mode & S_ISVTX) { - if (mode & S_IXOTH) bp[9] = 't'; + if (mode & 0001) bp[9] = 't'; else bp[9] = 'T'; } if (archive_entry_acl_count(entry, ARCHIVE_ENTRY_ACL_TYPE_ACCESS)) ==== //depot/projects/powerpc/lib/libarchive/archive_platform.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.28 2007/12/30 04:58:21 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.29 2008/02/19 06:06:13 kientzle Exp $ */ /* @@ -36,7 +36,10 @@ #ifndef ARCHIVE_PLATFORM_H_INCLUDED #define ARCHIVE_PLATFORM_H_INCLUDED -#if defined(PLATFORM_CONFIG_H) +#ifdef _WIN32 +#include "config_windows.h" +#include "archive_windows.h" +#elif defined(PLATFORM_CONFIG_H) /* Use hand-built config.h in environments that need it. */ #include PLATFORM_CONFIG_H #elif defined(HAVE_CONFIG_H) ==== //depot/projects/powerpc/lib/libarchive/archive_read_open_filename.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.21 2008/02/19 06:10:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -47,6 +47,10 @@ #include "archive.h" +#ifndef O_BINARY +#define O_BINARY 0 +#endif + struct read_file_data { int fd; size_t block_size; @@ -113,7 +117,7 @@ return (ARCHIVE_FATAL); } if (mine->filename[0] != '\0') - mine->fd = open(mine->filename, O_RDONLY); + mine->fd = open(mine->filename, O_RDONLY | O_BINARY); else mine->fd = 0; /* Fake "open" for stdin. */ if (mine->fd < 0) { ==== //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_bzip2.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.16 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.17 2008/02/19 05:44:59 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -145,7 +145,7 @@ (void)buff; /* UNUSED */ (void)n; /* UNUSED */ - archive_set_error(a, -1, + archive_set_error(&a->archive, -1, "This version of libarchive was compiled without bzip2 support"); return (ARCHIVE_FATAL); } ==== //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_gzip.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.15 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.16 2008/02/19 05:44:59 kientzle Exp $"); #ifdef HAVE_ERRNO_H @@ -146,7 +146,7 @@ (void)buff; /* UNUSED */ (void)n; /* UNUSED */ - archive_set_error(a, -1, + archive_set_error(&a->archive, -1, "This version of libarchive was compiled without gzip support"); return (ARCHIVE_FATAL); } ==== //depot/projects/powerpc/lib/libarchive/archive_read_support_format_ar.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.7 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -268,8 +268,7 @@ /* This must come before any call to _read_ahead. */ ar_parse_common_header(ar, entry, h); archive_entry_copy_pathname(entry, filename); - archive_entry_set_mode(entry, - S_IFREG | (archive_entry_mode(entry) & 0777)); + archive_entry_set_filetype(entry, AE_IFREG); /* Get the size of the filename table. */ number = ar_atol10(h + AR_size_offset, AR_size_size); if (number > SIZE_MAX) { @@ -375,8 +374,7 @@ /* Parse the time, owner, mode, size fields. */ r = ar_parse_common_header(ar, entry, h); /* Force the file type to a regular file. */ - archive_entry_set_mode(entry, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 24 17:53:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB33E16A40A; Sun, 24 Feb 2008 17:53:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E14D16A407 for ; Sun, 24 Feb 2008 17:53:11 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48CC613C45A for ; Sun, 24 Feb 2008 17:53:11 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OHrBJt067163 for ; Sun, 24 Feb 2008 17:53:11 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OHrAcs067160 for perforce@freebsd.org; Sun, 24 Feb 2008 17:53:10 GMT (envelope-from csjp@freebsd.org) Date: Sun, 24 Feb 2008 17:53:10 GMT Message-Id: <200802241753.m1OHrAcs067160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 17:53:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=136109 Change 136109 by csjp@ibm01 on 2008/02/24 17:52:51 Check to see if the kernel supports AUDITPIPE_SET_BUFMODE, and if so use it. Currently we are not setting any low watermarks Affected files ... .. //depot/projects/trustedbsd/netauditd/netauditd.c#7 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/netauditd.c#7 (text+ko) ==== @@ -25,13 +25,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include #include #include #include #include #include +#include + +#include +#include +#include + #include #include #include @@ -42,7 +47,7 @@ #include #include #include -#include + #include "netauditd.h" const struct conf_ent { @@ -386,6 +391,9 @@ struct timeval tv; struct au_cmpnt *au; int ret; +#ifdef AUDITPIPE_SET_BUFMODE + int opt; +#endif FD_ZERO(&srfds); TAILQ_FOREACH(au, &au_srclist, ac_glue) { @@ -394,6 +402,14 @@ au->ac_fd = open(au->ac_path, O_RDONLY); if (au->ac_fd == -1) err(1, "%s", au->ac_path); +#ifdef AUDITPIPE_SET_BUFMODE + opt = AUDITPIPE_BUFMODE_BUFFERED; + if (ioctl(au->ac_fd, AUDITPIPE_SET_BUFMODE, &opt) < 0) + err(1, "AUDITPIPE_SET_BUFMODE"); + /* + * We should add support for low watermarks here. + */ +#endif break; case NETAUDIT_SRC_NET: netaudit_socket_listen(au); @@ -422,6 +438,8 @@ case NETAUDIT_SRC_PIPE: netaudit_pipe_read(au); break; + case NETAUDIT_SRC_NET: + break; default: exit(2); } From owner-p4-projects@FreeBSD.ORG Sun Feb 24 17:57:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8902016A406; Sun, 24 Feb 2008 17:57:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BF8916A400 for ; Sun, 24 Feb 2008 17:57:20 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DC4713C455 for ; Sun, 24 Feb 2008 17:57:20 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OHvJQn067336 for ; Sun, 24 Feb 2008 17:57:19 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OHvJHe067333 for perforce@freebsd.org; Sun, 24 Feb 2008 17:57:19 GMT (envelope-from alm@freebsd.org) Date: Sun, 24 Feb 2008 17:57:19 GMT Message-Id: <200802241757.m1OHvJHe067333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 17:57:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=136110 Change 136110 by alm@alm_praetorian on 2008/02/24 17:57:05 Track bytes read for the current record in source buffer. Affected files ... .. //depot/projects/trustedbsd/netauditd/netauditd.h#4 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/netauditd.h#4 (text+ko) ==== @@ -52,6 +52,7 @@ struct au_cmpnt *sb_parent; int sb_fd; u_int32_t sb_reclen; + u_int32_t sb_read; u_char *sb_rec; u_char sb_buf[8192]; u_char sb_header[5]; From owner-p4-projects@FreeBSD.ORG Sun Feb 24 18:06:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A03E716A411; Sun, 24 Feb 2008 18:06:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62C2C16A40B for ; Sun, 24 Feb 2008 18:06:37 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AAAD13C4DD for ; Sun, 24 Feb 2008 18:06:37 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OI6bNX068907 for ; Sun, 24 Feb 2008 18:06:37 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OI6avu068904 for perforce@freebsd.org; Sun, 24 Feb 2008 18:06:36 GMT (envelope-from raj@freebsd.org) Date: Sun, 24 Feb 2008 18:06:36 GMT Message-Id: <200802241806.m1OI6avu068904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 136112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 18:06:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=136112 Change 136112 by raj@raj_mimi on 2008/02/24 18:06:21 Fix (c)/licensing info on the cfi(4) files. The driver was written by Marcel entirely, but somehow stale (c) notices slipped in. Affected files ... .. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#2 edit .. //depot/projects/e500/sys/dev/cfi/cfi_core.c#2 edit .. //depot/projects/e500/sys/dev/cfi/cfi_dev.c#2 edit .. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#2 edit .. //depot/projects/e500/sys/dev/cfi/cfi_var.h#2 edit Differences ... ==== //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#2 (text+ko) ==== @@ -14,17 +14,17 @@ * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * 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 Bill Paul OR THE VOICES IN HIS HEAD - * 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. */ #include ==== //depot/projects/e500/sys/dev/cfi/cfi_core.c#2 (text+ko) ==== @@ -14,17 +14,17 @@ * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * 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 Bill Paul OR THE VOICES IN HIS HEAD - * 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. */ #include ==== //depot/projects/e500/sys/dev/cfi/cfi_dev.c#2 (text+ko) ==== @@ -14,17 +14,17 @@ * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * 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 Bill Paul OR THE VOICES IN HIS HEAD - * 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. */ #include ==== //depot/projects/e500/sys/dev/cfi/cfi_reg.h#2 (text+ko) ==== @@ -14,17 +14,17 @@ * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * 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 Bill Paul OR THE VOICES IN HIS HEAD - * 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #ifndef _DEV_CFI_REG_H_ ==== //depot/projects/e500/sys/dev/cfi/cfi_var.h#2 (text+ko) ==== @@ -14,17 +14,17 @@ * may be used to endorse or promote products derived from this software * without specific prior written permission. * - * 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 Bill Paul OR THE VOICES IN HIS HEAD - * 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. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #ifndef _DEV_CFI_VAR_H_ From owner-p4-projects@FreeBSD.ORG Sun Feb 24 18:54:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9629F16A407; Sun, 24 Feb 2008 18:54:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58AE116A404; Sun, 24 Feb 2008 18:54:39 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.75]) by mx1.freebsd.org (Postfix) with ESMTP id 14D2E13C4E3; Sun, 24 Feb 2008 18:54:38 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (asmtp001-s [10.150.69.64]) by smtpoutm.mac.com (Xserve/smtpout012/MantshX 4.0) with ESMTP id m1OIscwf020896; Sun, 24 Feb 2008 10:54:38 -0800 (PST) Received: from [10.20.1.111] (dsl093-166-098.sfo2.dsl.speakeasy.net [66.93.166.98]) (authenticated bits=0) by mac.com (Xserve/asmtp001/MantshX 4.0) with ESMTP id m1OIsa86003458 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sun, 24 Feb 2008 10:54:37 -0800 (PST) Message-Id: <69615975-3509-4A40-A329-EA28AB9B1345@mac.com> From: Marcel Moolenaar To: Rafal Jaworowski In-Reply-To: <200802241806.m1OI6avu068904@repoman.freebsd.org> Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v919.2) Date: Sun, 24 Feb 2008 10:54:36 -0800 References: <200802241806.m1OI6avu068904@repoman.freebsd.org> X-Mailer: Apple Mail (2.919.2) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 136112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 18:54:40 -0000 On Feb 24, 2008, at 10:06 AM, Rafal Jaworowski wrote: > http://perforce.freebsd.org/chv.cgi?CH=136112 > > Change 136112 by raj@raj_mimi on 2008/02/24 18:06:21 > > Fix (c)/licensing info on the cfi(4) files. The driver was written by > Marcel entirely, but somehow stale (c) notices slipped in. Thanks for spotting and fixing it! -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Sun Feb 24 19:32:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 408D016A400; Sun, 24 Feb 2008 19:32:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEE3C16A402 for ; Sun, 24 Feb 2008 19:32:54 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98AF113C45E for ; Sun, 24 Feb 2008 19:32:54 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OJWs97073384 for ; Sun, 24 Feb 2008 19:32:54 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OJWsYP073381 for perforce@freebsd.org; Sun, 24 Feb 2008 19:32:54 GMT (envelope-from alm@freebsd.org) Date: Sun, 24 Feb 2008 19:32:54 GMT Message-Id: <200802241932.m1OJWsYP073381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 19:32:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=136117 Change 136117 by alm@alm_praetorian on 2008/02/24 19:32:22 Split things up a bit. Affected files ... .. //depot/projects/trustedbsd/netauditd/Makefile#3 edit .. //depot/projects/trustedbsd/netauditd/component.c#1 add .. //depot/projects/trustedbsd/netauditd/conf.c#1 add .. //depot/projects/trustedbsd/netauditd/netauditd.c#8 edit .. //depot/projects/trustedbsd/netauditd/netauditd.h#5 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ PROG= netauditd -SRCS= netauditd.c +SRCS= netauditd.c component.c conf.c NO_MAN= CFLAGS+= -Wall -ggdb ==== //depot/projects/trustedbsd/netauditd/netauditd.c#8 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2008 * Aaron Meihm. All rights reserved. * - * $Id: netauditd.c,v 1.9 2008/02/17 19:30:52 alm Exp $ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -50,285 +48,10 @@ #include "netauditd.h" -const struct conf_ent { - char *c_mode; - char *c_type; - int c_min_args; - int (*c_func)(args_t *); -} conftab[] = { - { "src", "pipe", 4, conf_parse_src_pipe }, - { "src", "net", 5, conf_parse_net }, - { "dst", "trail", 5, conf_parse_dst_trail }, - { "dst", "net", 6, conf_parse_net }, - { NULL, NULL, 0, NULL } -}; - char *conf_path = "/usr/local/etc/netauditd.conf"; int debug_flag; -TAILQ_HEAD(au_srclist, au_cmpnt) au_srclist; -TAILQ_HEAD(au_dstlist, au_cmpnt) au_dstlist; - -struct au_cmpnt * -component_init(int is_src, char *type, char *name) -{ - struct au_cmpnt *new; - - new = malloc(sizeof(struct au_cmpnt)); - if (new == NULL) - return (NULL); - memset(new, 0, sizeof(struct au_cmpnt)); - if (is_src) { - if (strcmp(type, "net") == 0) - new->ac_type = NETAUDIT_SRC_NET; - else if (strcmp(type, "pipe") == 0) - new->ac_type = NETAUDIT_SRC_PIPE; - else { - free(new); - return (NULL); - } - } - else { - if (strcmp(type, "net") == 0) - new->ac_type = NETAUDIT_DST_NET; - else if (strcmp(type, "trail") == 0) - new->ac_type = NETAUDIT_DST_TRAIL; - else { - free(new); - return (NULL); - } - } - if ((new->ac_name = strdup(name)) == NULL) { - free(new); - return (NULL); - } - TAILQ_INIT(&new->ac_oq); - return (new); -} - -int -component_clear_oq(struct au_cmpnt *ptr) -{ - struct au_queue_ent *a, *b; - - if (TAILQ_EMPTY(&ptr->ac_oq)) - return (0); - TAILQ_FOREACH_SAFE(a, &ptr->ac_oq, aq_glue, b) { - TAILQ_REMOVE(&ptr->ac_oq, a, aq_glue); - a->aq_ptr->ar_refcount--; - if (a->aq_ptr->ar_refcount == 0) { - free(a->aq_ptr->ar_rec); - free(a->aq_ptr); - } - free(a); - } - return (1); -} - void -component_destroy(struct au_cmpnt *ptr) -{ - if (ptr->ac_name != NULL) - free(ptr->ac_name); - if (ptr->ac_path != NULL) - free(ptr->ac_path); - if (ptr->ac_ainfo != NULL) - freeaddrinfo(ptr->ac_ainfo); - if (ptr->ac_consumers != NULL) - free(ptr->ac_consumers); - component_clear_oq(ptr); - free(ptr); -} - -struct au_cmpnt * -conf_get_src(char *name) -{ - struct au_cmpnt *ret; - - TAILQ_FOREACH(ret, &au_srclist, ac_glue) { - if (strcmp(ret->ac_name, name) == 0) - return (ret); - } - return (NULL); -} - -int -conf_parse_net(args_t *a) -{ - struct addrinfo hints; - struct au_cmpnt *new; - char *host, *svc; - int is_src = 0; - - if (strcmp(a->args[0], "src") == 0) - is_src = 1; - else if (strcmp(a->args[0], "dst") != 0) - return (-1); - host = a->args[3]; - svc = a->args[4]; - if ((new = component_init(is_src, a->args[2], a->args[1])) == NULL) - exit(2); - memset(&hints, 0, sizeof(hints)); - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - if (is_src) { - hints.ai_flags = AI_PASSIVE; - new->ac_type = NETAUDIT_SRC_NET; - } - else - new->ac_type = NETAUDIT_DST_NET; - if (getaddrinfo(host, svc, &hints, &new->ac_ainfo) != 0) { - free(new); - return (-1); - } - if (is_src) - TAILQ_INSERT_TAIL(&au_srclist, new, ac_glue); - else { - if (conf_link_consumers(new, a, 5) == -1) { - component_destroy(new); - return (-1); - } - TAILQ_INSERT_TAIL(&au_dstlist, new, ac_glue); - } - return (0); -} - -int -conf_link_consumers(struct au_cmpnt *ac, args_t *a, int start) -{ - struct au_cmpnt *ptr; - int i; - - for (i = start; i < a->args_n; i++) { - if ((ptr = conf_get_src(a->args[i])) == NULL) - return (-1); - dprintf("%s <- %s\n", ac->ac_name, ptr->ac_name); - if (ptr->ac_consumers == NULL) { - ptr->ac_consumers = malloc(sizeof(struct au_cmpnt *)); - ptr->ac_nconsumers = 1; - } - else { - ptr->ac_nconsumers++; - ptr->ac_consumers = realloc(ptr->ac_consumers, - sizeof(struct au_cmpnt *) * ptr->ac_nconsumers); - } - ptr->ac_consumers[ptr->ac_nconsumers - 1] = ac; - } - return (0); -} - -int -conf_parse_src_pipe(args_t *a) -{ - struct au_cmpnt *new; - - if ((new = component_init(1, a->args[2], a->args[1])) == NULL) - exit(2); - if ((new->ac_path = strdup(a->args[3])) == NULL) - exit(2); - TAILQ_INSERT_TAIL(&au_srclist, new, ac_glue); - return (0); -} - -int -conf_parse_dst_trail(args_t *a) -{ - struct au_cmpnt *new; - - if ((new = component_init(0, a->args[2], a->args[1])) == NULL) - exit(2); - if ((new->ac_path = strdup(a->args[3])) == NULL) - exit(2); - if (conf_link_consumers(new, a, 4) == -1) { - component_destroy(new); - return (-1); - } - TAILQ_INSERT_TAIL(&au_dstlist, new, ac_glue); - return (0); -} - -args_t * -conf_parse_args(char *buf) -{ - args_t *ret; - char *s0, *ptr; - - ret = malloc(sizeof(args_t)); - if (ret == NULL) - exit(2); - memset(ret, 0, sizeof(args_t)); - for (s0 = buf; (ptr = strsep(&s0, " ")) != NULL;) { - ret->args[ret->args_n] = strdup(ptr); - if (ret->args[ret->args_n] == NULL) - exit(2); - ret->args_n++; - if (ret->args_n == MAX_ARGUMENTS) - break; - } - return (ret); -} - -void -conf_free_args(args_t *a) -{ - int i; - - for (i = 0; i < a->args_n; i++) - free(a->args[i]); - free(a); -} - -void -conf_parse(char *buf, int lc) -{ - const struct conf_ent *cptr; - args_t *a; - int i; - - if (buf == NULL) - return; - for (i = 0; i < strlen(buf); i++) - if (buf[i] == '\n') { - buf[i] = '\0'; - break; - } - if ((buf[0] == '#') || (buf[0] == '\0')) - return; - dprintf("%d: \"%s\"\n", lc, buf); - a = conf_parse_args(buf); - /* Ensure three arguments are present */ - if (a->args_n < 3) { - fprintf(stderr, "netauditd: Syntax error: %s:%d\n", conf_path, - lc); - exit(1); - } - for (cptr = conftab; cptr->c_type != NULL; cptr++) { - if ((strcmp(cptr->c_mode, a->args[0]) == 0) && - (strcmp(cptr->c_type, a->args[2]) == 0)) { - if (a->args_n < cptr->c_min_args) { - fprintf(stderr, - "netauditd: Syntax error: %s:%d\n", - conf_path, lc); - exit(1); - } - if (cptr->c_func(a) == -1) { - fprintf(stderr, - "netauditd: Syntax error: %s:%d\n", - conf_path, lc); - exit(1); - } - break; - } - } - if (cptr->c_type == NULL) { /* Command not found */ - fprintf(stderr, "netauditd: Syntax error: %s:%d\n", - conf_path, lc); - exit(1); - } - conf_free_args(a); -} - -void dprintf(char *fmt, ...) { char buf[2048]; @@ -342,20 +65,6 @@ fprintf(stderr, "debug: %s", buf); } -void -conf_load(char *path) -{ - char confbuf[1024]; - FILE *fp; - int lc = 0; - - if ((fp = fopen(path, "r")) == NULL) - err(1, "%s", path); - while (fgets(confbuf, sizeof(confbuf), fp) != NULL) - conf_parse(confbuf, ++lc); - fclose(fp); -} - int main(int argc, char *argv[]) { ==== //depot/projects/trustedbsd/netauditd/netauditd.h#5 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2008 * Aaron Meihm. All rights reserved. * - * $Id: netauditd.h,v 1.5 2008/02/17 19:30:52 alm Exp $ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -78,10 +76,17 @@ int args_n; } args_t; +typedef TAILQ_HEAD(, au_cmpnt) au_cmpnt_head_t; +extern au_cmpnt_head_t au_srclist; +extern au_cmpnt_head_t au_dstlist; + +extern char *conf_path; + int component_clear_oq(struct au_cmpnt *); void component_destroy(struct au_cmpnt *); +struct au_cmpnt *component_get_src(char *); struct au_cmpnt *component_init(int, char *, char *); -struct au_cmpnt *conf_get_src(char *); + void conf_load(char *); int conf_link_consumers(struct au_cmpnt *, args_t *, int); void conf_parse(char *, int); @@ -90,6 +95,7 @@ int conf_parse_net(args_t *); args_t *conf_parse_args(char *); void conf_free_args(args_t *); + void dprintf(char *, ...); void netaudit_establish(void); void netaudit_oq(void); From owner-p4-projects@FreeBSD.ORG Sun Feb 24 20:29:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F78816A409; Sun, 24 Feb 2008 20:29:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21FD716A404 for ; Sun, 24 Feb 2008 20:29:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F032413C442 for ; Sun, 24 Feb 2008 20:29:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OKTO3T076548 for ; Sun, 24 Feb 2008 20:29:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OKTOlW076545 for perforce@freebsd.org; Sun, 24 Feb 2008 20:29:24 GMT (envelope-from sam@freebsd.org) Date: Sun, 24 Feb 2008 20:29:24 GMT Message-Id: <200802242029.m1OKTOlW076545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 20:29:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=136121 Change 136121 by sam@sam_ebb on 2008/02/24 20:29:00 fix building w/o IEEE80211_DEBUG Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#9 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#17 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#9 (text+ko) ==== @@ -99,7 +99,9 @@ static int adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { +#ifdef IEEE80211_DEBUG struct ieee80211com *ic = vap->iv_ic; +#endif struct ieee80211_node *ni; enum ieee80211_state ostate; ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#17 (text+ko) ==== @@ -1792,9 +1792,7 @@ frm[1] = (v) >> 8; \ frm += 2; \ } while (0) -#ifdef IEEE80211_DEBUG struct ieee80211vap *vap = ni->ni_vap; -#endif struct ieee80211com *ic = ni->ni_ic; struct mbuf *m; uint8_t *frm; From owner-p4-projects@FreeBSD.ORG Sun Feb 24 21:56:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5999B16A402; Sun, 24 Feb 2008 21:56:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C66D16A400 for ; Sun, 24 Feb 2008 21:56:34 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECFC713C45A for ; Sun, 24 Feb 2008 21:56:33 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OLuXu5089516 for ; Sun, 24 Feb 2008 21:56:33 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OLuX8b089513 for perforce@freebsd.org; Sun, 24 Feb 2008 21:56:33 GMT (envelope-from alm@freebsd.org) Date: Sun, 24 Feb 2008 21:56:33 GMT Message-Id: <200802242156.m1OLuX8b089513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 21:56:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=136124 Change 136124 by alm@alm_praetorian on 2008/02/24 21:56:10 Handle and aggregate audit records coming in on network sockets. Affected files ... .. //depot/projects/trustedbsd/netauditd/component.c#2 edit .. //depot/projects/trustedbsd/netauditd/netauditd.c#9 edit .. //depot/projects/trustedbsd/netauditd/netauditd.h#6 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/component.c#2 (text+ko) ==== @@ -80,6 +80,7 @@ return (NULL); } TAILQ_INIT(&new->ac_oq); + TAILQ_INIT(&new->ac_sbufq); return (new); } ==== //depot/projects/trustedbsd/netauditd/netauditd.c#9 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -94,9 +95,59 @@ } void +netaudit_build_rfds(fd_set *rfds) +{ + struct au_srcbuffer *asb; + struct au_cmpnt *au; + + TAILQ_FOREACH(au, &au_srclist, ac_glue) { + if (au->ac_type == NETAUDIT_SRC_NET) { + TAILQ_FOREACH(asb, &au->ac_sbufq, sb_glue) + FD_SET(asb->sb_fd, rfds); + } + FD_SET(au->ac_fd, rfds); + } +} + +void +netaudit_record_handler(fd_set *rfds) +{ + struct au_srcbuffer *asb, *tmp; + struct au_cmpnt *au; + + TAILQ_FOREACH(au, &au_srclist, ac_glue) { + if (FD_ISSET(au->ac_fd, rfds)) { + switch(au->ac_type) { + case NETAUDIT_SRC_PIPE: + netaudit_pipe_read(au); + break; + case NETAUDIT_SRC_NET: + netaudit_socket_accept(au); + break; + default: + exit(2); + } + } + } + TAILQ_FOREACH(au, &au_srclist, ac_glue) { + if (au->ac_type != NETAUDIT_SRC_NET) + continue; + TAILQ_FOREACH_SAFE(asb, &au->ac_sbufq, sb_glue, tmp) + if (FD_ISSET(asb->sb_fd, rfds)) + if (netaudit_socket_read(asb) == -1) { + close(asb->sb_fd); + TAILQ_REMOVE(&au->ac_sbufq, asb, + sb_glue); + free(asb->sb_sockaddr); + free(asb); + } + } +} + +void netaudit_run() { - fd_set rfds, srfds; + fd_set rfds; struct timeval tv; struct au_cmpnt *au; int ret; @@ -104,7 +155,6 @@ int opt; #endif - FD_ZERO(&srfds); TAILQ_FOREACH(au, &au_srclist, ac_glue) { switch (au->ac_type) { case NETAUDIT_SRC_PIPE: @@ -126,13 +176,13 @@ default: exit(2); } - FD_SET(au->ac_fd, &srfds); } netaudit_establish(); memset(&tv, 0, sizeof(tv)); tv.tv_usec = 100000; for (;;) { - memcpy(&rfds, &srfds, sizeof(rfds)); + FD_ZERO(&rfds); + netaudit_build_rfds(&rfds); ret = select(FD_SETSIZE, &rfds, NULL, NULL, &tv); if (ret == -1) { if (errno != EINTR) @@ -140,21 +190,8 @@ else continue; } - else if (ret != 0) { - TAILQ_FOREACH(au, &au_srclist, ac_glue) { - if (FD_ISSET(au->ac_fd, &rfds)) { - switch(au->ac_type) { - case NETAUDIT_SRC_PIPE: - netaudit_pipe_read(au); - break; - case NETAUDIT_SRC_NET: - break; - default: - exit(2); - } - } - } - } + else if (ret != 0) + netaudit_record_handler(&rfds); netaudit_establish(); netaudit_oq(); } @@ -289,6 +326,26 @@ } void +netaudit_socket_accept(struct au_cmpnt *au) +{ + struct au_srcbuffer *new; + + new = malloc(sizeof(struct au_srcbuffer)); + memset(new, 0, sizeof(struct au_srcbuffer)); + new->sb_socklen = au->ac_ainfo->ai_addrlen; + if ((new->sb_sockaddr = malloc(new->sb_socklen)) == NULL) + exit(2); + new->sb_fd = accept(au->ac_fd, new->sb_sockaddr, &new->sb_socklen); + if (new->sb_fd == -1) { + free(new->sb_sockaddr); + free(new); + return; + } + new->sb_parent = au; + TAILQ_INSERT_TAIL(&au->ac_sbufq, new, sb_glue); +} + +void netaudit_socket_listen(struct au_cmpnt *au) { struct addrinfo *addrptr; @@ -311,8 +368,78 @@ } int -netaudit_socket_read(struct au_cmpnt *au) +netaudit_socket_read(struct au_srcbuffer *asb) { + u_char *bufptr, *recbufptr; + int ret, left; + u_int32_t hdr_remain; + u_int32_t val; + u_int32_t need; + + ret = read(asb->sb_fd, asb->sb_buf, sizeof(asb->sb_buf)); + if (ret == -1) { + if (errno != EINTR) + return (-1); + else + return (0); + } + else if (ret == 0) + return (-1); + left = ret; + bufptr = asb->sb_buf; + while (left > 0) { + if (asb->sb_recbuf == NULL) { + hdr_remain = sizeof(asb->sb_header) - + asb->sb_read; + if (left >= hdr_remain) { + memcpy(asb->sb_header + asb->sb_read, bufptr, + hdr_remain); + asb->sb_read += hdr_remain; + left -= hdr_remain; + bufptr += hdr_remain; + memcpy(&val, asb->sb_header + 1, sizeof(val)); + asb->sb_recbuf = \ + malloc(sizeof(struct au_recbuf)); + if (asb->sb_recbuf == NULL) + exit(2); + asb->sb_recbuf->ar_reclen = be32toh(val); + dprintf("audit header: rec %u bytes\n", + asb->sb_recbuf->ar_reclen); + asb->sb_recbuf->ar_rec = \ + malloc(asb->sb_recbuf->ar_reclen); + if (asb->sb_recbuf->ar_rec == NULL) + exit(2); + memcpy(asb->sb_recbuf->ar_rec, + asb->sb_header, sizeof(asb->sb_header)); + continue; + } + else { + dprintf("PARTIAL HEADER READ\n"); + memcpy(asb->sb_header + asb->sb_read, bufptr, + left); + asb->sb_read += left; + left = 0; + return (0); + } + } + need = asb->sb_recbuf->ar_reclen - asb->sb_read; + recbufptr = asb->sb_recbuf->ar_rec + asb->sb_read; + dprintf("still need %u bytes\n", need); + if (left < need) { + memcpy(recbufptr, bufptr, left); + asb->sb_read += left; + return (0); + } + else { + memcpy(recbufptr, bufptr, need); + left -= need; + bufptr += need; + /* We have a full record at this point */ + netaudit_queue_record(asb->sb_parent, asb->sb_recbuf); + asb->sb_recbuf = NULL; + asb->sb_read = 0; + } + } return (0); } ==== //depot/projects/trustedbsd/netauditd/netauditd.h#6 (text+ko) ==== @@ -48,10 +48,11 @@ struct au_srcbuffer { struct au_cmpnt *sb_parent; + struct sockaddr *sb_sockaddr; + socklen_t sb_socklen; int sb_fd; - u_int32_t sb_reclen; + struct au_recbuf *sb_recbuf; u_int32_t sb_read; - u_char *sb_rec; u_char sb_buf[8192]; u_char sb_header[5]; TAILQ_ENTRY(au_srcbuffer) sb_glue; @@ -97,11 +98,14 @@ void conf_free_args(args_t *); void dprintf(char *, ...); +void netaudit_build_rfds(fd_set *); void netaudit_establish(void); void netaudit_oq(void); void netaudit_queue_record(struct au_cmpnt *, struct au_recbuf *); void netaudit_pipe_read(struct au_cmpnt *); +void netaudit_record_handler(fd_set *); void netaudit_run(void); +void netaudit_socket_accept(struct au_cmpnt *); void netaudit_socket_listen(struct au_cmpnt *); -int netaudit_socket_read(struct au_cmpnt *); +int netaudit_socket_read(struct au_srcbuffer *); void usage(void); From owner-p4-projects@FreeBSD.ORG Sun Feb 24 22:49:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7159C16A403; Sun, 24 Feb 2008 22:49:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AB5716A402 for ; Sun, 24 Feb 2008 22:49:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FD7313C458 for ; Sun, 24 Feb 2008 22:49:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1OMnSM3092283 for ; Sun, 24 Feb 2008 22:49:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1OMn2vH092275 for perforce@freebsd.org; Sun, 24 Feb 2008 22:49:02 GMT (envelope-from imp@freebsd.org) Date: Sun, 24 Feb 2008 22:49:02 GMT Message-Id: <200802242249.m1OMn2vH092275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 22:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=136126 Change 136126 by imp@imp_paco-paco on 2008/02/24 22:49:00 IFC @136095 Affected files ... .. //depot/projects/arm/src/COPYRIGHT#3 integrate .. //depot/projects/arm/src/LOCKS#2 integrate .. //depot/projects/arm/src/MAINTAINERS#8 integrate .. //depot/projects/arm/src/Makefile#16 integrate .. //depot/projects/arm/src/Makefile.inc1#33 integrate .. //depot/projects/arm/src/Makefile.upgrade#2 delete .. //depot/projects/arm/src/ObsoleteFiles.inc#31 integrate .. //depot/projects/arm/src/UPDATING#23 integrate .. //depot/projects/arm/src/bin/cp/cp.c#5 integrate .. //depot/projects/arm/src/bin/csh/USD.doc/Makefile#2 delete .. //depot/projects/arm/src/bin/date/date.c#2 integrate .. //depot/projects/arm/src/bin/ed/Makefile#3 integrate .. //depot/projects/arm/src/bin/ln/ln.1#2 integrate .. //depot/projects/arm/src/bin/ln/ln.c#2 integrate .. //depot/projects/arm/src/bin/ls/lomac.c#2 delete .. //depot/projects/arm/src/bin/ls/lomac.h#2 delete .. //depot/projects/arm/src/bin/mv/mv.1#3 integrate .. //depot/projects/arm/src/bin/mv/mv.c#2 integrate .. //depot/projects/arm/src/bin/mv/pathnames.h#2 delete .. //depot/projects/arm/src/bin/ps/extern.h#2 integrate .. //depot/projects/arm/src/bin/ps/keyword.c#2 integrate .. //depot/projects/arm/src/bin/ps/lomac.c#2 delete .. //depot/projects/arm/src/bin/ps/lomac.h#2 delete .. //depot/projects/arm/src/bin/ps/print.c#3 integrate .. //depot/projects/arm/src/bin/ps/ps.c#3 integrate .. //depot/projects/arm/src/bin/sh/Makefile#2 integrate .. //depot/projects/arm/src/bin/sh/mksyntax.c#2 integrate .. //depot/projects/arm/src/bin/sh/sh.1#7 integrate .. //depot/projects/arm/src/cddl/Makefile.inc#3 integrate .. //depot/projects/arm/src/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/arm/src/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/arm/src/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/arm/src/contrib/amd/AUTHORS#2 integrate .. //depot/projects/arm/src/contrib/amd/BUGS#2 integrate .. //depot/projects/arm/src/contrib/amd/COPYING#2 integrate .. //depot/projects/arm/src/contrib/amd/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/amd/FAQ#1 branch .. //depot/projects/arm/src/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/arm/src/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/arm/src/contrib/amd/INSTALL#2 integrate .. //depot/projects/arm/src/contrib/amd/MIRRORS#2 delete .. //depot/projects/arm/src/contrib/amd/NEWS#2 integrate .. //depot/projects/arm/src/contrib/amd/README.attrcache#1 branch .. //depot/projects/arm/src/contrib/amd/README.ldap#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/arm/src/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/map.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_autofs.c#2 delete .. //depot/projects/arm/src/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/arm/src/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/arm/src/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/arm/src/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/arm/src/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/arm/src/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/arm/src/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/arm/src/contrib/amd/bootstrap#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/hn_dref/hn_dref_default.h#2 delete .. //depot/projects/arm/src/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#2 delete .. //depot/projects/arm/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/arm/src/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/arm/src/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/arm/src/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/arm/src/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/arm/src/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/arm/src/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/arm/src/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/arm/src/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/arm/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/arm/src/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/arm/src/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/arm/src/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/arm/src/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/arm/src/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/arm/src/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/arm/src/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/arm/src/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/arm/src/contrib/amd/ldap.schema#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/arm/src/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/arm/src/contrib/amd/libamu/util.c#2 delete .. //depot/projects/arm/src/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/arm/src/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/arm/src/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/arm/src/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/arm/src/contrib/amd/m4/amindent#2 delete .. //depot/projects/arm/src/contrib/amd/m4/autopat#2 delete .. //depot/projects/arm/src/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/arm/src/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/arm/src/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/arm/src/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/arm/src/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/arm/src/contrib/amd/m4/mkconf#2 delete .. //depot/projects/arm/src/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/arm/src/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/arm/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/arm/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/lostaltmail.conf-sample#2 delete .. //depot/projects/arm/src/contrib/amd/scripts/lostaltmail.in#2 delete .. //depot/projects/arm/src/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/arm/src/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/arm/src/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/arm/src/contrib/amd/tasks#2 integrate .. //depot/projects/arm/src/contrib/amd/vers.m4#1 branch .. //depot/projects/arm/src/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/arm/src/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/arm/src/contrib/bc/h/getopt.h#2 delete .. //depot/projects/arm/src/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/arm/src/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/arm/src/contrib/bind/CHANGES#2 delete .. //depot/projects/arm/src/contrib/bind/DNSSEC#2 delete .. //depot/projects/arm/src/contrib/bind/FREEBSD-Upgrade#2 delete .. //depot/projects/arm/src/contrib/bind/FREEBSD-Xlist#2 delete .. //depot/projects/arm/src/contrib/bind/INSTALL#2 delete .. //depot/projects/arm/src/contrib/bind/LICENSE#2 delete .. //depot/projects/arm/src/contrib/bind/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/README#2 delete .. //depot/projects/arm/src/contrib/bind/SUPPORT#2 delete .. //depot/projects/arm/src/contrib/bind/TODO#2 delete .. //depot/projects/arm/src/contrib/bind/Version#2 delete .. //depot/projects/arm/src/contrib/bind/bin/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/addr/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/addr/addr.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/dig/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/dig/dig.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/dnskeygen/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/dnskeygen/dnskeygen.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/dnsquery/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/dnsquery/dnsquery.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/host/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/host/host.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/irpd/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/irpd/irpd.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/irpd/irs-irpd.conf#2 delete .. //depot/projects/arm/src/contrib/bind/bin/irpd/version.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/mkservdb/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/mkservdb/mkservdb.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named-bootconf/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named-bootconf/named-bootconf.sh#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named-bootconf/test.boot#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named-xfer/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named-xfer/named-xfer.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_defs.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_dump.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_func.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_glob.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_glue.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_ixfr.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_load.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_lookup.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_save.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_sec.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_tsig.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/db_update.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/named.conf#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/named.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_config.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_ctl.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_defs.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_forw.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_func.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_glob.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_glue.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_init.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_ixfr.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_lexer.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_lexer.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_main.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_maint.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_ncache.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_notify.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_parser.y#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_parseutil.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_parseutil.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_req.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_resp.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_signal.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_sort.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_stats.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_udp.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_update.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/ns_xfr.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/pathtemplate.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/test/127.0.0.zone#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/test/localhost.zone#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/test/named.conf#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/test/root.hint#2 delete .. //depot/projects/arm/src/contrib/bind/bin/named/version.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/ndc/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/ndc/ndc.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/commands.l#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/debug.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/getinfo.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/list.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/main.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/nslookup.help#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/pathnames.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/res.h#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/send.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/skip.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nslookup/subr.c#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nsupdate/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/bin/nsupdate/nsupdate.c#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/acl.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/address_list.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/comments.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/config.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/controls.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/docdef.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/example.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/include.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/index.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/key.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/logging.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/master.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/options.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/server.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/trusted-keys.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/html/zone.html#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/dig.1#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/dnskeygen.1#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/dnsquery.1#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/getaddrinfo.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/gethostbyname.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/getipnodebyname.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/getnameinfo.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/getnetent.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/hesiod.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/host.1#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/hostname.7#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/inet_cidr.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/irs.conf.5#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/mailaddr.7#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/mkdep.1#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/named-bootconf.8#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/named-xfer.8#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/named.8#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/named.conf.5#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/ndc.8#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/nslookup.8#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/nsupdate.8#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/resolver.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/resolver.5#2 delete .. //depot/projects/arm/src/contrib/bind/doc/man/tsig.3#2 delete .. //depot/projects/arm/src/contrib/bind/doc/misc/DynamicUpdate#2 delete .. //depot/projects/arm/src/contrib/bind/doc/misc/FAQ.1of2#2 delete .. //depot/projects/arm/src/contrib/bind/doc/misc/FAQ.2of2#2 delete .. //depot/projects/arm/src/contrib/bind/doc/misc/rfc2317-notes.txt#2 delete .. //depot/projects/arm/src/contrib/bind/doc/misc/style.txt#2 delete .. //depot/projects/arm/src/contrib/bind/include/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/include/arpa/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/include/arpa/inet.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/arpa/nameser.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/fd_setsize.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/hesiod.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/irp.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/irs.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/assertions.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/ctl.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/dst.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/eventlib.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/heap.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/list.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/logging.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/misc.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/isc/tree.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/netdb.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/netgroup.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/res_update.h#2 delete .. //depot/projects/arm/src/contrib/bind/include/resolv.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/README#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/bsafe_link.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/cylink_link.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/dst_api.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/dst_internal.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/eay_dss_link.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/hmac_link.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/md5.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/md5_dgst.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/md5_locl.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/prandom.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/rsaref_link.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/dst/support.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_addr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_cidr_pton.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_data.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_lnaof.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_makeaddr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_net_ntop.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_net_pton.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_neta.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_netof.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_network.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_ntoa.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_ntop.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/inet_pton.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/inet/nsap_addr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/Makefile.BSD#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/README#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns_gr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns_ho.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns_nw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns_pr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns_pw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/dns_sv.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gai_strerror.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_gr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_ho.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_ng.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_nw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_pr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_pw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gen_sv.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getaddrinfo.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getgrent.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getgrent_r.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gethostent.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/gethostent_r.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getnameinfo.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getnetent.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getnetent_r.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getnetgrent.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getnetgrent_r.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getprotoent.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getprotoent_r.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getpwent.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getpwent_r.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getservent.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/getservent_r.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/hesiod.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/hesiod_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_gr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_ho.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_ng.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_nw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_pr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_pw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irp_sv.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irpmarshall.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irs_data.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irs_data.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/irs_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_gr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_ho.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_ng.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_nw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_pr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_pw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/lcl_sv.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_gr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_ho.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_ng.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_nw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_pr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_pw.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nis_sv.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/nul_ng.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/pathnames.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/irs/util.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/assertions.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/assertions.mdoc#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/base64.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/bitncmp.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/bitncmp.mdoc#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ctl_clnt.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ctl_p.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ctl_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ctl_srvr.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ev_connects.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ev_files.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ev_streams.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ev_timers.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/ev_waits.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/eventlib.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/eventlib.mdoc#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/eventlib_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/heap.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/heap.mdoc#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/hex.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/logging.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/logging.mdoc#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/logging_p.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/memcluster.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/memcluster.mdoc#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/movefile.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/tree.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/isc/tree.mdoc#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_date.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_name.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_netint.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_parse.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_print.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_samedomain.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_sign.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_ttl.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/nameser/ns_verify.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/herror.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_comp.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_data.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_debug.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_debug.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_findzonecut.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_init.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_mkquery.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_mkupdate.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_mkupdate.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_private.h#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_query.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_send.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_sendsigned.c#2 delete .. //depot/projects/arm/src/contrib/bind/lib/resolv/res_update.c#2 delete .. //depot/projects/arm/src/contrib/bind/port/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/port/README#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/Makefile.set#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/bin/probe_ipv6#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/include/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/include/port_after.h#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/include/port_before.h#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/include/prand_conf.h#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/include/sys/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/noop.c#2 delete .. //depot/projects/arm/src/contrib/bind/port/freebsd/probe#2 delete .. //depot/projects/arm/src/contrib/bind/port/prand_conf/Makefile#2 delete .. //depot/projects/arm/src/contrib/bind/port/prand_conf/README#2 delete .. //depot/projects/arm/src/contrib/bind/port/prand_conf/prand_conf.c#2 delete .. //depot/projects/arm/src/contrib/bind/port/settings#2 delete .. //depot/projects/arm/src/contrib/bind/port/systype#2 delete .. //depot/projects/arm/src/contrib/bind/tests/irs_testclient.c#2 delete .. //depot/projects/arm/src/contrib/bind/tests/irs_testirpd.c#2 delete .. //depot/projects/arm/src/contrib/bind/tests/irs_testserver.c#2 delete .. //depot/projects/arm/src/contrib/bind/tests/test_cidr.c#2 delete .. //depot/projects/arm/src/contrib/bind/tests/test_getaddr.c#2 delete .. //depot/projects/arm/src/contrib/bind9/CHANGES#8 integrate .. //depot/projects/arm/src/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/arm/src/contrib/bind9/FAQ#5 integrate .. //depot/projects/arm/src/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/arm/src/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/arm/src/contrib/bind9/README#6 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/arm/src/contrib/bind9/configure.in#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/make/rules.in#4 integrate .. //depot/projects/arm/src/contrib/bind9/version#8 integrate .. //depot/projects/arm/src/contrib/binutils/bfd/aout-tic30.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/coff-mips.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/coff-tic30.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/coff-z8k.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/cpu-mips.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/cpu-tic30.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/cpu-v850.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/cpu-z8k.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/elf32-mips.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/elf32-v850.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/elf64-mips.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/mipsbsd.c#2 delete .. //depot/projects/arm/src/contrib/binutils/bfd/pe-mips.c#2 delete .. //depot/projects/arm/src/contrib/binutils/binutils/binutils.texi#2 delete .. //depot/projects/arm/src/contrib/binutils/binutils/config.texi#2 delete .. //depot/projects/arm/src/contrib/binutils/binutils/cxxfilt.man#2 delete .. //depot/projects/arm/src/contrib/binutils/binutils/rcparse.c#2 delete .. //depot/projects/arm/src/contrib/binutils/binutils/rcparse.h#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-tic30.c#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-tic30.h#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-v850.c#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-v850.h#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-z8k.c#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/config/tc-z8k.h#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/doc/c-v850.texi#2 delete .. //depot/projects/arm/src/contrib/binutils/gas/doc/c-z8k.texi#2 delete .. //depot/projects/arm/src/contrib/binutils/include/elf/arm-oabi.h#2 delete .. //depot/projects/arm/src/contrib/binutils/include/getopt.h#2 delete .. //depot/projects/arm/src/contrib/binutils/include/opcode/mips.h#2 delete .. //depot/projects/arm/src/contrib/binutils/include/opcode/tic30.h#2 delete .. //depot/projects/arm/src/contrib/binutils/include/opcode/v850.h#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/configdoc.texi#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/armelf_linux26.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/shelf.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/shelf_linux.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/tic30aout.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/tic30coff.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/v850.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/z8001.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/emulparams/z8002.sh#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/scripttempl/elfppc.sc#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/scripttempl/tic30aout.sc#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/scripttempl/tic30coff.sc#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/scripttempl/v850.sc#2 delete .. //depot/projects/arm/src/contrib/binutils/ld/scripttempl/z8000.sc#2 delete .. //depot/projects/arm/src/contrib/binutils/libiberty/acconfig.h#2 delete .. //depot/projects/arm/src/contrib/binutils/libiberty/alloca-conf.h#2 delete .. //depot/projects/arm/src/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/arm/src/contrib/binutils/libiberty/getopt.c#2 delete .. //depot/projects/arm/src/contrib/binutils/libiberty/getopt1.c#2 delete .. //depot/projects/arm/src/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/arm/src/contrib/binutils/opcodes/tic30-dis.c#2 delete .. //depot/projects/arm/src/contrib/binutils/opcodes/v850-dis.c#2 delete .. //depot/projects/arm/src/contrib/binutils/opcodes/v850-opc.c#2 delete .. //depot/projects/arm/src/contrib/binutils/opcodes/z8k-dis.c#2 delete .. //depot/projects/arm/src/contrib/binutils/opcodes/z8k-opc.h#2 delete .. //depot/projects/arm/src/contrib/binutils/opcodes/z8kgen.c#2 delete .. //depot/projects/arm/src/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/arm/src/contrib/cpio/alloca.c#2 delete .. //depot/projects/arm/src/contrib/cpio/copyin.c#2 delete .. //depot/projects/arm/src/contrib/cpio/copyout.c#2 delete .. //depot/projects/arm/src/contrib/cpio/copypass.c#2 delete .. //depot/projects/arm/src/contrib/cpio/cpio.1#2 delete .. //depot/projects/arm/src/contrib/cpio/cpio.h#2 delete .. //depot/projects/arm/src/contrib/cpio/cpio.texi#2 delete .. //depot/projects/arm/src/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/arm/src/contrib/cpio/defer.c#2 delete .. //depot/projects/arm/src/contrib/cpio/defer.h#2 delete .. //depot/projects/arm/src/contrib/cpio/dirname.c#2 delete .. //depot/projects/arm/src/contrib/cpio/dstring.c#2 delete .. //depot/projects/arm/src/contrib/cpio/dstring.h#2 delete .. //depot/projects/arm/src/contrib/cpio/error.c#2 delete .. //depot/projects/arm/src/contrib/cpio/extern.h#2 delete .. //depot/projects/arm/src/contrib/cpio/filemode.c#2 delete .. //depot/projects/arm/src/contrib/cpio/filetypes.h#2 delete .. //depot/projects/arm/src/contrib/cpio/getopt.c#2 delete .. //depot/projects/arm/src/contrib/cpio/getopt.h#2 delete .. //depot/projects/arm/src/contrib/cpio/getopt1.c#2 delete .. //depot/projects/arm/src/contrib/cpio/global.c#2 delete .. //depot/projects/arm/src/contrib/cpio/idcache.c#2 delete .. //depot/projects/arm/src/contrib/cpio/main.c#2 delete .. //depot/projects/arm/src/contrib/cpio/makepath.c#2 delete .. //depot/projects/arm/src/contrib/cpio/rmt.h#2 delete .. //depot/projects/arm/src/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/arm/src/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/arm/src/contrib/cpio/stripslash.c#2 delete .. //depot/projects/arm/src/contrib/cpio/system.h#2 delete .. //depot/projects/arm/src/contrib/cpio/tar.c#2 delete .. //depot/projects/arm/src/contrib/cpio/tar.h#2 delete .. //depot/projects/arm/src/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/arm/src/contrib/cpio/userspec.c#2 delete .. //depot/projects/arm/src/contrib/cpio/util.c#2 delete .. //depot/projects/arm/src/contrib/cpio/version.c#2 delete .. //depot/projects/arm/src/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/arm/src/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/arm/src/contrib/csup/mux.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/arm/src/contrib/cvs/BUGS#2 integrate .. //depot/projects/arm/src/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cvs/FAQ#2 integrate .. //depot/projects/arm/src/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/arm/src/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/arm/src/contrib/cvs/HACKING#2 integrate .. //depot/projects/arm/src/contrib/cvs/INSTALL#2 integrate .. //depot/projects/arm/src/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/NEWS#2 integrate .. //depot/projects/arm/src/contrib/cvs/README#2 integrate .. //depot/projects/arm/src/contrib/cvs/TESTS#2 integrate .. //depot/projects/arm/src/contrib/cvs/TODO#2 integrate .. //depot/projects/arm/src/contrib/cvs/acconfig.h#2 delete .. //depot/projects/arm/src/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/arm/src/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/arm/src/contrib/cvs/config.h.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/configure#2 integrate .. //depot/projects/arm/src/contrib/cvs/configure.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/README#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/arm/src/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/arm/src/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/arm/src/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/arm/src/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/fnmatch.h#2 delete .. //depot/projects/arm/src/contrib/cvs/lib/getdate#1 branch .. //depot/projects/arm/src/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/hostname.c#2 delete .. //depot/projects/arm/src/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/arm/src/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/add.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/client.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/client.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/history.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/history.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/import.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/log.c#3 integrate .. //depot/projects/arm/src/contrib/cvs/src/login.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/main.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/options.h.in#2 delete .. //depot/projects/arm/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/prepend_args.c#2 delete .. //depot/projects/arm/src/contrib/cvs/src/prepend_args.h#2 delete .. //depot/projects/arm/src/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/arm/src/contrib/cvs/src/rcscmds.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 24 23:50:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 884D216A405; Sun, 24 Feb 2008 23:50:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 493CB16A403 for ; Sun, 24 Feb 2008 23:50:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B0A113C455 for ; Sun, 24 Feb 2008 23:50:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1ONo9s6095706 for ; Sun, 24 Feb 2008 23:50:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1ONo8fw095699 for perforce@freebsd.org; Sun, 24 Feb 2008 23:50:08 GMT (envelope-from imp@freebsd.org) Date: Sun, 24 Feb 2008 23:50:08 GMT Message-Id: <200802242350.m1ONo8fw095699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 23:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=136129 Change 136129 by imp@imp_paco-paco on 2008/02/24 23:49:45 IFC @136127 Affected files ... .. //depot/projects/arm/src/bin/sh/cd.c#2 integrate .. //depot/projects/arm/src/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/arm/src/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/arm/src/lib/msun/powerpc/fenv.h#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_node.c#7 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vncache.c#10 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#9 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#20 integrate .. //depot/projects/arm/src/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/arm/src/sys/netsmb/smb_conn.c#6 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_node.c#12 integrate .. //depot/projects/arm/src/sys/powerpc/fpu/fpu_emu.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/float.h#2 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#21 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#22 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#28 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#26 integrate .. //depot/projects/arm/src/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/arm/src/usr.bin/ar/write.c#2 integrate .. //depot/projects/arm/src/usr.bin/find/find.1#7 integrate Differences ... ==== //depot/projects/arm/src/bin/sh/cd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); #include #include @@ -68,7 +68,9 @@ STATIC int cdphysical(char *); STATIC int docd(char *, int, int); STATIC char *getcomponent(void); -STATIC int updatepwd(char *); +STATIC char *findcwd(char *); +STATIC void updatepwd(char *); +STATIC char *getpwd2(char *, size_t); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -201,10 +203,11 @@ } INTOFF; - if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) { + if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -212,12 +215,14 @@ STATIC int cdphysical(char *dest) { + char *p; INTOFF; - if (chdir(dest) < 0 || updatepwd(NULL) < 0) { + if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -247,38 +252,20 @@ } -/* - * Update curdir (the name of the current directory) in response to a - * cd command. We also call hashcd to let the routines in exec.c know - * that the current directory has changed. - */ -STATIC int -updatepwd(char *dir) +STATIC char * +findcwd(char *dir) { char *new; char *p; - hashcd(); /* update command hash table */ - /* * If our argument is NULL, we don't know the current directory * any more because we traversed a symbolic link or something * we couldn't stat(). */ if (dir == NULL || curdir == NULL) { - if (prevdir) - ckfree(prevdir); - INTOFF; - prevdir = curdir; - curdir = NULL; - if (getpwd() == NULL) { - INTON; - return (-1); - } - setvar("PWD", curdir, VEXPORT); - setvar("OLDPWD", prevdir, VEXPORT); - INTON; - return (0); + p = stalloc(PATH_MAX); + return getpwd2(p, PATH_MAX); } cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); @@ -302,16 +289,25 @@ if (new == stackblock()) STPUTC('/', new); STACKSTRNUL(new); - INTOFF; + return stackblock(); +} + +/* + * Update curdir (the name of the current directory) in response to a + * cd command. We also call hashcd to let the routines in exec.c know + * that the current directory has changed. + */ +STATIC void +updatepwd(char *dir) +{ + hashcd(); /* update command hash table */ + if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(stackblock()); + curdir = savestr(dir); setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); - INTON; - - return (0); } int @@ -355,17 +351,31 @@ } /* - * Find out what the current directory is. If we already know the current - * directory, this routine returns immediately. + * Get the current directory and cache the result in curdir. */ char * getpwd(void) { char buf[PATH_MAX]; + char *p; if (curdir) return curdir; - if (getcwd(buf, sizeof(buf)) == NULL) { + + p = getpwd2(buf, sizeof(buf)); + if (p != NULL) + curdir = savestr(p); + + return curdir; +} + +/* + * Return the current directory. + */ +STATIC char * +getpwd2(char *buf, size_t size) +{ + if (getcwd(buf, size) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -373,12 +383,9 @@ stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - curdir = savestr(pwd); - return curdir; + return pwd; } return NULL; } - curdir = savestr(buf); - - return curdir; + return buf; } ==== //depot/projects/arm/src/gnu/lib/libgcc/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -122,7 +122,7 @@ .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c +LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif ==== //depot/projects/arm/src/lib/libc/powerpc/gen/flt_rounds.c#2 (text+ko) ==== @@ -32,11 +32,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT static const int map[] = { 1, /* round to nearest */ 0, /* round to zero */ @@ -52,3 +53,4 @@ __asm__ __volatile("mffs %0" : "=f"(fpscr)); return map[(fpscr & 0x03)]; } +#endif ==== //depot/projects/arm/src/lib/libc/powerpc/gen/fpgetmask.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_except_t fpgetmask() { @@ -51,3 +52,4 @@ __asm__("mffs %0" : "=f"(fpscr)); return ((fp_except_t)((fpscr >> 3) & 0x1f)); } +#endif ==== //depot/projects/arm/src/lib/libc/powerpc/gen/fpgetround.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_rnd_t fpgetround() { @@ -51,3 +52,4 @@ __asm__("mffs %0" : "=f"(fpscr)); return ((fp_rnd_t)(fpscr & 0x3)); } +#endif ==== //depot/projects/arm/src/lib/libc/powerpc/gen/fpgetsticky.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.1 2004/02/12 09:11:06 grehan Exp $ + * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.2 2008/02/24 19:22:53 raj Exp $ */ #include @@ -45,6 +45,7 @@ #include #include +#ifndef _SOFT_FLOAT #ifdef __weak_alias __weak_alias(fpgetsticky,_fpgetsticky) #endif @@ -57,3 +58,4 @@ __asm__ __volatile("mffs %0" : "=f"(fpscr)); return ((fp_except_t)((fpscr >> 25) & 0x1f)); } +#endif ==== //depot/projects/arm/src/lib/libc/powerpc/gen/fpsetmask.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_except_t fpsetmask(fp_except_t mask) { @@ -55,3 +56,4 @@ __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr)); return (old); } +#endif ==== //depot/projects/arm/src/lib/libc/powerpc/gen/fpsetround.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_rnd_t fpsetround(fp_rnd_t rnd_dir) { @@ -55,3 +56,4 @@ __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr)); return (old); } +#endif ==== //depot/projects/arm/src/lib/msun/powerpc/fenv.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.3 2005/03/16 19:03:45 das Exp $ + * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.4 2008/02/24 19:22:53 raj Exp $ */ #ifndef _FENV_H_ @@ -82,8 +82,13 @@ #define _ENABLE_MASK ((FE_DIVBYZERO | FE_INEXACT | FE_INVALID | \ FE_OVERFLOW | FE_UNDERFLOW) >> _FPUSW_SHIFT) +#ifndef _SOFT_FLOAT #define __mffs(__env) __asm __volatile("mffs %0" : "=f" (*(__env))) #define __mtfsf(__env) __asm __volatile("mtfsf 255,%0" : : "f" (__env)) +#else +#define __mffs(__env) +#define __mtfsf(__env) +#endif union __fpscr { double __d; ==== //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 (text+ko) ==== @@ -119,8 +119,8 @@ ASSERT(error == 0); zp->z_vnode = vp; vp->v_data = (caddr_t)zp; - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); } else { zp->z_vnode = NULL; } @@ -604,8 +604,8 @@ ASSERT(err == 0); vp = ZTOV(zp); vp->v_data = (caddr_t)zp; - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); vp->v_type = IFTOVT((mode_t)zp->z_phys->zp_mode); if (vp->v_type == VDIR) zp->z_zn_prefetch = B_TRUE; /* z_prefetch default is enabled */ ==== //depot/projects/arm/src/sys/fs/nwfs/nwfs_node.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.41 2008/01/24 12:34:27 attilio Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_node.c,v 1.42 2008/02/24 16:38:56 attilio Exp $ */ #include #include @@ -188,7 +188,7 @@ if (dvp) { np->n_parent = VTONW(dvp)->n_fid; } - vp->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(vp); lockmgr(&nwhashlock, LK_EXCLUSIVE, NULL); /* * Another process can create vnode while we blocked in malloc() or ==== //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vncache.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.40 2008/01/13 14:44:05 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.41 2008/02/24 16:38:56 attilio Exp $"); #include "opt_pseudofs.h" @@ -196,7 +196,7 @@ if ((pn->pn_flags & PFS_PROCDEP) != 0) (*vpp)->v_vflag |= VV_PROCDEP; pvd->pvd_vnode = *vpp; - (*vpp)->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(*vpp); vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY); error = insmntque(*vpp, mp); if (error != 0) { ==== //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.36 2008/01/24 12:34:27 attilio Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.37 2008/02/24 16:38:57 attilio Exp $ */ #include #include @@ -261,7 +261,7 @@ } else if (vp->v_type == VREG) SMBERROR("new vnode '%s' born without parent ?\n", np->n_name); - vp->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); smbfs_hash_lock(smp, td); ==== //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 (text+ko) ==== @@ -389,7 +389,7 @@ return (error); } - vp->v_vnlock->lk_flags |= LK_CANRECURSE; + VN_LOCK_AREC(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = insmntque(vp, XVFSTOMNT(XFS_MTOVFS(mp))); if (error != 0) { ==== //depot/projects/arm/src/sys/kern/vfs_lookup.c#20 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.105 2008/01/13 14:44:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.106 2008/02/24 16:38:57 attilio Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -84,7 +84,7 @@ error = getnewvnode("crossmp", NULL, &dead_vnodeops, &vp_crossmp); if (error != 0) panic("nameiinit: getnewvnode"); - vp_crossmp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_ASHARE(vp_crossmp); } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL) ==== //depot/projects/arm/src/sys/netncp/ncp_conn.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netncp/ncp_conn.c,v 1.31 2008/01/24 12:34:28 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/netncp/ncp_conn.c,v 1.32 2008/02/24 16:38:57 attilio Exp $"); #include #include @@ -193,7 +193,7 @@ int ncp_conn_assert_locked(struct ncp_conn *conn, const char *checker, struct thread *td) { - if (conn->nc_lock.lk_flags & LK_HAVE_EXCL) return 0; + if (lockstatus(&conn->nc_lock, curthread) == LK_EXCLUSIVE) return 0; printf("%s: connection isn't locked!\n", checker); return EIO; } ==== //depot/projects/arm/src/sys/netsmb/smb_conn.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.19 2008/01/24 12:34:29 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.20 2008/02/24 16:26:52 attilio Exp $"); #include #include @@ -62,8 +62,8 @@ MALLOC_DEFINE(M_SMBCONN, "smb_conn", "SMB connection"); -static void smb_co_init(struct smb_connobj *cp, int level, char *objname, - struct thread *td); +static void smb_co_init(struct smb_connobj *cp, int level, char *ilockname, + char *lockname, struct thread *td); static void smb_co_done(struct smb_connobj *cp); static int smb_co_lockstatus(struct smb_connobj *cp, struct thread *td); @@ -82,7 +82,7 @@ smb_sm_init(void) { - smb_co_init(&smb_vclist, SMBL_SM, "smbsm", curthread); + smb_co_init(&smb_vclist, SMBL_SM, "smbsm ilock", "smbsm", curthread); smb_co_unlock(&smb_vclist, 0, curthread); return 0; } @@ -227,11 +227,12 @@ * Common code for connection object */ static void -smb_co_init(struct smb_connobj *cp, int level, char *objname, struct thread *td) +smb_co_init(struct smb_connobj *cp, int level, char *ilockname, char *lockname, + struct thread *td) { SLIST_INIT(&cp->co_children); - smb_sl_init(&cp->co_interlock, objname); - lockinit(&cp->co_lock, PZERO, objname, 0, 0); + smb_sl_init(&cp->co_interlock, ilockname); + lockinit(&cp->co_lock, PZERO, lockname, 0, 0); cp->co_level = level; cp->co_usecount = 1; if (smb_co_lock(cp, LK_EXCLUSIVE, td) != 0) @@ -398,7 +399,7 @@ return EPERM; vcp = smb_zmalloc(sizeof(*vcp), M_SMBCONN, M_WAITOK); - smb_co_init(VCTOCP(vcp), SMBL_VC, "smb_vc", td); + smb_co_init(VCTOCP(vcp), SMBL_VC, "smb_vc ilock", "smb_vc", td); vcp->obj.co_free = smb_vc_free; vcp->obj.co_gone = smb_vc_gone; vcp->vc_number = smb_vcnext++; @@ -716,7 +717,7 @@ if (gid == SMBM_ANY_GROUP) gid = cred->cr_groups[0]; ssp = smb_zmalloc(sizeof(*ssp), M_SMBCONN, M_WAITOK); - smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss", td); + smb_co_init(SSTOCP(ssp), SMBL_SHARE, "smbss ilock", "smbss", td); ssp->obj.co_free = smb_share_free; ssp->obj.co_gone = smb_share_gone; smb_sl_init(&ssp->ss_stlock, "ssstlock"); ==== //depot/projects/arm/src/sys/nfsclient/nfs_node.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.87 2008/01/24 12:34:29 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.88 2008/02/24 16:38:57 attilio Exp $"); #include #include @@ -158,8 +158,8 @@ /* * NFS supports recursive and shared locking. */ - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); if (fhsize > NFS_SMALLFH) { MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK); } else ==== //depot/projects/arm/src/sys/powerpc/fpu/fpu_emu.c#2 (text+ko) ==== @@ -76,12 +76,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.3 2008/02/24 17:10:30 marcel Exp $"); #include "opt_ddb.h" -#define DEBUG - #include #include #include ==== //depot/projects/arm/src/sys/powerpc/include/float.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 * from: FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 - * $FreeBSD: src/sys/powerpc/include/float.h,v 1.8 2005/01/07 02:29:19 imp Exp $ + * $FreeBSD: src/sys/powerpc/include/float.h,v 1.9 2008/02/24 19:22:52 raj Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -36,12 +36,16 @@ #include +#ifndef _SOFT_FLOAT __BEGIN_DECLS extern int __flt_rounds(void); __END_DECLS +#define FLT_ROUNDS __flt_rounds() +#else +#define FLT_ROUNDS -1 +#endif #define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS __flt_rounds() #if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 1 /* operands promoted to double */ #define DECIMAL_DIG 35 /* max precision in decimal digits */ ==== //depot/projects/arm/src/sys/sys/vnode.h#21 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.329 2008/01/13 14:44:13 attilio Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.330 2008/02/24 16:38:57 attilio Exp $ */ #ifndef _SYS_VNODE_H_ @@ -400,6 +400,9 @@ #define VI_UNLOCK(vp) mtx_unlock(&(vp)->v_interlock) #define VI_MTX(vp) (&(vp)->v_interlock) +#define VN_LOCK_AREC(vp) ((vp)->v_vnlock->lk_flags |= LK_CANRECURSE) +#define VN_LOCK_ASHARE(vp) ((vp)->v_vnlock->lk_flags &= ~LK_NOSHARE) + #endif /* _KERNEL */ /* ==== //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.216 2008/01/13 14:44:13 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.217 2008/02/24 16:38:58 attilio Exp $"); /* * For now we want the safety net that the DEBUG flag provides. @@ -564,6 +564,9 @@ #define ACQUIRE_LOCK(lk) mtx_lock(lk) #define FREE_LOCK(lk) mtx_unlock(lk) +#define BUF_AREC(bp) ((bp)->b_lock.lk_flags |= LK_CANRECURSE) +#define BUF_NOREC(bp) ((bp)->b_lock.lk_flags &= ~LK_CANRECURSE) + /* * Worklist queue management. * These routines require that the lock be held. @@ -5251,7 +5254,7 @@ return (0); loop: /* While syncing snapshots, we must allow recursive lookups */ - bp->b_lock.lk_flags |= LK_CANRECURSE; + BUF_AREC(bp); ACQUIRE_LOCK(&lk); /* * As we hold the buffer locked, none of its dependencies @@ -5393,7 +5396,7 @@ /* We reach here only in error and unlocked */ if (error == 0) panic("softdep_sync_metadata: zero error"); - bp->b_lock.lk_flags &= ~LK_CANRECURSE; + BUF_NOREC(bp); bawrite(bp); return (error); } @@ -5405,7 +5408,7 @@ break; } VI_UNLOCK(vp); - bp->b_lock.lk_flags &= ~LK_CANRECURSE; + BUF_NOREC(bp); bawrite(bp); if (nbp != NULL) { bp = nbp; ==== //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#28 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.335 2008/01/24 12:34:29 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.336 2008/02/24 16:38:58 attilio Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -1363,8 +1363,8 @@ /* * FFS supports recursive and shared locking. */ - vp->v_vnlock->lk_flags |= LK_CANRECURSE; - vp->v_vnlock->lk_flags &= ~LK_NOSHARE; + VN_LOCK_AREC(vp); + VN_LOCK_ASHARE(vp); vp->v_data = ip; vp->v_bufobj.bo_bsize = fs->fs_bsize; ip->i_vnode = vp; ==== //depot/projects/arm/src/sys/vm/vm_object.c#26 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.390 2008/01/13 14:44:15 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.391 2008/02/24 18:03:56 alc Exp $"); #include "opt_vm.h" @@ -500,7 +500,10 @@ VM_OBJECT_UNLOCK(object); return; } else if (object->ref_count == 1) { - if (object->shadow_count == 0) { + if (object->shadow_count == 0 && + object->handle == NULL && + (object->type == OBJT_DEFAULT || + object->type == OBJT_SWAP)) { vm_object_set_flag(object, OBJ_ONEMAPPING); } else if ((object->shadow_count == 1) && (object->handle == NULL) && ==== //depot/projects/arm/src/usr.bin/ar/write.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/ar/write.c,v 1.1 2008/02/21 10:52:31 kaiw Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ar/write.c,v 1.3 2008/02/24 18:30:17 kaiw Exp $"); #include #include @@ -107,7 +107,7 @@ const char *bname; if (name == NULL) - return(NULL); + return (NULL); obj = malloc(sizeof(struct ar_obj)); if (obj == NULL) @@ -115,7 +115,7 @@ if ((obj->fd = open(name, O_RDONLY, 0)) < 0) { bsdar_warnc(bsdar, errno, "can't open file: %s", name); free(obj); - return(NULL); + return (NULL); } if ((bname = basename(name)) == NULL) @@ -154,6 +154,12 @@ obj->mtime = sb.st_mtime; obj->dev = sb.st_dev; obj->ino = sb.st_ino; + + if (obj->size == 0) { + obj->maddr = NULL; + return (obj); + } + if ((obj->maddr = mmap(NULL, obj->size, PROT_READ, MAP_PRIVATE, obj->fd, (off_t)0)) == MAP_FAILED) { bsdar_warnc(bsdar, errno, "can't mmap file: %s", obj->name); @@ -163,7 +169,7 @@ bsdar_errc(bsdar, EX_SOFTWARE, errno, "close failed: %s", obj->name); - return(obj); + return (obj); giveup: if (close(obj->fd) < 0) @@ -171,7 +177,7 @@ obj->name); free(obj->name); free(obj); - return(NULL); + return (NULL); } /* @@ -427,14 +433,14 @@ struct ar_obj *obj, *obj_temp; TAILQ_FOREACH_SAFE(obj, &bsdar->v_obj, objs, obj_temp) { - free(obj->name); if (obj->fd == -1) free(obj->maddr); else - if (munmap(obj->maddr, obj->size)) + if (obj->maddr != NULL && munmap(obj->maddr, obj->size)) bsdar_warnc(bsdar, errno, "can't munmap file: %s", obj->name); TAILQ_REMOVE(&bsdar->v_obj, obj, objs); + free(obj->name); free(obj); } @@ -478,7 +484,7 @@ /* Create archive symbol table and archive string table, if need. */ TAILQ_FOREACH(obj, &bsdar->v_obj, objs) { - if (!(bsdar->options & AR_SS)) + if (!(bsdar->options & AR_SS) && obj->maddr != NULL) create_symtab_entry(bsdar, obj->maddr, obj->size); if (strlen(obj->name) > _MAXNAMELEN_SVR4) add_to_ar_str_table(bsdar, obj->name); ==== //depot/projects/arm/src/usr.bin/find/find.1#7 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)find.1 8.7 (Berkeley) 5/9/95 -.\" $FreeBSD: src/usr.bin/find/find.1,v 1.83 2008/02/23 16:29:04 imp Exp $ +.\" $FreeBSD: src/usr.bin/find/find.1,v 1.85 2008/02/24 19:52:23 ceri Exp $ .\" -.Dd December 13, 2006 +.Dd February 24, 2008 .Dt FIND 1 .Os .Sh NAME @@ -466,6 +466,7 @@ Like .Ic -lname , but the match is case insensitive. +This is a GNU find extension. .It Ic -iname Ar pattern Like .Ic -name , @@ -492,7 +493,9 @@ .It Ic -lname Ar pattern Like .Ic -name , -but the matched file must also be a symbolic link. +but the contents of the symbolic link are matched instead of the file +name. +This is a GNU find extension. .It Ic -ls This primary always evaluates to true. The following information for the current file is written to standard output: From owner-p4-projects@FreeBSD.ORG Sun Feb 24 23:54:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D5C316A404; Sun, 24 Feb 2008 23:54:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F94B16A402 for ; Sun, 24 Feb 2008 23:54:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31DC013C458 for ; Sun, 24 Feb 2008 23:54:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1ONsECC095809 for ; Sun, 24 Feb 2008 23:54:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1ONsEQh095806 for perforce@freebsd.org; Sun, 24 Feb 2008 23:54:14 GMT (envelope-from imp@freebsd.org) Date: Sun, 24 Feb 2008 23:54:14 GMT Message-Id: <200802242354.m1ONsEQh095806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 23:54:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=136130 Change 136130 by imp@imp_paco-paco on 2008/02/24 23:53:58 IFC @136129 Affected files ... .. //depot/projects/arm/src/bin/sh/machdep.h#2 delete .. //depot/projects/arm/src/contrib/amd/doc/stamp-vti#2 integrate .. //depot/projects/arm/src/contrib/pf/pflogd/pidfile.c#3 delete .. //depot/projects/arm/src/contrib/pf/pflogd/pidfile.h#3 delete .. //depot/projects/arm/src/games/wargames/Makefile#2 delete .. //depot/projects/arm/src/games/wargames/wargames.6#2 delete .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_arm11.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#2 integrate .. //depot/projects/arm/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342var.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/std.crb#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/std.i81342#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#2 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/arm/src/sys/ia64/include/ioctl_meteor.h#2 delete .. //depot/projects/arm/src/usr.bin/ar/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/ar/ar.1#2 integrate .. //depot/projects/arm/src/usr.bin/ar/ar.c#2 integrate .. //depot/projects/arm/src/usr.sbin/crunch/crunchide/endian.h#2 delete Differences ... ==== //depot/projects/arm/src/contrib/amd/doc/stamp-vti#2 (text+ko) ==== @@ -1,3 +1,4 @@ -@set UPDATED 3 July 2001 -@set EDITION 6.0.7 -@set VERSION 6.0.7 +@set UPDATED 20 April 2006 +@set UPDATED-MONTH April 2006 +@set EDITION 6.1.5 +@set VERSION 6.1.5 ==== //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_arm11.S#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5.S#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/conf/CRB#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.15 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.3 2007/12/02 13:10:41 cognet Exp $ machine arm ident CRB @@ -64,7 +64,6 @@ device genclock device loop device ether -device nexus device mem # Memory and kernel memory devices #device saarm device miibus @@ -81,6 +80,8 @@ device atapist # ATAPI tape drives options ATA_STATIC_ID # Static device numbering +device "7seg" + # SCSI Controllers device pty ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/crb_machdep.c#2 (text+ko) ==== @@ -49,7 +49,8 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.3 2007/11/05 11:36:11 kib Exp $"); + #define _ARM32_BUS_DMA_PRIVATE #include @@ -162,6 +163,13 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + { + IOP34X_PCE1_VADDR, + IOP34X_PCE1, + IOP34X_PCE1_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, { 0, 0, @@ -421,7 +429,7 @@ #ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); #else - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); #endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/files.crb#2 (text+ko) ==== @@ -1,2 +1,3 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/arm/xscale/i8134x/files.crb,v 1.2 2007/09/22 16:25:43 cognet Exp $ arm/xscale/i8134x/crb_machdep.c standard +arm/xscale/i8134x/iq81342_7seg.c optional 7seg ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/files.i81342#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.2 2007/09/22 16:25:43 cognet Exp $"); #include #include @@ -95,3 +95,65 @@ { return (NULL); } + device_add_child(dev, "iqseg", 0); + bus_generic_probe(dev); + bus_generic_attach(dev); + return (0); +} + +static struct resource * +i81342_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + struct i81342_softc *sc = device_get_softc(dev); + struct resource *rv; + + if (type == SYS_RES_IRQ) { + rv = rman_reserve_resource(&sc->sc_irq_rman, + start, end, count, flags, child); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); + } + + return (NULL); +} + +static int +i81342_setup_intr(device_t dev, device_t child, struct resource *ires, + int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, + void **cookiep) +{ + + + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, + arg, cookiep); + arm_unmask_irq(rman_get_start(ires)); + return (0); +} + +static int +i81342_teardown_intr(device_t dev, device_t child, struct resource *res, + void *cookie) +{ + return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); +} + +static device_method_t i81342_methods[] = { + DEVMETHOD(device_probe, i81342_probe), + DEVMETHOD(device_attach, i81342_attach), + DEVMETHOD(device_identify, i81342_identify), + DEVMETHOD(bus_alloc_resource, i81342_alloc_resource), + DEVMETHOD(bus_setup_intr, i81342_setup_intr), + DEVMETHOD(bus_teardown_intr, i81342_teardown_intr), + {0, 0}, +}; + +static driver_t i81342_driver = { + "iq", + i81342_methods, + sizeof(struct i81342_softc), +}; +static devclass_t i81342_devclass; + +DRIVER_MODULE(iq, nexus, i81342_driver, i81342_devclass, 0, 0); ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342reg.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/xscale/i8134x/i81342reg.h,v 1.3 2007/09/22 22:25:24 cognet Exp $ */ #ifndef I83142_REG_H_ #define I83142_REG_H_ @@ -45,6 +45,63 @@ #define IOP34X_HWADDR 0xffd00000 #define IOP34X_SIZE 0x100000 +#define IOP34X_ADMA0_OFFSET 0x00080000 +#define IOP34X_ADMA1_OFFSET 0x00080200 +#define IOP34X_ADMA2_OFFSET 0x00080400 +#define IOP34X_ADMA_SIZE 0x200 + + +/* ADMA Registers */ +#define IOP34X_ADMA_CCR 0x0000 /* Channel Control Register */ +#define IOP34X_ADMA_CSR 0x0004 /* Channel Status Register */ +#define IOP34X_ADMA_DAR 0x0008 /* Descriptor Address Register */ +#define IOP34X_ADMA_IPCR 0x0018 /* Internal Interface Parity Ctrl Reg */ +#define IOP34X_ADMA_NDAR 0x0024 /* Next Descriptor Register */ +#define IOP34X_ADMA_DCR 0x0028 /* Descriptor Control Register */ + +#define IOP34X_ADMA_IE (1 << 0) /* Interrupt enable */ +#define IOP34X_ADMA_TR (1 << 1) /* Transfert Direction */ +/* + * Source Destination + * 00 Host I/O Interface Local Memory + * 01 Local Memory Host I/O Interface + * 10 Internal Bus Local Memory + * 11 Local Memory Internal Bus + */ +#define IOP34X_ADMA_SS (1 << 3) /* Source selection */ +/* 0000: Data Transfer / CRC / Memory Block Fill */ +#define IOP34X_ADMA_ZRBCE (1 << 7) /* Zero Result Buffer Check Enable */ +#define IOP34X_ADMA_MBFE (1 << 8) /* Memory Block Fill Enable */ +#define IOP34X_ADMA_CGE (1 << 9) /* CRC Generation enable */ +#define IOP34X_ADMA_CTD (1 << 10) /* CRC Transfer disable */ +#define IOP34X_ADMA_CSFD (1 << 11) /* CRC Seed fetch disable */ +#define IOP34X_ADMA_SWBE (1 << 12) /* Status write back enable */ +#define IOP34X_ADMA_ESE (1 << 13) /* Endian swap enable */ +#define IOP34X_ADMA_PQUTE (1 << 16) /* P+Q Update Transfer Enable */ +#define IOP34X_ADMA_DXE (1 << 17) /* Dual XOR Enable */ +#define IOP34X_ADMA_PQTE (1 << 18) /* P+Q Transfer Enable */ +#define IOP34X_ADMA_PTD (1 << 19) /* P Transfer Disable */ +#define IOP34X_ADMA_ROE (1 << 30) /* Relaxed Ordering Enable */ +#define IOP34X_ADMA_NSE (1 << 31) /* No Snoop Enable */ + +#define IOP34X_PBBAR0 0x81588 /* PBI Base Address Register 0 */ +#define IOP34X_PBBAR0_ADDRMASK 0xfffff000 +#define IOP34X_PBBAR1 0x81590 +#define IOP34X_PCE1 0xF2000000 +#define IOP34X_PCE1_SIZE 0x00100000 +#define IOP34X_PCE1_VADDR 0xF1000000 +#define IOP34X_ESSTSR0 0x82188 +#define IOP34X_CONTROLLER_ONLY (1 << 14) +#define IOP34X_INT_SEL_PCIX (1 << 15) +#define IOP34X_PFR 0x82180 /* Processor Frequency Register */ +#define IOP34X_FREQ_MASK ((1 << 16) | (1 << 17) | (1 << 18)) +#define IOP34X_FREQ_600 (0) +#define IOP34X_FREQ_667 (1 << 16) +#define IOP34X_FREQ_800 (1 << 17) +#define IOP34X_FREQ_833 ((1 << 17) | (1 << 16)) +#define IOP34X_FREQ_1000 (1 << 18) +#define IOP34X_FREQ_1200 ((1 << 16) | (1 << 18)) + #define IOP34X_UART0_VADDR IOP34X_VADDR + 0x82300 #define IOP34X_UART0_HWADDR IOP34X_HWADDR + 0x82300 #define IOP34X_UART1_VADDR IOP34X_VADDR + 0x82340 ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342var.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/obio_space.c#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/std.crb#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/std.i81342#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#4 (text+ko) ==== @@ -1,49 +1,115 @@ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/bwct_board.c,v 1.2 2007/12/23 14:57:35 ticso Exp $"); #include +#include "at91rm9200_lowlevel.h" +#include "at91rm9200.h" #include "emac.h" #include "lib.h" #include "ee.h" #include "board.h" #include "sd-card.h" -unsigned char mac[6]; +unsigned char mac[6] = { 0x00, 0x0e, 0x42, 0x02, 0x00, 0x28 }; + +static void USART0_Init(); +static void USART1_Init(); +static void USART2_Init(); +static void USART3_Init(); +static void DS1672_Init(); + +static void +DS1672_Init() { + uint8_t buf[] = {0x00, 0xa9}; + + EEWrite(0xd0, buf, sizeof(buf)); +} + +static void +USART0_Init() { + + AT91PS_PIO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; + AT91PS_PMC pPMC = (AT91PS_PMC)AT91C_BASE_PMC; + + // setup GPIO + pPio->PIO_ASR = AT91C_PA17_TXD0 | AT91C_PA18_RXD0; + pPio->PIO_PDR = AT91C_PA17_TXD0 | AT91C_PA18_RXD0; + + // enable power + pPMC->PMC_PCER = 1u << AT91C_ID_US0; +} + +static void +USART1_Init() { + + AT91PS_PIO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; + AT91PS_PMC pPMC = (AT91PS_PMC)AT91C_BASE_PMC; + + // setup GPIO + pPio->PIO_ASR = AT91C_PB20_TXD1 | AT91C_PB21_RXD1; + pPio->PIO_PDR = AT91C_PB20_TXD1 | AT91C_PB21_RXD1; + + // enable power + pPMC->PMC_PCER = 1u << AT91C_ID_US1; +} + +static void +USART2_Init() { + + AT91PS_PIO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; + AT91PS_PMC pPMC = (AT91PS_PMC)AT91C_BASE_PMC; + + // setup GPIO + pPio->PIO_ASR = AT91C_PA23_TXD2 | AT91C_PA22_RXD2; + pPio->PIO_PDR = AT91C_PA23_TXD2 | AT91C_PA22_RXD2; + + // enable power + pPMC->PMC_PCER = 1u << AT91C_ID_US2; +} static void -MacFromEE() -{ -#if 0 - uint32_t sig; +USART3_Init() { + + AT91PS_PIO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; + AT91PS_PMC pPMC = (AT91PS_PMC)AT91C_BASE_PMC; + + // setup GPIO + pPio->PIO_BSR = AT91C_PA5_TXD3 | AT91C_PA6_RXD3; + pPio->PIO_PDR = AT91C_PA5_TXD3 | AT91C_PA6_RXD3; - sig = 0; - EERead(0, (uint8_t *)&sig, sizeof(sig)); - if (sig != 0xaa55aa55) - return; - EERead(48, mac, 3); - EERead(48+5, mac+3, 3); -#else - mac[0] = 0x00; - mac[1] = 0x0e; - mac[2] = 0x42; - mac[3] = 0x02; - mac[4] = 0x00; - mac[5] = 0x21; -#endif - printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], - mac[1], mac[2], mac[3], mac[4], mac[5]); + // enable power + pPMC->PMC_PCER = 1u << AT91C_ID_US3; } void board_init(void) { - EEInit(); - MacFromEE(); - EMAC_Init(); - sdcard_init(); - EMAC_SetMACAddress(mac); + printf("\n\n"); + printf("BWCT FSB-A920-1\n"); + printf("http://www.bwct.de\n"); + printf("\n"); + printf("AT92RM9200 180MHz\n"); + printf("Initialising USART0\n"); + USART0_Init(); + printf("Initialising USART1\n"); + USART1_Init(); + printf("Initialising USART2\n"); + USART2_Init(); + printf("Initialising USART3\n"); + USART3_Init(); + printf("Initialising TWI\n"); + EEInit(); + printf("Initialising DS1672\n"); + DS1672_Init(); + printf("Initialising Ethernet\n"); + printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], + mac[1], mac[2], mac[3], mac[4], mac[5]); + EMAC_Init(); + EMAC_SetMACAddress(mac); + printf("Initialising SD-card\n"); + sdcard_init(); } #include "../bootspi/ee.c" ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/centipad_board.c#2 (text+ko) ==== ==== //depot/projects/arm/src/usr.bin/ar/Makefile#2 (text+ko) ==== @@ -1,11 +1,28 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.bin/ar/Makefile,v 1.12 2002/02/08 22:31:35 markm Exp $ +# $FreeBSD: src/usr.bin/ar/Makefile,v 1.19 2008/02/22 06:53:52 obrien Exp $ +.if defined(WITH_BSDAR) PROG= ar -SRCS= append.c ar.c archive.c contents.c delete.c extract.c misc.c \ - move.c print.c replace.c -CFLAGS+=-I${.CURDIR} -MAN= ar.1aout ar.5 -BINDIR= /usr/libexec/aout +.else +PROG= bsdar +.endif +SRCS= ar.c read.c util.c write.c + +WARNS?= 5 + +DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF} +LDADD= -larchive -lbz2 -lz -lelf + +.if defined(WITH_BSDAR) +NO_SHARED?= yes +LINKS= ${BINDIR}/ar ${BINDIR}/ranlib +MLINKS= ar ranlib +.else +LINKS= ${BINDIR}/bsdar ${BINDIR}/bsdranlib +MLINKS= bsdar.1 bsdranlib.1 + +CLEANFILES+= bsdar.1 +bsdar.1: ar.1 + ln -sf ${.ALLSRC} ${.TARGET} +.endif .include ==== //depot/projects/arm/src/usr.bin/ar/ar.1#2 (text+ko) ==== @@ -1,9 +1,5 @@ -.\" Copyright (c) 1990, 1993 -.\" The Regents of the University of California. All rights reserved. +.\" Copyright (c) 2007 Joseph Koshy. All rights reserved. .\" -.\" This code is derived from software contributed to Berkeley by -.\" Hugh Smith at The University of Guelph. -.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -12,205 +8,280 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. .\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. +.\" This software is provided by Joseph Koshy ``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 Joseph Koshy 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. .\" -.\" @(#)ar.1 8.1 (Berkeley) 6/29/93 -.\" $FreeBSD: src/usr.bin/ar/ar.1,v 1.15 2002/04/19 23:18:18 charnier Exp $ +.\" $FreeBSD: src/usr.bin/ar/ar.1,v 1.19 2008/02/23 14:34:52 brueffer Exp $ .\" -.Dd June 29, 1993 +.Dd August 31, 2007 +.Os .Dt AR 1 -.Os .Sh NAME -.Nm ar -.Nd create and maintain library archives +.Nm ar , +.Nm ranlib +.Nd manage archives .Sh SYNOPSIS .Nm .Fl d -.Op Fl \&Tv -.Ar archive Ar +.Op Fl T +.Op Fl j +.Op Fl v +.Op Fl z +.Ar archive +.Ar files ... .Nm .Fl m -.Op Fl \&Tv -.Ar archive Ar -.Nm -.Fl m -.Op Fl abiTv -.Ar position archive Ar +.Op Fl T +.Op Fl a Ar position-after +.Op Fl b Ar position-before +.Op Fl i Ar position-before +.Op Fl j +.Op Fl s +.Op Fl z +.Ar archive +.Ar files ... .Nm .Fl p -.Op Fl \&Tv -.Ar archive Op Ar +.Op Fl T +.Op Fl v +.Ar archive +.Op Ar files ... .Nm -.Fl q -.Op Fl cTv -.Ar archive Ar -.Nm .Fl r -.Op Fl cuTv -.Ar archive Ar +.Op Fl T +.Op Fl a Ar position-after +.Op Fl b Ar position-before +.Op Fl c +.Op Fl i Ar position-before +.Op Fl j +.Op Fl s +.Op Fl u +.Op Fl v +.Op Fl z +.Ar archive +.Ar files ... .Nm -.Fl r -.Op Fl abciuTv -.Ar position archive Ar +.Fl s +.Op Fl j +.Op Fl z +.Ar archive .Nm .Fl t -.Op Fl \&Tv -.Ar archive Op Ar +.Op Fl T +.Op Fl v +.Ar archive +.Op Ar files ... .Nm .Fl x -.Op Fl ouTv -.Ar archive Op Ar +.Op Fl C +.Op Fl T +.Op Fl o +.Op Fl u +.Op Fl v +.Ar archive +.Op Ar files ... +.Nm ranlib +.Ar archive ... .Sh DESCRIPTION The .Nm -utility creates and maintains groups of files combined into an archive. -Once an archive has been created, new files can be added and existing -files can be extracted, deleted, or replaced. +utility creates and maintains groups of files combined into an +archive. +Once an archive has been created, new files can be added to it, and +existing files can be extracted, deleted or replaced. .Pp -Files are named in the archive by a single component, i.e., if a file -referenced by a path containing a slash (``/'') is archived it will be -named by the last component of that path. -When matching paths listed on the command line against file names stored -in the archive, only the last component of the path will be compared. +Files are named in the archive by their last file name component, +so if a file referenced by a path containing a +.Dq / +is archived, it will be named by the last component of the path. +Similarly when matching paths listed on the command line against +file names stored in the archive, only the last component of the +path will be compared. .Pp -All informational and error messages use the path listed on the command -line, if any was specified; otherwise the name in the archive is used. -If multiple files in the archive have the same name, and paths are listed -on the command line to ``select'' archive files for an operation, only the -.Em first -file with a matching name will be selected. -.Pp The normal use of .Nm -is for the creation and maintenance of libraries suitable for use with -the loader (see -.Xr ld 1 ) +is for the creation and maintenance of libraries suitable for use +with the link editor +.Xr ld 1 , although it is not restricted to this purpose. +The +.Nm +utility can create and manage an archive symbol table (see +.Xr ar 5 ) +used to speed up link editing operations. +If a symbol table is present in an archive, it will be +kept up-to-date by subsequent operations on the archive (excepting +the quick update specified by the +.Fl q +option). .Pp -The options are as follows: +The +.Nm ranlib +utility is used to add an archive symbol table +to an existing archive. +.Sh OPTIONS +The +.Nm +utility supports the following options: .Bl -tag -width indent -.It Fl a -A positioning modifier used with the options +.It Fl a Ar member-after +When used with option +.Fl m +this option specifies that the archive members specified by +arguments +.Ar files ... +are moved to after the archive member named by argument +.Ar member-after . +When used with option +.Fl r +this option specifies that the files specified by arguments +.Ar files ... +are added after the archive member named by argument +.Ar member-after . +.It Fl b Ar member-before +When used with option +.Fl m +this option specifies that the archive members specified by +arguments +.Ar files ... +are moved to before the archive member named by argument +.Ar member-before . +When used with option .Fl r -and -.Fl m . -The files are entered or moved -.Em after -the archive member -.Ar position , -which must be specified. -.It Fl b -A positioning modifier used with the options +this option specifies that the files specified by arguments +.Ar files ... +are added before the archive member named by argument +.Ar member-before . +.It Fl c +Suppress the informational message printed when a new archive is +created using the .Fl r and -.Fl m . -The files are entered or moved -.Em before -the archive member -.Ar position , -which must be specified. -.It Fl c -Whenever an archive is created, an informational message to that effect -is written to standard error. -If the -.Fl c -option is specified, -.Nm -creates the archive silently. +.Fl q +options. +.It Fl C +Prevent extracted files from replacing like-named files +in the file system. .It Fl d -Delete the specified archive files. -.It Fl i -Identical to the -.Fl b -option. +Delete the members named by arguments +.Ar files ... +from the archive specified by argument +.Ar archive . +The archive's symbol table, if present, is updated to reflect +the new contents of the archive. +.It Fl f +Synonymous with option +.Fl T . +.It Fl i Ar member-before +Synonymous with option +.Fl b . +.It Fl j +Compress the resulting archive with +.Xr bzip2 1 . .It Fl m -Move the specified archive files within the archive. -If one of the options +Move archive members specified by arguments +.Ar files ... +within the archive. +If a position has been specified by one of the .Fl a , .Fl b or .Fl i -is specified, the files are moved -before or after the -.Ar position -file in the archive. -If none of those options are specified, the files are moved +options, the members are moved to before or after the specified +position. +If no position has been specified, the specified members are moved to the end of the archive. +If the archive has a symbol table, it is updated to reflect the +new contents of the archive. .It Fl o -Set the access and modification times of extracted files to the -modification time of the file when it was entered into the archive. -This will fail if the user is not the owner of the extracted file -or the super-user. +Preserve the original modification times of members when extracting +them. .It Fl p -Write the contents of the specified archive files to the standard output. -If no files are specified, the contents of all the files in the archive -are written in the order they appear in the archive. +Write the contents of the specified archive members named by +arguments +.Ar files ... +to standard output. +If no members were specified, the contents of all the files in the +archive are written in the order they appear in the archive. .It Fl q -(Quickly) append the specified files to the archive. -If the archive does not exist a new archive file is created. -Much faster than the -.Fl r -option, when creating a large archive -piece-by-piece, as no checking is done to see if the files already -exist in the archive. +Append the files specified by arguments +.Ar files ... +to the archive specified by argument +.Ar archive +without checking if the files already exist in the archive and +without updating the archive's symbol table. +If the archive file +.Ar archive +does not already exist, a new archive is created. +However, to be compatible with GNU +.Nm , +.Fl q +is implemented as a synonym for +.Fl r . .It Fl r -Replace or add the specified files to the archive. -If the archive does not exist a new archive file is created. -Files that replace existing files do not change the order of the files +Replace (add) the files specified by arguments +.Ar files ... +in the archive specified by argument +.Ar archive , +creating the archive if necessary. +Files that replace existing files do not change the order of files within the archive. -New files are appended to the archive unless one of the options +If a file named in arguments +.Ar files ... +does not exist, existing members in the archive that match that +name are not changed. +New files are added to the end of the archive unless one of the +positioning options .Fl a , .Fl b or .Fl i is specified. -.It Fl T -Select and/or name archive members using only the first fifteen characters -of the archive member or command line file name. -The historic archive format had sixteen bytes for the name, but some -historic archiver and loader implementations were unable to handle names -that used the entire space. -This means that file names that are not unique in their first fifteen -characters can subsequently be confused. -A warning message is printed to the standard error output if any file -names are truncated. -(See -.Xr ar 5 -for more information.) +The archive symbol table, if it exists, is updated to reflect the +new state of the archive. +.It Fl s +Add an archive symbol table (see +.Xr ar 5 ) +to the archive specified by argument +.Ar archive . +Invoking +.Nm +with the +.Fl s +option alone is equivalent to invoking +.Nm ranlib . .It Fl t -List the specified files in the order in which they appear in the archive, -each on a separate line. +List the files specified by arguments +.Ar files ... +in the order in which they appear in the archive, one per line. If no files are specified, all files in the archive are listed. +.It Fl T +Use only the first fifteen characters of the archive member name or +command line file name argument when naming archive members. .It Fl u -Update files. +Conditionally update the archive or extract members. When used with the .Fl r -option, files in the archive will be replaced -only if the disk file has a newer modification time than the file in -the archive. +option, files named by arguments +.Ar files ... +will be replaced in the archive if they are newer than their +archived versions. When used with the .Fl x -option, files in the archive will be extracted -only if the archive file has a newer modification time than the file -on disk. +option, the members specified by arguments +.Ar files ... +will be extracted only if they are newer than the corresponding +files in the file system. .It Fl v Provide verbose output. When used with the @@ -221,98 +292,115 @@ .Fl x options, .Nm -gives a file-by-file description of the archive modification. -This description consists of three, white-space separated fields: the -option letter, a dash (``-'') and the file name. +gives a file-by-file description of the archive modification being +performed, which consists of three white-space seperated fields: +the option letter, a dash +.Dq "-" , +and the file name. When used with the .Fl r option, .Nm -displays the description as above, but the initial letter is an ``a'' if -the file is added to the archive and an ``r'' if the file replaces a file -already in the archive. -.Pp +displays the description as above, but the initial letter is an +.Dq a +if the file is added to the archive, or an +.Dq r +if the file replaces a file already in the archive. When used with the .Fl p -option, -the name of each printed file, -enclosed in less-than (``<'') and greater-than (``>'') characters, -is written to the standard output before -the contents of the file; -it is preceded by a single newline character, and -followed by two newline characters. -.Pp +option, the name of the file enclosed in +.Dq < +and +.Dq > +characters is written to standard output preceded by a single newline +character and followed by two newline characters. +The contents of the named file follow the file name. When used with the .Fl t option, .Nm -displays an ``ls -l'' style listing of information about the members of -the archive. -This listing consists of eight, white-space separated fields: -the file permissions (see -.Xr strmode 3 ) , -the decimal user and group ID's, separated by a single slash (``/''), -the file size (in bytes), the file modification time (in the -.Xr date 1 -format ``%b %e %H:%M %Y''), and the name of the file. +displays eight whitespace separated fields: +the file permissions as displayed by +.Xr strmode 3 , +decimal user and group IDs separated by a slash ( +.Dq / Ns ) , +the file size in bytes, the file modification time in +.Xr strftime 3 +format +.Dq "%b %e %H:%M %Y" , +and the name of the file. .It Fl x >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 00:09:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B2FB16A408; Mon, 25 Feb 2008 00:09:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C258516A406 for ; Mon, 25 Feb 2008 00:09:38 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B856913C469 for ; Mon, 25 Feb 2008 00:09:38 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P09cRT097528 for ; Mon, 25 Feb 2008 00:09:38 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P09cKE097525 for perforce@freebsd.org; Mon, 25 Feb 2008 00:09:38 GMT (envelope-from csjp@freebsd.org) Date: Mon, 25 Feb 2008 00:09:38 GMT Message-Id: <200802250009.m1P09cKE097525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 00:09:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=136131 Change 136131 by csjp@ibm01 on 2008/02/25 00:09:12 A couple of cosmetic tweaks Affected files ... .. //depot/projects/trustedbsd/netauditd/conf.c#2 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/conf.c#2 (text+ko) ==== @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include #include #include #include #include #include + #include #include #include @@ -40,10 +40,12 @@ #include #include #include + #include + #include "netauditd.h" -const struct conf_ent { +static const struct conf_ent { char *c_mode; char *c_type; int c_min_args; From owner-p4-projects@FreeBSD.ORG Mon Feb 25 00:32:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D11D316A40A; Mon, 25 Feb 2008 00:32:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BD9A16A408 for ; Mon, 25 Feb 2008 00:32:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 749B613C469 for ; Mon, 25 Feb 2008 00:32:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P0WKxr098248 for ; Mon, 25 Feb 2008 00:32:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P0WJTQ098245 for perforce@freebsd.org; Mon, 25 Feb 2008 00:32:19 GMT (envelope-from imp@freebsd.org) Date: Mon, 25 Feb 2008 00:32:19 GMT Message-Id: <200802250032.m1P0WJTQ098245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 00:32:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=136134 Change 136134 by imp@imp_paco-paco on 2008/02/25 00:31:28 IFC @136132 Affected files ... .. //depot/projects/arm/src/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#4 integrate Differences ... ==== //depot/projects/arm/src/sys/powerpc/include/hid.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: hid.h,v 1.2 2001/08/22 21:05:25 matt Exp $ - * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.3 2005/02/04 01:14:38 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.4 2008/02/25 00:09:23 raj Exp $ */ #ifndef _POWERPC_HID_H_ @@ -65,9 +65,9 @@ #define HID0_SGE 0x00000080 /* Enable store gathering */ #define HID0_DCFA 0x00000040 /* Data cache flush assist */ #define HID0_BTIC 0x00000020 /* Enable BTIC */ -#define HID0_LRSTK 0x00000010 /* Link register stack enable (7450) */ +#define HID0_LRSTK 0x00000010 /* Link register stack enable (7450) */ #define HID0_ABE 0x00000008 /* Enable address broadcast */ -#define HID0_FOLD 0x00000008 /* Branch folding enable (7450) */ +#define HID0_FOLD 0x00000008 /* Branch folding enable (7450) */ #define HID0_BHT 0x00000004 /* Enable branch history table */ #define HID0_NOPTI 0x00000001 /* No-op the dcbt(st) */ @@ -85,6 +85,13 @@ "\020ICE\017DCE\016ILOCK\015DLOCK\014ICFI\013DCFI\012SPD\011XBSEN" \ "\010SGE\007b25\006BTIC\005LRSTK\004FOLD\003BHT\002NOPDST\001NOPTI" +#define HID0_E500_BITMASK \ + "\20" \ + "\040EMCP\037b1\036b2\035b3\034b4\033b5\032b6\031b7" \ + "\030DOZE\027NAP\026SLEEP\025b11\024b12\023b13\022b14\021b15" \ + "\020b16\017TBEN\016SEL_TBCLK\015b19\014b20\013b21\012b22\011b23" \ + "\010EN_MAS7_UPDATE\007DCFA\006b26\005b27\004b28\003b29\002b30\001NOPTI" + /* * HID0 bit definitions per cpu model * ==== //depot/projects/arm/src/sys/powerpc/include/spr.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: spr.h,v 1.25 2002/08/14 15:38:40 matt Exp $ - * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.6 2005/02/04 01:17:04 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.7 2008/02/25 00:09:23 raj Exp $ */ #ifndef _POWERPC_SPR_H_ #define _POWERPC_SPR_H_ @@ -125,6 +125,8 @@ #define MPC7448 0x8004 #define MPC7410 0x800c #define MPC8245 0x8081 +#define FSL_E500v1 0x8020 +#define FSL_E500v2 0x8021 #define SPR_IBAT0U 0x210 /* .68 Instruction BAT Reg 0 Upper */ #define SPR_IBAT0U 0x210 /* .6. Instruction BAT Reg 0 Upper */ ==== //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $ - * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.9 2007/02/18 17:40:09 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.10 2008/02/25 00:09:23 raj Exp $ */ #include @@ -97,6 +97,8 @@ { "Motorola PowerPC 7447A", MPC7447A, REVFMT_MAJMIN }, { "Motorola PowerPC 7448", MPC7448, REVFMT_MAJMIN }, { "Motorola PowerPC 8240", MPC8240, REVFMT_MAJMIN }, + { "Freescale e500v1 core", FSL_E500v1, REVFMT_MAJMIN }, + { "Freescale e500v2 core", FSL_E500v2, REVFMT_MAJMIN }, { "Unknown PowerPC CPU", 0, REVFMT_HEX } }; @@ -121,13 +123,18 @@ vers = pvr >> 16; rev = pvr; switch (vers) { - case MPC7410: - min = (pvr >> 0) & 0xff; - maj = min <= 4 ? 1 : 2; - break; - default: - maj = (pvr >> 8) & 0xf; - min = (pvr >> 0) & 0xf; + case MPC7410: + min = (pvr >> 0) & 0xff; + maj = min <= 4 ? 1 : 2; + break; + case FSL_E500v1: + case FSL_E500v2: + maj = (pvr >> 4) & 0xf; + min = (pvr >> 0) & 0xf; + break; + default: + maj = (pvr >> 8) & 0xf; + min = (pvr >> 0) & 0xf; } for (cp = models; cp->version != 0; cp++) { @@ -146,15 +153,15 @@ printf("cpu%d: %s revision ", cpuid, name); switch (revfmt) { - case REVFMT_MAJMIN: - printf("%u.%u", maj, min); - break; - case REVFMT_HEX: - printf("0x%04x", rev); - break; - case REVFMT_DEC: - printf("%u", rev); - break; + case REVFMT_MAJMIN: + printf("%u.%u", maj, min); + break; + case REVFMT_HEX: + printf("0x%04x", rev); + break; + case REVFMT_DEC: + printf("%u", rev); + break; } hid0 = mfspr(SPR_HID0); @@ -163,96 +170,104 @@ * Configure power-saving mode. */ switch (vers) { - case MPC603: - case MPC603e: - case MPC603ev: - case MPC604ev: - case MPC750: - case IBM750FX: - case MPC7400: - case MPC7410: - case MPC8240: - case MPC8245: - /* Select DOZE mode. */ - hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); - hid0 |= HID0_DOZE | HID0_DPM; + case MPC603: + case MPC603e: + case MPC603ev: + case MPC604ev: + case MPC750: + case IBM750FX: + case MPC7400: + case MPC7410: + case MPC8240: + case MPC8245: + /* Select DOZE mode. */ + hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); + hid0 |= HID0_DOZE | HID0_DPM; #ifdef notyet - powersave = 1; + powersave = 1; #endif - break; + break; - case MPC7448: - case MPC7447A: - case MPC7457: - case MPC7455: - case MPC7450: - /* Enable the 7450 branch caches */ - hid0 |= HID0_SGE | HID0_BTIC; - hid0 |= HID0_LRSTK | HID0_FOLD | HID0_BHT; - /* Disable BTIC on 7450 Rev 2.0 or earlier and on 7457 */ - if (((pvr >> 16) == MPC7450 && (pvr & 0xFFFF) <= 0x0200) - || (pvr >> 16) == MPC7457) - hid0 &= ~HID0_BTIC; - /* Select NAP mode. */ - hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); - hid0 |= HID0_NAP | HID0_DPM; + case MPC7448: + case MPC7447A: + case MPC7457: + case MPC7455: + case MPC7450: + /* Enable the 7450 branch caches */ + hid0 |= HID0_SGE | HID0_BTIC; + hid0 |= HID0_LRSTK | HID0_FOLD | HID0_BHT; + /* Disable BTIC on 7450 Rev 2.0 or earlier and on 7457 */ + if (((pvr >> 16) == MPC7450 && (pvr & 0xFFFF) <= 0x0200) + || (pvr >> 16) == MPC7457) + hid0 &= ~HID0_BTIC; + /* Select NAP mode. */ + hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); + hid0 |= HID0_NAP | HID0_DPM; #ifdef notyet - powersave = 0; /* but don't use it */ + powersave = 0; /* but don't use it */ #endif - break; + break; - default: - /* No power-saving mode is available. */ ; + default: + /* No power-saving mode is available. */ ; } switch (vers) { - case IBM750FX: - case MPC750: - hid0 &= ~HID0_DBP; /* XXX correct? */ - hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; - break; + case IBM750FX: + case MPC750: + hid0 &= ~HID0_DBP; /* XXX correct? */ + hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; + break; + + case MPC7400: + case MPC7410: + hid0 &= ~HID0_SPD; + hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; + hid0 |= HID0_EIEC; + break; - case MPC7400: - case MPC7410: - hid0 &= ~HID0_SPD; - hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT; - hid0 |= HID0_EIEC; - break; + case FSL_E500v1: + case FSL_E500v2: + hid0 |= HID0_EMCP; + break; } mtspr(SPR_HID0, hid0); switch (vers) { - case MPC7447A: - case MPC7448: - case MPC7450: - case MPC7455: - case MPC7457: - bitmask = HID0_7450_BITMASK; - break; - default: - bitmask = HID0_BITMASK; - break; + case MPC7447A: + case MPC7448: + case MPC7450: + case MPC7455: + case MPC7457: + bitmask = HID0_7450_BITMASK; + break; + case FSL_E500v1: + case FSL_E500v2: + bitmask = HID0_E500_BITMASK; + break; + default: + bitmask = HID0_BITMASK; + break; } switch (vers) { - case MPC750: - case IBM750FX: - case MPC7400: - case MPC7410: - case MPC7447A: - case MPC7448: - case MPC7450: - case MPC7455: - case MPC7457: - cpu_print_speed(); - printf("\n"); - cpu_config_l2cr(cpuid, vers); - break; - - default: - printf("\n"); - break; + case MPC750: + case IBM750FX: + case MPC7400: + case MPC7410: + case MPC7447A: + case MPC7448: + case MPC7450: + case MPC7455: + case MPC7457: + cpu_print_speed(); + printf("\n"); + cpu_config_l2cr(cpuid, vers); + break; + default: + printf("\n"); + break; } printf("cpu%d: HID0 %b\n", cpuid, hid0, bitmask); @@ -325,7 +340,7 @@ printf("cpu%d: ", cpuid); if (l2cr & L2CR_L2E) { - if (vers == MPC7450 || + if (vers == MPC7450 || vers == MPC7455 || vers == MPC7457) { u_int l3cr; From owner-p4-projects@FreeBSD.ORG Mon Feb 25 01:35:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FCEA16A405; Mon, 25 Feb 2008 01:35:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F393D16A402 for ; Mon, 25 Feb 2008 01:35:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F21BD13C45E for ; Mon, 25 Feb 2008 01:35:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P1ZKsq011389 for ; Mon, 25 Feb 2008 01:35:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P1Yx8g011305 for perforce@freebsd.org; Mon, 25 Feb 2008 01:34:59 GMT (envelope-from imp@freebsd.org) Date: Mon, 25 Feb 2008 01:34:59 GMT Message-Id: <200802250134.m1P1Yx8g011305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 01:35:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=136135 Change 136135 by imp@imp_paco-paco on 2008/02/25 01:34:46 IFC @136132 Affected files ... .. //depot/projects/mips2/src/COPYRIGHT#3 integrate .. //depot/projects/mips2/src/LOCKS#2 integrate .. //depot/projects/mips2/src/MAINTAINERS#7 integrate .. //depot/projects/mips2/src/Makefile#7 integrate .. //depot/projects/mips2/src/Makefile.inc1#14 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#13 integrate .. //depot/projects/mips2/src/UPDATING#10 integrate .. //depot/projects/mips2/src/bin/date/date.c#2 integrate .. //depot/projects/mips2/src/bin/sh/cd.c#2 integrate .. //depot/projects/mips2/src/bin/sh/mksyntax.c#2 integrate .. //depot/projects/mips2/src/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/mips2/src/contrib/cvs/BUGS#2 integrate .. //depot/projects/mips2/src/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/FAQ#2 integrate .. //depot/projects/mips2/src/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/mips2/src/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2/src/contrib/cvs/HACKING#2 integrate .. //depot/projects/mips2/src/contrib/cvs/INSTALL#2 integrate .. //depot/projects/mips2/src/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/NEWS#2 integrate .. //depot/projects/mips2/src/contrib/cvs/README#2 integrate .. //depot/projects/mips2/src/contrib/cvs/TESTS#2 integrate .. //depot/projects/mips2/src/contrib/cvs/TODO#2 integrate .. //depot/projects/mips2/src/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/mips2/src/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/mips2/src/contrib/cvs/config.h.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/configure#2 integrate .. //depot/projects/mips2/src/contrib/cvs/configure.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/README#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/mips2/src/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/mips2/src/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/mips2/src/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/mips2/src/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/getdate#1 branch .. //depot/projects/mips2/src/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/mips2/src/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/add.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/client.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/client.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/history.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/history.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/import.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/log.c#3 integrate .. //depot/projects/mips2/src/contrib/cvs/src/login.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/main.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/release.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/root.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/root.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/run.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/server.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/server.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/status.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/update.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/version.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/mips2/src/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/cvs/tools/README#2 integrate .. //depot/projects/mips2/src/contrib/file/ChangeLog#3 integrate .. //depot/projects/mips2/src/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/animation#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/archive#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/audio#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/mips2/src/contrib/file/Magdir/blender#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/chi#2 delete .. //depot/projects/mips2/src/contrib/file/Magdir/commands#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/console#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/cvs#2 delete .. //depot/projects/mips2/src/contrib/file/Magdir/database#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/efi#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/elf#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/fortran#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/hdf#2 delete .. //depot/projects/mips2/src/contrib/file/Magdir/impulse#2 delete .. //depot/projects/mips2/src/contrib/file/Magdir/java#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/mips2/src/contrib/file/Makefile.am#3 integrate .. //depot/projects/mips2/src/contrib/file/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/file/acconfig.h#2 delete .. //depot/projects/mips2/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/mips2/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/mips2/src/contrib/file/apprentice.c#3 integrate .. //depot/projects/mips2/src/contrib/file/ascmagic.c#3 integrate .. //depot/projects/mips2/src/contrib/file/compress.c#3 integrate .. //depot/projects/mips2/src/contrib/file/config.h.in#3 integrate .. //depot/projects/mips2/src/contrib/file/configure#3 integrate .. //depot/projects/mips2/src/contrib/file/configure.in#3 integrate .. //depot/projects/mips2/src/contrib/file/file.c#3 integrate .. //depot/projects/mips2/src/contrib/file/file.h#3 integrate .. //depot/projects/mips2/src/contrib/file/file.man#2 integrate .. //depot/projects/mips2/src/contrib/file/file_opts.h#1 branch .. //depot/projects/mips2/src/contrib/file/fsmagic.c#3 integrate .. //depot/projects/mips2/src/contrib/file/funcs.c#3 integrate .. //depot/projects/mips2/src/contrib/file/install-sh#3 integrate .. //depot/projects/mips2/src/contrib/file/is_tar.c#3 integrate .. //depot/projects/mips2/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/mips2/src/contrib/file/magic.c#3 integrate .. //depot/projects/mips2/src/contrib/file/magic.h#3 integrate .. //depot/projects/mips2/src/contrib/file/magic.man#2 integrate .. //depot/projects/mips2/src/contrib/file/magic.mime#3 integrate .. //depot/projects/mips2/src/contrib/file/missing#2 delete .. //depot/projects/mips2/src/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/mips2/src/contrib/file/names.h#3 integrate .. //depot/projects/mips2/src/contrib/file/patchlevel.h#3 integrate .. //depot/projects/mips2/src/contrib/file/print.c#3 integrate .. //depot/projects/mips2/src/contrib/file/readelf.c#3 integrate .. //depot/projects/mips2/src/contrib/file/readelf.h#2 integrate .. //depot/projects/mips2/src/contrib/file/softmagic.c#3 integrate .. //depot/projects/mips2/src/contrib/file/stamp-h.in#2 delete .. //depot/projects/mips2/src/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/mips2/src/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/NEWS#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/config.guess#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/config.sub#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/dist.mk#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/html/ncurses-intro.html#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/headers#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/modules#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.wide#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/headers#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/ncurses_dll.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/tic.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/install-sh#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/clear.1#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_attr.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_border.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_clear.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_extend.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_insstr.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/mips2/src/contrib/ncurses/man/curs_mouse.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/mips2/src/contrib/ncurses/man/curs_outopts.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_termattrs.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_termcap.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/mips2/src/contrib/ncurses/man/curs_trace.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/default_colors.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_new.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_validation.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/infocmp.1m#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/manlinks.sed#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/panel.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/term.5#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/term.7#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/tic.1m#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/tput.1#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/tset.1#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/menu.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/modules#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/shlib#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/mk-1st.awk#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/mips2/src/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/mips2/src/contrib/ncurses/mkinstalldirs#3 delete .. //depot/projects/mips2/src/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKkeyname.awk#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/define_key.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/keyok.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_addstr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_color.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_insch.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_instr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_redrawln.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_refresh.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slkclear.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slkset.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/safe_sprintf.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/modules#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/access.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/add_tries.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_error.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/setbuf.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/strings.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_cchar.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/clear.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/modules#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tic.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/tack/COPYING#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/HISTORY#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/Makefile.in#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/README#2 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/ansi.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/charset.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/color.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/control.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/crum.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/edit.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/fun.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/init.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/menu.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/modes.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/modules#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/output.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/pad.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/scan.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/sync.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/sysdep.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/tack.1#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/tack.c#3 delete .. //depot/projects/mips2/src/contrib/ncurses/tack/tack.h#3 delete .. //depot/projects/mips2/src/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/mips2/src/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/mips2/src/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/mips2/src/contrib/top/display.c#2 integrate .. //depot/projects/mips2/src/contrib/top/layout.h#2 integrate .. //depot/projects/mips2/src/contrib/top/machine.h#4 integrate .. //depot/projects/mips2/src/contrib/top/top.c#5 integrate .. //depot/projects/mips2/src/contrib/top/top.h#3 integrate .. //depot/projects/mips2/src/contrib/traceroute/as.c#1 branch .. //depot/projects/mips2/src/contrib/traceroute/as.h#1 branch .. //depot/projects/mips2/src/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/mips2/src/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/mips2/src/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/mips2/src/crypto/openssh/FREEBSD-upgrade#3 integrate .. //depot/projects/mips2/src/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/mips2/src/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/mips2/src/etc/defaults/periodic.conf#7 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#7 integrate .. //depot/projects/mips2/src/etc/devd.conf#5 integrate .. //depot/projects/mips2/src/etc/mail/access.sample#2 integrate .. //depot/projects/mips2/src/etc/namedb/named.conf#5 integrate .. //depot/projects/mips2/src/etc/namedb/named.root#3 integrate .. //depot/projects/mips2/src/etc/netstart#2 integrate .. //depot/projects/mips2/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/mips2/src/etc/periodic/security/100.chksetuid#3 integrate .. //depot/projects/mips2/src/etc/rc#3 integrate .. //depot/projects/mips2/src/etc/rc.d/dhclient#5 integrate .. //depot/projects/mips2/src/etc/rc.d/hostid#3 integrate .. //depot/projects/mips2/src/etc/rc.d/ipfw#4 integrate .. //depot/projects/mips2/src/etc/rc.d/jail#4 integrate .. //depot/projects/mips2/src/etc/rc.d/kerberos#4 integrate .. //depot/projects/mips2/src/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/mips2/src/etc/rc.d/netif#4 integrate .. //depot/projects/mips2/src/etc/rc.d/ppp#4 integrate .. //depot/projects/mips2/src/etc/rc.firewall#4 integrate .. //depot/projects/mips2/src/etc/rc.firewall6#2 integrate .. //depot/projects/mips2/src/etc/rc.subr#6 integrate .. //depot/projects/mips2/src/etc/sendmail/freebsd.mc#5 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/limerick#5 integrate .. //depot/projects/mips2/src/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/mips2/src/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/mips2/src/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/mips2/src/gnu/usr.bin/Makefile#5 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#4 integrate .. //depot/projects/mips2/src/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/mips2/src/gnu/usr.bin/man/man/man.c#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/man/manpath/manpath.c#2 integrate .. //depot/projects/mips2/src/include/fts.h#2 integrate .. //depot/projects/mips2/src/include/pthread_np.h#4 integrate .. //depot/projects/mips2/src/include/unistd.h#3 integrate .. //depot/projects/mips2/src/lib/libarchive/Makefile#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_bzip2.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_compression_none.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_ustar.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/cpio.5#1 branch .. //depot/projects/mips2/src/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/mips2/src/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/README#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/main.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test.h#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_isorr_bz2.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_zip.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/mips2/src/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/db/test/btree.tests/main.c#3 integrate .. //depot/projects/mips2/src/lib/libc/db/test/dbtest.c#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/mips2/src/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/mips2/src/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/mips2/src/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/mips2/src/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/fts.3#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/fts.c#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/mips2/src/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/mips2/src/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/include/namespace.h#2 integrate .. //depot/projects/mips2/src/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/mips2/src/lib/libc/inet/inet_network.c#4 integrate .. //depot/projects/mips2/src/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libc/locale/ascii.c#1 branch .. //depot/projects/mips2/src/lib/libc/locale/mblocal.h#3 integrate .. //depot/projects/mips2/src/lib/libc/locale/setrunelocale.c#4 integrate .. //depot/projects/mips2/src/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/mips2/src/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_comp.c#4 integrate .. //depot/projects/mips2/src/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/heapsort.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.3#6 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/qsort.c#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/Makefile.inc#5 integrate .. //depot/projects/mips2/src/lib/libc/sys/access.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/extattr_get_file.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/flock.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/mips2/src/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/mips2/src/lib/libdisk/disk.c#3 integrate .. //depot/projects/mips2/src/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/mips2/src/lib/libfetch/common.c#3 integrate .. //depot/projects/mips2/src/lib/libfetch/fetch.3#4 integrate .. //depot/projects/mips2/src/lib/libfetch/ftp.c#4 integrate .. //depot/projects/mips2/src/lib/libfetch/http.c#4 integrate .. //depot/projects/mips2/src/lib/libkse/Makefile#4 integrate .. //depot/projects/mips2/src/lib/libkse/kse.map#3 integrate .. //depot/projects/mips2/src/lib/libkse/sys/lock.c#3 integrate .. //depot/projects/mips2/src/lib/libkse/thread/thr_mutex.c#4 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm.c#4 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_file.c#3 integrate .. //depot/projects/mips2/src/lib/libmagic/config.h#3 integrate .. //depot/projects/mips2/src/lib/libmilter/Makefile#3 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.3#5 integrate .. //depot/projects/mips2/src/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/mips2/src/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/Makefile#7 integrate .. //depot/projects/mips2/src/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libthr/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/mips2/src/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libthr/arch/sparc64/include/pthread_md.h#3 integrate .. //depot/projects/mips2/src/lib/libthr/pthread.map#6 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_mutex.c#9 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_sem.c#5 integrate .. //depot/projects/mips2/src/lib/libutil/pty.3#2 integrate .. //depot/projects/mips2/src/lib/libutil/pty.c#5 integrate .. //depot/projects/mips2/src/lib/msun/Makefile#5 integrate .. //depot/projects/mips2/src/lib/msun/Symbol.map#5 integrate .. //depot/projects/mips2/src/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/mips2/src/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/mips2/src/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/mips2/src/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/mips2/src/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/mips2/src/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/mips2/src/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/mips2/src/lib/msun/bsdsrc/b_tgamma.c#3 integrate .. //depot/projects/mips2/src/lib/msun/i387/Makefile.inc#4 integrate .. //depot/projects/mips2/src/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/mips2/src/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/mips2/src/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/mips2/src/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/mips2/src/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/mips2/src/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/mips2/src/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/mips2/src/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/mips2/src/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/mips2/src/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/mips2/src/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/mips2/src/lib/msun/man/cos.3#3 integrate .. //depot/projects/mips2/src/lib/msun/man/exp.3#3 integrate .. //depot/projects/mips2/src/lib/msun/man/j0.3#3 integrate .. //depot/projects/mips2/src/lib/msun/man/lgamma.3#3 integrate .. //depot/projects/mips2/src/lib/msun/man/log.3#1 branch .. //depot/projects/mips2/src/lib/msun/man/lrint.3#2 integrate .. //depot/projects/mips2/src/lib/msun/man/rint.3#3 integrate .. //depot/projects/mips2/src/lib/msun/man/sin.3#3 integrate .. //depot/projects/mips2/src/lib/msun/man/tan.3#3 integrate .. //depot/projects/mips2/src/lib/msun/powerpc/fenv.h#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_exp.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_lgamma_r.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_lgammaf_r.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_log.c#4 integrate .. //depot/projects/mips2/src/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_logf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_remainder.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_remainderf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_scalbf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/k_rem_pio2f.c#2 delete .. //depot/projects/mips2/src/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/math.h#4 integrate .. //depot/projects/mips2/src/lib/msun/src/math_private.h#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_cos.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_cosf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_expm1.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_expm1f.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_frexp.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_ilogb.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_ilogbf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_logb.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_nextafter.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_nextafterf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_significand.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_sin.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_sinf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_sinl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_tan.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_tanf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_tanh.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_tanl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_tgammaf.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/s_trunc.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/mips2/src/lib/ncurses/ncurses/Makefile#5 integrate .. //depot/projects/mips2/src/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/mips2/src/release/Makefile#10 integrate .. //depot/projects/mips2/src/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/mips2/src/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/mips2/src/release/fixit.profile#3 integrate .. //depot/projects/mips2/src/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/mips2/src/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/mips2/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/mips2/src/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/mips2/src/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/mips2/src/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/mips2/src/sbin/dhclient/dhclient-script#5 integrate .. //depot/projects/mips2/src/sbin/ffsinfo/ffsinfo.c#3 integrate .. //depot/projects/mips2/src/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/mips2/src/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/mips2/src/sbin/geom/core/geom.8#3 integrate .. //depot/projects/mips2/src/sbin/geom/core/geom.c#5 integrate .. //depot/projects/mips2/src/sbin/gpt/gpt.8#3 integrate .. //depot/projects/mips2/src/sbin/gpt/gpt.c#4 integrate .. //depot/projects/mips2/src/sbin/gpt/migrate.c#2 integrate .. //depot/projects/mips2/src/sbin/gpt/show.c#3 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/mips2/src/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/mips2/src/sbin/md5/md5.c#2 integrate .. //depot/projects/mips2/src/sbin/mount/getmntopts.3#2 integrate .. //depot/projects/mips2/src/sbin/mount/mount.c#6 integrate .. //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.8#3 integrate .. //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/mips2/src/sbin/natd/natd.8#3 integrate .. //depot/projects/mips2/src/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/mips2/src/sbin/quotacheck/quotacheck.8#3 integrate .. //depot/projects/mips2/src/sbin/quotacheck/quotacheck.c#4 integrate .. //depot/projects/mips2/src/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/mips2/src/sbin/sconfig/sconfig.c#3 integrate .. //depot/projects/mips2/src/sbin/setkey/parse.y#4 integrate .. //depot/projects/mips2/src/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/mips2/src/share/colldef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/mips2/src/share/man/man3/tree.3#2 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#14 integrate .. //depot/projects/mips2/src/share/man/man4/ath.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/atkbd.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/awi.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/axe.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/ciss.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/coda.4#1 branch .. //depot/projects/mips2/src/share/man/man4/dcons.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ed.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/edsc.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/mips2/src/share/man/man4/hptiop.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ip6.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/ipmi.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/lagg.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/man4.i386/ep.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/mfi.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/mxge.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/oldcard.4#2 delete .. //depot/projects/mips2/src/share/man/man4/pci.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/pcib.4#1 branch .. //depot/projects/mips2/src/share/man/man4/puc.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/rr232x.4#3 delete .. //depot/projects/mips2/src/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/sched_ule.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/sf.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/sk.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/snd_envy24.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/snd_envy24ht.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/snd_spicds.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/syncache.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/vlan.4#5 integrate .. //depot/projects/mips2/src/share/man/man4/wi.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/xl.4#3 integrate .. //depot/projects/mips2/src/share/man/man5/boot.config.5#2 integrate .. //depot/projects/mips2/src/share/man/man5/fstab.5#3 integrate .. //depot/projects/mips2/src/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/mips2/src/share/man/man5/src.conf.5#7 integrate .. //depot/projects/mips2/src/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/mips2/src/share/man/man7/clocks.7#2 integrate .. //depot/projects/mips2/src/share/man/man7/ports.7#8 integrate .. //depot/projects/mips2/src/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/mips2/src/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/mips2/src/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/mips2/src/share/man/man9/Makefile#9 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/lock.9#5 integrate .. //depot/projects/mips2/src/share/man/man9/mbuf.9#4 integrate .. //depot/projects/mips2/src/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/pci.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/style.9#3 integrate .. //depot/projects/mips2/src/share/misc/bsd-family-tree#8 integrate .. //depot/projects/mips2/src/share/misc/committers-ports.dot#6 integrate .. //depot/projects/mips2/src/share/misc/committers-src.dot#6 integrate .. //depot/projects/mips2/src/share/misc/pci_vendors#4 integrate .. //depot/projects/mips2/src/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/mips2/src/share/mk/bsd.libnames.mk#6 integrate .. //depot/projects/mips2/src/share/mk/bsd.own.mk#8 integrate .. //depot/projects/mips2/src/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/mips2/src/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/mips2/src/share/msgdef/Makefile#3 integrate .. //depot/projects/mips2/src/share/msgdef/ko_KR.UTF-8.src#1 branch .. //depot/projects/mips2/src/share/msgdef/ko_KR.eucKR.src#2 integrate .. //depot/projects/mips2/src/share/termcap/termcap.src#3 integrate .. //depot/projects/mips2/src/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/mips2/src/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/mips2/src/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/mips2/src/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/mips2/src/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/mips2/src/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/da_DK.ISO8859-1.src#3 integrate .. //depot/projects/mips2/src/share/timedef/da_DK.UTF-8.src#3 integrate .. //depot/projects/mips2/src/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/mips2/src/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/mips2/src/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/mips2/src/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/mips2/src/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/mips2/src/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/mips2/src/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/mips2/src/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/mips2/src/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/mips2/src/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/mips2/src/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/mips2/src/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/mips2/src/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/mn_MN.UTF-8.src#2 integrate .. //depot/projects/mips2/src/share/timedef/nl_NL.ISO8859-1.src#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 02:35:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06D9016A405; Mon, 25 Feb 2008 02:35:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA8AE16A402 for ; Mon, 25 Feb 2008 02:35:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE46A13C468 for ; Mon, 25 Feb 2008 02:35:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P2ZRVv014439 for ; Mon, 25 Feb 2008 02:35:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P2Z60O014390 for perforce@freebsd.org; Mon, 25 Feb 2008 02:35:06 GMT (envelope-from imp@freebsd.org) Date: Mon, 25 Feb 2008 02:35:06 GMT Message-Id: <200802250235.m1P2Z60O014390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 02:35:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=136137 Change 136137 by imp@imp_paco-paco on 2008/02/25 02:34:28 Big IFC from mips2 @136136 Affected files ... .. //depot/projects/mips2-jnpr/src/COPYRIGHT#2 integrate .. //depot/projects/mips2-jnpr/src/LOCKS#2 integrate .. //depot/projects/mips2-jnpr/src/MAINTAINERS#2 integrate .. //depot/projects/mips2-jnpr/src/Makefile#5 integrate .. //depot/projects/mips2-jnpr/src/Makefile.inc1#6 integrate .. //depot/projects/mips2-jnpr/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/mips2-jnpr/src/UPDATING#2 integrate .. //depot/projects/mips2-jnpr/src/bin/date/date.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/sh/cd.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/sh/mksyntax.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/BUGS#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/FAQ#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/HACKING#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/INSTALL#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/NEWS#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/README#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/TESTS#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/TODO#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/config.h.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/configure#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/configure.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/README#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/getdate#1 branch .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/mips2-jnpr/src/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/add.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/client.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/client.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/history.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/history.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/import.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/log.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/login.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/release.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/root.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/root.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/run.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/server.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/server.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/status.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/update.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/version.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/cvs/tools/README#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/blender#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/chi#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/cvs#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/efi#1 branch .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/fortran#1 branch .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/hdf#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/impulse#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/java#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/acconfig.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/compress.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/config.h.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/configure#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/configure.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/file.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/file.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/file.man#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/file_opts.h#1 branch .. //depot/projects/mips2-jnpr/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/funcs.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/install-sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/magic.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/magic.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/magic.man#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/magic.mime#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/missing#2 delete .. //depot/projects/mips2-jnpr/src/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/names.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/print.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/readelf.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/readelf.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/file/stamp-h.in#2 delete .. //depot/projects/mips2-jnpr/src/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/NEWS#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/config.guess#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/config.sub#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/configure#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/configure.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/headers#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/form/modules#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/headers#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/install-sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/mkinstalldirs#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/COPYING#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/HISTORY#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/Makefile.in#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/README#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/ansi.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/charset.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/color.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/control.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/crum.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/edit.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/fun.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/init.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/menu.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/modes.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/modules#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/output.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/pad.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/scan.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/sync.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/sysdep.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/tack.1#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/tack.c#2 delete .. //depot/projects/mips2-jnpr/src/contrib/ncurses/tack/tack.h#2 delete .. //depot/projects/mips2-jnpr/src/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/mips2-jnpr/src/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/top/display.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/top/layout.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/top/machine.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/top/top.c#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/top/top.h#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/traceroute/as.c#1 branch .. //depot/projects/mips2-jnpr/src/contrib/traceroute/as.h#1 branch .. //depot/projects/mips2-jnpr/src/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/mips2-jnpr/src/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/mips2-jnpr/src/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2-jnpr/src/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/mips2-jnpr/src/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/mips2-jnpr/src/etc/defaults/periodic.conf#2 integrate .. //depot/projects/mips2-jnpr/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/mips2-jnpr/src/etc/devd.conf#2 integrate .. //depot/projects/mips2-jnpr/src/etc/mail/access.sample#2 integrate .. //depot/projects/mips2-jnpr/src/etc/namedb/named.conf#2 integrate .. //depot/projects/mips2-jnpr/src/etc/namedb/named.root#2 integrate .. //depot/projects/mips2-jnpr/src/etc/netstart#2 integrate .. //depot/projects/mips2-jnpr/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/mips2-jnpr/src/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/hostid#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/jail#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/kerberos#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/netif#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/ppp#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.firewall#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.firewall6#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.subr#2 integrate .. //depot/projects/mips2-jnpr/src/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/mips2-jnpr/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/mips2-jnpr/src/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/mips2-jnpr/src/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/mips2-jnpr/src/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/man/manpath/manpath.c#2 integrate .. //depot/projects/mips2-jnpr/src/include/fts.h#2 integrate .. //depot/projects/mips2-jnpr/src/include/pthread_np.h#2 integrate .. //depot/projects/mips2-jnpr/src/include/unistd.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/cpio.5#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/README#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/mips2-jnpr/src/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/mips2-jnpr/src/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/include/namespace.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/locale/ascii.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/flock.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/mips2-jnpr/src/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libdisk/disk.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libfetch/common.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libfetch/fetch.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libfetch/http.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libkse/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libkse/kse.map#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libkvm/kvm.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libmagic/config.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libmilter/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libpmc/pmc.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libutil/pty.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libutil/pty.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/Symbol.map#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/s_llrintl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/s_lrintl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/s_rintl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/i387/s_llrintl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/i387/s_lrintl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/i387/s_rintl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/man/cos.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/exp.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/j0.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/lgamma.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/log.3#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/man/lrint.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/rint.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/sin.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/tan.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/powerpc/fenv.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_exp.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_log.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_remainder.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_remainderf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_rem_pio2f.c#2 delete .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/math.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/math_private.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_cos.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_cosf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_expm1.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_expm1f.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_frexp.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_ilogb.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_ilogbf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_llrintl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_logb.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_lrintl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_modff.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_nearbyint.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_nextafter.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_nextafterf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_rintl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_significand.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_sin.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_sinf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_sinl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_tan.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_tanf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_tanh.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_tanl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_tgammaf.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_trunc.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/w_cabs.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/mips2-jnpr/src/release/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/mips2-jnpr/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/mips2-jnpr/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/mips2-jnpr/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/mips2-jnpr/src/release/fixit.profile#2 integrate .. //depot/projects/mips2-jnpr/src/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/mips2-jnpr/src/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/mips2-jnpr/src/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/mips2-jnpr/src/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/mips2-jnpr/src/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/mips2-jnpr/src/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/core/geom.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/core/geom.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/gpt/migrate.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/gpt/show.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/md5/md5.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/mount/getmntopts.3#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/mount/mount.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/natd/natd.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/mips2-jnpr/src/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/setkey/parse.y#2 integrate .. //depot/projects/mips2-jnpr/src/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/mips2-jnpr/src/share/colldef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man3/tree.3#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ath.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/atkbd.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/awi.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/axe.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ciss.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/coda.4#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man4/dcons.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ed.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/edsc.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man4/hptiop.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ip6.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ipmi.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/mfi.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/mxge.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/oldcard.4#2 delete .. //depot/projects/mips2-jnpr/src/share/man/man4/pci.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/pcib.4#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man4/puc.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/rr232x.4#2 delete .. //depot/projects/mips2-jnpr/src/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/sf.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/sk.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/syncache.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/wi.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/xl.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/boot.config.5#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/fstab.5#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man7/clocks.7#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man7/ports.7#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/mips2-jnpr/src/share/man/man9/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/mbuf.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/pci.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/style.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/mips2-jnpr/src/share/misc/committers-ports.dot#2 integrate .. //depot/projects/mips2-jnpr/src/share/misc/committers-src.dot#2 integrate .. //depot/projects/mips2-jnpr/src/share/misc/pci_vendors#2 integrate .. //depot/projects/mips2-jnpr/src/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/mips2-jnpr/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/mips2-jnpr/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/mips2-jnpr/src/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/mips2-jnpr/src/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/msgdef/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/share/msgdef/ko_KR.UTF-8.src#1 branch .. //depot/projects/mips2-jnpr/src/share/msgdef/ko_KR.eucKR.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/termcap/termcap.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/mips2-jnpr/src/share/timedef/mn_MN.UTF-8.src#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 02:54:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 801FC16A406; Mon, 25 Feb 2008 02:54:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4201F16A400 for ; Mon, 25 Feb 2008 02:54:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 47CAA13C474 for ; Mon, 25 Feb 2008 02:54:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P2sukm015046 for ; Mon, 25 Feb 2008 02:54:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P2stMd015043 for perforce@freebsd.org; Mon, 25 Feb 2008 02:54:55 GMT (envelope-from sam@freebsd.org) Date: Mon, 25 Feb 2008 02:54:55 GMT Message-Id: <200802250254.m1P2stMd015043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 02:54:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=136138 Change 136138 by sam@sam_ebb on 2008/02/25 02:54:10 o require drivers to allocate the ifnet w/ IFT_IEEE80211 instead of blindly clobbering if_type in ieee80211_ifattach; this is effectively a noop but codifies the fact drivers are 802.11-specific o fix various radiotap bogosity in drivers; in particular we no longer need to use bpfattach2 or maintain a private sc_drvbpf as if_bpf isn't used by way of attaching as an 802.11 device (and not calling ether_ifattach) Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#36 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#17 edit .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#8 edit .. //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#6 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#13 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#8 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#15 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#10 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#12 edit .. //depot/projects/vap/sys/dev/ral/rt2661var.h#7 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#7 edit .. //depot/projects/vap/sys/dev/usb/if_rumvar.h#5 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#9 edit .. //depot/projects/vap/sys/dev/usb/if_uralvar.h#7 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#8 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#5 edit .. //depot/projects/vap/sys/dev/wi/if_wi.c#11 edit .. //depot/projects/vap/sys/dev/wi/if_wivar.h#8 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#7 edit .. //depot/projects/vap/sys/net80211/ieee80211.c#26 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#36 (text+ko) ==== @@ -293,7 +293,7 @@ DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid); - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(sc->sc_dev, "can not if_alloc()\n"); error = ENOSPC; @@ -3754,14 +3754,13 @@ } static int -ath_rx_tap(struct ath_softc *sc, struct mbuf *m, +ath_rx_tap(struct ifnet *ifp, struct mbuf *m, const struct ath_rx_status *rs, u_int64_t tsf, int16_t nf) { #define CHANNEL_HT (CHANNEL_HT20|CHANNEL_HT40PLUS|CHANNEL_HT40MINUS) + struct ath_softc *sc = ifp->if_softc; u_int8_t rix; - KASSERT(sc->sc_drvbpf != NULL, ("no tap")); - /* * Discard anything shorter than an ack or cts. */ @@ -3802,7 +3801,7 @@ sc->sc_rx_th.wr_antnoise = nf; sc->sc_rx_th.wr_antenna = rs->rs_antenna; - bpf_mtap2(sc->sc_drvbpf, &sc->sc_rx_th, sc->sc_rx_th_len, m); + bpf_mtap2(ifp->if_bpf, &sc->sc_rx_th, sc->sc_rx_th_len, m); return 1; #undef CHANNEL_HT @@ -3951,14 +3950,14 @@ * pass decrypt+mic errors but others may be * interesting (e.g. crc). */ - if (bpf_peers_present(sc->sc_drvbpf) && + if (bpf_peers_present(ifp->if_bpf) && (rs->rs_status & sc->sc_monpass)) { bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_POSTREAD); /* NB: bpf needs the mbuf length setup */ len = rs->rs_datalen; m->m_pkthdr.len = m->m_len = len; - (void) ath_rx_tap(sc, m, rs, tsf, nf); + (void) ath_rx_tap(ifp, m, rs, tsf, nf); } /* XXX pass MIC errors up for s/w reclaculation */ goto rx_next; @@ -4015,8 +4014,8 @@ sc->sc_stats.ast_ant_rx[rs->rs_antenna]++; - if (bpf_peers_present(sc->sc_drvbpf) && - !ath_rx_tap(sc, m, rs, tsf, nf)) { + if (bpf_peers_present(ifp->if_bpf) && + !ath_rx_tap(ifp, m, rs, tsf, nf)) { m_freem(m); /* XXX reclaim */ goto rx_next; } @@ -4758,7 +4757,7 @@ ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, sc->sc_hwmap[txrate].ieeerate, -1); - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); sc->sc_tx_th.wt_tsf = htole64(tsf); @@ -4771,8 +4770,7 @@ sc->sc_tx_th.wt_txpower = ni->ni_txpower; sc->sc_tx_th.wt_antenna = sc->sc_txantenna; - bpf_mtap2(sc->sc_drvbpf, - &sc->sc_tx_th, sc->sc_tx_th_len, m0); + bpf_mtap2(ifp->if_bpf, &sc->sc_tx_th, sc->sc_tx_th_len, m0); } /* @@ -6591,9 +6589,8 @@ { struct ifnet *ifp = sc->sc_ifp; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th)); /* * Initialize constant fields. * XXX make header lengths a multiple of 32-bits so subsequent @@ -6618,6 +6615,7 @@ const struct ieee80211_bpf_params *params) { struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; struct ath_hal *ah = sc->sc_ah; int error, ismcast, ismrr; int hdrlen, pktlen, try0, txantenna; @@ -6702,7 +6700,7 @@ ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, sc->sc_hwmap[txrate].ieeerate, -1); - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { u_int64_t tsf = ath_hal_gettsf64(ah); sc->sc_tx_th.wt_tsf = htole64(tsf); @@ -6713,8 +6711,7 @@ sc->sc_tx_th.wt_txpower = ni->ni_txpower; sc->sc_tx_th.wt_antenna = sc->sc_txantenna; - bpf_mtap2(sc->sc_drvbpf, - &sc->sc_tx_th, sc->sc_tx_th_len, m0); + bpf_mtap2(ifp->if_bpf, &sc->sc_tx_th, sc->sc_tx_th_len, m0); } /* ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#17 (text+ko) ==== @@ -283,7 +283,6 @@ u_int sc_rfsilentpin; /* GPIO pin for rfkill int */ u_int sc_rfsilentpol; /* pin setting for rfkill on */ - struct bpf_if *sc_drvbpf; struct ath_tx_radiotap_header sc_tx_th; int sc_tx_th_len; struct ath_rx_radiotap_header sc_rx_th; ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#8 (text+ko) ==== @@ -280,7 +280,7 @@ goto fail; } - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(dev, "can not if_alloc()\n"); goto fail; @@ -345,9 +345,8 @@ ic->ic_vap_create = ipw_vap_create; ic->ic_vap_delete = ipw_vap_delete; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap)); sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); @@ -1167,7 +1166,7 @@ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = le32toh(status->len); - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct ipw_rx_radiotap_header *tap = &sc->sc_rxtap; tap->wr_flags = 0; @@ -1175,7 +1174,7 @@ tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } if (sc->flags & IPW_FLAG_SCANNING) @@ -1526,14 +1525,14 @@ wh = mtod(m0, struct ieee80211_frame *); } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct ipw_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } shdr = SLIST_FIRST(&sc->free_shdr); ==== //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#6 (text+ko) ==== @@ -158,8 +158,6 @@ uint32_t rxcur; int txfree; - struct bpf_if *sc_drvbpf; - struct ipw_rx_radiotap_header sc_rxtap; int sc_rxtap_len; ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#13 (text+ko) ==== @@ -350,7 +350,7 @@ iwi_wme_init(sc); - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(dev, "can not if_alloc()\n"); goto fail; @@ -412,9 +412,8 @@ ic->ic_vap_create = iwi_vap_create; ic->ic_vap_delete = iwi_vap_delete; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap)); sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); @@ -1263,7 +1262,7 @@ m_adj(m, sizeof (struct iwi_hdr) + sizeof (struct iwi_frame)); - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct iwi_rx_radiotap_header *tap = &sc->sc_rxtap; tap->wr_flags = 0; @@ -1271,7 +1270,7 @@ tap->wr_antsignal = frame->signal; tap->wr_antenna = frame->antenna; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } IWI_UNLOCK(sc); @@ -1793,12 +1792,12 @@ wh = mtod(m0, struct ieee80211_frame *); } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct iwi_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data = &txq->data[txq->cur]; ==== //depot/projects/vap/sys/dev/iwi/if_iwivar.h#8 (text+ko) ==== @@ -230,20 +230,11 @@ int sc_cmd_cur; /* current queued scan task */ int sc_cmd_next; /* last queued scan task */ unsigned long sc_maxdwell; /* max dwell time for curchan */ - struct bpf_if *sc_drvbpf; - union { - struct iwi_rx_radiotap_header th; - uint8_t pad[64]; - } sc_rxtapu; -#define sc_rxtap sc_rxtapu.th + struct iwi_rx_radiotap_header sc_rxtap; int sc_rxtap_len; - union { - struct iwi_tx_radiotap_header th; - uint8_t pad[64]; - } sc_txtapu; -#define sc_txtap sc_txtapu.th + struct iwi_tx_radiotap_header sc_txtap; int sc_txtap_len; }; ==== //depot/projects/vap/sys/dev/ral/rt2560.c#15 (text) ==== @@ -258,7 +258,7 @@ goto fail5; } - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(sc->sc_dev, "can not if_alloc()\n"); goto fail6; @@ -307,9 +307,8 @@ ic->ic_vap_create = rt2560_vap_create; ic->ic_vap_delete = rt2560_vap_delete; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap)); sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); @@ -1239,7 +1238,7 @@ m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff; - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2560_rx_radiotap_header *tap = &sc->sc_rxtap; uint32_t tsf_lo, tsf_hi; @@ -1254,7 +1253,7 @@ tap->wr_antenna = sc->rx_ant; tap->wr_antsignal = RT2560_RSSI(sc, desc->rssi); - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } sc->sc_flags |= RT2560_F_INPUT_RUNNING; @@ -1554,6 +1553,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = sc->sc_ifp; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; bus_dma_segment_t segs[RT2560_MAX_SCATTER]; @@ -1574,7 +1574,7 @@ return error; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1583,7 +1583,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; @@ -1610,6 +1610,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = sc->sc_ifp; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; struct ieee80211_frame *wh; @@ -1643,7 +1644,7 @@ return error; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1652,7 +1653,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; @@ -1700,6 +1701,7 @@ struct ieee80211_node *ni, const struct ieee80211_bpf_params *params) { struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; bus_dma_segment_t segs[RT2560_MAX_SCATTER]; @@ -1726,7 +1728,7 @@ return error; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1735,7 +1737,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; @@ -1802,6 +1804,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = sc->sc_ifp; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; struct rt2560_node *rn; @@ -1943,14 +1946,14 @@ wh = mtod(m0, struct ieee80211_frame *); } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; tap->wt_rate = rate; tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; ==== //depot/projects/vap/sys/dev/ral/rt2560var.h#10 (text) ==== @@ -155,8 +155,6 @@ int tx_ant; int nb_ant; - struct bpf_if *sc_drvbpf; - struct rt2560_rx_radiotap_header sc_rxtap; int sc_rxtap_len; ==== //depot/projects/vap/sys/dev/ral/rt2661.c#12 (text) ==== @@ -284,7 +284,7 @@ goto fail3; } - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(sc->sc_dev, "can not if_alloc()\n"); error = ENOMEM; @@ -338,9 +338,8 @@ ic->ic_vap_create = rt2661_vap_create; ic->ic_vap_delete = rt2661_vap_delete; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap)); sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); @@ -1146,7 +1145,7 @@ rssi = rt2661_get_rssi(sc, desc->rssi); - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2661_rx_radiotap_header *tap = &sc->sc_rxtap; uint32_t tsf_lo, tsf_hi; @@ -1160,7 +1159,7 @@ tap->wr_rate = rt2661_rxrate(desc); tap->wr_antsignal = rssi < 0 ? 0 : rssi; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } sc->sc_flags |= RAL_INPUT_RUNNING; RAL_UNLOCK(sc); @@ -1476,6 +1475,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = sc->sc_ifp; struct rt2661_tx_desc *desc; struct rt2661_tx_data *data; struct ieee80211_frame *wh; @@ -1509,13 +1509,13 @@ return error; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2661_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; tap->wt_rate = rate; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; @@ -1595,6 +1595,7 @@ struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = &sc->sc_ic; struct rt2661_tx_ring *txq = &sc->txq[ac]; + struct ifnet *ifp = sc->sc_ifp; struct rt2661_tx_desc *desc; struct rt2661_tx_data *data; struct rt2661_node *rn; @@ -1740,7 +1741,7 @@ wh = mtod(m0, struct ieee80211_frame *); } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rt2661_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1748,7 +1749,7 @@ tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; ==== //depot/projects/vap/sys/dev/ral/rt2661var.h#7 (text) ==== @@ -158,8 +158,6 @@ int dwelltime; - struct bpf_if *sc_drvbpf; - struct rt2661_rx_radiotap_header sc_rxtap; int sc_rxtap_len; ==== //depot/projects/vap/sys/dev/usb/if_rum.c#7 (text+ko) ==== @@ -470,7 +470,7 @@ return ENXIO; } - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { printf("%s: can not if_alloc()\n", device_get_nameunit(sc->sc_dev)); @@ -520,9 +520,8 @@ ic->ic_vap_create = rum_vap_create; ic->ic_vap_delete = rum_vap_delete; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + IEEE80211_RADIOTAP_HDRLEN, - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof (struct ieee80211_frame) + sizeof(sc->sc_txtap)); sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); @@ -925,7 +924,7 @@ rssi = rum_get_rssi(sc, desc->rssi); - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rum_rx_radiotap_header *tap = &sc->sc_rxtap; tap->wr_flags = IEEE80211_RADIOTAP_F_FCS; @@ -935,7 +934,7 @@ tap->wr_antenna = sc->rx_ant; tap->wr_antsignal = rssi; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); @@ -1120,6 +1119,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; struct rum_tx_desc *desc; struct rum_tx_data *data; struct ieee80211_frame *wh; @@ -1161,7 +1161,7 @@ flags |= RT2573_TX_TIMESTAMP; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1170,7 +1170,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); @@ -1210,6 +1210,7 @@ const struct ieee80211_bpf_params *params) { struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; struct rum_tx_desc *desc; struct rum_tx_data *data; uint32_t flags; @@ -1231,7 +1232,7 @@ if ((params->ibp_flags & IEEE80211_BPF_NOACK) == 0) flags |= RT2573_TX_NEED_ACK; - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1240,7 +1241,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; @@ -1281,6 +1282,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; struct rum_tx_desc *desc; struct rum_tx_data *data; struct ieee80211_frame *wh; @@ -1329,7 +1331,7 @@ *(uint16_t *)wh->i_dur = htole16(dur); } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1338,7 +1340,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); ==== //depot/projects/vap/sys/dev/usb/if_rumvar.h#5 (text+ko) ==== @@ -140,8 +140,6 @@ int sifs; uint8_t bbp17; - struct bpf_if *sc_drvbpf; - struct rum_rx_radiotap_header sc_rxtap; int sc_rxtap_len; ==== //depot/projects/vap/sys/dev/usb/if_ural.c#9 (text+ko) ==== @@ -460,7 +460,7 @@ device_get_nameunit(sc->sc_dev), sc->asic_rev, ural_get_rf(sc->rf_rev)); - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { printf("%s: can not if_alloc()\n", device_get_nameunit(sc->sc_dev)); @@ -509,8 +509,8 @@ ic->ic_vap_create = ural_vap_create; ic->ic_vap_delete = ural_vap_delete; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof (struct ieee80211_frame) + sizeof(sc->sc_txtap)); sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); @@ -993,7 +993,7 @@ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff; - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct ural_rx_radiotap_header *tap = &sc->sc_rxtap; tap->wr_flags = IEEE80211_RADIOTAP_F_FCS; @@ -1003,7 +1003,7 @@ tap->wr_antenna = sc->rx_ant; tap->wr_antsignal = URAL_RSSI(desc->rssi); - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } /* Strip trailing 802.11 MAC FCS. */ @@ -1216,6 +1216,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = sc->sc_ifp; const struct ieee80211_txparam *tp; struct ural_tx_desc *desc; struct ural_tx_data *data; @@ -1259,7 +1260,7 @@ flags |= RAL_TX_TIMESTAMP; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct ural_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1268,7 +1269,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RAL_TX_DESC_SIZE); @@ -1309,6 +1310,7 @@ const struct ieee80211_bpf_params *params) { struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = sc->sc_ifp; struct ural_tx_desc *desc; struct ural_tx_data *data; uint32_t flags; @@ -1327,7 +1329,7 @@ return EINVAL; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct ural_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1336,7 +1338,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } data->m = m0; @@ -1385,6 +1387,7 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = sc->sc_ifp; struct ural_tx_desc *desc; struct ural_tx_data *data; struct ieee80211_frame *wh; @@ -1431,7 +1434,7 @@ *(uint16_t *)wh->i_dur = htole16(dur); } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct ural_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1440,7 +1443,7 @@ tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RAL_TX_DESC_SIZE); ==== //depot/projects/vap/sys/dev/usb/if_uralvar.h#7 (text+ko) ==== @@ -134,8 +134,6 @@ int tx_ant; int nb_ant; - struct bpf_if *sc_drvbpf; - struct ural_rx_radiotap_header sc_rxtap; int sc_rxtap_len; ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#8 (text+ko) ==== @@ -286,7 +286,7 @@ sc->sc_dev = dev; - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(dev, "can not if_alloc()\n"); return ENXIO; @@ -413,9 +413,8 @@ ic->ic_vap_create = zyd_vap_create; ic->ic_vap_delete = zyd_vap_delete; - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof(struct ieee80211_frame) + sizeof(sc->sc_txtap), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof(struct ieee80211_frame) + sizeof(sc->sc_txtap)); sc->sc_rxtap_len = sizeof(sc->sc_rxtap); sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); @@ -2007,7 +2006,7 @@ m->m_pkthdr.len = m->m_len = rlen; bcopy((const uint8_t *)(plcp + 1), mtod(m, uint8_t *), rlen); - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct zyd_rx_radiotap_header *tap = &sc->sc_rxtap; tap->wr_flags = 0; @@ -2021,7 +2020,7 @@ tap->wr_antsignal = stat->rssi + -95; tap->wr_antnoise = -95; /* XXX */ - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } rssi = stat->rssi > 63 ? 127 : 2 * stat->rssi; @@ -2176,13 +2175,13 @@ desc->plcp_service |= ZYD_PLCP_LENGEXT; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct zyd_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; tap->wt_rate = rate; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } m_copydata(m0, 0, m0->m_pkthdr.len, @@ -2345,7 +2344,7 @@ desc->plcp_service |= ZYD_PLCP_LENGEXT; } - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct zyd_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -2353,7 +2352,7 @@ tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } m_copydata(m0, 0, m0->m_pkthdr.len, ==== //depot/projects/vap/sys/dev/usb/if_zydreg.h#5 (text+ko) ==== @@ -1238,8 +1238,6 @@ int tx_timer; - struct bpf_if *sc_drvbpf; - struct zyd_rx_radiotap_header sc_rxtap; int sc_rxtap_len; ==== //depot/projects/vap/sys/dev/wi/if_wi.c#11 (text+ko) ==== @@ -266,7 +266,7 @@ }; int error; - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(dev, "can not if_alloc\n"); wi_free(dev); @@ -519,9 +519,8 @@ ieee80211_media_init(ic, wi_media_change, wi_media_status); #if NBPFILTER > 0 - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th)); /* * Initialize constant fields. * XXX make header lengths a multiple of 32-bits so subsequent @@ -958,11 +957,11 @@ frmhdr.wi_tx_ctl |= htole16(WI_TXCNTL_NOCRYPT); } #if NBPFILTER > 0 - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { sc->sc_tx_th.wt_rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - bpf_mtap2(sc->sc_drvbpf, - &sc->sc_tx_th, sc->sc_tx_th_len, m0); + bpf_mtap2(ifp->if_bpf, + &sc->sc_tx_th, sc->sc_tx_th_len, m0); } #endif m_copydata(m0, 0, sizeof(struct ieee80211_frame), @@ -1076,11 +1075,10 @@ } } #if NBPFILTER > 0 - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { sc->sc_tx_th.wt_rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - bpf_mtap2(sc->sc_drvbpf, - &sc->sc_tx_th, sc->sc_tx_th_len, m0); + bpf_mtap2(ifp->if_bpf, &sc->sc_tx_th, sc->sc_tx_th_len, m0); } #endif m_copydata(m0, 0, sizeof(struct ieee80211_frame), @@ -1676,7 +1674,7 @@ CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); #if NBPFILTER > 0 - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { /* XXX replace divide by table */ sc->sc_rx_th.wr_rate = frmhdr.wi_rx_rate / 5; sc->sc_rx_th.wr_antsignal = frmhdr.wi_rx_signal; @@ -1685,8 +1683,7 @@ if (frmhdr.wi_status & WI_STAT_PCF) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 03:02:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06B9616A406; Mon, 25 Feb 2008 03:02:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A91F816A401 for ; Mon, 25 Feb 2008 03:02:07 +0000 (UTC) (envelope-from sam@errno.com) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id 979D013C4E8 for ; Mon, 25 Feb 2008 03:02:07 +0000 (UTC) (envelope-from sam@errno.com) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id m1P326f5093649 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 24 Feb 2008 19:02:06 -0800 (PST) (envelope-from sam@errno.com) Message-ID: <47C22FAE.3080400@errno.com> Date: Sun, 24 Feb 2008 19:02:06 -0800 From: Sam Leffler User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: Perforce Change Reviews References: <200802250254.m1P2stMd015043@repoman.freebsd.org> In-Reply-To: <200802250254.m1P2stMd015043@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DCC--Metrics: ebb.errno.com; whitelist Cc: Subject: Re: PERFORCE change 136138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 03:02:08 -0000 Sam Leffler wrote: > http://perforce.freebsd.org/chv.cgi?CH=136138 > > Change 136138 by sam@sam_ebb on 2008/02/25 02:54:10 > > o require drivers to allocate the ifnet w/ IFT_IEEE80211 > instead of blindly clobbering if_type in ieee80211_ifattach; > this is effectively a noop but codifies the fact drivers > are 802.11-specific > o fix various radiotap bogosity in drivers; in particular > we no longer need to use bpfattach2 or maintain a private > sc_drvbpf as if_bpf isn't used by way of attaching as an > 802.11 device (and not calling ether_ifattach) > > FWIW switching over to use if_bpf is required to make tcpdump work on the parent device as otherwise BIOCSETIF fails because it checks for if_bpf being NULL and that doesn't happen any more as a side effect of calling ether_ifattach. netbsd is smarter about this; it walks the bpf_iflist regardless of if_bpf. Sam From owner-p4-projects@FreeBSD.ORG Mon Feb 25 03:29:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 608ED16A404; Mon, 25 Feb 2008 03:29:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 238F916A401 for ; Mon, 25 Feb 2008 03:29:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E927B13C442 for ; Mon, 25 Feb 2008 03:29:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P3TnZp017431 for ; Mon, 25 Feb 2008 03:29:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P3Tm3j017428 for perforce@freebsd.org; Mon, 25 Feb 2008 03:29:48 GMT (envelope-from sam@freebsd.org) Date: Mon, 25 Feb 2008 03:29:48 GMT Message-Id: <200802250329.m1P3Tm3j017428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 03:29:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=136139 Change 136139 by sam@sam_ebb on 2008/02/25 03:29:17 bring in iwn Affected files ... .. //depot/projects/vap/sys/contrib/dev/iwn/LICENSE#1 branch .. //depot/projects/vap/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#1 branch .. //depot/projects/vap/sys/dev/iwn/if_iwnreg.h#1 branch .. //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#1 branch .. //depot/projects/vap/sys/modules/iwn/Makefile#1 branch .. //depot/projects/vap/sys/modules/iwnfw/Makefile#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:12:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EBEB16A404; Mon, 25 Feb 2008 04:12:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D599116A402 for ; Mon, 25 Feb 2008 04:12:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BEA3613C43E for ; Mon, 25 Feb 2008 04:12:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4CqAn020081 for ; Mon, 25 Feb 2008 04:12:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4Cpca020078 for perforce@freebsd.org; Mon, 25 Feb 2008 04:12:51 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:12:51 GMT Message-Id: <200802250412.m1P4Cpca020078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:12:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=136140 Change 136140 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:11:51 ensure that access to xpq_queue is serialized add logging for queued updates Affected files ... .. //depot/projects/xen31/sys/i386/include/xen/xenfunc.h#2 edit .. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#10 edit .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#18 edit Differences ... ==== //depot/projects/xen31/sys/i386/include/xen/xenfunc.h#2 (text+ko) ==== @@ -55,7 +55,13 @@ int xen_boothowto(char *envp); -void xen_machphys_update(unsigned long, unsigned long); +void _xen_machphys_update(unsigned long, unsigned long, char *file, int line); + +#ifdef INVARIANTS +#define xen_machphys_update(a, b) _xen_machphys_update((a), (b), __FILE__, __LINE__) +#else +#define xen_machphys_update(a, b) _xen_machphys_update((a), (b), NULL, 0) +#endif void xen_update_descriptor(union descriptor *, union descriptor *); ==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#10 (text+ko) ==== @@ -35,7 +35,7 @@ #define _XEN_XENPMAP_H_ void xen_invlpg(vm_offset_t); void xen_load_cr3(vm_paddr_t); -void xen_queue_pt_update(vm_paddr_t, vm_paddr_t); +void _xen_queue_pt_update(vm_paddr_t, vm_paddr_t, char *, int); void xen_pt_switch(vm_paddr_t); void xen_set_ldt(vm_paddr_t, unsigned long); void xen_tlb_flush(void); @@ -47,6 +47,13 @@ void xen_flush_queue(void); void pmap_ref(pt_entry_t *pte, vm_paddr_t ma); +#ifdef INVARIANTS +#define xen_queue_pt_update(a, b) _xen_queue_pt_update((a), (b), __FILE__, __LINE__) +#else +#define xen_queue_pt_update(a, b) _xen_queue_pt_update((a), (b), NULL, 0) +#endif + + #include #include @@ -62,9 +69,6 @@ #define PMAP_DEC_REF_PAGE(a) #endif -#if 0 -#define WRITABLE_PAGETABLES -#endif #define ALWAYS_SYNC 0 #ifdef PT_DEBUG ==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#18 (text+ko) ==== @@ -84,6 +84,7 @@ xen_pfn_t *xen_phys_machine; int preemptable, init_first; extern unsigned int avail_space; +extern int gdt_set; void ni_cli(void); void ni_sti(void); @@ -190,7 +191,13 @@ #define XPQ_IDX xpq_idx[vcpu] #define SET_VCPU() int vcpu = smp_processor_id() #else +struct mmu_log { + char *file; + int line; +}; + static mmu_update_t xpq_queue[XPQUEUE_SIZE]; +static struct mmu_log xpq_queue_log[XPQUEUE_SIZE]; static int xpq_idx = 0; #define XPQ_QUEUE xpq_queue @@ -225,11 +232,36 @@ int error, i; /* window of vulnerability here? */ + if (__predict_true(gdt_set)) + critical_enter(); XPQ_IDX = 0; /* Make sure index is cleared first to avoid double updates. */ error = HYPERVISOR_mmu_update((mmu_update_t *)&XPQ_QUEUE, _xpq_idx, NULL, DOMID_SELF); +#if 0 + if (__predict_true(gdt_set)) + for (i = _xpq_idx; i > 0;) { + if (i >= 3) { + CTR6(KTR_PMAP, "mmu:val: %lx ptr: %lx val: %lx ptr: %lx val: %lx ptr: %lx", + (XPQ_QUEUE[i-1].val & 0xffffffff), (XPQ_QUEUE[i-1].ptr & 0xffffffff), + (XPQ_QUEUE[i-2].val & 0xffffffff), (XPQ_QUEUE[i-2].ptr & 0xffffffff), + (XPQ_QUEUE[i-3].val & 0xffffffff), (XPQ_QUEUE[i-3].ptr & 0xffffffff)); + i -= 3; + } else if (i == 2) { + CTR4(KTR_PMAP, "mmu: val: %lx ptr: %lx val: %lx ptr: %lx", + (XPQ_QUEUE[i-1].val & 0xffffffff), (XPQ_QUEUE[i-1].ptr & 0xffffffff), + (XPQ_QUEUE[i-2].val & 0xffffffff), (XPQ_QUEUE[i-2].ptr & 0xffffffff)); + i = 0; + } else { + CTR2(KTR_PMAP, "mmu: val: %lx ptr: %lx", + (XPQ_QUEUE[i-1].val & 0xffffffff), (XPQ_QUEUE[i-1].ptr & 0xffffffff)); + i = 0; + } + } +#endif + if (__predict_true(gdt_set)) + critical_exit(); if (__predict_false(error < 0)) { for (i = 0; i < _xpq_idx; i++) printf("val: %llx ptr: %llx\n", XPQ_QUEUE[i].val, XPQ_QUEUE[i].ptr); @@ -268,31 +300,50 @@ xen_load_cr3(vm_paddr_t val) { struct mmuext_op op; + + KASSERT(XPQ_IDX == 0, ("pending operations XPQ_IDX=%d", XPQ_IDX)); op.cmd = MMUEXT_NEW_BASEPTR; op.arg1.mfn = xpmap_ptom(val) >> PAGE_SHIFT; - xen_flush_queue(); PANIC_IF(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0); } void -xen_machphys_update(unsigned long mfn, unsigned long pfn) +_xen_machphys_update(unsigned long mfn, unsigned long pfn, char *file, int line) { + + if (__predict_true(gdt_set)) + critical_enter(); SET_VCPU(); - XPQ_QUEUE[XPQ_IDX].ptr = (mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; XPQ_QUEUE[XPQ_IDX].val = pfn; +#ifdef INVARIANTS + xpq_queue_log[XPQ_IDX].file = file; + xpq_queue_log[XPQ_IDX].line = line; +#endif xen_increment_idx(); - _xen_flush_queue(); + if (__predict_true(gdt_set)) + critical_exit(); } void -xen_queue_pt_update(vm_paddr_t ptr, vm_paddr_t val) +_xen_queue_pt_update(vm_paddr_t ptr, vm_paddr_t val, char *file, int line) { + + if (__predict_true(gdt_set)) + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + + if (__predict_true(gdt_set)) + critical_enter(); SET_VCPU(); - XPQ_QUEUE[XPQ_IDX].ptr = ((uint64_t)ptr) | MMU_NORMAL_PT_UPDATE; XPQ_QUEUE[XPQ_IDX].val = (uint64_t)val; +#ifdef INVARIANTS + xpq_queue_log[XPQ_IDX].file = file; + xpq_queue_log[XPQ_IDX].line = line; +#endif xen_increment_idx(); + if (__predict_true(gdt_set)) + critical_exit(); } void @@ -800,7 +851,8 @@ for (i = 0; i < 4; i++) IdlePTDnewma[i] = xpmap_ptom( VTOP((uint8_t *)IdlePTDnew + i*PAGE_SIZE)); - + + /* * L3 */ @@ -818,6 +870,7 @@ for (i = 0; i < 4; i++) pdir_shadow[PTDPTDI + i] = IdlePTDnewma[i] | PG_V; + PT_SET_MA(IdlePDPTnew, IdlePDPTnewma | PG_V); xen_pt_unpin(IdlePDPTma); #endif @@ -843,10 +896,12 @@ offset = KPTDI; #endif /* allocate remainder of NKPT pages */ - for (i = l1_pages; i < NKPT; i++, cur_space += PAGE_SIZE) + for (i = l1_pages; i < NKPT; i++, cur_space += PAGE_SIZE) { + xen_pt_pin(xpmap_ptom(VTOP(cur_space))); xen_queue_pt_update((vm_paddr_t)(IdlePTDma + (offset + i)*sizeof(vm_paddr_t)), - xpmap_ptom(VTOP(cur_space)) | PG_KERNEL); - + xpmap_ptom(VTOP(cur_space)) | PG_KERNEL); + } + PT_UPDATES_FLUSH(); /* * L1 - can't copy Xen's mappings @@ -861,9 +916,15 @@ PT_SET_MA((uint8_t *)pdir_shadow + i*PAGE_SIZE, pdir_shadow_ma[i] | PG_V); } + + xen_load_cr3(VTOP(IdlePDPTnew)); + xen_pgdpt_pin(xpmap_ptom(VTOP(IdlePDPTnew))); + for (i = 0; i < 4; i++) { + xen_queue_pt_update((vm_paddr_t)(IdlePTDnewma[2] + (PTDPTDI - 1024 + i)*sizeof(vm_paddr_t)), + IdlePTDnewma[i] | PG_V); + } + PT_UPDATES_FLUSH(); - xen_load_cr3(VTOP(IdlePDPTnew)); - IdlePTD = IdlePTDnew; IdlePDPT = IdlePDPTnew; IdlePDPTma = IdlePDPTnewma; From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:12:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A961D16A52D; Mon, 25 Feb 2008 04:12:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AB5F16A525 for ; Mon, 25 Feb 2008 04:12:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4776613C442 for ; Mon, 25 Feb 2008 04:12:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4Cr0p020087 for ; Mon, 25 Feb 2008 04:12:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4CqiO020084 for perforce@freebsd.org; Mon, 25 Feb 2008 04:12:52 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:12:52 GMT Message-Id: <200802250412.m1P4CqiO020084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:12:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=136141 Change 136141 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:12:29 increase logging - log SIGSEGV as well Affected files ... .. //depot/projects/xen31/sys/i386/i386/trap.c#10 edit Differences ... ==== //depot/projects/xen31/sys/i386/i386/trap.c#10 (text+ko) ==== @@ -745,7 +745,7 @@ { vm_offset_t va; struct vmspace *vm = NULL; - vm_map_t map; + vm_map_t map = NULL; int rv = 0; vm_prot_t ftype = 0; struct thread *td = curthread; @@ -834,10 +834,30 @@ return (-1); } #ifdef XEN - if (rv == KERN_PROTECTION_FAILURE) - log(LOG_ERR, "SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x\n", p->p_comm, va, ftype, frame->tf_eip); + if (rv) { + pt_entry_t pteval = 0; + + if (PTD[va >> PDRSHIFT]) + pteval = *(vtopte(va)); + if (rv == KERN_PROTECTION_FAILURE) { + + CTR5(KTR_PMAP, "SIGBUS: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x", + p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff)); + CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x", + vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err); + log(LOG_ERR, "SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", + p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval); + } else { + CTR5(KTR_PMAP, "SIGSEGV: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x", + p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff)); + CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x", + vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err); + log(LOG_ERR, "SIGSEGV: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", + p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval); + } + + } #endif - return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:13:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CF7916A404; Mon, 25 Feb 2008 04:13:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 604E616A401 for ; Mon, 25 Feb 2008 04:13:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 327AB13C467 for ; Mon, 25 Feb 2008 04:13:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4DwFW020183 for ; Mon, 25 Feb 2008 04:13:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4DvDx020180 for perforce@freebsd.org; Mon, 25 Feb 2008 04:13:57 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:13:57 GMT Message-Id: <200802250413.m1P4DvDx020180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:13:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=136142 Change 136142 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:13:06 increase KTR_ENTRIES only use KTR_PMAP Affected files ... .. //depot/projects/xen31/sys/i386/conf/XEN#6 edit Differences ... ==== //depot/projects/xen31/sys/i386/conf/XEN#6 (text+ko) ==== @@ -150,7 +150,7 @@ nooption ISAPNP options KTR -options KTR_COMPILE=(KTR_VM|KTR_PMAP|KTR_TRAP) +options KTR_COMPILE=(KTR_PMAP) options KTR_CPUMASK=0xff -options KTR_ENTRIES=8192 -options KTR_MASK=(KTR_VM|KTR_PMAP|KTR_TRAP) +options KTR_ENTRIES=65536 +options KTR_MASK=(KTR_PMAP) From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:17:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A76B616A40B; Mon, 25 Feb 2008 04:17:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 681B116A409 for ; Mon, 25 Feb 2008 04:17:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F77913C465 for ; Mon, 25 Feb 2008 04:17:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4H4WQ020280 for ; Mon, 25 Feb 2008 04:17:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4H3Hv020277 for perforce@freebsd.org; Mon, 25 Feb 2008 04:17:03 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:17:03 GMT Message-Id: <200802250417.m1P4H3Hv020277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:17:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=136143 Change 136143 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:16:08 add extensive KTR logging revert to recursive page tables eliminate most uses of writable page tables disable pmap_copy for now (causes SIGBUS) Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#39 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#39 (text+ko) ==== @@ -103,6 +103,8 @@ * and to when physical maps must be made correct. */ +#define PMAP_DIAGNOSTIC + #include "opt_cpu.h" #include "opt_pmap.h" #include "opt_msgbuf.h" @@ -112,6 +114,7 @@ #include #include #include +#include #include #include #include @@ -193,8 +196,6 @@ #define pmap_pte_u(pte) ((*(int *)pte & PG_A) != 0) #define pmap_pte_v(pte) ((*(int *)pte & PG_V) != 0) -#define pmap_pte_set_w(pte, v) ((v) ? atomic_set_int((u_int *)(pte), PG_W) : \ - atomic_clear_int((u_int *)(pte), PG_W)) #define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) struct pmap kernel_pmap_store; @@ -310,7 +311,6 @@ - static __inline void pagezero(void *page) { @@ -331,22 +331,27 @@ pd_set(struct pmap *pmap, int ptepindex, vm_paddr_t val, int type) { vm_paddr_t pdir_ma = vtomach(&pmap->pm_pdir[ptepindex]); - vm_paddr_t shadow_pdir_ma = vtomach(&pmap->pm_pdir_shadow[ptepindex]); switch (type) { case SH_PD_SET_VA: +#if 0 xen_queue_pt_update(shadow_pdir_ma, xpmap_ptom(val & ~(PG_RW))); +#endif xen_queue_pt_update(pdir_ma, xpmap_ptom(val)); break; case SH_PD_SET_VA_MA: +#if 0 xen_queue_pt_update(shadow_pdir_ma, val & ~(PG_RW)); +#endif xen_queue_pt_update(pdir_ma, val); break; case SH_PD_SET_VA_CLEAR: +#if 0 xen_queue_pt_update(shadow_pdir_ma, 0); +#endif xen_queue_pt_update(pdir_ma, 0); break; } @@ -409,7 +414,6 @@ #ifdef PAE kernel_pmap->pm_pdpt = (pdpt_entry_t *) (KERNBASE + (u_int)IdlePDPT); #endif - kernel_pmap->pm_pdir_shadow = PCPU_GET(pdir_shadow); kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvchunk); LIST_INIT(&allpmaps); @@ -441,7 +445,7 @@ } SYSMAP(caddr_t, CMAP1, CADDR1, 1) SYSMAP(caddr_t, CMAP3, CADDR3, 1) - *CMAP3 = 0; + PT_SET_MA(CADDR3, 0); /* * Crashdump maps. @@ -467,9 +471,8 @@ mtx_init(&PMAP2mutex, "PMAP2", NULL, MTX_DEF); virtual_avail = va; + PT_SET_MA(CADDR1, 0); - *CMAP1 = 0; - /* * Leave in place an identity mapping (virt == phys) for the low 1 MB * physical memory region that is used by the ACPI wakeup code. This @@ -809,6 +812,9 @@ u_int cpumask; u_int other_cpus; + CTR2(KTR_PMAP, "pmap_invalidate_page: pmap=%p va=0x%x", + pmap, va); + sched_pin(); if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { invlpg(va); @@ -832,6 +838,9 @@ u_int other_cpus; vm_offset_t addr; + CTR3(KTR_PMAP, "pmap_invalidate_page: pmap=%p eva=0x%x sva=0x%x", + pmap, sva, eva); + sched_pin(); if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { for (addr = sva; addr < eva; addr += PAGE_SIZE) @@ -857,6 +866,8 @@ u_int cpumask; u_int other_cpus; + CTR1(KTR_PMAP, "pmap_invalidate_page: pmap=%p", pmap); + sched_pin(); if (pmap == kernel_pmap || pmap->pm_active == all_cpus) { invltlb(); @@ -889,6 +900,8 @@ PMAP_INLINE void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { + CTR2(KTR_PMAP, "pmap_invalidate_page: pmap=%p va=0x%x", + pmap, va); if (pmap == kernel_pmap || pmap->pm_active) invlpg(va); @@ -900,6 +913,10 @@ { vm_offset_t addr; + if (eva - sva > PAGE_SIZE) + CTR3(KTR_PMAP, "pmap_invalidate_range: pmap=%p sva=0x%x eva=0x%x", + pmap, sva, eva); + if (pmap == kernel_pmap || pmap->pm_active) for (addr = sva; addr < eva; addr += PAGE_SIZE) invlpg(addr); @@ -910,6 +927,8 @@ pmap_invalidate_all(pmap_t pmap) { + CTR1(KTR_PMAP, "pmap_invalidate_all: pmap=%p", pmap); + if (pmap == kernel_pmap || pmap->pm_active) invltlb(); } @@ -933,8 +952,8 @@ { return (pmap == kernel_pmap || - (pmap == vmspace_pmap(curthread->td_proc->p_vmspace) && - (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde[0] & PG_FRAME))); + (pmap == vmspace_pmap(curthread->td_proc->p_vmspace) && + (pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde[0] & PG_FRAME))); } /* @@ -958,9 +977,11 @@ newpf = *pde & PG_FRAME; if ((*PMAP2 & PG_FRAME) != newpf) { PT_UPDATES_FLUSH(); - *PMAP2 = newpf | PG_V | PG_A | PG_M; - pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR2); + PT_SET_MA(PADDR2, newpf | PG_V | PG_A | PG_M); + CTR3(KTR_PMAP, "pmap_pte: pmap=%p va=0x%x newpte=0x%08x", + pmap, va, (*PMAP2 & 0xffffffff)); } + return (PADDR2 + (i386_btop(va) & (NPTEPG - 1))); } return (0); @@ -975,7 +996,9 @@ { if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2) { - *PMAP2 = 0; + CTR1(KTR_PMAP, "pmap_pte_release: pte=0x%jx", + *PMAP2); + PT_SET_VA(PMAP2, 0, TRUE); mtx_unlock(&PMAP2mutex); } } @@ -1016,11 +1039,13 @@ newpf = *pde & PG_FRAME; if ((*PMAP1 & PG_FRAME) != newpf) { PT_UPDATES_FLUSH(); - *PMAP1 = newpf | PG_V | PG_A | PG_M; + PT_SET_MA(PADDR1, newpf | PG_V | PG_A | PG_M); + CTR3(KTR_PMAP, "pmap_pte_quick: pmap=%p va=0x%x newpte=0x%jx", + pmap, va, *PMAP1); + #ifdef SMP PMAP1cpu = PCPU_GET(cpuid); #endif - invlcaddr(PADDR1); PMAP1changed++; } else #ifdef SMP @@ -1048,7 +1073,8 @@ vm_paddr_t rtval; pt_entry_t *pte; pd_entry_t pde; - + pt_entry_t pteval; + rtval = 0; PMAP_LOCK(pmap); pde = pmap->pm_pdir[va >> PDRSHIFT]; @@ -1059,7 +1085,8 @@ return rtval; } pte = pmap_pte(pmap, va); - rtval = (PT_GET(pte) & PG_FRAME) | (va & PAGE_MASK); + pteval = *pte ? xpmap_mtop(*pte) : 0; + rtval = (pteval & PG_FRAME) | (va & PAGE_MASK); pmap_pte_release(pte); } PMAP_UNLOCK(pmap); @@ -1124,7 +1151,7 @@ sched_pin(); pte = PT_GET(pmap_pte_quick(pmap, va)); if (*PMAP1) - *PMAP1 = 0; + PT_SET_MA(PADDR1, 0); if ((pte & PG_V) && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { m = PHYS_TO_VM_PAGE(pte & PG_FRAME); @@ -1149,10 +1176,7 @@ PMAP_INLINE void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { - pt_entry_t *pte; - - pte = vtopte(va); - pte_store(pte, pa | PG_RW | PG_V | pgeflag); + PT_SET_MA(va, xpmap_ptom(pa)| PG_RW | PG_V | pgeflag); } PMAP_INLINE void @@ -1205,6 +1229,8 @@ vm_offset_t va, sva; va = sva = *virt; + CTR4(KTR_PMAP, "pmap_map: va=0x%x start=0x%jx end=0x%jx prot=0x%x", + va, start, end, prot); while (start < end) { pmap_kenter(va, start); va += PAGE_SIZE; @@ -1235,7 +1261,8 @@ multicall_entry_t mcl[16]; multicall_entry_t *mclp = mcl; int error; - + + CTR2(KTR_PMAP, "pmap_qenter:sva=0x%x count=%d", va, count); pte = vtopte(sva); endpte = pte + count; while (pte < endpte) { @@ -1266,7 +1293,7 @@ #ifdef INVARIANTS for (pte = vtopte(sva), mclcount = 0; mclcount < count; mclcount++, pte++) - KASSERT(*pte, ("pte not set for va=0x%x\n", sva + mclcount*PAGE_SIZE)); + KASSERT(*pte, ("pte not set for va=0x%x", sva + mclcount*PAGE_SIZE)); #endif } @@ -1281,12 +1308,17 @@ { vm_offset_t va; + CTR2(KTR_PMAP, "pmap_qremove: sva=0x%x count=%d", sva, count); va = sva; + vm_page_lock_queues(); + critical_enter(); while (count-- > 0) { pmap_kremove(va); va += PAGE_SIZE; } pmap_invalidate_range(kernel_pmap, sva, va); + critical_exit(); + vm_page_unlock_queues(); } /*************************************************** @@ -1324,6 +1356,7 @@ { vm_offset_t pteva; + PT_UPDATES_FLUSH(); /* * unmap the page table page */ @@ -1401,8 +1434,8 @@ int pmap_pinit(pmap_t pmap) { - vm_page_t m, ptdpg[NPGPTD*2 + 1]; - int npgptd = NPGPTD*2 + 1; + vm_page_t m, ptdpg[NPGPTD + 1]; + int npgptd = NPGPTD + 1; static int color; int i; @@ -1419,17 +1452,9 @@ PMAP_LOCK_DESTROY(pmap); return (0); } -#ifdef XEN - pmap->pm_pdir_shadow = (pd_entry_t *)kmem_alloc_nofault(kernel_map, - NBPTD); - if (pmap->pm_pdir == NULL) { - PMAP_LOCK_DESTROY(pmap); - return (0); - } -#ifdef PAE +#if defined(XEN) && defined(PAE) pmap->pm_pdpt = (pd_entry_t *)kmem_alloc_nofault(kernel_map, 1); #endif -#endif #if defined(PAE) && !defined(XEN) pmap->pm_pdpt = uma_zalloc(pdptzone, M_WAITOK | M_ZERO); @@ -1454,12 +1479,10 @@ ptdpg[i++] = m; } } - pmap_qenter((vm_offset_t)pmap->pm_pdir, ptdpg, NPGPTD); - for (i = 0; i < NPGPTD; i++) { if ((ptdpg[i]->flags & PG_ZERO) == 0) - bzero(pmap->pm_pdir + (i * NPDEPG), PAGE_SIZE); + pagezero(&pmap->pm_pdir[i*NPTEPG]); } mtx_lock_spin(&allpmaps_lock); @@ -1470,8 +1493,8 @@ bcopy(PTD + KPTDI, pmap->pm_pdir + KPTDI, nkpt * sizeof(pd_entry_t)); #ifdef PAE #ifdef XEN - pmap_qenter((vm_offset_t)pmap->pm_pdpt, &ptdpg[NPGPTD*2], 1); - if ((ptdpg[NPGPTD*2]->flags & PG_ZERO) == 0) + pmap_qenter((vm_offset_t)pmap->pm_pdpt, &ptdpg[NPGPTD], 1); + if ((ptdpg[NPGPTD]->flags & PG_ZERO) == 0) bzero(pmap->pm_pdpt, PAGE_SIZE); #endif for (i = 0; i < NPGPTD; i++) { @@ -1483,33 +1506,31 @@ } #endif #ifdef XEN - pmap_qenter((vm_offset_t)pmap->pm_pdir_shadow, &ptdpg[NPGPTD], NPGPTD); - - for (i = 0; i < NPGPTD; i++) - if ((ptdpg[i + NPGPTD]->flags & PG_ZERO) == 0) - bzero(pmap->pm_pdir_shadow + (i * NPDEPG), PAGE_SIZE); - for (i = 0; i < NPGPTD; i++) - pmap->pm_pdir_shadow[PTDPTDI + i] = - xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i])) | PG_V; - for (i = 0; i < NPGPTD; i++) - pmap->pm_pdir[PTDPTDI + i] = - xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i + NPGPTD])) | PG_V; - for (i = KPTDI; i < KPTDI + nkpt; i++) - pmap->pm_pdir_shadow[i] = PTD[i] & ~(PG_RW); for (i = 0; i < NPGPTD; i++) { pt_entry_t *pd; - + vm_paddr_t ma; + + ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i])); pd = pmap->pm_pdir + (i * NPDEPG); PT_SET_MA(pd, *vtopte((vm_offset_t)pd) & ~(PG_M|PG_A|PG_U|PG_RW)); - pd = pmap->pm_pdir_shadow + (i * NPDEPG); - PT_SET_MA(pd, *vtopte((vm_offset_t)pd) & ~(PG_M|PG_A|PG_U|PG_RW)); +#if 0 + xen_pgd_pin(ma); +#endif } + #ifdef PAE PT_SET_MA(pmap->pm_pdpt, *vtopte((vm_offset_t)pmap->pm_pdpt) & ~PG_RW); #endif + vm_page_lock_queues(); xen_flush_queue(); + xen_pgdpt_pin(xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD]))); + for (i = 0; i < NPGPTD; i++) { + vm_paddr_t ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i])); + PT_SET_VA_MA(&pmap->pm_pdir[PTDPTDI + i], ma | PG_V | PG_A, FALSE); + } + xen_flush_queue(); + vm_page_unlock_queues(); #endif - pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1522,7 +1543,7 @@ * mapped correctly. */ static vm_page_t -_pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags) +_pmap_allocpte(pmap_t pmap, unsigned int ptepindex, int flags) { vm_paddr_t ptema; vm_page_t m; @@ -1557,15 +1578,16 @@ * Map the pagetable page into the process address space, if * it isn't already there. */ - pmap->pm_stats.resident_count++; ptema = xpmap_ptom(VM_PAGE_TO_PHYS(m)); xen_pt_pin(ptema); - PD_SET_VA_MA(pmap, ptepindex, + PT_SET_VA_MA(&pmap->pm_pdir[ptepindex], (ptema | PG_U | PG_RW | PG_V | PG_A | PG_M), TRUE); - - return m; + + KASSERT(pmap->pm_pdir[ptepindex], + ("_pmap_allocpte: ptepindex=%d did not get mapped", ptepindex)); + return (m); } static vm_page_t @@ -1615,9 +1637,13 @@ * Here if the pte page isn't mapped, or if it has * been deallocated. */ + CTR3(KTR_PMAP, "pmap_allocpte: pmap=%p va=0x%08x flags=0x%x", + pmap, va, flags); m = _pmap_allocpte(pmap, ptepindex, flags); if (m == NULL && (flags & M_WAITOK)) goto retry; + + KASSERT(pmap->pm_pdir[ptepindex], ("ptepindex=%d did not get mapped", ptepindex)); } return (m); } @@ -1733,9 +1759,9 @@ int i; #ifdef XEN #ifdef PAE - int npgptd = 2*NPGPTD + 1; + int npgptd = NPGPTD + 1; #else - int npgptd = 2*NPGPTD; + int npgptd = NPGPTD; #endif #else int npgptd = NPGPTD; @@ -1750,16 +1776,11 @@ LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); -#ifdef XEN for (i = 0; i < NPGPTD; i++) - ptdpg[i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir_shadow + (i*NPDEPG)) & PG_FRAME); - pmap_qremove((vm_offset_t)pmap->pm_pdir_shadow, NPGPTD); -#endif - for (i = 0; i < NPGPTD; i++) - ptdpg[NPGPTD + i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir + (i*NPDEPG)) & PG_FRAME); + ptdpg[i] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir + (i*NPDEPG)) & PG_FRAME); pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD); #if defined(PAE) && defined(XEN) - ptdpg[2*NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt)); + ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt)); #endif for (i = 0; i < npgptd; i++) { @@ -1852,9 +1873,8 @@ mtx_lock_spin(&allpmaps_lock); LIST_FOREACH(pmap, &allpmaps, pm_list) - PD_SET_VA(pmap, (kernel_vm_end >> PDRSHIFT), newpdir, FALSE); + PD_SET_VA(pmap, (kernel_vm_end >> PDRSHIFT), newpdir, TRUE); - PT_UPDATES_FLUSH(); mtx_unlock_spin(&allpmaps_lock); kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); if (kernel_vm_end - 1 >= kernel_map->max_offset) { @@ -2176,9 +2196,13 @@ pt_entry_t oldpte; vm_page_t m; + CTR3(KTR_PMAP, "pmap_remove_pte: pmap=%p *ptq=0x%jx va=0x%x", + pmap, *ptq, va); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - oldpte = pte_load_clear(ptq); + oldpte = *ptq; + PT_SET_VA_MA(ptq, 0, TRUE); if (oldpte & PG_W) pmap->pm_stats.wired_count -= 1; /* @@ -2194,10 +2218,7 @@ * why, but I think the most likely explanation is that xen's writable * page table implementation doesn't respect the unused bits. */ - if ((oldpte & PG_MANAGED) -#ifdef PTEBROKEN - || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS)) -#endif + if ((oldpte & PG_MANAGED) || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS)) ) { m = PHYS_TO_VM_PAGE(xpmap_mtop(oldpte) & PG_FRAME); @@ -2227,6 +2248,9 @@ { pt_entry_t *pte; + CTR2(KTR_PMAP, "pmap_remove_page: pmap=%p va=0x%x", + pmap, va); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -2235,7 +2259,7 @@ pmap_remove_pte(pmap, pte, va, free); pmap_invalidate_page(pmap, va); if (*PMAP1) - *PMAP1 = 0; + PT_SET_MA(PADDR1, 0); } @@ -2253,7 +2277,10 @@ pt_entry_t *pte; vm_page_t free = NULL; int anyvalid; - + + CTR3(KTR_PMAP, "pmap_remove: pmap=%p sva=0x%x eva=0x%x", + pmap, sva, eva); + /* * Perform an unsynchronized read. This is, however, safe. */ @@ -2330,12 +2357,13 @@ break; } } + PT_UPDATES_FLUSH(); if (*PMAP1) - *PMAP1 = 0; + PT_SET_VA_MA(PMAP1, 0, TRUE); out: - sched_unpin(); if (anyvalid) pmap_invalidate_all(pmap); + sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); pmap_free_zero_pages(free); @@ -2367,8 +2395,8 @@ * XXX This makes pmap_remove_all() illegal for non-managed pages! */ if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", - VM_PAGE_TO_PHYS(m)); + panic("pmap_remove_all: illegal for unmanaged page, va: 0x%jx", + VM_PAGE_TO_PHYS(m) & 0xffffffff); } #endif mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -2378,7 +2406,9 @@ PMAP_LOCK(pmap); pmap->pm_stats.resident_count--; pte = pmap_pte_quick(pmap, pv->pv_va); - tpte = pte_load_clear(pte); + + tpte = *pte; + PT_SET_VA_MA(pte, 0, TRUE); if (tpte & PG_W) pmap->pm_stats.wired_count--; if (tpte & PG_A) @@ -2402,8 +2432,9 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + PT_UPDATES_FLUSH(); if (*PMAP1) - *PMAP1 = 0; + PT_SET_MA(PADDR1, 0); sched_unpin(); } @@ -2419,6 +2450,9 @@ pt_entry_t *pte; int anychanged; + CTR4(KTR_PMAP, "pmap_protect: pmap=%p sva=0x%x eva=0x%x prot=0x%x", + pmap, sva, eva, prot); + if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); return; @@ -2506,6 +2540,12 @@ #endif if (pbits != obits) { +#ifdef XEN + obits = *pte; + PT_SET_VA_MA(pte, pbits, TRUE); + if (*pte != pbits) + goto retry; +#else #ifdef PAE if (!atomic_cmpset_64(pte, obits, pbits)) goto retry; @@ -2514,6 +2554,7 @@ pbits)) goto retry; #endif +#endif if (obits & PG_G) pmap_invalidate_page(pmap, sva); else @@ -2521,11 +2562,12 @@ } } } + PT_UPDATES_FLUSH(); if (*PMAP1) - *PMAP1 = 0; - sched_unpin(); + PT_SET_VA_MA(PMAP1, 0, TRUE); if (anychanged) pmap_invalidate_all(pmap); + sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -2554,6 +2596,8 @@ vm_page_t mpte, om; boolean_t invlva; + CTR6(KTR_PMAP, "pmap_enter: pmap=%08p va=0x%08x access=0x%x m=%p prot=0x%x wired=%d", + pmap, va, access, m, prot, wired); va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC if (va > VM_MAX_KERNEL_ADDRESS) @@ -2596,7 +2640,7 @@ */ if (pte == NULL) { panic("pmap_enter: invalid page directory pdir=%#jx, va=%#x\n", - (uintmax_t)pmap->pm_pdir[PTDPTDI], va); + (uintmax_t)pmap->pm_pdir[va >> PDRSHIFT], va); } pa = VM_PAGE_TO_PHYS(m); @@ -2606,11 +2650,12 @@ #if 0 KASSERT((*pte & PG_V) || (*pte == 0), ("address set but not valid pte=%p *pte=0x%016jx", pte, *pte)); -#endif - origpte = PT_GET(pte); +#endif + origpte = *pte; + if (origpte) + origpte = xpmap_mtop(origpte); opa = origpte & PG_FRAME; - /* * Mapping has not changed, must be protection or wiring change. */ @@ -2700,6 +2745,7 @@ if (pmap == kernel_pmap) newpte |= pgeflag; + critical_enter(); /* * if the mapping or permission bits are different, we need * to update the pte. @@ -2707,7 +2753,8 @@ if ((origpte & ~(PG_M|PG_A)) != newpte) { if (origpte) { invlva = FALSE; - origpte = pte_load_store(pte, newpte | PG_A); + origpte = *pte; + PT_SET_VA(pte, newpte | PG_A, FALSE); if (origpte & PG_A) { if (origpte & PG_MANAGED) vm_page_flag_set(om, PG_REFERENCED); @@ -2730,14 +2777,17 @@ } if (invlva) pmap_invalidate_page(pmap, va); - } else - pte_store(pte, newpte | PG_A); + } else{ + PT_SET_VA(pte, newpte | PG_A, FALSE); + } + } + PT_UPDATES_FLUSH(); + critical_exit(); if (*PMAP1) - *PMAP1 = 0; + PT_SET_VA_MA(PMAP1, 0, TRUE); sched_unpin(); vm_page_unlock_queues(); - KASSERT(*vtopte(va), ("pte not set for va=0x%x\n", va)); PMAP_UNLOCK(pmap); } @@ -2804,6 +2854,9 @@ int count = 0; mclp = &mcl; + CTR4(KTR_PMAP, "pmap_enter_quick: pmap=%p va=0x%x m=%p prot=0x%x", + pmap, va, m, prot); + PMAP_LOCK(pmap); (void) pmap_enter_quick_locked(&mclp, &count, pmap, va, m, prot, NULL); if (count) @@ -2900,6 +2953,7 @@ * quick entry into any pmap, one would likely use pmap_pte_quick. * But that isn't as quick as vtopte. */ + KASSERT(pmap_is_current(pmap), ("entering pages in non-current pmap")); pte = vtopte(va); if (*pte & PG_V) { if (mpte != NULL) { @@ -3040,6 +3094,7 @@ PMAP_LOCK(pmap); pmap->pm_stats.resident_count += size >> PAGE_SHIFT; npdes = size >> PDRSHIFT; + critical_enter(); for(i = 0; i < npdes; i++) { PD_SET_VA(pmap, ptepindex, ptepa | PG_U | PG_M | PG_RW | PG_V | PG_PS, FALSE); @@ -3047,6 +3102,7 @@ ptepindex += 1; } pmap_invalidate_all(pmap); + critical_exit(); out: PMAP_UNLOCK(pmap); } @@ -3064,21 +3120,25 @@ { pt_entry_t *pte; + vm_page_lock_queues(); PMAP_LOCK(pmap); pte = pmap_pte(pmap, va); - if (wired && !pmap_pte_w(pte)) + if (wired && !pmap_pte_w(pte)) { + PT_SET_VA_MA((pte), *(pte) | PG_W, TRUE); pmap->pm_stats.wired_count++; - else if (!wired && pmap_pte_w(pte)) + } else if (!wired && pmap_pte_w(pte)) { + PT_SET_VA_MA((pte), *(pte) & ~PG_W, TRUE); pmap->pm_stats.wired_count--; - + } + /* * Wiring is not a hardware characteristic so there is no need to * invalidate TLB. */ - pmap_pte_set_w(pte, wired); pmap_pte_release(pte); PMAP_UNLOCK(pmap); + vm_page_unlock_queues(); } @@ -3100,12 +3160,21 @@ vm_offset_t end_addr = src_addr + len; vm_offset_t pdnxt; + return; + if (dst_addr != src_addr) return; - if (!pmap_is_current(src_pmap)) + if (!pmap_is_current(src_pmap)) { + CTR2(KTR_PMAP, + "pmap_copy, skipping: pdir[PTDPTDI]=0x%jx PTDpde[0]=0x%jx", + (src_pmap->pm_pdir[PTDPTDI] & PG_FRAME), (PTDpde[0] & PG_FRAME)); + return; - + } + CTR5(KTR_PMAP, "pmap_copy: dst_pmap=%p src_pmap=%p dst_addr=0x%x len=%d src_addr=0x%x", + dst_pmap, src_pmap, dst_addr, len, src_addr); + vm_page_lock_queues(); if (dst_pmap < src_pmap) { PMAP_LOCK(dst_pmap); @@ -3168,11 +3237,7 @@ * accessed (referenced) bits * during the copy. */ -#if 0 PT_SET_VA_MA(dst_pte, ptetemp & ~(PG_W | PG_M | PG_A), FALSE); -#else - *dst_pte = ptetemp & ~(PG_W | PG_M | PG_A); -#endif dst_pmap->pm_stats.resident_count++; } else { free = NULL; @@ -3190,9 +3255,9 @@ src_pte++; } } + PT_UPDATES_FLUSH(); if (*PMAP1) - *PMAP1 = 0; - PT_UPDATES_FLUSH(); + PT_SET_VA_MA(PMAP1, 0, TRUE); sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(src_pmap); @@ -3213,10 +3278,9 @@ if (*sysmaps->CMAP2) panic("pmap_zero_page: CMAP2 busy"); sched_pin(); - *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; - invlcaddr(sysmaps->CADDR2); + PT_SET_MA(sysmaps->CADDR2, PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M); pagezero(sysmaps->CADDR2); - *sysmaps->CMAP2 = 0; + PT_SET_MA(sysmaps->CADDR2, 0); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3237,14 +3301,13 @@ if (*sysmaps->CMAP2) panic("pmap_zero_page: CMAP2 busy"); sched_pin(); - *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; + PT_SET_MA(sysmaps->CADDR2, PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M); - invlcaddr(sysmaps->CADDR2); if (off == 0 && size == PAGE_SIZE) pagezero(sysmaps->CADDR2); else bzero((char *)sysmaps->CADDR2 + off, size); - *sysmaps->CMAP2 = 0; + PT_SET_MA(sysmaps->CADDR2, 0); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3262,10 +3325,9 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); sched_pin(); - *CMAP3 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M; - invlcaddr(CADDR3); + PT_SET_MA(CADDR3, PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(m)) | PG_A | PG_M); pagezero(CADDR3); - *CMAP3 = 0; + PT_SET_MA(CADDR3, 0); sched_unpin(); } @@ -3287,13 +3349,11 @@ if (*sysmaps->CMAP2) panic("pmap_copy_page: CMAP2 busy"); sched_pin(); - invlpg((u_int)sysmaps->CADDR1); - invlpg((u_int)sysmaps->CADDR2); - *sysmaps->CMAP1 = PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A; - *sysmaps->CMAP2 = PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M; + PT_SET_MA(sysmaps->CADDR1, PG_V | xpmap_ptom(VM_PAGE_TO_PHYS(src)) | PG_A); + PT_SET_MA(sysmaps->CADDR2, PG_V | PG_RW | xpmap_ptom(VM_PAGE_TO_PHYS(dst)) | PG_A | PG_M); bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); - *sysmaps->CMAP1 = 0; - *sysmaps->CMAP2 = 0; + PT_SET_MA(sysmaps->CADDR1, 0); + PT_SET_MA(sysmaps->CADDR2, 0); sched_unpin(); mtx_unlock(&sysmaps->lock); } @@ -3312,7 +3372,7 @@ int loops = 0; if (m->flags & PG_FICTITIOUS) - return FALSE; + return (FALSE); mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -3377,11 +3437,14 @@ uint32_t inuse, bitmask; int allfree; + CTR1(KTR_PMAP, "pmap_remove_pages: pmap=%p", pmap); + if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) { printf("warning: pmap_remove_pages called with non-current pmap\n"); return; } vm_page_lock_queues(); + KASSERT(pmap_is_current(pmap), ("removing pages from non-current pmap")); PMAP_LOCK(pmap); sched_pin(); TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) { @@ -3395,19 +3458,8 @@ pv = &pc->pc_pventry[idx]; inuse &= ~bitmask; - if (pmap->pm_pdir_shadow[pv->pv_va >> PDRSHIFT] == 0) { - printf("PDIR IS ZERO @ VA %08x\n", pv->pv_va); - /* workaround insufficient wired count - * on page directory - this only buys - * us a little bit of time as the list - * on one of the pages is now corrupt - */ - allfree = 0; - goto skip; - } - pte = vtopte(pv->pv_va); - tpte = PT_GET(pte); + tpte = *pte ? xpmap_mtop(*pte) : 0; if (tpte == 0) { printf( @@ -3448,7 +3500,6 @@ vm_page_flag_clear(m, PG_WRITEABLE); pmap_unuse_pt(pmap, pv->pv_va, &free); - skip: /* Mark free */ PV_STAT(pv_entry_frees++); @@ -3471,8 +3522,10 @@ pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc); } } - if (*PMAP1) - *PMAP1 = 0; + PT_UPDATES_FLUSH(); + if (*PMAP1) + PT_SET_MA(PADDR1, 0); + sched_unpin(); pmap_invalidate_all(pmap); vm_page_unlock_queues(); @@ -3510,7 +3563,7 @@ break; } if (*PMAP1) - *PMAP1 = 0; + PT_SET_MA(PADDR1, 0); sched_unpin(); return (rv); } @@ -3529,9 +3582,9 @@ return (rv); - if (*pmap_pde(pmap, addr)) { + if (pmap_is_current(pmap) && *pmap_pde(pmap, addr)) { pte = vtopte(addr); - rv = ((*pte & PG_V) == 0); + rv = (*pte == 0); } return (rv); } @@ -3610,8 +3663,9 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + PT_UPDATES_FLUSH(); if (*PMAP1) - *PMAP1 = 0; + PT_SET_MA(PADDR1, 0); sched_unpin(); } @@ -3658,8 +3712,10 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:17:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24CB216A5FA; Mon, 25 Feb 2008 04:17:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D874E16A406 for ; Mon, 25 Feb 2008 04:17:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A99DF13C467 for ; Mon, 25 Feb 2008 04:17:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4H5IA020286 for ; Mon, 25 Feb 2008 04:17:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4H4wq020283 for perforce@freebsd.org; Mon, 25 Feb 2008 04:17:04 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:17:04 GMT Message-Id: <200802250417.m1P4H4wq020283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=136144 Change 136144 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:16:45 remove pm_pdir_shadow Affected files ... .. //depot/projects/xen31/sys/i386/include/pmap.h#12 edit Differences ... ==== //depot/projects/xen31/sys/i386/include/pmap.h#12 (text+ko) ==== @@ -410,9 +410,6 @@ pdpt_entry_t *pm_pdpt; /* KVA of page director pointer table */ #endif -#ifdef XEN - vm_paddr_t *pm_pdir_shadow; -#endif }; typedef struct pmap *pmap_t; From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:39:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C23516A405; Mon, 25 Feb 2008 04:39:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F75716A402 for ; Mon, 25 Feb 2008 04:39:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E580813C442 for ; Mon, 25 Feb 2008 04:39:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4dboY021013 for ; Mon, 25 Feb 2008 04:39:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4daoq021010 for perforce@freebsd.org; Mon, 25 Feb 2008 04:39:36 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:39:36 GMT Message-Id: <200802250439.m1P4daoq021010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:39:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=136145 Change 136145 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:38:42 make sure any pending updates have happened before we context switch Affected files ... .. //depot/projects/xen31/sys/kern/kern_switch.c#3 edit Differences ... ==== //depot/projects/xen31/sys/kern/kern_switch.c#3 (text+ko) ==== @@ -179,6 +179,9 @@ td->td_critnest = 0; if (td->td_owepreempt) { td->td_critnest = 1; +#ifdef XEN + PT_UPDATES_FLUSH(); +#endif thread_lock(td); td->td_critnest--; SCHED_STAT_INC(switch_owepreempt); From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:39:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF43316A52F; Mon, 25 Feb 2008 04:39:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D9CD16A49E for ; Mon, 25 Feb 2008 04:39:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EDE713C447 for ; Mon, 25 Feb 2008 04:39:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4dcEN021019 for ; Mon, 25 Feb 2008 04:39:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4dbSv021016 for perforce@freebsd.org; Mon, 25 Feb 2008 04:39:37 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:39:37 GMT Message-Id: <200802250439.m1P4dbSv021016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:39:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=136146 Change 136146 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:39:30 don't need to flush updates in pmap_pte routines as the update address stored are machine addresses Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#40 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#40 (text+ko) ==== @@ -976,7 +976,6 @@ mtx_lock(&PMAP2mutex); newpf = *pde & PG_FRAME; if ((*PMAP2 & PG_FRAME) != newpf) { - PT_UPDATES_FLUSH(); PT_SET_MA(PADDR2, newpf | PG_V | PG_A | PG_M); CTR3(KTR_PMAP, "pmap_pte: pmap=%p va=0x%x newpte=0x%08x", pmap, va, (*PMAP2 & 0xffffffff)); @@ -1038,7 +1037,6 @@ KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); newpf = *pde & PG_FRAME; if ((*PMAP1 & PG_FRAME) != newpf) { - PT_UPDATES_FLUSH(); PT_SET_MA(PADDR1, newpf | PG_V | PG_A | PG_M); CTR3(KTR_PMAP, "pmap_pte_quick: pmap=%p va=0x%x newpte=0x%jx", pmap, va, *PMAP1); From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:40:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C29E116A412; Mon, 25 Feb 2008 04:40:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8607B16A409 for ; Mon, 25 Feb 2008 04:40:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5506113C4E3 for ; Mon, 25 Feb 2008 04:40:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4eguE021090 for ; Mon, 25 Feb 2008 04:40:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4efp4021087 for perforce@freebsd.org; Mon, 25 Feb 2008 04:40:41 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:40:41 GMT Message-Id: <200802250440.m1P4efp4021087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:40:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=136147 Change 136147 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:39:57 don't build modules Affected files ... .. //depot/projects/xen31/sys/i386/conf/XEN#7 edit Differences ... ==== //depot/projects/xen31/sys/i386/conf/XEN#7 (text+ko) ==== @@ -25,6 +25,7 @@ #hints "GENERIC.hints" # Default places to look for devices. makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions MODULES_OVERRIDE="" options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption From owner-p4-projects@FreeBSD.ORG Mon Feb 25 04:42:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C84716A405; Mon, 25 Feb 2008 04:42:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F36016A401 for ; Mon, 25 Feb 2008 04:42:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09A1813C44B for ; Mon, 25 Feb 2008 04:42:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4glwU021167 for ; Mon, 25 Feb 2008 04:42:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4glXF021164 for perforce@freebsd.org; Mon, 25 Feb 2008 04:42:47 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 25 Feb 2008 04:42:47 GMT Message-Id: <200802250442.m1P4glXF021164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 04:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=136148 Change 136148 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:41:49 assert that there aren't any pending updates when returning to user Affected files ... .. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#11 edit .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#19 edit .. //depot/projects/xen31/sys/kern/subr_trap.c#4 edit Differences ... ==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#11 (text+ko) ==== @@ -46,6 +46,7 @@ void xen_pt_unpin(vm_paddr_t); void xen_flush_queue(void); void pmap_ref(pt_entry_t *pte, vm_paddr_t ma); +void xen_check_queue(void); #ifdef INVARIANTS #define xen_queue_pt_update(a, b) _xen_queue_pt_update((a), (b), __FILE__, __LINE__) ==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#19 (text+ko) ==== @@ -288,6 +288,12 @@ } void +xen_check_queue(void) +{ + KASSERT(XPQ_IDX == 0, ("pending operations XPQ_IDX=%d", XPQ_IDX)); +} + +void xen_invlpg(vm_offset_t va) { struct mmuext_op op; ==== //depot/projects/xen31/sys/kern/subr_trap.c#4 (text+ko) ==== @@ -86,6 +86,10 @@ CTR3(KTR_SYSC, "userret: thread %p (pid %d, %s)", td, p->p_pid, td->td_name); +#ifdef XEN + xen_check_queue(); +#endif + #ifdef DIAGNOSTIC /* Check that we called signotify() enough. */ PROC_LOCK(p); From owner-p4-projects@FreeBSD.ORG Mon Feb 25 06:06:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6326A16A407; Mon, 25 Feb 2008 06:06:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A22E16A400 for ; Mon, 25 Feb 2008 06:06:55 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0540513C4EA for ; Mon, 25 Feb 2008 06:06:55 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P66sCa035036 for ; Mon, 25 Feb 2008 06:06:54 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P66rf2035019 for perforce@freebsd.org; Mon, 25 Feb 2008 06:06:53 GMT (envelope-from alm@freebsd.org) Date: Mon, 25 Feb 2008 06:06:53 GMT Message-Id: <200802250606.m1P66rf2035019@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 06:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=136149 Change 136149 by alm@alm_praetorian on 2008/02/25 06:06:46 basic daemonize various style changes use component_destroy() instead of free() Affected files ... .. //depot/projects/trustedbsd/netauditd/component.c#3 edit .. //depot/projects/trustedbsd/netauditd/conf.c#3 edit .. //depot/projects/trustedbsd/netauditd/netauditd.c#10 edit .. //depot/projects/trustedbsd/netauditd/netauditd.h#7 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/component.c#3 (text+ko) ==== @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include #include #include #include #include #include + #include #include #include @@ -40,7 +40,9 @@ #include #include #include + #include + #include "netauditd.h" au_cmpnt_head_t au_srclist; ==== //depot/projects/trustedbsd/netauditd/conf.c#3 (text+ko) ==== @@ -84,7 +84,7 @@ else new->ac_type = NETAUDIT_DST_NET; if (getaddrinfo(host, svc, &hints, &new->ac_ainfo) != 0) { - free(new); + component_destroy(new); return (-1); } if (is_src) ==== //depot/projects/trustedbsd/netauditd/netauditd.c#10 (text+ko) ==== @@ -49,8 +49,11 @@ #include "netauditd.h" +#define FLAG_DEBUG 1 +#define FLAG_FOREGROUND (1 << 1) + char *conf_path = "/usr/local/etc/netauditd.conf"; -int debug_flag; +int netaudit_flags; void dprintf(char *fmt, ...) @@ -58,7 +61,7 @@ char buf[2048]; va_list ap; - if (!debug_flag) + if (!(netaudit_flags & FLAG_DEBUG)) return; va_start(ap, fmt); vsnprintf(buf, sizeof(buf), fmt, ap); @@ -71,10 +74,13 @@ { char ch; - while ((ch = getopt(argc, argv, "df:h")) != -1) { + while ((ch = getopt(argc, argv, "Ddf:h")) != -1) { switch (ch) { + case 'D': + netaudit_flags |= FLAG_FOREGROUND; + break; case 'd': - debug_flag = 1; + netaudit_flags |= FLAG_DEBUG; break; case 'f': conf_path = optarg; @@ -177,6 +183,13 @@ exit(2); } } + if (!(netaudit_flags & FLAG_FOREGROUND)) { + ret = fork(); + if (ret == -1) + err(1, "fork"); + if (ret != 0) + exit(0); + } netaudit_establish(); memset(&tv, 0, sizeof(tv)); tv.tv_usec = 100000; @@ -361,10 +374,10 @@ if (listen(au->ac_fd, 16) == -1) err(1, "listen"); if ((flags = fcntl(au->ac_fd, F_GETFL)) == -1) - exit(2); + err(1, "fcntl"); flags |= O_NONBLOCK; if (fcntl(au->ac_fd, F_SETFL, flags) == -1) - exit(2); + err(1, "fcntl"); } int @@ -446,6 +459,6 @@ void usage() { - fputs("usage: netauditd [-dh] [-f path]\n", stderr); + fputs("usage: netauditd [-Ddh] [-f path]\n", stderr); exit(1); } ==== //depot/projects/trustedbsd/netauditd/netauditd.h#7 (text+ko) ==== @@ -27,7 +27,6 @@ #define MAX_ARGUMENTS 256 #define NETAUDIT_PIPE_BUFSIZE 1024 -#define NETAUDIT_DELAY_TIMER 100000 #define NETAUDIT_SRC_PIPE 1 #define NETAUDIT_SRC_NET 2 @@ -37,12 +36,12 @@ struct au_recbuf { void *ar_rec; u_int32_t ar_reclen; - u_int32_t ar_refcount; + int ar_refcount; }; struct au_queue_ent { struct au_recbuf *aq_ptr; - int aq_remain; + u_int32_t aq_remain; TAILQ_ENTRY(au_queue_ent) aq_glue; }; From owner-p4-projects@FreeBSD.ORG Mon Feb 25 06:43:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87EF816A408; Mon, 25 Feb 2008 06:43:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AFBF16A406 for ; Mon, 25 Feb 2008 06:43:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3776313C474 for ; Mon, 25 Feb 2008 06:43:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P6hwxq036218 for ; Mon, 25 Feb 2008 06:43:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P6hv1p036215 for perforce@freebsd.org; Mon, 25 Feb 2008 06:43:57 GMT (envelope-from imp@freebsd.org) Date: Mon, 25 Feb 2008 06:43:57 GMT Message-Id: <200802250643.m1P6hv1p036215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 06:43:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=136150 Change 136150 by imp@imp_lighthouse on 2008/02/25 06:43:33 Define STRICT_ASSIGN for the FLT_EVAL_METHOD not being defined too. # Maybe this is a bug? Affected files ... .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2.c#3 edit .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2f.c#3 edit .. //depot/projects/mips2-jnpr/src/lib/msun/src/math_private.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2.c#3 (text+ko) ==== @@ -127,7 +127,7 @@ } } if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ -medium: +medium:; /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); fn = fn-0x1.8p52; ==== //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2f.c#3 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/lib/msun/src/math_private.h#3 (text+ko) ==== @@ -172,6 +172,8 @@ } \ } while (0) #endif +#else +#define STRICT_ASSIGN(type, lval, rval) ((lval) = (rval)) #endif /* From owner-p4-projects@FreeBSD.ORG Mon Feb 25 06:49:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB91B16A405; Mon, 25 Feb 2008 06:49:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E73A16A403 for ; Mon, 25 Feb 2008 06:49:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5232E13C45D for ; Mon, 25 Feb 2008 06:49:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P6n7MP036425 for ; Mon, 25 Feb 2008 06:49:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P6n6ZF036422 for perforce@freebsd.org; Mon, 25 Feb 2008 06:49:06 GMT (envelope-from imp@freebsd.org) Date: Mon, 25 Feb 2008 06:49:06 GMT Message-Id: <200802250649.m1P6n6ZF036422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 06:49:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=136152 Change 136152 by imp@imp_lighthouse on 2008/02/25 06:48:59 More magic Affected files ... .. //depot/projects/mips2-jnpr/src/lib/Makefile#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/Makefile#4 (text+ko) ==== @@ -70,7 +70,7 @@ _libipx= libipx .endif -.if ${MK_MAGIC} != "no" +.if ${MK_MAGIC} != "no" && ${MACHINE_ARCH} != "mips" _libmagic= libmagic .endif From owner-p4-projects@FreeBSD.ORG Mon Feb 25 06:59:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27CF016A407; Mon, 25 Feb 2008 06:59:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE64B16A405 for ; Mon, 25 Feb 2008 06:59:26 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C948613C447 for ; Mon, 25 Feb 2008 06:59:26 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P6xPDE036739 for ; Mon, 25 Feb 2008 06:59:25 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P6xPe6036736 for perforce@freebsd.org; Mon, 25 Feb 2008 06:59:25 GMT (envelope-from raj@freebsd.org) Date: Mon, 25 Feb 2008 06:59:25 GMT Message-Id: <200802250659.m1P6xPe6036736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 136153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 06:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=136153 Change 136153 by raj@raj_mimi on 2008/02/25 06:58:56 IFC @136132 Affected files ... .. //depot/projects/e500/bin/sh/cd.c#2 integrate .. //depot/projects/e500/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/e500/lib/libc/powerpc/gen/flt_rounds.c#3 integrate .. //depot/projects/e500/lib/libc/powerpc/gen/fpgetmask.c#3 integrate .. //depot/projects/e500/lib/libc/powerpc/gen/fpgetround.c#3 integrate .. //depot/projects/e500/lib/libc/powerpc/gen/fpgetsticky.c#3 integrate .. //depot/projects/e500/lib/libc/powerpc/gen/fpsetmask.c#3 integrate .. //depot/projects/e500/lib/libc/powerpc/gen/fpsetround.c#3 integrate .. //depot/projects/e500/lib/msun/powerpc/fenv.h#3 integrate .. //depot/projects/e500/sys/powerpc/include/float.h#3 integrate .. //depot/projects/e500/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/e500/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/e500/sys/powerpc/powerpc/cpu.c#3 edit .. //depot/projects/e500/sys/vm/vm_object.c#9 integrate .. //depot/projects/e500/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/e500/usr.bin/ar/ar.c#2 integrate .. //depot/projects/e500/usr.bin/ar/write.c#2 integrate .. //depot/projects/e500/usr.bin/find/find.1#3 integrate Differences ... ==== //depot/projects/e500/bin/sh/cd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); #include #include @@ -68,7 +68,9 @@ STATIC int cdphysical(char *); STATIC int docd(char *, int, int); STATIC char *getcomponent(void); -STATIC int updatepwd(char *); +STATIC char *findcwd(char *); +STATIC void updatepwd(char *); +STATIC char *getpwd2(char *, size_t); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -201,10 +203,11 @@ } INTOFF; - if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) { + if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -212,12 +215,14 @@ STATIC int cdphysical(char *dest) { + char *p; INTOFF; - if (chdir(dest) < 0 || updatepwd(NULL) < 0) { + if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -247,38 +252,20 @@ } -/* - * Update curdir (the name of the current directory) in response to a - * cd command. We also call hashcd to let the routines in exec.c know - * that the current directory has changed. - */ -STATIC int -updatepwd(char *dir) +STATIC char * +findcwd(char *dir) { char *new; char *p; - hashcd(); /* update command hash table */ - /* * If our argument is NULL, we don't know the current directory * any more because we traversed a symbolic link or something * we couldn't stat(). */ if (dir == NULL || curdir == NULL) { - if (prevdir) - ckfree(prevdir); - INTOFF; - prevdir = curdir; - curdir = NULL; - if (getpwd() == NULL) { - INTON; - return (-1); - } - setvar("PWD", curdir, VEXPORT); - setvar("OLDPWD", prevdir, VEXPORT); - INTON; - return (0); + p = stalloc(PATH_MAX); + return getpwd2(p, PATH_MAX); } cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); @@ -302,16 +289,25 @@ if (new == stackblock()) STPUTC('/', new); STACKSTRNUL(new); - INTOFF; + return stackblock(); +} + +/* + * Update curdir (the name of the current directory) in response to a + * cd command. We also call hashcd to let the routines in exec.c know + * that the current directory has changed. + */ +STATIC void +updatepwd(char *dir) +{ + hashcd(); /* update command hash table */ + if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(stackblock()); + curdir = savestr(dir); setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); - INTON; - - return (0); } int @@ -355,17 +351,31 @@ } /* - * Find out what the current directory is. If we already know the current - * directory, this routine returns immediately. + * Get the current directory and cache the result in curdir. */ char * getpwd(void) { char buf[PATH_MAX]; + char *p; if (curdir) return curdir; - if (getcwd(buf, sizeof(buf)) == NULL) { + + p = getpwd2(buf, sizeof(buf)); + if (p != NULL) + curdir = savestr(p); + + return curdir; +} + +/* + * Return the current directory. + */ +STATIC char * +getpwd2(char *buf, size_t size) +{ + if (getcwd(buf, size) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -373,12 +383,9 @@ stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - curdir = savestr(pwd); - return curdir; + return pwd; } return NULL; } - curdir = savestr(buf); - - return curdir; + return buf; } ==== //depot/projects/e500/gnu/lib/libgcc/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs ==== //depot/projects/e500/lib/libc/powerpc/gen/flt_rounds.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include ==== //depot/projects/e500/lib/libc/powerpc/gen/fpgetmask.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include ==== //depot/projects/e500/lib/libc/powerpc/gen/fpgetround.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include ==== //depot/projects/e500/lib/libc/powerpc/gen/fpgetsticky.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.1 2004/02/12 09:11:06 grehan Exp $ + * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.2 2008/02/24 19:22:53 raj Exp $ */ #include ==== //depot/projects/e500/lib/libc/powerpc/gen/fpsetmask.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include ==== //depot/projects/e500/lib/libc/powerpc/gen/fpsetround.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include ==== //depot/projects/e500/lib/msun/powerpc/fenv.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.3 2005/03/16 19:03:45 das Exp $ + * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.4 2008/02/24 19:22:53 raj Exp $ */ #ifndef _FENV_H_ ==== //depot/projects/e500/sys/powerpc/include/float.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 * from: FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 - * $FreeBSD: src/sys/powerpc/include/float.h,v 1.8 2005/01/07 02:29:19 imp Exp $ + * $FreeBSD: src/sys/powerpc/include/float.h,v 1.9 2008/02/24 19:22:52 raj Exp $ */ #ifndef _MACHINE_FLOAT_H_ ==== //depot/projects/e500/sys/powerpc/include/hid.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: hid.h,v 1.2 2001/08/22 21:05:25 matt Exp $ - * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.3 2005/02/04 01:14:38 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/hid.h,v 1.4 2008/02/25 00:09:23 raj Exp $ */ #ifndef _POWERPC_HID_H_ ==== //depot/projects/e500/sys/powerpc/include/spr.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: spr.h,v 1.25 2002/08/14 15:38:40 matt Exp $ - * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.6 2005/02/04 01:17:04 grehan Exp $ + * $FreeBSD: src/sys/powerpc/include/spr.h,v 1.7 2008/02/25 00:09:23 raj Exp $ */ #ifndef _POWERPC_SPR_H_ #define _POWERPC_SPR_H_ @@ -126,8 +126,8 @@ #define MPC7448 0x8004 #define MPC7410 0x800c #define MPC8245 0x8081 -#define BOOKE_E500v1 0x8020 -#define BOOKE_E500v2 0x8021 +#define FSL_E500v1 0x8020 +#define FSL_E500v2 0x8021 #define SPR_IBAT0U 0x210 /* .68 Instruction BAT Reg 0 Upper */ #define SPR_IBAT0U 0x210 /* .6. Instruction BAT Reg 0 Upper */ ==== //depot/projects/e500/sys/powerpc/powerpc/cpu.c#3 (text+ko) ==== @@ -55,7 +55,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $ - * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.9 2007/02/18 17:40:09 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.10 2008/02/25 00:09:23 raj Exp $ */ #include @@ -97,8 +97,8 @@ { "Motorola PowerPC 7447A", MPC7447A, REVFMT_MAJMIN }, { "Motorola PowerPC 7448", MPC7448, REVFMT_MAJMIN }, { "Motorola PowerPC 8240", MPC8240, REVFMT_MAJMIN }, - { "Freescale e500v1 core", BOOKE_E500v1, REVFMT_MAJMIN }, - { "Freescale e500v2 core", BOOKE_E500v2, REVFMT_MAJMIN }, + { "Freescale e500v1 core", FSL_E500v1, REVFMT_MAJMIN }, + { "Freescale e500v2 core", FSL_E500v2, REVFMT_MAJMIN }, { "Unknown PowerPC CPU", 0, REVFMT_HEX } }; @@ -130,8 +130,8 @@ min = (pvr >> 0) & 0xff; maj = min <= 4 ? 1 : 2; break; - case BOOKE_E500v1: - case BOOKE_E500v2: + case FSL_E500v1: + case FSL_E500v2: maj = (pvr >> 4) & 0xf; min = (pvr >> 0) & 0xf; break; @@ -229,8 +229,8 @@ hid0 |= HID0_EIEC; break; - case BOOKE_E500v1: - case BOOKE_E500v2: + case FSL_E500v1: + case FSL_E500v2: hid0 |= HID0_EMCP; break; } @@ -245,8 +245,8 @@ case MPC7457: bitmask = HID0_7450_BITMASK; break; - case BOOKE_E500v1: - case BOOKE_E500v2: + case FSL_E500v1: + case FSL_E500v2: bitmask = HID0_E500_BITMASK; break; default: @@ -268,8 +268,8 @@ printf("\n"); cpu_config_l2cr(cpuid, vers); break; - case BOOKE_E500v1: - case BOOKE_E500v2: + case FSL_E500v1: + case FSL_E500v2: #if 0 /* * Cache enable sequence according @@ -285,7 +285,6 @@ /* Enable i-cache */ icache_enable(); - printf("L1 CSR0 (d): 0x%08x\n", mfspr(SPR_L1CSR0)); printf("L1 CSR1 (i): 0x%08x\n", mfspr(SPR_L1CSR1)); #endif @@ -366,7 +365,7 @@ printf("cpu%d: ", cpuid); if (l2cr & L2CR_L2E) { - if (vers == MPC7450 || + if (vers == MPC7450 || vers == MPC7455 || vers == MPC7457) { u_int l3cr; ==== //depot/projects/e500/sys/vm/vm_object.c#9 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.390 2008/01/13 14:44:15 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.391 2008/02/24 18:03:56 alc Exp $"); #include "opt_vm.h" @@ -500,7 +500,10 @@ VM_OBJECT_UNLOCK(object); return; } else if (object->ref_count == 1) { - if (object->shadow_count == 0) { + if (object->shadow_count == 0 && + object->handle == NULL && + (object->type == OBJT_DEFAULT || + object->type == OBJT_SWAP)) { vm_object_set_flag(object, OBJ_ONEMAPPING); } else if ((object->shadow_count == 1) && (object->handle == NULL) && ==== //depot/projects/e500/usr.bin/ar/ar.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/ar/ar.c,v 1.16 2008/02/21 10:52:31 kaiw Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ar/ar.c,v 1.17 2008/02/24 18:07:46 kaiw Exp $"); #include #include @@ -108,7 +108,8 @@ if ((bsdar->progname = getprogname()) == NULL) bsdar->progname = "ar"; - if (strcmp(bsdar->progname, "ranlib") == 0) { + if (strcmp(bsdar->progname, "ranlib") == 0 || + strcmp(bsdar->progname, "bsdranlib") == 0) { while ((opt = getopt_long(argc, argv, "tV", longopts, NULL)) != -1) { switch(opt) { ==== //depot/projects/e500/usr.bin/ar/write.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/ar/write.c,v 1.1 2008/02/21 10:52:31 kaiw Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/ar/write.c,v 1.3 2008/02/24 18:30:17 kaiw Exp $"); #include #include @@ -107,7 +107,7 @@ const char *bname; if (name == NULL) - return(NULL); + return (NULL); obj = malloc(sizeof(struct ar_obj)); if (obj == NULL) @@ -115,7 +115,7 @@ if ((obj->fd = open(name, O_RDONLY, 0)) < 0) { bsdar_warnc(bsdar, errno, "can't open file: %s", name); free(obj); - return(NULL); + return (NULL); } if ((bname = basename(name)) == NULL) @@ -154,6 +154,12 @@ obj->mtime = sb.st_mtime; obj->dev = sb.st_dev; obj->ino = sb.st_ino; + + if (obj->size == 0) { + obj->maddr = NULL; + return (obj); + } + if ((obj->maddr = mmap(NULL, obj->size, PROT_READ, MAP_PRIVATE, obj->fd, (off_t)0)) == MAP_FAILED) { bsdar_warnc(bsdar, errno, "can't mmap file: %s", obj->name); @@ -163,7 +169,7 @@ bsdar_errc(bsdar, EX_SOFTWARE, errno, "close failed: %s", obj->name); - return(obj); + return (obj); giveup: if (close(obj->fd) < 0) @@ -171,7 +177,7 @@ obj->name); free(obj->name); free(obj); - return(NULL); + return (NULL); } /* @@ -427,14 +433,14 @@ struct ar_obj *obj, *obj_temp; TAILQ_FOREACH_SAFE(obj, &bsdar->v_obj, objs, obj_temp) { - free(obj->name); if (obj->fd == -1) free(obj->maddr); else - if (munmap(obj->maddr, obj->size)) + if (obj->maddr != NULL && munmap(obj->maddr, obj->size)) bsdar_warnc(bsdar, errno, "can't munmap file: %s", obj->name); TAILQ_REMOVE(&bsdar->v_obj, obj, objs); + free(obj->name); free(obj); } @@ -478,7 +484,7 @@ /* Create archive symbol table and archive string table, if need. */ TAILQ_FOREACH(obj, &bsdar->v_obj, objs) { - if (!(bsdar->options & AR_SS)) + if (!(bsdar->options & AR_SS) && obj->maddr != NULL) create_symtab_entry(bsdar, obj->maddr, obj->size); if (strlen(obj->name) > _MAXNAMELEN_SVR4) add_to_ar_str_table(bsdar, obj->name); ==== //depot/projects/e500/usr.bin/find/find.1#3 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)find.1 8.7 (Berkeley) 5/9/95 -.\" $FreeBSD: src/usr.bin/find/find.1,v 1.83 2008/02/23 16:29:04 imp Exp $ +.\" $FreeBSD: src/usr.bin/find/find.1,v 1.85 2008/02/24 19:52:23 ceri Exp $ .\" -.Dd December 13, 2006 +.Dd February 24, 2008 .Dt FIND 1 .Os .Sh NAME @@ -466,6 +466,7 @@ Like .Ic -lname , but the match is case insensitive. +This is a GNU find extension. .It Ic -iname Ar pattern Like .Ic -name , @@ -492,7 +493,9 @@ .It Ic -lname Ar pattern Like .Ic -name , -but the matched file must also be a symbolic link. +but the contents of the symbolic link are matched instead of the file +name. +This is a GNU find extension. .It Ic -ls This primary always evaluates to true. The following information for the current file is written to standard output: From owner-p4-projects@FreeBSD.ORG Mon Feb 25 11:56:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FDE416A409; Mon, 25 Feb 2008 11:56:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2227316A403 for ; Mon, 25 Feb 2008 11:56:47 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 11ED313C45E for ; Mon, 25 Feb 2008 11:56:47 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1PBukRq062380 for ; Mon, 25 Feb 2008 11:56:46 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1PBukfS062377 for perforce@freebsd.org; Mon, 25 Feb 2008 11:56:46 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 25 Feb 2008 11:56:46 GMT Message-Id: <200802251156.m1PBukfS062377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 136160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 11:56:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=136160 Change 136160 by sephe@sephe_zealot:sam_wifi on 2008/02/25 11:56:15 Silent witness warning about sleeping with non-sleepable lock (recursive driver lock) held Affected files ... .. //depot/projects/wifi/sys/dev/bwi/bwimac.c#9 edit .. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#24 edit Differences ... ==== //depot/projects/wifi/sys/dev/bwi/bwimac.c#9 (text+ko) ==== @@ -882,6 +882,8 @@ char fwname[64]; int idx; + BWI_ASSERT_LOCKED(sc); + /* * Try getting the firmware stub so firmware * module would be loaded automatically @@ -889,7 +891,9 @@ if (mac->mac_stub == NULL) { snprintf(fwname, sizeof(fwname), BWI_FW_STUB_PATH, sc->sc_fw_version); + BWI_UNLOCK(sc); mac->mac_stub = firmware_get(fwname); + BWI_LOCK(sc); if (mac->mac_stub == NULL) { if_printf(ifp, "request firmware %s failed\n", fwname); return ENOMEM; @@ -901,7 +905,9 @@ sc->sc_fw_version, mac->mac_rev >= 5 ? 5 : mac->mac_rev); + BWI_UNLOCK(sc); mac->mac_ucode = firmware_get(fwname); + BWI_LOCK(sc); if (mac->mac_ucode == NULL) { if_printf(ifp, "request firmware %s failed\n", fwname); return ENOMEM; @@ -916,7 +922,9 @@ sc->sc_fw_version, mac->mac_rev < 5 ? 4 : 5); + BWI_UNLOCK(sc); mac->mac_pcm = firmware_get(fwname); + BWI_LOCK(sc); if (mac->mac_pcm == NULL) { if_printf(ifp, "request firmware %s failed\n", fwname); return ENOMEM; @@ -941,7 +949,9 @@ snprintf(fwname, sizeof(fwname), BWI_FW_IV_PATH, sc->sc_fw_version, idx); + BWI_UNLOCK(sc); mac->mac_iv = firmware_get(fwname); + BWI_LOCK(sc); if (mac->mac_iv == NULL) { if_printf(ifp, "request firmware %s failed\n", fwname); return ENOMEM; @@ -967,7 +977,9 @@ snprintf(fwname, sizeof(fwname), BWI_FW_IV_EXT_PATH, sc->sc_fw_version, idx); + BWI_UNLOCK(sc); mac->mac_iv_ext = firmware_get(fwname); + BWI_LOCK(sc); if (mac->mac_iv_ext == NULL) { if_printf(ifp, "request firmware %s failed\n", fwname); return ENOMEM; ==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#24 (text+ko) ==== @@ -94,6 +94,7 @@ } __packed; static void bwi_init(void *); +static void bwi_init_locked(struct bwi_softc *); static int bwi_ioctl(struct ifnet *, u_long, caddr_t); static void bwi_start(struct ifnet *); static void bwi_start_locked(struct ifnet *); @@ -1186,7 +1187,18 @@ static void bwi_init(void *xsc) { - bwi_init_statechg(xsc, 1); + struct bwi_softc *sc = xsc; + + BWI_LOCK(sc); + bwi_init_locked(sc); + BWI_UNLOCK(sc); +} + +static void +bwi_init_locked(struct bwi_softc *sc) +{ + BWI_ASSERT_LOCKED(sc); + bwi_init_statechg(sc, 1); } static void @@ -1197,7 +1209,7 @@ struct bwi_mac *mac; int error; - BWI_LOCK(sc); + BWI_ASSERT_LOCKED(sc); bwi_stop(sc, statechg); @@ -1276,7 +1288,6 @@ bwi_stop(sc, 1); else bwi_start_locked(ifp); - BWI_UNLOCK(sc); } static int @@ -1316,7 +1327,7 @@ if (ifp->if_flags & IFF_UP) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) - bwi_init(sc); + bwi_init_locked(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) bwi_stop(sc, 1); @@ -1329,7 +1340,7 @@ if (error == ENETRESET) { if (IS_RUNNING(ifp)) - bwi_init(sc); + bwi_init_locked(sc); error = 0; } BWI_UNLOCK(sc); @@ -1866,7 +1877,7 @@ BWI_LOCK(sc); if (ieee80211_media_change(ifp) == ENETRESET && IS_RUNNING(ifp)) - bwi_init(ifp->if_softc); + bwi_init_locked(ifp->if_softc); BWI_UNLOCK(sc); return 0; @@ -4324,6 +4335,8 @@ { struct bwi_softc *sc = xsc; + BWI_LOCK(sc); if_printf(sc->sc_ifp, "%s begin\n", __func__); bwi_init_statechg(xsc, 0); + BWI_UNLOCK(sc); } From owner-p4-projects@FreeBSD.ORG Mon Feb 25 16:50:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D9DA16A40B; Mon, 25 Feb 2008 16:50:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2E2C16A407 for ; Mon, 25 Feb 2008 16:50:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D968613C4F6 for ; Mon, 25 Feb 2008 16:50:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1PGoNWv096638 for ; Mon, 25 Feb 2008 16:50:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1PGoNGT096635 for perforce@freebsd.org; Mon, 25 Feb 2008 16:50:23 GMT (envelope-from sam@freebsd.org) Date: Mon, 25 Feb 2008 16:50:23 GMT Message-Id: <200802251650.m1PGoNGT096635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 16:50:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=136174 Change 136174 by sam@sam_ebb on 2008/02/25 16:50:10 checkpoint bwi conversion Affected files ... .. //depot/projects/vap/sys/conf/files#17 edit .. //depot/projects/vap/sys/conf/options#11 edit .. //depot/projects/vap/sys/dev/bwi/bwimac.c#2 edit .. //depot/projects/vap/sys/dev/bwi/bwirf.c#2 edit .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#2 edit .. //depot/projects/vap/sys/dev/bwi/if_bwivar.h#2 edit .. //depot/projects/vap/sys/modules/bwi/Makefile#2 edit Differences ... ==== //depot/projects/vap/sys/conf/files#17 (text+ko) ==== @@ -495,6 +495,11 @@ dev/bktr/bktr_os.c optional bktr pci dev/bktr/bktr_tuner.c optional bktr pci dev/bktr/msp34xx.c optional bktr pci +dev/bwi/if_bwi.c optional bwi +dev/bwi/if_bwi_pci.c optional bwi pci +dev/bwi/bwimac.c optional bwi +dev/bwi/bwiphy.c optional bwi +dev/bwi/bwirf.c optional bwi dev/buslogic/bt.c optional bt dev/buslogic/bt_eisa.c optional bt eisa dev/buslogic/bt_isa.c optional bt isa ==== //depot/projects/vap/sys/conf/options#11 (text+ko) ==== @@ -729,6 +729,10 @@ ATH_DIAGAPI opt_ath.h ATH_TX99_DIAG opt_ath.h +# options for the Broadcom wireless driver +BWI_DEBUG opt_bwi.h +BWI_DEBUG_VERBOSE opt_bwi.h + # dcons options DCONS_BUF_SIZE opt_dcons.h DCONS_POLL_HZ opt_dcons.h ==== //depot/projects/vap/sys/dev/bwi/bwimac.c#2 (text+ko) ==== @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#include "opt_bwi.h" #include #include ==== //depot/projects/vap/sys/dev/bwi/bwirf.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#include "opt_bwi.h" #include #include ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#2 (text+ko) ==== @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#include "opt_bwi.h" #include #include @@ -93,6 +94,11 @@ uint8_t bssid[IEEE80211_ADDR_LEN]; } __packed; +static struct ieee80211vap *bwi_vap_create(struct ieee80211com *, + const char [IFNAMSIZ], int, int, int, + const uint8_t [IEEE80211_ADDR_LEN], + const uint8_t [IEEE80211_ADDR_LEN]); +static void bwi_vap_delete(struct ieee80211vap *); static void bwi_init(void *); static int bwi_ioctl(struct ifnet *, u_long, caddr_t); static void bwi_start(struct ifnet *); @@ -103,7 +109,7 @@ static void bwi_scan_start(struct ieee80211com *); static void bwi_set_channel(struct ieee80211com *); static void bwi_scan_end(struct ieee80211com *); -static int bwi_newstate(struct ieee80211com *, enum ieee80211_state, int); +static int bwi_newstate(struct ieee80211vap *, enum ieee80211_state, int); static void bwi_updateslot(struct ifnet *); static struct ieee80211_node *bwi_node_alloc(struct ieee80211_node_table *); static void bwi_newassoc(struct ieee80211_node *, int); @@ -115,11 +121,10 @@ static int bwi_calc_rssi(struct bwi_softc *, const struct bwi_rxbuf_hdr *); static __inline uint8_t bwi_ofdm_plcp2rate(const uint32_t *); static __inline uint8_t bwi_ds_plcp2rate(const struct ieee80211_ds_plcp_hdr *); -static void bwi_rx_radiotap(struct bwi_softc *, struct mbuf *, +static void bwi_rx_radiotap(struct ifnet *, struct mbuf *, struct bwi_rxbuf_hdr *, const void *, int, int); static void bwi_restart(void *, int); -static void bwi_newstate_begin(struct bwi_softc *, enum ieee80211_state); static void bwi_init_statechg(struct bwi_softc *, int); static void bwi_stop(struct bwi_softc *, int); static int bwi_newbuf(struct bwi_softc *, int, int); @@ -188,7 +193,6 @@ static void bwi_set_addr_filter(struct bwi_softc *, uint16_t, const uint8_t *); static void bwi_set_bssid(struct bwi_softc *, const uint8_t *); -static int bwi_set_chan(struct bwi_softc *, struct ieee80211_channel *); static void bwi_get_card_flags(struct bwi_softc *); static void bwi_get_eaddr(struct bwi_softc *, uint16_t, uint8_t *); @@ -352,7 +356,8 @@ struct ifnet *ifp; struct bwi_mac *mac; struct bwi_phy *phy; - int i, error, bands; + int i, error; + uint8_t bands; BWI_LOCK_INIT(sc); @@ -365,6 +370,8 @@ device_get_nameunit(dev)); TASK_INIT(&sc->sc_restart_task, 0, bwi_restart, sc); + callout_init_mtx(&sc->sc_calib_ch, &sc->sc_mtx, 0); + /* * Initialize sysctl variables */ @@ -372,8 +379,9 @@ sc->sc_led_idle = (2350 * hz) / 1000; sc->sc_led_blink = 1; sc->sc_txpwr_calib = 1; +#ifdef BWI_DEBUG sc->sc_debug = bwi_debug; - +#endif bwi_power_on(sc, 1); error = bwi_bbp_attach(sc); @@ -436,7 +444,7 @@ if (error) goto fail; - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(dev, "can not if_alloc()\n"); error = ENOSPC; @@ -446,34 +454,6 @@ /* set these up early for if_printf use */ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - callout_init_mtx(&sc->sc_calib_ch, &sc->sc_mtx, 0); - callout_init_mtx(&sc->sc_amrr_ch, &sc->sc_mtx, 0); - - /* - * Add sysctl nodes - */ - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "fw_version", CTLFLAG_RD, &sc->sc_fw_version, 0, - "Firmware version"); - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "led_idle", CTLFLAG_RW, &sc->sc_led_idle, 0, - "# ticks before LED enters idle state"); - SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "led_blink", CTLFLAG_RW, &sc->sc_led_blink, 0, - "Allow LED to blink"); - SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "txpwr_calib", CTLFLAG_RW, &sc->sc_txpwr_calib, 0, - "Enable software TX power calibration"); -#ifdef BWI_DEBUG - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "debug", CTLFLAG_RW, &sc->sc_debug, 0, "Debug flags"); -#endif - ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_init = bwi_init; @@ -484,11 +464,6 @@ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); - /* Get locale */ - sc->sc_locale = __SHIFTOUT(bwi_read_sprom(sc, BWI_SPROM_CARD_INFO), - BWI_SPROM_CARD_INFO_LOCALE); - DPRINTF(sc, BWI_DBG_ATTACH, "locale: %d\n", sc->sc_locale); - /* * Setup ratesets, phytype, channels and get MAC address */ @@ -520,45 +495,39 @@ } else { panic("unknown phymode %d\n", phy->phy_mode); } + + /* Get locale */ + sc->sc_locale = __SHIFTOUT(bwi_read_sprom(sc, BWI_SPROM_CARD_INFO), + BWI_SPROM_CARD_INFO_LOCALE); + DPRINTF(sc, BWI_DBG_ATTACH, "locale: %d\n", sc->sc_locale); /* XXX use locale */ - ieee80211_init_channels(ic, 0, CTRY_DEFAULT, bands, 0, 1); + ieee80211_init_channels(ic, NULL, &bands); ic->ic_ifp = ifp; ic->ic_caps = IEEE80211_C_SHSLOT | IEEE80211_C_SHPREAMBLE | IEEE80211_C_WPA | IEEE80211_C_MONITOR; - ic->ic_state = IEEE80211_S_INIT; ic->ic_opmode = IEEE80211_M_STA; - - ic->ic_updateslot = bwi_updateslot; - ieee80211_ifattach(ic); ic->ic_headroom = sizeof(struct bwi_txbuf_hdr); - ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS; /* override default methods */ - sc->sc_newstate = ic->ic_newstate; - ic->ic_newstate = bwi_newstate; + ic->ic_vap_create = bwi_vap_create; + ic->ic_vap_delete = bwi_vap_delete; + ic->ic_raw_xmit = bwi_raw_xmit; + ic->ic_updateslot = bwi_updateslot; + ic->ic_node_alloc = bwi_node_alloc; ic->ic_scan_start = bwi_scan_start; ic->ic_scan_end = bwi_scan_end; ic->ic_set_channel = bwi_set_channel; - ic->ic_node_alloc = bwi_node_alloc; - ic->ic_newassoc = bwi_newassoc; - ic->ic_raw_xmit = bwi_raw_xmit; - /* complete initialization */ - ieee80211_media_init(ic, bwi_media_change, ieee80211_media_status); - ieee80211_amrr_init(&sc->sc_amrr, ic, - IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); /* - * Attach radio tap + * Attach bpf. */ - bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th), - &sc->sc_drvbpf); + bpfattach(ifp, DLT_IEEE802_11_RADIO, + sizeof(struct ieee80211_frame) + sizeof(sc->sc_tx_th)); sc->sc_tx_th_len = roundup(sizeof(sc->sc_tx_th), sizeof(uint32_t)); sc->sc_tx_th.wt_ihdr.it_len = htole16(sc->sc_tx_th_len); @@ -568,6 +537,30 @@ sc->sc_rx_th.wr_ihdr.it_len = htole16(sc->sc_rx_th_len); sc->sc_rx_th.wr_ihdr.it_present = htole32(BWI_RX_RADIOTAP_PRESENT); + /* + * Add sysctl nodes + */ + SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "fw_version", CTLFLAG_RD, &sc->sc_fw_version, 0, + "Firmware version"); + SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "led_idle", CTLFLAG_RW, &sc->sc_led_idle, 0, + "# ticks before LED enters idle state"); + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "led_blink", CTLFLAG_RW, &sc->sc_led_blink, 0, + "Allow LED to blink"); + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "txpwr_calib", CTLFLAG_RW, &sc->sc_txpwr_calib, 0, + "Enable software TX power calibration"); +#ifdef BWI_DEBUG + SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "debug", CTLFLAG_RW, &sc->sc_debug, 0, "Debug flags"); +#endif if (bootverbose) ieee80211_announce(ic); @@ -588,7 +581,6 @@ BWI_UNLOCK(sc); callout_drain(&sc->sc_calib_ch); - callout_drain(&sc->sc_amrr_ch); ieee80211_ifdetach(&sc->sc_ic); for (i = 0; i < sc->sc_nmac; ++i) @@ -602,6 +594,54 @@ return (0); } +static struct ieee80211vap * +bwi_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) +{ + struct bwi_softc *sc = ic->ic_ifp->if_softc; + struct bwi_vap *bvp; + struct ieee80211vap *vap; + + if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ + return NULL; + bvp = (struct bwi_vap *) malloc(sizeof(struct bwi_vap), + M_80211_VAP, M_WAITOK | M_ZERO); + if (bvp == NULL) + return NULL; + vap = &bvp->bv_vap; + /* enable s/w bmiss handling for sta mode */ + ieee80211_vap_setup(ic, vap, name, unit, opmode, + flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); + + /* override default methods */ + bvp->bv_newstate = vap->iv_newstate; + vap->iv_newstate = bwi_newstate; +#if 0 + vap->iv_update_beacon = bwi_beacon_update; +#endif + callout_init_mtx(&bvp->bv_amrr_ch, &sc->sc_mtx, 0); + ieee80211_amrr_init(&bvp->bv_amrr, vap, + IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + + /* complete setup */ + ieee80211_vap_attach(vap, bwi_media_change, ieee80211_media_status); + ic->ic_opmode = opmode; + return vap; +} + +static void +bwi_vap_delete(struct ieee80211vap *vap) +{ + struct bwi_vap *bvp = BWI_VAP(vap); + + callout_drain(&bvp->bv_amrr_ch); + ieee80211_vap_detach(vap); + free(bvp, M_80211_VAP); +} + void bwi_suspend(struct bwi_softc *sc) { @@ -1207,12 +1247,16 @@ mac = &sc->sc_mac[0]; error = bwi_regwin_switch(sc, &mac->mac_regwin, NULL); - if (error) - goto back; - + if (error) { + if_printf(ifp, "%s: error %d on regwin switch\n", + __func__, error); + goto bad; + } error = bwi_mac_init(mac); - if (error) - goto back; + if (error) { + if_printf(ifp, "%s: error %d on MAC init\n", __func__, error); + goto bad; + } bwi_bbp_power_on(sc, BWI_CLOCK_MODE_DYN); @@ -1237,7 +1281,7 @@ CSR_READ_4(sc, BWI_TXSTATUS1); } if (i == NRETRY) - if_printf(ifp, "can't drain TX status\n"); + if_printf(ifp, "%s: can't drain TX status\n", __func__); #undef NRETRY } @@ -1246,36 +1290,24 @@ /* Start MAC */ error = bwi_mac_start(mac); - if (error) - goto back; + if (error) { + if_printf(ifp, "%s: error %d starting MAC\n", __func__, error); + goto bad; + } /* Clear stop flag before enabling interrupt */ sc->sc_flags &= ~BWI_F_STOP; + ifp->if_drv_flags |= IFF_DRV_RUNNING; + /* Enable intrs */ bwi_enable_intrs(sc, BWI_INIT_INTRS); - ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - - if (statechg) { - if (ic->ic_opmode != IEEE80211_M_MONITOR) { - if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) - ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); - } else { - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); - } - } else { - /* XXX */ - if (ic->ic_state != IEEE80211_S_INIT) - bwi_set_channel(ic); - ieee80211_new_state(ic, ic->ic_state, -1); - } -back: - if (error) - bwi_stop(sc, 1); - else - bwi_start_locked(ifp); + ieee80211_start_all(ic); /* start all vap's */ + BWI_UNLOCK(sc); + return; +bad: + bwi_stop(sc, 1); BWI_UNLOCK(sc); } @@ -1285,6 +1317,8 @@ #define IS_RUNNING(ifp) \ ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) struct bwi_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *)req; int error = 0; BWI_LOCK(sc); @@ -1322,16 +1356,19 @@ bwi_stop(sc, 1); } break; + case SIOCADDMULTI: + case SIOCDELMULTI: + /* XXX */ + break; + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: - error = ieee80211_ioctl(&sc->sc_ic, cmd, req); + error = ether_ioctl(ifp, cmd, req); break; } - if (error == ENETRESET) { - if (IS_RUNNING(ifp)) - bwi_init(sc); - error = 0; - } BWI_UNLOCK(sc); return error; @@ -1352,70 +1389,35 @@ bwi_start_locked(struct ifnet *ifp) { struct bwi_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; struct bwi_txbuf_data *tbd = &sc->sc_tx_bdata[BWI_TX_DATA_RING]; struct ieee80211_frame *wh; struct ieee80211_node *ni; - struct ether_header *eh; struct ieee80211_key *k; struct mbuf *m; int trans, idx; - if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) || - (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) return; trans = 0; idx = tbd->tbd_idx; while (tbd->tbd_buf[idx].tb_mbuf == NULL) { - IF_DEQUEUE(&ic->ic_mgtq, m); - if (m != NULL) { - ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; - m->m_pkthdr.rcvif = NULL; - } else { - if (ic->ic_state != IEEE80211_S_RUN) - break; + IFQ_DRV_DEQUEUE(&ifp->if_snd, m); /* XXX: LOCK */ + if (m == NULL) + break; - IFQ_DRV_DEQUEUE(&ifp->if_snd, m); /* XXX: LOCK */ - if (m == NULL) - break; - - if (m->m_len < sizeof(*eh)) { - m = m_pullup(m, sizeof(*eh)); - if (m == NULL) { - ifp->if_oerrors++; - continue; - } - } - eh = mtod(m, struct ether_header *); - - ni = ieee80211_find_txnode(ic, eh->ether_dhost); - if (ni == NULL) { - m_freem(m); - ifp->if_oerrors++; - continue; - } - - /* TODO: PS */ - - ifp->if_opackets++; - BPF_MTAP(ifp, m); - - m = ieee80211_encap(ic, m, ni); - if (m == NULL) { - ieee80211_free_node(ni); - ifp->if_oerrors++; - continue; - } + ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; + m = ieee80211_encap(ni, m); + if (m == NULL) { + ieee80211_free_node(ni); + ifp->if_oerrors++; + continue; } - if (ic->ic_rawbpf != NULL) - bpf_mtap(ic->ic_rawbpf, m); - wh = mtod(m, struct ieee80211_frame *); if (wh->i_fc[1] & IEEE80211_FC1_WEP) { - k = ieee80211_crypto_encap(ic, ni, m); + k = ieee80211_crypto_encap(ni, m); if (k == NULL) { ieee80211_free_node(ni); m_freem(m); @@ -1437,6 +1439,8 @@ tbd->tbd_used++; idx = (idx + 1) % BWI_TX_NDESC; + ifp->if_opackets++; + if (tbd->tbd_used + BWI_TX_NSPRDESC >= BWI_TX_NDESC) { ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; @@ -1459,8 +1463,7 @@ struct bwi_txbuf_data *tbd = &sc->sc_tx_bdata[BWI_TX_DATA_RING]; int idx, error; - if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) || - (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { ieee80211_free_node(ni); m_freem(m); return ENETDOWN; @@ -1522,10 +1525,6 @@ BWI_ASSERT_LOCKED(sc); sc->sc_flags |= BWI_F_STOP; - if (statechg) - ieee80211_new_state(ic, IEEE80211_S_INIT, -1); - else - bwi_newstate_begin(sc, IEEE80211_S_INIT); if (ifp->if_drv_flags & IFF_DRV_RUNNING) { KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC, @@ -1617,8 +1616,9 @@ i, txrx_intr_status[i]); if (txrx_intr_status[i] & BWI_TXRX_INTR_ERROR) { - if_printf(ifp, "intr fatal TX/RX (%d) error 0x%08x\n", - i, txrx_intr_status[i]); + if_printf(ifp, + "%s: intr fatal TX/RX (%d) error 0x%08x\n", + __func__, i, txrx_intr_status[i]); txrx_error = 1; } } @@ -1637,7 +1637,7 @@ if (intr_status & BWI_INTR_PHY_TXERR) { if (mac->mac_flags & BWI_MAC_F_PHYE_RESET) { - if_printf(ifp, "intr PHY TX error\n"); + if_printf(ifp, "%s: intr PHY TX error\n", __func__); taskqueue_enqueue(sc->sc_tq, &sc->sc_restart_task); BWI_UNLOCK(sc); return; @@ -1717,15 +1717,24 @@ static void bwi_set_channel(struct ieee80211com *ic) { - struct ifnet *ifp = ic->ic_ifp; - struct bwi_softc *sc = ifp->if_softc; - int error; + struct bwi_softc *sc = ic->ic_ifp->if_softc; + const struct ieee80211_channel *c = ic->ic_curchan; + struct bwi_mac *mac; BWI_LOCK(sc); - error = bwi_set_chan(sc, ic->ic_curchan); - if (error) - if_printf(ifp, "can't set channel to %u\n", - ieee80211_chan2ieee(ic, ic->ic_curchan)); + KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC, + ("current regwin type %d", sc->sc_cur_regwin->rw_type)); + mac = (struct bwi_mac *)sc->sc_cur_regwin; + bwi_rf_set_chan(mac, ieee80211_chan2ieee(ic, c), 0); + + /* + * Setup radio tap channel freq and flags + */ + sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq = + htole16(c->ic_freq); + sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags = + htole16(c->ic_flags & 0xffff); + BWI_UNLOCK(sc); } @@ -1734,42 +1743,37 @@ { } -static void -bwi_newstate_begin(struct bwi_softc *sc, enum ieee80211_state nstate) -{ - BWI_ASSERT_LOCKED(sc); - - callout_stop(&sc->sc_calib_ch); - callout_stop(&sc->sc_amrr_ch); - - bwi_led_newstate(sc, nstate); - - if (nstate == IEEE80211_S_INIT) - sc->sc_txpwrcb_type = BWI_TXPWR_INIT; -} - static int -bwi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) +bwi_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { - struct ifnet *ifp = ic->ic_ifp; + struct bwi_vap *bvp = BWI_VAP(vap); + struct ifnet *ifp = vap->iv_ic->ic_ifp; struct bwi_softc *sc = ifp->if_softc; + const struct ieee80211_txparam *tp; struct bwi_mac *mac; struct ieee80211_node *ni; int error; BWI_LOCK(sc); - bwi_newstate_begin(sc, nstate); + callout_stop(&bvp->bv_amrr_ch); + callout_stop(&sc->sc_calib_ch); if (nstate == IEEE80211_S_INIT) + sc->sc_txpwrcb_type = BWI_TXPWR_INIT; + + bwi_led_newstate(sc, nstate); + + error = bvp->bv_newstate(vap, nstate, arg); + if (error != 0) goto back; - if (ic->ic_opmode == IEEE80211_M_MONITOR) { + if (vap->iv_opmode == IEEE80211_M_MONITOR) { /* Nothing to do */ } else if (nstate == IEEE80211_S_RUN) { - ni = ic->ic_bss; + ni = vap->iv_bss; - bwi_set_bssid(sc, ic->ic_bss->ni_bssid); + bwi_set_bssid(sc, vap->iv_bss->ni_bssid); KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC, ("current regwin type %d", sc->sc_cur_regwin->rw_type)); @@ -1782,27 +1786,22 @@ #else sc->sc_txpwrcb_type = BWI_TXPWR_CALIB; #endif - - if (ic->ic_opmode == IEEE80211_M_STA) { + if (vap->iv_opmode == IEEE80211_M_STA) { /* fake a join to init the tx rate */ bwi_newassoc(ni, 1); } - if (ic->ic_opmode != IEEE80211_M_MONITOR) { - /* start automatic rate control timer */ - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) - callout_reset(&sc->sc_amrr_ch, hz / 2, - bwi_amrr_timeout, sc); - } + /* start automatic rate control timer */ + tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) + callout_reset(&bvp->bv_amrr_ch, hz / 2, + bwi_amrr_timeout, vap); + + callout_reset(&sc->sc_calib_ch, hz, bwi_calibrate, sc); } else { bwi_set_bssid(sc, bwi_zero_addr); } - back: - error = sc->sc_newstate(ic, nstate, arg); - - if (nstate == IEEE80211_S_RUN) - callout_reset(&sc->sc_calib_ch, hz, bwi_calibrate, sc); BWI_UNLOCK(sc); return error; @@ -1821,56 +1820,49 @@ static void bwi_newassoc(struct ieee80211_node *ni, int isnew) { - struct bwi_softc *sc = ni->ni_ic->ic_ifp->if_softc; + struct ieee80211vap *vap = ni->ni_vap; int i; - ieee80211_amrr_node_init(&sc->sc_amrr, &((struct bwi_node *)ni)->amn); + ieee80211_amrr_node_init(&BWI_VAP(vap)->bv_amrr, &BWI_NODE(ni)->amn); /* set rate to some reasonable initial value */ for (i = ni->ni_rates.rs_nrates - 1; i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; i--); - ni->ni_txrate = i; + ni->ni_txrate = i; } static void bwi_iter_func(void *arg, struct ieee80211_node *ni) { - struct bwi_softc *sc = arg; - struct bwi_node *bn = (struct bwi_node *)ni; + struct ieee80211vap *vap = arg; + struct bwi_node *bn = BWI_NODE(ni); - ieee80211_amrr_choose(&sc->sc_amrr, ni, &bn->amn); + ieee80211_amrr_choose(&BWI_VAP(vap)->bv_amrr, ni, &bn->amn); } static void bwi_amrr_timeout(void *arg) { - struct bwi_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = arg; + struct ieee80211com *ic = vap->iv_ic; + struct bwi_softc *sc = ic->ic_ifp->if_softc; BWI_ASSERT_LOCKED(sc); - if (ic->ic_opmode == IEEE80211_M_STA) - bwi_iter_func(sc, ic->ic_bss); + if (vap->iv_opmode == IEEE80211_M_STA) + bwi_iter_func(sc, vap->iv_bss); else - ieee80211_iterate_nodes(&ic->ic_sta, bwi_iter_func, sc); - callout_reset(&sc->sc_amrr_ch, hz / 2, bwi_amrr_timeout, sc); + ieee80211_iterate_nodes(&ic->ic_sta, bwi_iter_func, vap); + callout_reset(&BWI_VAP(vap)->bv_amrr_ch, hz / 2, bwi_amrr_timeout, vap); } static int bwi_media_change(struct ifnet *ifp) { -#define IS_RUNNING(ifp) \ - ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) - struct bwi_softc *sc = ifp->if_softc; - - BWI_LOCK(sc); - if (ieee80211_media_change(ifp) == ENETRESET && IS_RUNNING(ifp)) - bwi_init(ifp->if_softc); - BWI_UNLOCK(sc); - - return 0; -#undef IS_RUNNING + int error = ieee80211_media_change(ifp); + /* NB: only the fixed rate can change and that doesn't need a reset */ + return (error == ENETRESET ? 0 : error); } static int @@ -2649,42 +2641,6 @@ } static int -bwi_set_chan(struct bwi_softc *sc, struct ieee80211_channel *c) -{ - struct ieee80211com *ic = &sc->sc_ic; - struct bwi_mac *mac; - uint16_t flags; - u_int chan; - - BWI_LOCK(sc); - - KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC, - ("current regwin type %d", sc->sc_cur_regwin->rw_type)); - mac = (struct bwi_mac *)sc->sc_cur_regwin; - - chan = ieee80211_chan2ieee(ic, c); - - bwi_rf_set_chan(mac, chan, 0); - - /* - * Setup radio tap channel freq and flags - */ - if (IEEE80211_IS_CHAN_G(c)) - flags = IEEE80211_CHAN_G; - else - flags = IEEE80211_CHAN_B; - - sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq = - htole16(c->ic_freq); - sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags = - htole16(flags); - - BWI_UNLOCK(sc); - - return 0; -} - -static int bwi_rxeof(struct bwi_softc *sc, int end_idx) { struct bwi_ring_data *rd = &sc->sc_rx_rdata; @@ -2723,8 +2679,8 @@ buflen = le16toh(hdr->rxh_buflen); if (buflen < BWI_FRAME_MIN_LEN(wh_ofs)) { - if_printf(ifp, "zero length data, hdr_extra %d\n", - hdr_extra); + if_printf(ifp, "%s: zero length data, hdr_extra %d\n", + __func__, hdr_extra); ifp->if_ierrors++; m_freem(m); goto next; @@ -2743,8 +2699,8 @@ rate = bwi_ds_plcp2rate(plcp); /* RX radio tap */ - if (sc->sc_drvbpf != NULL) - bwi_rx_radiotap(sc, m, hdr, plcp, rate, rssi); + if (bpf_peers_present(ifp->if_bpf)) + bwi_rx_radiotap(ifp, m, hdr, plcp, rate, rssi); m_adj(m, -IEEE80211_CRC_LEN); @@ -2752,10 +2708,13 @@ wh = mtod(m, struct ieee80211_frame_min *); ni = ieee80211_find_rxnode(ic, wh); - - type = ieee80211_input(ic, m, ni, rssi - BWI_NOISE_FLOOR, - BWI_NOISE_FLOOR, le16toh(hdr->rxh_tsf)); - ieee80211_free_node(ni); + if (ni != NULL) { + type = ieee80211_input(ni, m, rssi - BWI_NOISE_FLOOR, + BWI_NOISE_FLOOR, 0); + ieee80211_free_node(ni); + } else + type = ieee80211_input_all(ic, m, + rssi - BWI_NOISE_FLOOR, BWI_NOISE_FLOOR, 0); if (type == IEEE80211_FC0_TYPE_DATA) { rx_data = 1; sc->sc_rx_rate = rate; @@ -2887,8 +2846,8 @@ DELAY(1000); } if (i == NRETRY) { - if_printf(ifp, "wait for TX ring(%d) stable timed out\n", - ring_idx); + if_printf(ifp, "%s: wait for TX ring(%d) stable timed out\n", + __func__, ring_idx); } CSR_WRITE_4(sc, rd->rdata_txrx_ctrl + BWI_TX32_CTRL, 0); @@ -2901,7 +2860,8 @@ DELAY(1000); } if (i == NRETRY) - if_printf(ifp, "reset TX ring (%d) timed out\n", ring_idx); + if_printf(ifp, "%s: reset TX ring (%d) timed out\n", + __func__, ring_idx); #undef NRETRY @@ -3039,13 +2999,16 @@ bwi_encap(struct bwi_softc *sc, int idx, struct mbuf *m, struct ieee80211_node *ni) { + struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = ic->ic_ifp; struct bwi_ring_data *rd = &sc->sc_tx_rdata[BWI_TX_DATA_RING]; struct bwi_txbuf_data *tbd = &sc->sc_tx_bdata[BWI_TX_DATA_RING]; struct bwi_txbuf *tb = &tbd->tbd_buf[idx]; struct bwi_mac *mac; struct bwi_txbuf_hdr *hdr; struct ieee80211_frame *wh; + const struct ieee80211_txparam *tp; uint8_t rate, rate_fb; uint32_t mac_ctrl; uint16_t phy_ctrl; @@ -3069,9 +3032,14 @@ * Find TX rate */ bzero(tb->tb_rate_idx, sizeof(tb->tb_rate_idx)); + tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; if (IEEE80211_IS_MULTICAST(wh->i_addr1)) - rate = rate_fb = ic->ic_mcast_rate; - else if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { + rate = rate_fb = tp->mcastrate; + else if (m->m_flags & M_EAPOL) + rate = rate_fb = tp->mgmtrate; + else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) + rate = rate_fb = tp->ucastrate; + else { rate = ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL; tb->tb_rate_idx[0] = ni->ni_txrate; @@ -3084,15 +3052,13 @@ rate_fb = rate; tb->tb_rate_idx[1] = tb->tb_rate_idx[0]; } - } else - rate = rate_fb = ic->ic_fixed_rate; - + } sc->sc_tx_rate = rate; /* * TX radio tap */ - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { sc->sc_tx_th.wt_flags = 0; if (wh->i_fc[1] & IEEE80211_FC1_WEP) sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP; @@ -3103,7 +3069,7 @@ } sc->sc_tx_th.wt_rate = rate; - bpf_mtap2(sc->sc_drvbpf, &sc->sc_tx_th, sc->sc_tx_th_len, m); + bpf_mtap2(ifp->if_bpf, &sc->sc_tx_th, sc->sc_tx_th_len, m); } /* @@ -3111,7 +3077,7 @@ */ M_PREPEND(m, sizeof(*hdr), M_DONTWAIT); if (m == NULL) { - if_printf(ic->ic_ifp, "prepend TX header failed\n"); + if_printf(ifp, "%s: prepend TX header failed\n", __func__); return ENOBUFS; } hdr = mtod(m, struct bwi_txbuf_hdr *); @@ -3163,7 +3129,8 @@ error = bus_dmamap_load_mbuf(sc->sc_buf_dtag, tb->tb_dmap, m, bwi_dma_buf_addr, &paddr, BUS_DMA_NOWAIT); if (error && error != EFBIG) { - if_printf(ic->ic_ifp, "can't load TX buffer (1) %d\n", error); + if_printf(ifp, "%s: can't load TX buffer (1) %d\n", + __func__, error); goto back; } @@ -3172,7 +3139,8 @@ m_new = m_defrag(m, M_DONTWAIT); if (m_new == NULL) { - if_printf(ic->ic_ifp, "can't defrag TX buffer\n"); + if_printf(ifp, "%s: can't defrag TX buffer\n", + __func__); error = ENOBUFS; goto back; } else { @@ -3183,8 +3151,8 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 17:41:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D326916A407; Mon, 25 Feb 2008 17:41:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95A7C16A402; Mon, 25 Feb 2008 17:41:20 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.freebsd.org (Postfix) with ESMTP id 548DB13C458; Mon, 25 Feb 2008 17:41:20 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from phobos.samsco.home (phobos.samsco.home [192.168.254.11]) (authenticated bits=0) by pooker.samsco.org (8.13.8/8.13.8) with ESMTP id m1PH48Cl006657; Mon, 25 Feb 2008 10:04:08 -0700 (MST) (envelope-from scottl@samsco.org) Message-ID: <47C2F508.8030100@samsco.org> Date: Mon, 25 Feb 2008 10:04:08 -0700 From: Scott Long User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.11) Gecko/20071128 SeaMonkey/1.1.7 MIME-Version: 1.0 To: Kip Macy References: <200802220822.m1M8Mmsm061884@repoman.freebsd.org> In-Reply-To: <200802220822.m1M8Mmsm061884@repoman.freebsd.org> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.4 required=5.4 tests=ALL_TRUSTED autolearn=failed version=3.1.8 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on pooker.samsco.org Cc: Perforce Change Reviews Subject: Re: PERFORCE change 135946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 17:41:21 -0000 Kip Macy wrote: > http://perforce.freebsd.org/chv.cgi?CH=135946 > > Change 135946 by kmacy@pandemonium:kmacy:xen31 on 2008/02/22 08:22:28 > > remove unneeded devices > Last time I tried paring down the kernel config, I ran into problems with the kernel getting too small for the sizing assumptions that Xen has in locore. Maybe this is related to the report that arrived last night? Scott From owner-p4-projects@FreeBSD.ORG Mon Feb 25 18:55:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5529616A408; Mon, 25 Feb 2008 18:55:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F322316A404 for ; Mon, 25 Feb 2008 18:55:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAB9013C474 for ; Mon, 25 Feb 2008 18:55:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1PItVck003792 for ; Mon, 25 Feb 2008 18:55:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1PItV1G003789 for perforce@freebsd.org; Mon, 25 Feb 2008 18:55:31 GMT (envelope-from sam@freebsd.org) Date: Mon, 25 Feb 2008 18:55:31 GMT Message-Id: <200802251855.m1PItV1G003789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 18:55:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=136178 Change 136178 by sam@sam_ebb on 2008/02/25 18:55:23 parent devices must handle [GS]IFMEDIA directly for ifconfig to report their status Affected files ... .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#9 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#14 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#16 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#13 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#8 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#10 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#9 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#8 edit Differences ... ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#9 (text+ko) ==== @@ -1727,6 +1727,8 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ipw_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; int error = 0; IPW_LOCK_DECL; @@ -1742,7 +1744,10 @@ ipw_stop_locked(sc); } break; - + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: error = ether_ioctl(ifp, cmd, data); } ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#14 (text+ko) ==== @@ -1978,6 +1978,8 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct iwi_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; int error = 0; IWI_LOCK_DECL; @@ -2008,7 +2010,10 @@ } } break; - + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: error = ether_ioctl(ifp, cmd, data); } ==== //depot/projects/vap/sys/dev/ral/rt2560.c#16 (text) ==== @@ -2067,6 +2067,9 @@ rt2560_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct rt2560_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; + int error = 0; switch (cmd) { case SIOCSIFFLAGS: @@ -2082,10 +2085,15 @@ rt2560_stop(sc); } break; + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: - return ether_ioctl(ifp, cmd, data); + error = ether_ioctl(ifp, cmd, data); + break; } - return 0; + return error; } static void ==== //depot/projects/vap/sys/dev/ral/rt2661.c#13 (text) ==== @@ -1905,6 +1905,9 @@ rt2661_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct rt2661_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; + int error = 0; switch (cmd) { case SIOCSIFFLAGS: @@ -1918,9 +1921,13 @@ rt2661_stop(sc); } break; - + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: - return ether_ioctl(ifp, cmd, data); + error = ether_ioctl(ifp, cmd, data); + break; } return 0; } ==== //depot/projects/vap/sys/dev/usb/if_rum.c#8 (text+ko) ==== @@ -1432,6 +1432,8 @@ rum_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct rum_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; int error = 0; RUM_LOCK(sc); @@ -1448,6 +1450,10 @@ rum_stop(sc); } break; + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: error = ether_ioctl(ifp, cmd, data); } ==== //depot/projects/vap/sys/dev/usb/if_ural.c#10 (text+ko) ==== @@ -1536,6 +1536,8 @@ ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ural_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; int error = 0; RAL_LOCK(sc); @@ -1552,9 +1554,13 @@ ural_stop(sc); } break; - + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: error = ether_ioctl(ifp, cmd, data); + break; } RAL_UNLOCK(sc); ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#9 (text+ko) ==== @@ -2473,6 +2473,8 @@ zyd_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct zyd_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; int error = 0; ZYD_LOCK(sc); @@ -2492,15 +2494,18 @@ } sc->sc_if_flags = ifp->if_flags; break; - case SIOCADDMULTI: case SIOCDELMULTI: if (ifp->if_drv_flags & IFF_DRV_RUNNING) zyd_set_multi(sc); break; - + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: error = ether_ioctl(ifp, cmd, data); + break; } ZYD_UNLOCK(sc); ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#8 (text+ko) ==== @@ -2190,6 +2190,8 @@ wpi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct wpi_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; int error = 0; WPI_LOCK_DECL; @@ -2203,6 +2205,10 @@ } else if (ifp->if_drv_flags & IFF_DRV_RUNNING) wpi_stop_locked(sc); break; + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: error = ether_ioctl(ifp, cmd, data); break; From owner-p4-projects@FreeBSD.ORG Mon Feb 25 20:08:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 474EB16A400; Mon, 25 Feb 2008 20:08:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A52716A404 for ; Mon, 25 Feb 2008 20:08:22 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00DC413C44B for ; Mon, 25 Feb 2008 20:08:22 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1PK8LhD008874 for ; Mon, 25 Feb 2008 20:08:21 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1PK8LIn008871 for perforce@freebsd.org; Mon, 25 Feb 2008 20:08:21 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 25 Feb 2008 20:08:21 GMT Message-Id: <200802252008.m1PK8LIn008871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 136183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 20:08:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=136183 Change 136183 by swise@swise:vic10:iwarp on 2008/02/25 20:08:15 Don't use socket ptr after closing in process_connected(). Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 (text+ko) ==== @@ -1543,8 +1543,8 @@ if ((ep->com.so->so_state & SS_ISCONNECTED) && !ep->com.so->so_error) { send_mpa_req(ep); } else { + connect_reply_upcall(ep, -ep->com.so->so_error); close_socket(&ep->com); - connect_reply_upcall(ep, -ep->com.so->so_error); state_set(&ep->com, DEAD); put_ep(&ep->com); } From owner-p4-projects@FreeBSD.ORG Mon Feb 25 21:52:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C237816A401; Mon, 25 Feb 2008 21:52:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FD4D16A409 for ; Mon, 25 Feb 2008 21:52:04 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51E6913C442 for ; Mon, 25 Feb 2008 21:52:04 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1PLq4NR022548 for ; Mon, 25 Feb 2008 21:52:04 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1PLq2Fi022534 for perforce@freebsd.org; Mon, 25 Feb 2008 21:52:02 GMT (envelope-from wsalamon@computer.org) Date: Mon, 25 Feb 2008 21:52:02 GMT Message-Id: <200802252152.m1PLq2Fi022534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 136188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 21:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=136188 Change 136188 by wsalamon@gretsch on 2008/02/25 21:51:57 Create a branch for audit/MAC integration: The first set of functionality will be to enable MAC policies to annotation audit records. Part of the TrustedBSD project. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/float.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/param.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/support.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/AVILA#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/BWCT#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/CRB#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/HL200#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/_types.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/asm.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/bus.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/clock.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/elf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/endian.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/exec.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/float.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/fp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/frame.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/intr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/limits.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/param.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/proc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/profile.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/psl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pte.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/resource.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/runq.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/signal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/smp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/stack.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/swi.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/trap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/README#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/boot.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/commands.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/console.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/help.common#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/interp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/loader.8#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/ls.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/misc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/module.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/panic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/README#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/README.quirks#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 25 23:18:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FAD116A411; Mon, 25 Feb 2008 23:18:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE51F16A40F for ; Mon, 25 Feb 2008 23:18:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D18F613C474 for ; Mon, 25 Feb 2008 23:18:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1PNI8DW059048 for ; Mon, 25 Feb 2008 23:18:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1PNI8f4059045 for perforce@freebsd.org; Mon, 25 Feb 2008 23:18:08 GMT (envelope-from sam@freebsd.org) Date: Mon, 25 Feb 2008 23:18:08 GMT Message-Id: <200802252318.m1PNI8f4059045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 23:18:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=136193 Change 136193 by sam@sam_ebb on 2008/02/25 23:17:59 drop lock around call to ioctl handler to bring the parent interface up; this causes troubles for drivers that download firmware in their init method; in theor firmware should be downloaded on vap create but there may be other reasons to remove this restriction Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#22 (text+ko) ==== @@ -1099,8 +1099,10 @@ IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, "%s: up parent %s\n", __func__, parent->if_xname); parent->if_flags |= IFF_UP; - /* XXX holding lock */ + /* XXX drop lock */ + IEEE80211_UNLOCK(ic); parent->if_ioctl(parent, SIOCSIFFLAGS, NULL); + IEEE80211_LOCK(ic); } /* * Mark us running. Note that we do this after From owner-p4-projects@FreeBSD.ORG Mon Feb 25 23:26:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EFD316A409; Mon, 25 Feb 2008 23:26:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D50CE16A407 for ; Mon, 25 Feb 2008 23:26:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C734E13C461 for ; Mon, 25 Feb 2008 23:26:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1PNQJw5059434 for ; Mon, 25 Feb 2008 23:26:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1PNQJWu059431 for perforce@freebsd.org; Mon, 25 Feb 2008 23:26:19 GMT (envelope-from sam@freebsd.org) Date: Mon, 25 Feb 2008 23:26:19 GMT Message-Id: <200802252326.m1PNQJWu059431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 23:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=136194 Change 136194 by sam@sam_ebb on 2008/02/25 23:25:36 o vap'ify iwn; this exposed some issues that need more thought for drivers that need to defer state changes o cleanup timer handling: there are 3 timers, one for periodic calibration (60 secs), tx watchdog (5 secs), and one for the rate control (500 ms); instead of running calibration off the rate control timer combine calbration and tx watchdog as these require the softc lock and have closer duty cycyles; also the rate control timer is totally bogus and needs to be removed but by splitting it out we can at least run it w/o acquiring a mutex (since rate control is now per-vap and the update work is race free or at least race tolerant) o add raw xmit support (initially for mgt frames but also for raw packet injection--untested) o strip out channel sorting since net80211 has it in this branch Affected files ... .. //depot/projects/vap/sys/conf/files#18 edit .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#2 edit .. //depot/projects/vap/sys/dev/iwn/if_iwnvar.h#2 edit Differences ... ==== //depot/projects/vap/sys/conf/files#18 (text+ko) ==== @@ -744,6 +744,7 @@ dev/isp/isp_target.c optional isp dev/ispfw/ispfw.c optional ispfw dev/iwi/if_iwi.c optional iwi +dev/iwn/if_iwn.c optional iwn dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#2 (text+kox) ==== @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -76,6 +77,11 @@ static int iwn_attach(device_t); static int iwn_detach(device_t); static int iwn_cleanup(device_t); +static struct ieee80211vap *iwn_vap_create(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode, + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); +static void iwn_vap_delete(struct ieee80211vap *); static int iwn_shutdown(device_t); static int iwn_suspend(device_t); static int iwn_resume(device_t); @@ -102,7 +108,7 @@ struct ieee80211_node *iwn_node_alloc(struct ieee80211_node_table *); void iwn_newassoc(struct ieee80211_node *, int); int iwn_media_change(struct ifnet *); -int iwn_newstate(struct ieee80211com *, enum ieee80211_state, int); +int iwn_newstate(struct ieee80211vap *, enum ieee80211_state, int); void iwn_mem_lock(struct iwn_softc *); void iwn_mem_unlock(struct iwn_softc *); uint32_t iwn_mem_read(struct iwn_softc *, uint32_t); @@ -116,8 +122,11 @@ int iwn_transfer_firmware(struct iwn_softc *); int iwn_load_firmware(struct iwn_softc *); void iwn_unload_firmware(struct iwn_softc *); -void iwn_calib_timeout(void *); -void iwn_iter_func(void *, struct ieee80211_node *); +static void iwn_timer_timeout(void *); +static void iwn_calib_reset(struct iwn_softc *); +static void iwn_amrr_reset(struct ieee80211vap *); +static void iwn_amrr_iter_func(void *, struct ieee80211_node *); +static void iwn_amrr_timeout(void *); void iwn_ampdu_rx_start(struct iwn_softc *, struct iwn_rx_desc *); void iwn_rx_intr(struct iwn_softc *, struct iwn_rx_desc *, struct iwn_rx_data *); @@ -133,7 +142,9 @@ int iwn_tx_data(struct iwn_softc *, struct mbuf *, struct ieee80211_node *, struct iwn_tx_ring *); void iwn_start(struct ifnet *); -void iwn_watchdog(struct ifnet *); +static int iwn_raw_xmit(struct ieee80211_node *, struct mbuf *, + const struct ieee80211_bpf_params *); +static void iwn_watchdog(struct iwn_softc *); int iwn_ioctl(struct ifnet *, u_long, caddr_t); int iwn_cmd(struct iwn_softc *, int, const void *, int, int); int iwn_setup_node_mrr(struct iwn_softc *, uint8_t, int); @@ -168,11 +179,10 @@ static void iwn_scan_start(struct ieee80211com *); static void iwn_scan_end(struct ieee80211com *); static void iwn_set_channel(struct ieee80211com *); -static void iwn_scan_curchan(struct ieee80211com *, unsigned long); -static void iwn_scan_mindwell(struct ieee80211com *); +static void iwn_scan_curchan(struct ieee80211_scan_state *, unsigned long); +static void iwn_scan_mindwell(struct ieee80211_scan_state *); static void iwn_ops(void *, int); static int iwn_queue_cmd( struct iwn_softc *, int, int, int); -static void iwn_tick(void *); static void iwn_bpfattach(struct iwn_softc *); static void iwn_sysctlattach(struct iwn_softc *); @@ -280,8 +290,7 @@ IWN_LOCK_INIT(sc); IWN_CMD_LOCK_INIT(sc); - callout_init_mtx(&sc->calib_to, &sc->sc_mtx, 0); - callout_init_mtx(&sc->watchdog_to, &sc->sc_mtx, 0); + callout_init_mtx(&sc->sc_timer_to, &sc->sc_mtx, 0); /* * Create the taskqueues used by the driver. Primarily @@ -354,7 +363,7 @@ goto fail; } - ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(dev, "can not allocate ifnet structure\n"); goto fail; @@ -363,7 +372,6 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ - ic->ic_state = IEEE80211_S_INIT; /* set device capabilities */ ic->ic_caps = @@ -406,7 +414,9 @@ IFQ_SET_READY(&ifp->if_snd); ieee80211_ifattach(ic); - ic->ic_bmissthreshold = 10; /* override default */ + ic->ic_vap_create = iwn_vap_create; + ic->ic_vap_delete = iwn_vap_delete; + ic->ic_raw_xmit = iwn_raw_xmit; ic->ic_node_alloc = iwn_node_alloc; ic->ic_newassoc = iwn_newassoc; ic->ic_wme.wme_update = iwn_wme_update; @@ -416,15 +426,6 @@ ic->ic_scan_curchan = iwn_scan_curchan; ic->ic_scan_mindwell = iwn_scan_mindwell; - /* override state transition machine */ - sc->sc_newstate = ic->ic_newstate; - ic->ic_newstate = iwn_newstate; - ieee80211_media_init(ic, iwn_media_change, ieee80211_media_status); - - ieee80211_amrr_init(&sc->amrr, ic, - IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); - iwn_bpfattach(sc); iwn_sysctlattach(sc); @@ -465,8 +466,7 @@ if (ifp != NULL) { iwn_stop(sc); - callout_drain(&sc->calib_to); - callout_drain(&sc->watchdog_to); + callout_drain(&sc->sc_timer_to); bpfdetach(ifp); ieee80211_ifdetach(ic); } @@ -492,6 +492,49 @@ return 0; } +static struct ieee80211vap * +iwn_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) +{ + struct iwn_vap *ivp; + struct ieee80211vap *vap; + + if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ + return NULL; + ivp = (struct iwn_vap *) malloc(sizeof(struct iwn_vap), + M_80211_VAP, M_NOWAIT | M_ZERO); + if (ivp == NULL) + return NULL; + vap = &ivp->iv_vap; + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); + vap->iv_bmissthreshold = 10; /* override default */ + /* override with driver methods */ + ivp->iv_newstate = vap->iv_newstate; + vap->iv_newstate = iwn_newstate; + + callout_init(&ivp->iv_amrr_to, CALLOUT_MPSAFE); + ieee80211_amrr_init(&ivp->iv_amrr, vap, + IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + + /* complete setup */ + ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); + ic->ic_opmode = opmode; + return vap; +} + +static void +iwn_vap_delete(struct ieee80211vap *vap) +{ + struct iwn_vap *ivp = IWN_VAP(vap); + + callout_drain(&ivp->iv_amrr_to); + ieee80211_vap_detach(vap); + free(ivp, M_80211_VAP); +} + static int iwn_shutdown(device_t dev) { @@ -904,10 +947,10 @@ void iwn_newassoc(struct ieee80211_node *ni, int isnew) { - struct iwn_softc *sc = ni->ni_ic->ic_ifp->if_softc; + struct ieee80211vap *vap = ni->ni_vap; int i; - ieee80211_amrr_node_init(&sc->amrr, &((struct iwn_node *)ni)->amn); + ieee80211_amrr_node_init(&IWN_VAP(vap)->iv_amrr, &IWN_NODE(ni)->amn); /* set rate to some reasonable initial value */ for (i = ni->ni_rates.rs_nrates - 1; @@ -919,43 +962,55 @@ int iwn_media_change(struct ifnet *ifp) { - int error; - - error = ieee80211_media_change(ifp); - if (error == ENETRESET) { - if ((ifp->if_flags & IFF_UP) && - (ifp->if_drv_flags & IFF_DRV_RUNNING)) - iwn_init(ifp->if_softc); - error = 0; - } - return error; + int error = ieee80211_media_change(ifp); + /* NB: only the fixed rate can change and that doesn't need a reset */ + return (error == ENETRESET ? 0 : error); } int -iwn_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) +iwn_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { - struct ifnet *ifp = ic->ic_ifp; - struct iwn_softc *sc = ifp->if_softc; + struct iwn_vap *ivp = IWN_VAP(vap); + struct ieee80211com *ic = vap->iv_ic; + struct iwn_softc *sc = ic->ic_ifp->if_softc; DPRINTF(sc, IWN_DEBUG_STATE, "%s: %s -> %s\n", __func__, - ieee80211_state_name[ic->ic_state], + ieee80211_state_name[vap->iv_state], ieee80211_state_name[nstate]); + callout_stop(&sc->sc_timer_to); + callout_stop(&ivp->iv_amrr_to); + /* * Some state transitions require issuing a configure request * to the adapter. This must be done in a blocking context * so we toss control to the task q thread where the state * change will be finished after the command completes. */ - if (nstate == IEEE80211_S_AUTH && ic->ic_state != IEEE80211_S_AUTH) { + if (nstate == IEEE80211_S_AUTH && vap->iv_state != IEEE80211_S_AUTH) { /* !AUTH -> AUTH requires adapter config */ return iwn_queue_cmd(sc, IWN_AUTH, arg, IWN_QUEUE_NORMAL); } - if (nstate == IEEE80211_S_RUN && ic->ic_state != IEEE80211_S_RUN) { - /* !RUN -> RUN requires setting the association id */ + if (nstate == IEEE80211_S_RUN && vap->iv_state != IEEE80211_S_RUN) { + /* + * !RUN -> RUN requires setting the association id + * which is done with a firmware cmd. We also defer + * starting the timers until that work is done. + */ return iwn_queue_cmd(sc, IWN_RUN, arg, IWN_QUEUE_NORMAL); } - return sc->sc_newstate(ic, nstate, arg); + if (nstate == IEEE80211_S_RUN) { + const struct ieee80211_txparam *tp; + /* + * RUN -> RUN transition; just restart the timers. + */ + iwn_calib_reset(sc); + tp = &vap->iv_txparms[ + ieee80211_chan2mode(vap->iv_bss->ni_chan)]; + if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) + iwn_amrr_reset(vap); + } + return ivp->iv_newstate(vap, nstate, arg); } /* @@ -1269,44 +1324,56 @@ } } -void -iwn_calib_timeout(void *arg) +static void +iwn_timer_timeout(void *arg) { struct iwn_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; - int s; - if (ic->ic_state != IEEE80211_S_RUN) - return; + IWN_LOCK_ASSERT(sc); - /* automatic rate control triggered every 500ms */ - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { - /* XXX */ - s = splnet(); - if (ic->ic_opmode == IEEE80211_M_STA) - iwn_iter_func(sc, ic->ic_bss); - else - ieee80211_iterate_nodes(&ic->ic_sta, iwn_iter_func, sc); - splx(s); - } - - /* automatic calibration every 60s */ - if (++sc->calib_cnt >= 120) { + if (sc->calib_cnt && --sc->calib_cnt == 0) { DPRINTF(sc, IWN_DEBUG_CALIBRATE, "%s\n", - "sending request for statistics"); + "send statistics request"); (void) iwn_cmd(sc, IWN_CMD_GET_STATISTICS, NULL, 0, 1); - sc->calib_cnt = 0; + sc->calib_cnt = 60; /* do calibration every 60s */ } - callout_reset(&sc->calib_to, hz / 2, iwn_calib_timeout, sc); + iwn_watchdog(sc); /* NB: piggyback tx watchdog */ + callout_reset(&sc->sc_timer_to, hz, iwn_timer_timeout, sc); +} + +static void +iwn_calib_reset(struct iwn_softc *sc) +{ + callout_reset(&sc->sc_timer_to, hz, iwn_timer_timeout, sc); + sc->calib_cnt = 60; /* do calibration every 60s */ +} + +static void +iwn_amrr_reset(struct ieee80211vap *vap) +{ + /* rate control updated every 500ms */ + callout_reset(&IWN_VAP(vap)->iv_amrr_to, hz / 2, iwn_amrr_timeout, vap); +} + +static void +iwn_amrr_iter_func(void *arg, struct ieee80211_node *ni) +{ + struct ieee80211vap *vap = arg; + + ieee80211_amrr_choose(&IWN_VAP(vap)->iv_amrr, ni, &IWN_NODE(ni)->amn); } -void -iwn_iter_func(void *arg, struct ieee80211_node *ni) +static void +iwn_amrr_timeout(void *arg) { - struct iwn_softc *sc = arg; - struct iwn_node *wn = IWN_NODE(ni); + struct ieee80211vap *vap = arg; - ieee80211_amrr_choose(&sc->amrr, ni, &wn->amn); + if (vap->iv_opmode != IEEE80211_M_STA) { + struct ieee80211com *ic = vap->iv_ic; + ieee80211_iterate_nodes(&ic->ic_sta, iwn_amrr_iter_func, vap); + } else + iwn_amrr_iter_func(vap, vap->iv_bss); + iwn_amrr_reset(vap); } void @@ -1440,10 +1507,15 @@ ring->desc[ring->cur] = htole32(paddr >> 8); rssi = iwn_get_rssi(sc, stat); - nf = (ic->ic_state == IEEE80211_S_RUN && + + /* grab a reference to the source node */ + wh = mtod(m, struct ieee80211_frame *); + ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); + + nf = (ni != NULL && ni->ni_vap->iv_state == IEEE80211_S_RUN && (ic->ic_flags & IEEE80211_F_SCAN) == 0) ? sc->noise : -95; - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct iwn_rx_radiotap_header *tap = &sc->sc_rxtap; tap->wr_flags = 0; @@ -1455,19 +1527,18 @@ if (stat->flags & htole16(IWN_CONFIG_SHPREAMBLE)) tap->wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_rxtap_len, m); } - /* grab a reference to the source node */ - wh = mtod(m, struct ieee80211_frame *); - ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); + IWN_UNLOCK(sc); - IWN_UNLOCK(sc); /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, rssi - nf, nf, 0); + if (ni != NULL) { + (void) ieee80211_input(ni, m, rssi - nf, nf, 0); + ieee80211_free_node(ni); + } else + (void) ieee80211_input_all(ic, m, rssi - nf, nf, 0); - /* node is no longer needed */ - ieee80211_free_node(ni); IWN_LOCK(sc); } @@ -1475,16 +1546,17 @@ iwn_rx_statistics(struct iwn_softc *sc, struct iwn_rx_desc *desc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct iwn_calib_state *calib = &sc->calib; struct iwn_stats *stats = (struct iwn_stats *)(desc + 1); /* beacon stats are meaningful only when associated and not scanning */ - if (ic->ic_state != IEEE80211_S_RUN || + if (vap->iv_state != IEEE80211_S_RUN || (ic->ic_flags & IEEE80211_F_SCAN)) return; DPRINTF(sc, IWN_DEBUG_CALIBRATE, "%s: cmd %d\n", __func__, desc->type); - sc->calib_cnt = 0; /* reset timeout */ + iwn_calib_reset(sc); /* test if temperature has changed */ if (stats->general.temp != sc->rawtemp) { @@ -1552,8 +1624,7 @@ DPRINTF(sc, IWN_DEBUG_ANY, "%s: status 0x%x\n", __func__, le32toh(stat->status)); ifp->if_oerrors++; - } else - ifp->if_opackets++; + } bus_dmamap_sync(ring->data_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(ring->data_dmat, data->map); @@ -1568,7 +1639,6 @@ ring->queued--; sc->sc_tx_timer = 0; - callout_stop(&sc->watchdog_to); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; iwn_start(ifp); } @@ -1598,6 +1668,7 @@ iwn_notif_intr(struct iwn_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); uint16_t hw; hw = le16toh(sc->shared->closed_count) & 0xfff; @@ -1649,9 +1720,9 @@ * If more than 5 consecutive beacons are missed, * reinitialize the sensitivity state machine. */ - if (ic->ic_state == IEEE80211_S_RUN && misses > 5) + if (vap->iv_state == IEEE80211_S_RUN && misses > 5) (void) iwn_init_sensitivity(sc); - if (misses >= ic->ic_bmissthreshold) + if (misses >= vap->iv_bmissthreshold) ieee80211_beacon_miss(ic); break; } @@ -1807,7 +1878,10 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m0, struct ieee80211_node *ni, struct iwn_tx_ring *ring) { - struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = sc->sc_ifp; + const struct ieee80211_txparam *tp; struct iwn_tx_desc *desc; struct iwn_tx_data *data; struct iwn_tx_cmd *cmd; @@ -1823,24 +1897,28 @@ int rate, error, pad, nsegs, i, ismcast, id; bus_dma_segment_t segs[IWN_MAX_SCATTER]; + IWN_LOCK_ASSERT(sc); + wh = mtod(m0, struct ieee80211_frame *); type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1); hdrlen = ieee80211_anyhdrsize(wh); /* pick a tx rate */ + /* XXX ni_chan */ + tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; if (type == IEEE80211_FC0_TYPE_MGT) - rate = ni->ni_rates.rs_rates[0]; + rate = tp->mgmtrate; else if (ismcast) - rate = ic->ic_mcast_rate; - else if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) - rate = ic->ic_fixed_rate; + rate = tp->mcastrate; + else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) + rate = tp->ucastrate; else rate = ni->ni_rates.rs_rates[ni->ni_txrate]; rate &= IEEE80211_RATE_VAL; if (wh->i_fc[1] & IEEE80211_FC1_WEP) { - k = ieee80211_crypto_encap(ic, ni, m0); + k = ieee80211_crypto_encap(ni, m0); if (k == NULL) { m_freem(m0); return ENOBUFS; @@ -1850,7 +1928,7 @@ } else k = NULL; - if (bpf_peers_present(sc->sc_drvbpf)) { + if (bpf_peers_present(ifp->if_bpf)) { struct iwn_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; @@ -1858,7 +1936,7 @@ if (k != NULL) tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP; - bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } flags = IWN_TX_AUTO_SEQ; @@ -1874,7 +1952,7 @@ /* check if RTS/CTS or CTS-to-self protection must be used */ if (!ismcast) { /* multicast frames are not sent at OFDM rates in 802.11b/g */ - if (m0->m_pkthdr.len+IEEE80211_CRC_LEN > ic->ic_rtsthreshold) { + if (m0->m_pkthdr.len+IEEE80211_CRC_LEN > vap->iv_rtsthreshold) { flags |= IWN_TX_NEED_RTS | IWN_TX_FULL_TXOP; } else if ((ic->ic_flags & IEEE80211_F_USEPROT) && IWN_RATE_IS_OFDM(rate)) { @@ -1907,7 +1985,6 @@ } else pad = 0; - IWN_LOCK(sc); desc = &ring->desc[ring->cur]; data = &ring->data[ring->cur]; @@ -2006,7 +2083,9 @@ /* kick Tx ring */ ring->cur = (ring->cur + 1) % IWN_TX_RING_COUNT; IWN_WRITE(sc, IWN_TX_WIDX, ring->qid << 8 | ring->cur); - IWN_UNLOCK(sc); + + ifp->if_opackets++; + sc->sc_tx_timer = 5; return 0; } @@ -2015,100 +2094,268 @@ iwn_start(struct ifnet *ifp) { struct iwn_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; struct iwn_tx_ring *txq; - struct ether_header *eh; struct mbuf *m; int pri; for (;;) { - IF_POLL(&ic->ic_mgtq, m); - if (m != NULL) { - pri = M_WME_GETAC(m); - txq = &sc->txq[pri]; - if (txq->queued >= IWN_TX_RING_COUNT - 8) { - /* XXX not right */ - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - break; + IFQ_DRV_DEQUEUE(&ifp->if_snd, m); + if (m == NULL) + break; + ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; + pri = M_WME_GETAC(m); + txq = &sc->txq[pri]; + m = ieee80211_encap(ni, m); + if (m == NULL) { + ifp->if_oerrors++; + ieee80211_free_node(ni); + continue; + } + IWN_LOCK(sc); + if (txq->queued >= IWN_TX_RING_COUNT - 8) { + /* XXX not right */ + /* ring is nearly full, stop flow */ + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + } + if (iwn_tx_data(sc, m, ni, txq) != 0) { + ifp->if_oerrors++; + ieee80211_free_node(ni); + IWN_UNLOCK(sc); + break; + } + IWN_UNLOCK(sc); + } +} + +static int +iwn_tx_handoff(struct iwn_softc *sc, + struct iwn_tx_ring *ring, + struct iwn_tx_cmd *cmd, + struct iwn_cmd_data *tx, + struct ieee80211_node *ni, + struct mbuf *m0, u_int hdrlen, int pad) +{ + struct ifnet *ifp = sc->sc_ifp; + struct iwn_tx_desc *desc; + struct iwn_tx_data *data; + bus_addr_t paddr; + struct mbuf *mnew; + int error, nsegs, i; + bus_dma_segment_t segs[IWN_MAX_SCATTER]; + + /* copy and trim IEEE802.11 header */ + memcpy((uint8_t *)(tx + 1), mtod(m0, uint8_t *), hdrlen); + m_adj(m0, hdrlen); + + desc = &ring->desc[ring->cur]; + data = &ring->data[ring->cur]; + + error = bus_dmamap_load_mbuf_sg(ring->data_dmat, data->map, m0, segs, + &nsegs, BUS_DMA_NOWAIT); + if (error != 0) { + if (error == EFBIG) { + /* too many fragments, linearize */ + mnew = m_collapse(m0, M_DONTWAIT, IWN_MAX_SCATTER); + if (mnew == NULL) { + IWN_UNLOCK(sc); + device_printf(sc->sc_dev, + "%s: could not defrag mbuf\n", __func__); + m_freem(m0); + return ENOBUFS; } - IF_DEQUEUE(&ic->ic_mgtq, m); + m0 = mnew; + error = bus_dmamap_load_mbuf_sg(ring->data_dmat, + data->map, m0, segs, &nsegs, BUS_DMA_NOWAIT); + } + if (error != 0) { + IWN_UNLOCK(sc); + device_printf(sc->sc_dev, + "%s: bus_dmamap_load_mbuf_sg failed, error %d\n", + __func__, error); + m_freem(m0); + return error; + } + } + + data->m = m0; + data->ni = ni; + + DPRINTF(sc, IWN_DEBUG_XMIT, "%s: qid %d idx %d len %d nsegs %d\n", + __func__, ring->qid, ring->cur, m0->m_pkthdr.len, nsegs); + + paddr = ring->cmd_dma.paddr + ring->cur * sizeof (struct iwn_tx_cmd); + tx->loaddr = htole32(paddr + 4 + + offsetof(struct iwn_cmd_data, ntries)); + tx->hiaddr = 0; /* limit to 32-bit physical addresses */ + + /* first scatter/gather segment is used by the tx data command */ + IWN_SET_DESC_NSEGS(desc, 1 + nsegs); + IWN_SET_DESC_SEG(desc, 0, paddr, 4 + sizeof (*tx) + hdrlen + pad); + for (i = 1; i <= nsegs; i++) { + IWN_SET_DESC_SEG(desc, i, segs[i - 1].ds_addr, + segs[i - 1].ds_len); + } + sc->shared->len[ring->qid][ring->cur] = + htole16(hdrlen + m0->m_pkthdr.len + 8); + + if (ring->cur < IWN_TX_WINDOW) + sc->shared->len[ring->qid][ring->cur + IWN_TX_RING_COUNT] = + htole16(hdrlen + m0->m_pkthdr.len + 8); + + ring->queued++; + + /* kick Tx ring */ + ring->cur = (ring->cur + 1) % IWN_TX_RING_COUNT; + IWN_WRITE(sc, IWN_TX_WIDX, ring->qid << 8 | ring->cur); + + ifp->if_opackets++; + sc->sc_tx_timer = 5; + + return 0; +} - ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; - m->m_pkthdr.rcvif = NULL; +static int +iwn_tx_data_raw(struct iwn_softc *sc, struct mbuf *m0, + struct ieee80211_node *ni, struct iwn_tx_ring *ring, + const struct ieee80211_bpf_params *params) +{ + struct ifnet *ifp = sc->sc_ifp; + struct iwn_tx_cmd *cmd; + struct iwn_cmd_data *tx; + struct ieee80211_frame *wh; + uint32_t flags; + uint8_t type, subtype; + u_int hdrlen; + int rate, pad; - if (iwn_tx_data(sc, m, ni, txq) != 0) - break; - } else { - if (ic->ic_state != IEEE80211_S_RUN) - break; + IWN_LOCK_ASSERT(sc); - IFQ_DRV_DEQUEUE(&ifp->if_snd, m); - if (m == NULL) - break; - /* - * Cancel any background scan. - */ - if (ic->ic_flags & IEEE80211_F_SCAN) - ieee80211_cancel_scan(ic); + wh = mtod(m0, struct ieee80211_frame *); + type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; + subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; + hdrlen = ieee80211_anyhdrsize(wh); - if (m->m_len < sizeof (*eh) && - (m = m_pullup(m, sizeof (*eh))) != NULL) { - ifp->if_oerrors++; - continue; - } + flags = IWN_TX_AUTO_SEQ; + if ((params->ibp_flags & IEEE80211_BPF_NOACK) == 0) + flags |= IWN_TX_NEED_ACK; + if (params->ibp_flags & IEEE80211_BPF_RTS) + flags |= IWN_TX_NEED_RTS | IWN_TX_FULL_TXOP; + if (params->ibp_flags & IEEE80211_BPF_CTS) + flags |= IWN_TX_NEED_CTS | IWN_TX_FULL_TXOP; + if (type == IEEE80211_FC0_TYPE_MGT && + subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP) { + /* tell h/w to set timestamp in probe responses */ + flags |= IWN_TX_INSERT_TSTAMP; + } + if (hdrlen & 3) { + /* first segment's length must be a multiple of 4 */ + flags |= IWN_TX_NEED_PADDING; + pad = 4 - (hdrlen & 3); + } else + pad = 0; - eh = mtod(m, struct ether_header *); - ni = ieee80211_find_txnode(ic, eh->ether_dhost); - if (ni == NULL) { - /* NB: ieee80211_find_txnode does stat+msg */ - m_freem(m); - goto bad; - } - if (ieee80211_classify(ic, m, ni)) { - m_freem(m); - goto reclaim; - } - pri = M_WME_GETAC(m); - txq = &sc->txq[pri]; - if (txq->queued >= IWN_TX_RING_COUNT - 8) { - /* XXX not right */ - /* there is no place left in this ring */ - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - m_freem(m); - goto reclaim; - } - BPF_MTAP(ifp, m); + /* pick a tx rate */ + rate = params->ibp_rate0; - m = ieee80211_encap(ic, m, ni); - if (m == NULL) - goto bad; + if (bpf_peers_present(ifp->if_bpf)) { + struct iwn_tx_radiotap_header *tap = &sc->sc_txtap; - if (bpf_peers_present(ic->ic_rawbpf)) - bpf_mtap(ic->ic_rawbpf, m); + tap->wt_flags = 0; + tap->wt_rate = rate; - if (iwn_tx_data(sc, m, ni, txq) != 0) { - bad: - ifp->if_oerrors++; - reclaim: - if (ni != NULL) - ieee80211_free_node(ni); - break; - } - } - sc->sc_tx_timer = 5; - ic->ic_lastdata = ticks; + bpf_mtap2(ifp->if_bpf, tap, sc->sc_txtap_len, m0); } + + cmd = &ring->cmd[ring->cur]; + cmd->code = IWN_CMD_TX_DATA; + cmd->flags = 0; + cmd->qid = ring->qid; + cmd->idx = ring->cur; + + tx = (struct iwn_cmd_data *)cmd->data; + /* NB: no need to bzero tx, all fields are reinitialized here */ + tx->id = IWN_ID_BROADCAST; + tx->flags = htole32(flags); + tx->len = htole16(m0->m_pkthdr.len); + tx->rate = iwn_plcp_signal(rate); + tx->rts_ntries = params->ibp_try1; /* XXX? */ + tx->data_ntries = params->ibp_try0; + tx->lifetime = htole32(IWN_LIFETIME_INFINITE); + /* XXX use try count? */ + if (type == IEEE80211_FC0_TYPE_MGT) { + if (subtype == IEEE80211_FC0_SUBTYPE_ASSOC_REQ || + subtype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) + tx->timeout = htole16(3); + else + tx->timeout = htole16(2); + } else + tx->timeout = htole16(0); + tx->security = 0; + /* XXX alternate between Ant A and Ant B ? */ + tx->rflags = IWN_RFLAG_ANT_B; /* XXX params->ibp_pri >> 2 */ + tx->ridx = IWN_MAX_TX_RETRIES - 1; + if (!IWN_RATE_IS_OFDM(rate)) + tx->rflags |= IWN_RFLAG_CCK; + + return iwn_tx_handoff(sc, ring, cmd, tx, ni, m0, hdrlen, pad); } -void -iwn_watchdog(struct ifnet *ifp) +static int +iwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, + const struct ieee80211_bpf_params *params) { + struct ieee80211com *ic = ni->ni_ic; + struct ifnet *ifp = ic->ic_ifp; struct iwn_softc *sc = ifp->if_softc; + struct iwn_tx_ring *txq; + int error; + + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + ieee80211_free_node(ni); + m_freem(m); + return ENETDOWN; + } + IWN_LOCK(sc); + if (params == NULL) + txq = &sc->txq[M_WME_GETAC(m)]; + else + txq = &sc->txq[params->ibp_pri & 3]; + if (txq->queued >= IWN_TX_RING_COUNT - 8) { + /* XXX not right */ + /* ring is nearly full, stop flow */ + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + } + if (params == NULL) { + /* + * Legacy path; interpret frame contents to decide + * precisely how to send the frame. + */ + error = iwn_tx_data(sc, m, ni, txq); + } else { + /* + * Caller supplied explicit parameters to use in + * sending the frame. + */ + error = iwn_tx_data_raw(sc, m, ni, txq, params); + } + if (error != 0) { + /* NB: m is reclaimed on tx failure */ + ieee80211_free_node(ni); + ifp->if_oerrors++; + } + IWN_UNLOCK(sc); + return error; +} + +static void +iwn_watchdog(struct iwn_softc *sc) +{ if (sc->sc_tx_timer > 0 && --sc->sc_tx_timer == 0) { - device_printf(sc->sc_dev, "device timeout\n"); - ifp->if_oerrors++; + struct ifnet *ifp = sc->sc_ifp; + + if_printf(ifp, "device timeout\n"); iwn_queue_cmd(sc, IWN_REINIT, 0, IWN_QUEUE_CLEAR); } } @@ -2118,6 +2365,7 @@ { struct iwn_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; + struct ifreq *ifr = (struct ifreq *) data; int error = 0; switch (cmd) { @@ -2143,16 +2391,13 @@ error = 0; break; #endif - + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); + break; default: - error = ieee80211_ioctl(ic, cmd, data); - } - if (error == ENETRESET) { - if ((ifp->if_flags & IFF_UP ) && - (ifp->if_drv_flags & IFF_DRV_RUNNING) && - (ic->ic_roaming != IEEE80211_ROAMING_MANUAL)) - iwn_init(sc); - error = 0; + error = ether_ioctl(ifp, cmd, data); + break; } return error; } @@ -2337,61 +2582,7 @@ } } -static __inline int -chancompar(const void *a, const void *b) -{ - const struct ieee80211_channel *ca = a; - const struct ieee80211_channel *cb = b; - - return (ca->ic_freq == cb->ic_freq) ? - (ca->ic_flags & IEEE80211_CHAN_ALL) - - (cb->ic_flags & IEEE80211_CHAN_ALL) : - ca->ic_freq - cb->ic_freq; -} - -/* - * Insertion sort. - */ -#define swap(_a, _b, _size) { \ - uint8_t *s = _b; \ - int i = _size; \ - do { \ - uint8_t tmp = *_a; \ - *_a++ = *s; \ - *s++ = tmp; \ - } while (--i); \ - _a -= _size; \ -} - static void -sort_channels(void *a, size_t n, size_t size) -{ - uint8_t *aa = a; - uint8_t *ai, *t; - - for (ai = aa+size; --n >= 1; ai += size) - for (t = ai; t > aa; t -= size) { - uint8_t *u = t - size; - if (chancompar(u, t) <= 0) - break; - swap(u, t, size); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 26 00:14:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E19616A406; Tue, 26 Feb 2008 00:14:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3757F16A404 for ; Tue, 26 Feb 2008 00:14:32 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 222C913C455 for ; Tue, 26 Feb 2008 00:14:32 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q0ETxH062183 for ; Tue, 26 Feb 2008 00:14:29 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q0ETIZ062180 for perforce@freebsd.org; Tue, 26 Feb 2008 00:14:29 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 26 Feb 2008 00:14:29 GMT Message-Id: <200802260014.m1Q0ETIZ062180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 00:14:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=136195 Change 136195 by peter@peter_overcee on 2008/02/26 00:14:13 IFC @136192 Affected files ... .. //depot/projects/hammer/bin/sh/cd.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#9 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#17 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ar/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.h#8 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/clock_gettime.2#10 integrate .. //depot/projects/hammer/lib/msun/powerpc/fenv.h#4 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#8 integrate .. //depot/projects/hammer/lib/msun/src/k_rem_pio2.c#4 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#10 integrate .. //depot/projects/hammer/lib/msun/src/s_cosf.c#6 integrate .. //depot/projects/hammer/lib/msun/src/s_sinf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/s_tanf.c#5 integrate .. //depot/projects/hammer/sbin/ping6/ping6.c#12 integrate .. //depot/projects/hammer/share/man/man9/VOP_LOCK.9#10 integrate .. //depot/projects/hammer/share/man/man9/lock.9#12 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#17 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#57 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#29 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#31 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#21 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#9 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#25 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#36 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#41 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#37 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#27 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#53 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#33 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#124 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#25 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#54 integrate .. //depot/projects/hammer/sys/netncp/ncp_conn.c#12 integrate .. //depot/projects/hammer/sys/netsmb/smb_conn.c#13 integrate .. //depot/projects/hammer/sys/netsmb/smb_iod.c#11 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#25 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#33 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#53 integrate .. //depot/projects/hammer/sys/powerpc/include/float.h#9 integrate .. //depot/projects/hammer/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#14 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#12 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#12 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#9 integrate .. //depot/projects/hammer/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/hammer/sys/sys/buf.h#34 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#17 integrate .. //depot/projects/hammer/sys/sys/param.h#105 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#22 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#49 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#74 integrate .. //depot/projects/hammer/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/hammer/usr.bin/ar/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/ar/ar.c#4 integrate .. //depot/projects/hammer/usr.bin/ar/write.c#2 integrate .. //depot/projects/hammer/usr.bin/du/du.1#9 integrate .. //depot/projects/hammer/usr.bin/du/du.c#17 integrate .. //depot/projects/hammer/usr.bin/find/find.1#24 integrate Differences ... ==== //depot/projects/hammer/bin/sh/cd.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); #include #include @@ -68,7 +68,9 @@ STATIC int cdphysical(char *); STATIC int docd(char *, int, int); STATIC char *getcomponent(void); -STATIC int updatepwd(char *); +STATIC char *findcwd(char *); +STATIC void updatepwd(char *); +STATIC char *getpwd2(char *, size_t); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -201,10 +203,11 @@ } INTOFF; - if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) { + if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -212,12 +215,14 @@ STATIC int cdphysical(char *dest) { + char *p; INTOFF; - if (chdir(dest) < 0 || updatepwd(NULL) < 0) { + if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -247,38 +252,20 @@ } -/* - * Update curdir (the name of the current directory) in response to a - * cd command. We also call hashcd to let the routines in exec.c know - * that the current directory has changed. - */ -STATIC int -updatepwd(char *dir) +STATIC char * +findcwd(char *dir) { char *new; char *p; - hashcd(); /* update command hash table */ - /* * If our argument is NULL, we don't know the current directory * any more because we traversed a symbolic link or something * we couldn't stat(). */ if (dir == NULL || curdir == NULL) { - if (prevdir) - ckfree(prevdir); - INTOFF; - prevdir = curdir; - curdir = NULL; - if (getpwd() == NULL) { - INTON; - return (-1); - } - setvar("PWD", curdir, VEXPORT); - setvar("OLDPWD", prevdir, VEXPORT); - INTON; - return (0); + p = stalloc(PATH_MAX); + return getpwd2(p, PATH_MAX); } cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); @@ -302,16 +289,25 @@ if (new == stackblock()) STPUTC('/', new); STACKSTRNUL(new); - INTOFF; + return stackblock(); +} + +/* + * Update curdir (the name of the current directory) in response to a + * cd command. We also call hashcd to let the routines in exec.c know + * that the current directory has changed. + */ +STATIC void +updatepwd(char *dir) +{ + hashcd(); /* update command hash table */ + if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(stackblock()); + curdir = savestr(dir); setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); - INTON; - - return (0); } int @@ -355,17 +351,31 @@ } /* - * Find out what the current directory is. If we already know the current - * directory, this routine returns immediately. + * Get the current directory and cache the result in curdir. */ char * getpwd(void) { char buf[PATH_MAX]; + char *p; if (curdir) return curdir; - if (getcwd(buf, sizeof(buf)) == NULL) { + + p = getpwd2(buf, sizeof(buf)); + if (p != NULL) + curdir = savestr(p); + + return curdir; +} + +/* + * Return the current directory. + */ +STATIC char * +getpwd2(char *buf, size_t size) +{ + if (getcwd(buf, size) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -373,12 +383,9 @@ stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - curdir = savestr(pwd); - return curdir; + return pwd; } return NULL; } - curdir = savestr(buf); - - return curdir; + return buf; } ==== //depot/projects/hammer/contrib/tcpdump/print-802_11.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/hammer/gnu/lib/libgcc/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -122,7 +122,7 @@ .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c +LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif ==== //depot/projects/hammer/gnu/usr.bin/binutils/ar/Makefile#6 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ar -#MAN= gnu-ar.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar -.endif SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#7 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ranlib -#MAN= gnu-ranlib.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 +.endif + PROG= ranlib -.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $ */ #ifndef _KGDB_H_ @@ -49,7 +49,6 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); -void kgdb_auto_load_klds(void); void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); ==== //depot/projects/hammer/lib/libc/powerpc/gen/flt_rounds.c#2 (text+ko) ==== @@ -32,11 +32,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/flt_rounds.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT static const int map[] = { 1, /* round to nearest */ 0, /* round to zero */ @@ -52,3 +53,4 @@ __asm__ __volatile("mffs %0" : "=f"(fpscr)); return map[(fpscr & 0x03)]; } +#endif ==== //depot/projects/hammer/lib/libc/powerpc/gen/fpgetmask.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetmask.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_except_t fpgetmask() { @@ -51,3 +52,4 @@ __asm__("mffs %0" : "=f"(fpscr)); return ((fp_except_t)((fpscr >> 3) & 0x1f)); } +#endif ==== //depot/projects/hammer/lib/libc/powerpc/gen/fpgetround.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpgetround.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_rnd_t fpgetround() { @@ -51,3 +52,4 @@ __asm__("mffs %0" : "=f"(fpscr)); return ((fp_rnd_t)(fpscr & 0x3)); } +#endif ==== //depot/projects/hammer/lib/libc/powerpc/gen/fpgetsticky.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.1 2004/02/12 09:11:06 grehan Exp $ + * $FreeBSD: src/lib/libc/powerpc/gen/fpgetsticky.c,v 1.2 2008/02/24 19:22:53 raj Exp $ */ #include @@ -45,6 +45,7 @@ #include #include +#ifndef _SOFT_FLOAT #ifdef __weak_alias __weak_alias(fpgetsticky,_fpgetsticky) #endif @@ -57,3 +58,4 @@ __asm__ __volatile("mffs %0" : "=f"(fpscr)); return ((fp_except_t)((fpscr >> 25) & 0x1f)); } +#endif ==== //depot/projects/hammer/lib/libc/powerpc/gen/fpsetmask.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetmask.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_except_t fpsetmask(fp_except_t mask) { @@ -55,3 +56,4 @@ __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr)); return (old); } +#endif ==== //depot/projects/hammer/lib/libc/powerpc/gen/fpsetround.c#2 (text+ko) ==== @@ -38,11 +38,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.1 2004/02/12 09:11:06 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/fpsetround.c,v 1.2 2008/02/24 19:22:53 raj Exp $"); #include #include +#ifndef _SOFT_FLOAT fp_rnd_t fpsetround(fp_rnd_t rnd_dir) { @@ -55,3 +56,4 @@ __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr)); return (old); } +#endif ==== //depot/projects/hammer/lib/libc/sys/clock_gettime.2#10 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.24 2007/01/09 00:28:14 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.25 2008/02/25 13:03:18 brueffer Exp $ .\" .Dd November 4, 2006 .Dt CLOCK_GETTIME 2 @@ -52,8 +52,8 @@ .Fn clock_gettime and .Fn clock_settime -allow the calling process to retrieve or set the value used by a clock -which is specified by +system calls allow the calling process to retrieve or set the value +used by a clock which is specified by .Fa clock_id . .Pp The ==== //depot/projects/hammer/lib/msun/powerpc/fenv.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.3 2005/03/16 19:03:45 das Exp $ + * $FreeBSD: src/lib/msun/powerpc/fenv.h,v 1.4 2008/02/24 19:22:53 raj Exp $ */ #ifndef _FENV_H_ @@ -82,8 +82,13 @@ #define _ENABLE_MASK ((FE_DIVBYZERO | FE_INEXACT | FE_INVALID | \ FE_OVERFLOW | FE_UNDERFLOW) >> _FPUSW_SHIFT) +#ifndef _SOFT_FLOAT #define __mffs(__env) __asm __volatile("mffs %0" : "=f" (*(__env))) #define __mtfsf(__env) __asm __volatile("mtfsf 255,%0" : : "f" (__env)) +#else +#define __mffs(__env) +#define __mtfsf(__env) +#endif union __fpscr { double __d; ==== //depot/projects/hammer/lib/msun/src/e_rem_pio2.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.15 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -56,7 +56,7 @@ __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; - double tx[3]; + double tx[3],ty[2]; int32_t e0,i,j,nx,n,ix,hx; u_int32_t low; @@ -182,7 +182,7 @@ tx[2] = z; nx = 3; while(tx[nx-1]==zero) nx--; /* skip zero term */ - n = __kernel_rem_pio2(tx,y,e0,nx,2); - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,nx,1); + if(hx<0) {y[0] = -ty[0]; y[1] = -ty[1]; return -n;} + y[0] = ty[0]; y[1] = ty[1]; return n; } ==== //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#8 (text+ko) ==== @@ -15,12 +15,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.24 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * - * return the remainder of x rem pi/2 in y[0]+y[1] - * use double precision internally + * return the remainder of x rem pi/2 in *y + * use double precision for everything except passing x * use __kernel_rem_pio2() for large x */ @@ -41,11 +41,14 @@ pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +#ifdef INLINE_REM_PIO2F +extern inline +#endif int -__ieee754_rem_pio2f(float x, float *y) +__ieee754_rem_pio2f(float x, double *y) { double w,r,fn; - double tx[1],ty[2]; + double tx[1],ty[1]; float z; int32_t e0,n,ix,hx; @@ -63,23 +66,20 @@ #endif r = x-fn*pio2_1; w = fn*pio2_1t; - y[0] = r-w; - y[1] = (r-y[0])-w; + *y = r-w; return n; } /* * all other (large) arguments */ if(ix>=0x7f800000) { /* x is inf or NaN */ - y[0]=y[1]=x-x; return 0; + *y=x-x; return 0; } /* set z = scalbn(|x|,ilogb(|x|)-23) */ e0 = (ix>>23)-150; /* e0 = ilogb(|x|)-23; */ SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23))); tx[0] = z; - n = __kernel_rem_pio2(tx,ty,e0,1,1); - y[0] = ty[0]; - y[1] = ty[0] - y[0]; - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,1,0); + if(hx<0) {*y = -ty[0]; return -n;} + *y = ty[0]; return n; } ==== //depot/projects/hammer/lib/msun/src/k_rem_pio2.c#4 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.10 2008/02/17 07:31:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.11 2008/02/25 11:43:20 bde Exp $"); /* * __kernel_rem_pio2(x,y,e0,nx,prec) @@ -78,8 +78,13 @@ * Here is the description of some local variables: * * jk jk+1 is the initial number of terms of ipio2[] needed - * in the computation. The recommended value is 2,3,4, - * 6 for single, double, extended,and quad. + * in the computation. The minimum and recommended value + * for jk is 3,4,4,6 for single, double, extended, and quad. + * jk+1 must be 2 larger than you might expect so that our + * recomputation test works. (Up to 24 bits in the integer + * part (the 24 bits of it that we compute) and 23 bits in + * the fraction part may be lost to cancelation before we + * recompute.) * * jz local integer variable indicating the number of * terms of ipio2[] used. @@ -129,7 +134,7 @@ #include "math.h" #include "math_private.h" -static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ +static const int init_jk[] = {3,4,4,6}; /* initial value for jk */ /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi ==== //depot/projects/hammer/lib/msun/src/math_private.h#10 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.25 2008/02/22 14:11:03 bde Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.26 2008/02/25 13:33:20 bde Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -320,7 +320,7 @@ double __kernel_tan(double,double,int); /* float precision kernel functions */ -int __ieee754_rem_pio2f(float,float*); +int __ieee754_rem_pio2f(float,double*); float __kernel_sindf(double); float __kernel_cosdf(double); float __kernel_tandf(double,int); ==== //depot/projects/hammer/lib/msun/src/s_cosf.c#6 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.16 2008/02/22 02:30:35 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float cosf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -71,13 +75,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_cosdf((double)y[0]+y[1]); - case 1: return __kernel_sindf(-(double)y[0]-y[1]); - case 2: return -__kernel_cosdf((double)y[0]+y[1]); + case 0: return __kernel_cosdf(y); + case 1: return __kernel_sindf(-y); + case 2: return -__kernel_cosdf(y); default: - return __kernel_sindf((double)y[0]+y[1]); + return __kernel_sindf(y); } } } ==== //depot/projects/hammer/lib/msun/src/s_sinf.c#5 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float sinf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -69,13 +73,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_sindf((double)y[0]+y[1]); - case 1: return __kernel_cosdf((double)y[0]+y[1]); - case 2: return __kernel_sindf(-(double)y[0]-y[1]); + case 0: return __kernel_sindf(y); + case 1: return __kernel_cosdf(y); + case 2: return __kernel_sindf(-y); default: - return -__kernel_cosdf((double)y[0]+y[1]); + return -__kernel_cosdf(y); } } } ==== //depot/projects/hammer/lib/msun/src/s_tanf.c#5 (text+ko) ==== @@ -15,11 +15,15 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_TANDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_tanf.c" /* Small multiples of pi/2 rounded to double precision. */ @@ -32,7 +36,7 @@ float tanf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -61,8 +65,8 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); /* integer parameter: 1 -- n even; -1 -- n odd */ - return __kernel_tandf((double)y[0]+y[1],1-((n&1)<<1)); + return __kernel_tandf(y,1-((n&1)<<1)); } } ==== //depot/projects/hammer/sbin/ping6/ping6.c#12 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.32 2007/11/20 01:58:34 dd Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.33 2008/02/25 10:45:25 silby Exp $"; #endif /* not lint */ /* @@ -457,9 +457,9 @@ if (interval.tv_sec < 0) errx(1, "illegal timing interval %s", optarg); /* less than 1/hz does not make sense */ - if (interval.tv_sec == 0 && interval.tv_usec < 10000) { - warnx("too small interval, raised to 0.01"); - interval.tv_usec = 10000; + if (interval.tv_sec == 0 && interval.tv_usec < 1) { + warnx("too small interval, raised to .000001"); + interval.tv_usec = 1; } options |= F_INTERVAL; break; ==== //depot/projects/hammer/share/man/man9/VOP_LOCK.9#10 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.22 2008/01/18 22:09:29 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.23 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd January 19, 2008 +.Dd February 25, 2008 .Os .Dt VOP_LOCK 9 .Sh NAME @@ -46,7 +46,7 @@ .Ft int .Fn VOP_UNLOCK "struct vnode *vp" "int flags" .Ft int -.Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td" +.Fn VOP_ISLOCKED "struct vnode *vp" .Ft int .Fn vn_lock "struct vnode *vp" "int flags" .Sh DESCRIPTION @@ -101,9 +101,6 @@ .It Dv LK_RETRY Retry until locked. .El -.It Fa td -Thread context to use for the locks. -.El .Pp Kernel code should use .Fn vn_lock ==== //depot/projects/hammer/share/man/man9/lock.9#12 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.25 2008/02/14 19:39:09 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.26 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd February 13, 2008 +.Dd February 25, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -49,7 +49,7 @@ .Ft int .Fn lockmgr "struct lock *lkp" "u_int flags" "struct mtx *interlkp" .Ft int -.Fn lockstatus "struct lock *lkp" "struct thread *td" +.Fn lockstatus "struct lock *lkp" .Ft void .Fn lockmgr_disown "struct lock *lkp" .Ft void @@ -180,20 +180,11 @@ .Pp The .Fn lockstatus -function returns the status of the lock in relation to the -.Vt thread -passed to it. -Note that if -.Fa td -is -.Dv NULL -and an exclusive lock is held, -.Dv LK_EXCLUSIVE -will be returned. +function returns the status of the lock in relation to the current thread. .Pp The .Fn lockmgr_disown -function switches the owner from curthread to be +function switches the owner from the current thread to be .Dv LK_KERNPROC, if the lock is already held. .Pp @@ -283,11 +274,9 @@ function returns: .Bl -tag -width ".Dv LK_EXCLUSIVE" .It Dv LK_EXCLUSIVE -An exclusive lock is held by the thread -.Fa td . +An exclusive lock is held by the current thread. .It Dv LK_EXCLOTHER -An exclusive lock is held by someone other than the thread -.Fa td . +An exclusive lock is held by someone other than the current thread. .It Dv LK_SHARED A shared lock is held. .It Li 0 ==== //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 (text+ko) ==== @@ -1113,7 +1113,7 @@ int ltype = 0; if (cnp->cn_flags & ISDOTDOT) { - ltype = VOP_ISLOCKED(dvp, td); + ltype = VOP_ISLOCKED(dvp); VOP_UNLOCK(dvp, 0); } error = vn_lock(*vpp, cnp->cn_lkflags); @@ -1171,7 +1171,7 @@ /* ARGSUSED */ static int zfs_create(vnode_t *dvp, char *name, vattr_t *vap, int excl, int mode, - vnode_t **vpp, cred_t *cr, kthread_t *td) + vnode_t **vpp, cred_t *cr) { znode_t *zp, *dzp = VTOZ(dvp); zfsvfs_t *zfsvfs = dzp->z_zfsvfs; @@ -3245,7 +3245,7 @@ mode = vap->va_mode & ALLPERMS; return (zfs_create(ap->a_dvp, cnp->cn_nameptr, vap, !EXCL, mode, - ap->a_vpp, cnp->cn_cred, cnp->cn_thread)); + ap->a_vpp, cnp->cn_cred)); } static int ==== //depot/projects/hammer/sys/dev/atkbdc/psm.c#9 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 26 01:42:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4732616A40A; Tue, 26 Feb 2008 01:42:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A3EF16A409 for ; Tue, 26 Feb 2008 01:42:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE2CA13C442 for ; Tue, 26 Feb 2008 01:42:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q1gf4p074971 for ; Tue, 26 Feb 2008 01:42:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q1gfO2074968 for perforce@freebsd.org; Tue, 26 Feb 2008 01:42:41 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 26 Feb 2008 01:42:41 GMT Message-Id: <200802260142.m1Q1gfO2074968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 01:42:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=136198 Change 136198 by kmacy@kmacy:entropy:iwarp on 2008/02/26 01:42:24 compile firmware in directly Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/bin2h.pl#1 add .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#17 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_t3fw.c#1 add .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_t3fw.h#1 add .. //depot/projects/iwarp/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete .. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#8 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#17 (text+ko) ==== @@ -217,6 +217,14 @@ "use a single queue-set per port"); +/* + * The driver uses an auto-queue algorithm by default. + * To disable it and force a single queue-set per port, use singleq = 1. + */ +static int force_fw_update = 0; +TUNABLE_INT("hw.cxgb.force_fw_update", &force_fw_update); +SYSCTL_UINT(_hw_cxgb, OID_AUTO, force_fw_update, CTLFLAG_RDTUN, &force_fw_update, 0, + "update firmware even if up to date"); int cxgb_use_16k_clusters = 0; TUNABLE_INT("hw.cxgb.use_16k_clusters", &cxgb_use_16k_clusters); @@ -380,14 +388,13 @@ return (BUS_PROBE_DEFAULT); } -#define FW_FNAME "t3fw%d%d%d" +#define FW_FNAME "cxgb_t3fw" #define TPEEPROM_NAME "t3%ctpe%d%d%d" #define TPSRAM_NAME "t3%cps%d%d%d" static int upgrade_fw(adapter_t *sc) { - char buf[32]; #ifdef FIRMWARE_LATEST const struct firmware *fw; #else @@ -395,16 +402,11 @@ #endif int status; - snprintf(&buf[0], sizeof(buf), FW_FNAME, FW_VERSION_MAJOR, - FW_VERSION_MINOR, FW_VERSION_MICRO); - - fw = firmware_get(buf); - - if (fw == NULL) { - device_printf(sc->dev, "Could not find firmware image %s\n", buf); + if ((fw = firmware_get(FW_FNAME)) == NULL) { + device_printf(sc->dev, "Could not find firmware image %s\n", FW_FNAME); return (ENOENT); } else - device_printf(sc->dev, "updating firmware on card with %s\n", buf); + device_printf(sc->dev, "updating firmware on card\n"); status = t3_load_fw(sc, (const uint8_t *)fw->data, fw->datasize); device_printf(sc->dev, "firmware update returned %s %d\n", (status == 0) ? "success" : "fail", status); @@ -570,7 +572,7 @@ /* Create a periodic callout for checking adapter status */ callout_init(&sc->cxgb_tick_ch, TRUE); - if (t3_check_fw_version(sc, &must_load) != 0 && must_load) { + if ((t3_check_fw_version(sc, &must_load) != 0 && must_load) || force_fw_update) { /* * Warn user that a firmware update will be attempted in init. */ ==== //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#8 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS+= cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c SRCS+= cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h opt_global.h -SRCS+= uipc_mvec.c cxgb_support.c +SRCS+= uipc_mvec.c cxgb_support.c cxgb_t3fw.c SRCS+= cxgb_multiq.c CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP @@ -24,13 +24,6 @@ .if ${MACHINE_ARCH} != "ia64" -# ld is broken on ia64 -t3fw-5.0.0.bin: ${CXGB}/t3fw-5.0.0.bin.gz.uu - uudecode -p < ${CXGB}/t3fw-5.0.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS= t3fw-5.0.0.bin:t3fw500 -CLEANFILES+= t3fw-5.0.0.bin t3b_protocol_sram-1.1.0.bin: ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu uudecode -p < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \ From owner-p4-projects@FreeBSD.ORG Tue Feb 26 01:52:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B284A16A401; Tue, 26 Feb 2008 01:52:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7345316A409 for ; Tue, 26 Feb 2008 01:52:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60D2A13C467 for ; Tue, 26 Feb 2008 01:52:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q1qxiQ075274 for ; Tue, 26 Feb 2008 01:52:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q1qurg075271 for perforce@freebsd.org; Tue, 26 Feb 2008 01:52:56 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 26 Feb 2008 01:52:56 GMT Message-Id: <200802260152.m1Q1qurg075271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 01:53:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=136199 Change 136199 by kmacy@kmacy:entropy:iwarp on 2008/02/26 01:52:54 IFC #136190 Affected files ... .. //depot/projects/iwarp/Makefile.inc1#7 integrate .. //depot/projects/iwarp/ObsoleteFiles.inc#9 integrate .. //depot/projects/iwarp/UPDATING#6 integrate .. //depot/projects/iwarp/bin/date/date.c#2 integrate .. //depot/projects/iwarp/bin/sh/cd.c#2 integrate .. //depot/projects/iwarp/bin/sh/mksyntax.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/FREEBSD-upgrade#3 integrate .. //depot/projects/iwarp/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/iwarp/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/iwarp/contrib/ncurses/NEWS#3 integrate .. //depot/projects/iwarp/contrib/ncurses/dist.mk#3 integrate .. //depot/projects/iwarp/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/projects/iwarp/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/iwarp/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/iwarp/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/iwarp/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/iwarp/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/lib_slkinit.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/iwarp/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/iwarp/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/iwarp/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/iwarp/contrib/traceroute/as.c#1 branch .. //depot/projects/iwarp/contrib/traceroute/as.h#1 branch .. //depot/projects/iwarp/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/iwarp/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/iwarp/etc/mail/access.sample#2 integrate .. //depot/projects/iwarp/etc/namedb/named.root#3 integrate .. //depot/projects/iwarp/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/iwarp/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/iwarp/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/iwarp/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/iwarp/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/iwarp/gnu/usr.bin/man/manpath/manpath.c#2 integrate .. //depot/projects/iwarp/include/unistd.h#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry_strmode.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/main.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/test/test.h#3 integrate .. //depot/projects/iwarp/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/iwarp/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/iwarp/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/iwarp/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/iwarp/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/iwarp/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/iwarp/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/iwarp/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/iwarp/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/iwarp/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/iwarp/lib/libc/stdlib/malloc.3#5 integrate .. //depot/projects/iwarp/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/iwarp/lib/libc/sys/access.2#4 integrate .. //depot/projects/iwarp/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/iwarp/lib/libdisk/disk.c#2 integrate .. //depot/projects/iwarp/lib/libfetch/common.c#3 integrate .. //depot/projects/iwarp/lib/libfetch/fetch.3#3 integrate .. //depot/projects/iwarp/lib/libfetch/ftp.c#4 integrate .. //depot/projects/iwarp/lib/libfetch/http.c#4 integrate .. //depot/projects/iwarp/lib/libmilter/Makefile#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/iwarp/lib/msun/Makefile#4 integrate .. //depot/projects/iwarp/lib/msun/Symbol.map#4 integrate .. //depot/projects/iwarp/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/iwarp/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/iwarp/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/iwarp/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/iwarp/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/iwarp/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/iwarp/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/iwarp/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/iwarp/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/iwarp/lib/msun/ld128/s_exp2l.c#3 integrate .. //depot/projects/iwarp/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/iwarp/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/iwarp/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/iwarp/lib/msun/ld80/s_exp2l.c#3 integrate .. //depot/projects/iwarp/lib/msun/man/cos.3#2 integrate .. //depot/projects/iwarp/lib/msun/man/j0.3#2 integrate .. //depot/projects/iwarp/lib/msun/man/lgamma.3#2 integrate .. //depot/projects/iwarp/lib/msun/man/sin.3#2 integrate .. //depot/projects/iwarp/lib/msun/man/tan.3#2 integrate .. //depot/projects/iwarp/lib/msun/powerpc/fenv.h#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_exp.c#3 integrate .. //depot/projects/iwarp/lib/msun/src/e_expf.c#4 integrate .. //depot/projects/iwarp/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_log.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_remainder.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_remainderf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_cos.c#3 integrate .. //depot/projects/iwarp/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_rem_pio2.c#3 integrate .. //depot/projects/iwarp/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/math.h#5 integrate .. //depot/projects/iwarp/lib/msun/src/math_private.h#4 integrate .. //depot/projects/iwarp/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_cos.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_cosf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/iwarp/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_exp2.c#4 integrate .. //depot/projects/iwarp/lib/msun/src/s_exp2f.c#4 integrate .. //depot/projects/iwarp/lib/msun/src/s_expm1.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_expm1f.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_frexp.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_ilogb.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_ilogbf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_logb.c#3 integrate .. //depot/projects/iwarp/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_modff.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_nextafter.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_nextafterf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/iwarp/lib/msun/src/s_rintf.c#3 integrate .. //depot/projects/iwarp/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_significand.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_sin.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_sinf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_sinl.c#1 branch .. //depot/projects/iwarp/lib/msun/src/s_tan.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_tanf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_tanh.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_tanl.c#1 branch .. //depot/projects/iwarp/lib/msun/src/s_tgammaf.c#1 branch .. //depot/projects/iwarp/lib/msun/src/s_trunc.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/iwarp/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/iwarp/lib/ncurses/ncurses/ncurses_cfg.h#3 integrate .. //depot/projects/iwarp/release/Makefile#6 integrate .. //depot/projects/iwarp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/iwarp/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/iwarp/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/iwarp/sbin/md5/md5.c#2 integrate .. //depot/projects/iwarp/sbin/mount/getmntopts.3#2 integrate .. //depot/projects/iwarp/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/iwarp/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/iwarp/sbin/ping6/ping6.c#3 integrate .. //depot/projects/iwarp/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/iwarp/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/iwarp/share/man/man4/Makefile#8 integrate .. //depot/projects/iwarp/share/man/man4/ciss.4#2 integrate .. //depot/projects/iwarp/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/iwarp/share/man/man4/hptrr.4#3 integrate .. //depot/projects/iwarp/share/man/man4/ip6.4#2 integrate .. //depot/projects/iwarp/share/man/man4/mxge.4#3 integrate .. //depot/projects/iwarp/share/man/man4/sk.4#2 integrate .. //depot/projects/iwarp/share/man/man5/fstab.5#3 integrate .. //depot/projects/iwarp/share/man/man9/Makefile#7 integrate .. //depot/projects/iwarp/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/iwarp/share/man/man9/lock.9#4 integrate .. //depot/projects/iwarp/share/man/man9/pci.9#2 integrate .. //depot/projects/iwarp/share/misc/committers-src.dot#5 integrate .. //depot/projects/iwarp/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/iwarp/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/iwarp/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/iwarp/sys/boot/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/iwarp/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/iwarp/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/iwarp/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/iwarp/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/iwarp/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/iwarp/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/iwarp/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/iwarp/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/iwarp/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/iwarp/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/iwarp/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/iwarp/sys/boot/uboot/Makefile#1 branch .. //depot/projects/iwarp/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/iwarp/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/iwarp/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/iwarp/sys/cam/cam_periph.c#2 integrate .. //depot/projects/iwarp/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/iwarp/sys/conf/NOTES#6 integrate .. //depot/projects/iwarp/sys/conf/files#8 integrate .. //depot/projects/iwarp/sys/conf/files.powerpc#6 integrate .. //depot/projects/iwarp/sys/conf/files.sparc64#3 integrate .. //depot/projects/iwarp/sys/conf/options#5 integrate .. //depot/projects/iwarp/sys/conf/options.powerpc#3 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/iwarp/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/iwarp/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/iwarp/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/iwarp/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/iwarp/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/iwarp/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/iwarp/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_adapter.h#15 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.c#10 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.h#7 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#20 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_osdep.h#10 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/iwarp/sys/dev/cxgb/sys/cxgb_support.c#7 integrate .. //depot/projects/iwarp/sys/dev/cxgb/sys/mbufq.h#4 integrate .. //depot/projects/iwarp/sys/dev/cxgb/sys/mvec.h#8 integrate .. //depot/projects/iwarp/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/iwarp/sys/dev/cxgb/t3cdev.h#6 integrate .. //depot/projects/iwarp/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#3 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#4 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#18 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#14 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_defs.h#10 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c#6 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#7 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#10 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.h#5 integrate .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/iwarp/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/iwarp/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/iwarp/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/iwarp/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/iwarp/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/iwarp/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/iwarp/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/iwarp/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/iwarp/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/iwarp/sys/dev/twe/twe.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/umass.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/iwarp/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/iwarp/sys/fs/coda/TODO#2 integrate .. //depot/projects/iwarp/sys/fs/coda/cnode.h#3 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_kernel.h#2 delete .. //depot/projects/iwarp/sys/fs/coda/coda_namecache.c#2 delete .. //depot/projects/iwarp/sys/fs/coda/coda_namecache.h#3 delete .. //depot/projects/iwarp/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_psdev.c#3 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/iwarp/sys/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/iwarp/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/iwarp/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/iwarp/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/iwarp/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/iwarp/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/iwarp/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/iwarp/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/iwarp/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/iwarp/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/iwarp/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/iwarp/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/iwarp/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/iwarp/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/iwarp/sys/geom/geom_disk.c#2 integrate .. //depot/projects/iwarp/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/iwarp/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/iwarp/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/iwarp/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/iwarp/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/iwarp/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/iwarp/sys/i386/i386/geode.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/iwarp/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/iwarp/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/iwarp/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/iwarp/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/iwarp/sys/kern/init_sysent.c#3 integrate .. //depot/projects/iwarp/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_exit.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_lock.c#6 integrate .. //depot/projects/iwarp/sys/kern/kern_mib.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_module.c#3 integrate .. //depot/projects/iwarp/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/iwarp/sys/kern/kern_tc.c#3 integrate .. //depot/projects/iwarp/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/iwarp/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/iwarp/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/iwarp/sys/kern/syscalls.c#3 integrate .. //depot/projects/iwarp/sys/kern/syscalls.master#4 integrate .. //depot/projects/iwarp/sys/kern/systrace_args.c#3 integrate .. //depot/projects/iwarp/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/iwarp/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/iwarp/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/iwarp/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/iwarp/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/iwarp/sys/kern/vfs_default.c#3 integrate .. //depot/projects/iwarp/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/iwarp/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/iwarp/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/iwarp/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/iwarp/sys/kern/vnode_if.src#3 integrate .. //depot/projects/iwarp/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/iwarp/sys/libkern/quad.h#2 integrate .. //depot/projects/iwarp/sys/modules/coda/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#9 integrate .. //depot/projects/iwarp/sys/modules/cxgb/tom/Makefile#6 integrate .. //depot/projects/iwarp/sys/modules/geom/Makefile#3 integrate .. //depot/projects/iwarp/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/iwarp/sys/net/route.c#6 integrate .. //depot/projects/iwarp/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/iwarp/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/iwarp/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/iwarp/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/iwarp/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/iwarp/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/iwarp/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/iwarp/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/iwarp/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/iwarp/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/iwarp/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/iwarp/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/iwarp/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/iwarp/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/iwarp/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/iwarp/sys/powerpc/include/bootinfo.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/float.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/iwarp/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit.c#6 integrate .. //depot/projects/iwarp/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/iwarp/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/iwarp/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/iwarp/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/iwarp/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/iwarp/sys/sys/buf.h#3 integrate .. //depot/projects/iwarp/sys/sys/conf.h#3 integrate .. //depot/projects/iwarp/sys/sys/ipc.h#2 integrate .. //depot/projects/iwarp/sys/sys/ktrace.h#2 integrate .. //depot/projects/iwarp/sys/sys/lock.h#4 integrate .. //depot/projects/iwarp/sys/sys/lockmgr.h#5 integrate .. //depot/projects/iwarp/sys/sys/module.h#2 integrate .. //depot/projects/iwarp/sys/sys/param.h#9 integrate .. //depot/projects/iwarp/sys/sys/priv.h#4 integrate .. //depot/projects/iwarp/sys/sys/proc.h#9 integrate .. //depot/projects/iwarp/sys/sys/shm.h#2 integrate .. //depot/projects/iwarp/sys/sys/syscall.h#3 integrate .. //depot/projects/iwarp/sys/sys/syscall.mk#3 integrate .. //depot/projects/iwarp/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/iwarp/sys/sys/sysproto.h#3 integrate .. //depot/projects/iwarp/sys/sys/user.h#4 integrate .. //depot/projects/iwarp/sys/sys/vnode.h#4 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/iwarp/sys/vm/vm_object.c#5 integrate .. //depot/projects/iwarp/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/iwarp/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/iwarp/tools/regression/lib/msun/Makefile#4 integrate .. //depot/projects/iwarp/tools/regression/lib/msun/test-exponential.c#2 integrate .. //depot/projects/iwarp/tools/regression/lib/msun/test-trig.c#1 branch .. //depot/projects/iwarp/tools/regression/lib/msun/test-trig.t#1 branch .. //depot/projects/iwarp/tools/regression/security/open_to_operation/Makefile#1 branch .. //depot/projects/iwarp/tools/regression/security/open_to_operation/open_to_operation.c#1 branch .. //depot/projects/iwarp/usr.bin/Makefile#4 integrate .. //depot/projects/iwarp/usr.bin/ar/Makefile#1 branch .. //depot/projects/iwarp/usr.bin/ar/ar.1#1 branch .. //depot/projects/iwarp/usr.bin/ar/ar.c#1 branch .. //depot/projects/iwarp/usr.bin/ar/ar.h#1 branch .. //depot/projects/iwarp/usr.bin/ar/read.c#1 branch .. //depot/projects/iwarp/usr.bin/ar/util.c#1 branch .. //depot/projects/iwarp/usr.bin/ar/write.c#1 branch .. //depot/projects/iwarp/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/iwarp/usr.bin/du/du.1#2 integrate .. //depot/projects/iwarp/usr.bin/du/du.c#3 integrate .. //depot/projects/iwarp/usr.bin/find/extern.h#2 integrate .. //depot/projects/iwarp/usr.bin/find/find.1#2 integrate .. //depot/projects/iwarp/usr.bin/find/find.h#2 integrate .. //depot/projects/iwarp/usr.bin/find/function.c#2 integrate .. //depot/projects/iwarp/usr.bin/find/option.c#2 integrate .. //depot/projects/iwarp/usr.bin/gzip/znew#2 integrate .. //depot/projects/iwarp/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/iwarp/usr.bin/kdump/kdump.c#4 integrate .. //depot/projects/iwarp/usr.bin/kdump/mksubr#3 integrate .. //depot/projects/iwarp/usr.bin/ktrace/ktrace.1#2 integrate .. //depot/projects/iwarp/usr.bin/ktrace/ktrace.h#2 integrate .. //depot/projects/iwarp/usr.bin/ktrace/subr.c#2 integrate .. //depot/projects/iwarp/usr.bin/ministat/ministat.c#2 integrate .. //depot/projects/iwarp/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/iwarp/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/iwarp/usr.bin/netstat/route.c#3 integrate .. //depot/projects/iwarp/usr.bin/procstat/procstat.c#2 integrate .. //depot/projects/iwarp/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/iwarp/usr.bin/procstat/procstat_files.c#4 integrate .. //depot/projects/iwarp/usr.bin/procstat/procstat_kstack.c#3 integrate .. //depot/projects/iwarp/usr.bin/procstat/procstat_threads.c#3 integrate .. //depot/projects/iwarp/usr.bin/procstat/procstat_vm.c#2 integrate .. //depot/projects/iwarp/usr.bin/quota/quota.c#2 integrate .. //depot/projects/iwarp/usr.bin/sed/compile.c#2 integrate .. //depot/projects/iwarp/usr.bin/sed/defs.h#2 integrate .. //depot/projects/iwarp/usr.bin/sed/main.c#3 integrate .. //depot/projects/iwarp/usr.bin/sed/process.c#2 integrate .. //depot/projects/iwarp/usr.bin/tar/write.c#2 integrate .. //depot/projects/iwarp/usr.bin/uniq/uniq.c#2 integrate .. //depot/projects/iwarp/usr.sbin/bootparamd/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/bootparamd/Makefile.inc#2 integrate .. //depot/projects/iwarp/usr.sbin/cdcontrol/cdcontrol.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/add/pkg_add.1#5 integrate .. //depot/projects/iwarp/usr.sbin/pmcstat/Makefile#3 integrate .. //depot/projects/iwarp/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate .. //depot/projects/iwarp/usr.sbin/powerd/powerd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pw/pw.8#3 integrate .. //depot/projects/iwarp/usr.sbin/pw/pw.c#2 integrate .. //depot/projects/iwarp/usr.sbin/pw/pw_group.c#2 integrate .. //depot/projects/iwarp/usr.sbin/rpcbind/rpcbind.c#4 integrate .. //depot/projects/iwarp/usr.sbin/sa/db.c#3 integrate .. //depot/projects/iwarp/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/iwarp/usr.sbin/timed/timed/timed.8#3 integrate .. //depot/projects/iwarp/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/iwarp/usr.sbin/traceroute6/traceroute6.c#4 integrate .. //depot/projects/iwarp/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate .. //depot/projects/iwarp/usr.sbin/zic/zdump.c#2 integrate Differences ... ==== //depot/projects/iwarp/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -872,6 +872,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,18 +889,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -967,6 +972,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/iwarp/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.130 2008/02/06 19:45:25 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080220: geom_lvm rename to geom_linux_lvm +OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal OLD_FILES+=usr/share/man/man4/card.4.gz OLD_FILES+=usr/share/man/man4/oldcard.4.gz ==== //depot/projects/iwarp/UPDATING#6 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080220: + The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), + likewise the kernel option is now GEOM_LINUX_LVM. + +20080211: + The default NFS mount mode has changed from UDP to TCP for + increased reliability. If you rely on (insecurely) NFS + mounting across a firewall you may need to update your + firewall rules. + +20080208: + Belatedly note the addition of m_collapse for compacting + mbuf chains. + 20080126: The fts(3) structures have been changed to use adequate integer types for their members and so to be able to cope @@ -969,4 +983,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.517 2008/01/26 17:09:39 yar Exp $ +$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ ==== //depot/projects/iwarp/bin/date/date.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.47 2005/01/10 08:39:21 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.48 2008/02/07 16:04:24 ru Exp $"); #include #include @@ -186,8 +186,10 @@ const char *dot, *t; int century; + lt = localtime(&tval); + lt->tm_isdst = -1; /* divine correct DST */ + if (fmt != NULL) { - lt = localtime(&tval); t = strptime(p, fmt, lt); if (t == NULL) { fprintf(stderr, "Failed conversion of ``%s''" @@ -208,8 +210,6 @@ badformat(); } - lt = localtime(&tval); - if (dot != NULL) { /* .ss */ dot++; /* *dot++ = '\0'; */ if (strlen(dot) != 2) @@ -264,9 +264,6 @@ } } - /* Let mktime() decide whether summer time is in effect. */ - lt->tm_isdst = -1; - /* convert broken-down time to GMT clock time */ if ((tval = mktime(lt)) == -1) errx(1, "nonexistent time"); ==== //depot/projects/iwarp/bin/sh/cd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); #include #include @@ -68,7 +68,9 @@ STATIC int cdphysical(char *); STATIC int docd(char *, int, int); STATIC char *getcomponent(void); -STATIC int updatepwd(char *); +STATIC char *findcwd(char *); +STATIC void updatepwd(char *); +STATIC char *getpwd2(char *, size_t); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -201,10 +203,11 @@ } INTOFF; - if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) { + if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -212,12 +215,14 @@ STATIC int cdphysical(char *dest) { + char *p; INTOFF; - if (chdir(dest) < 0 || updatepwd(NULL) < 0) { + if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -247,38 +252,20 @@ } -/* - * Update curdir (the name of the current directory) in response to a - * cd command. We also call hashcd to let the routines in exec.c know - * that the current directory has changed. - */ -STATIC int -updatepwd(char *dir) +STATIC char * +findcwd(char *dir) { char *new; char *p; - hashcd(); /* update command hash table */ - /* * If our argument is NULL, we don't know the current directory * any more because we traversed a symbolic link or something * we couldn't stat(). */ if (dir == NULL || curdir == NULL) { - if (prevdir) - ckfree(prevdir); - INTOFF; - prevdir = curdir; - curdir = NULL; - if (getpwd() == NULL) { - INTON; - return (-1); - } - setvar("PWD", curdir, VEXPORT); - setvar("OLDPWD", prevdir, VEXPORT); - INTON; - return (0); + p = stalloc(PATH_MAX); + return getpwd2(p, PATH_MAX); } cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); @@ -302,16 +289,25 @@ if (new == stackblock()) STPUTC('/', new); STACKSTRNUL(new); - INTOFF; + return stackblock(); +} + +/* + * Update curdir (the name of the current directory) in response to a + * cd command. We also call hashcd to let the routines in exec.c know + * that the current directory has changed. + */ +STATIC void +updatepwd(char *dir) +{ + hashcd(); /* update command hash table */ + if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(stackblock()); + curdir = savestr(dir); setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); - INTON; - - return (0); } int @@ -355,17 +351,31 @@ } /* - * Find out what the current directory is. If we already know the current - * directory, this routine returns immediately. + * Get the current directory and cache the result in curdir. */ char * getpwd(void) { char buf[PATH_MAX]; + char *p; if (curdir) return curdir; - if (getcwd(buf, sizeof(buf)) == NULL) { + + p = getpwd2(buf, sizeof(buf)); + if (p != NULL) + curdir = savestr(p); + + return curdir; +} + +/* + * Return the current directory. + */ +STATIC char * +getpwd2(char *buf, size_t size) +{ + if (getcwd(buf, size) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -373,12 +383,9 @@ stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - curdir = savestr(pwd); - return curdir; + return pwd; } return NULL; } - curdir = savestr(buf); - - return curdir; + return buf; } ==== //depot/projects/iwarp/bin/sh/mksyntax.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.24 2005/08/13 15:47:13 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.25 2008/02/18 20:01:33 marcel Exp $"); /* * This program creates syntax.h and syntax.c. @@ -139,10 +139,7 @@ /* Determine the characteristics of chars. */ c = -1; - if (c < 0) - sign = 1; - else - sign = 0; + sign = (c > 0) ? 0 : 1; for (nbits = 1 ; ; nbits++) { d = (1 << nbits) - 1; if (d == c) ==== //depot/projects/iwarp/contrib/ncurses/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/ncurses/FREEBSD-upgrade,v 1.2 2007/12/30 11:19:29 rafan Exp $ +$FreeBSD: src/contrib/ncurses/FREEBSD-upgrade,v 1.3 2008/02/11 13:42:45 rafan Exp $ ncurses @@ -18,6 +18,10 @@ src/contrib/ncurses NCURSES v5_6_20061217 The date in the tag can be obtained from contrib/ncurses/dist.mk. +If the version is a snapshot, + + cvs import -m 'Import ncurses 5.6-20080209 snapshot onto the vendor branch' \ + src/contrib/ncurses NCURSES v5_6_20080209 Remove files that are removed in this release in vendor branch (NCURSES) instead of HEAD. ==== //depot/projects/iwarp/contrib/ncurses/MANIFEST#3 (text+ko) ==== @@ -571,6 +571,7 @@ ./man/curs_termattrs.3x >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 26 01:55:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3637A16A403; Tue, 26 Feb 2008 01:55:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDD8416A401 for ; Tue, 26 Feb 2008 01:55:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDFF813C448 for ; Tue, 26 Feb 2008 01:55:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q1t3aa075365 for ; Tue, 26 Feb 2008 01:55:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q1t3JP075362 for perforce@freebsd.org; Tue, 26 Feb 2008 01:55:03 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 26 Feb 2008 01:55:03 GMT Message-Id: <200802260155.m1Q1t3JP075362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 01:55:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=136200 Change 136200 by kmacy@kmacy:entropy:iwarp on 2008/02/26 01:55:01 add cxgb_t3fw.c to kernel compile remove firmware Affected files ... .. //depot/projects/iwarp/sys/conf/files#9 edit .. //depot/projects/iwarp/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#4 delete Differences ... ==== //depot/projects/iwarp/sys/conf/files#9 (text+ko) ==== @@ -519,6 +519,7 @@ dev/cxgb/cxgb_lro.c optional cxgb pci dev/cxgb/cxgb_sge.c optional cxgb pci dev/cxgb/cxgb_multiq.c optional cxgb pci +dev/cxgb/cxgb_t3fw.c optional cxgb pci dev/cxgb/common/cxgb_mc5.c optional cxgb pci dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci From owner-p4-projects@FreeBSD.ORG Tue Feb 26 02:27:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEF3116A406; Tue, 26 Feb 2008 02:27:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7234616A402 for ; Tue, 26 Feb 2008 02:27:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6160713C47E for ; Tue, 26 Feb 2008 02:27:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q2RtPp080077 for ; Tue, 26 Feb 2008 02:27:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q2RrrR080074 for perforce@freebsd.org; Tue, 26 Feb 2008 02:27:53 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 26 Feb 2008 02:27:53 GMT Message-Id: <200802260227.m1Q2RrrR080074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 02:27:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=136202 Change 136202 by kmacy@kmacy:entropy:iwarp on 2008/02/26 02:27:28 make T3 firmware a separate build target Suggested by: Sam Leffler Affected files ... .. //depot/projects/iwarp/sys/conf/NOTES#7 edit .. //depot/projects/iwarp/sys/conf/files#10 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#19 edit .. //depot/projects/iwarp/sys/modules/cxgb/Makefile#5 edit .. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#10 edit .. //depot/projects/iwarp/sys/modules/cxgb/cxgb_t3fw/Makefile#1 add Differences ... ==== //depot/projects/iwarp/sys/conf/NOTES#7 (text+ko) ==== @@ -1883,6 +1883,7 @@ device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device cxgb # Chelsio T3 10 Gigabit Ethernet +device cxgb_t3fw # Chelsio T3 10 Gigabit Ethernet firmware - must either be availables as module or linked in device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) hint.fxp.0.prefer_iomap="0" ==== //depot/projects/iwarp/sys/conf/files#10 (text+ko) ==== @@ -514,21 +514,21 @@ dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs pccard dev/cxgb/cxgb_main.c optional cxgb pci -dev/cxgb/cxgb_offload.c optional cxgb pci -dev/cxgb/cxgb_l2t.c optional cxgb pci -dev/cxgb/cxgb_lro.c optional cxgb pci -dev/cxgb/cxgb_sge.c optional cxgb pci -dev/cxgb/cxgb_multiq.c optional cxgb pci -dev/cxgb/cxgb_t3fw.c optional cxgb pci -dev/cxgb/common/cxgb_mc5.c optional cxgb pci -dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci -dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci -dev/cxgb/common/cxgb_ael1002.c optional cxgb pci -dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci -dev/cxgb/common/cxgb_xgmac.c optional cxgb pci -dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci -dev/cxgb/sys/uipc_mvec.c optional cxgb pci -dev/cxgb/sys/cxgb_support.c optional cxgb pci +dev/cxgb/cxgb_offload.c optional cxgb pci +dev/cxgb/cxgb_l2t.c optional cxgb pci +dev/cxgb/cxgb_lro.c optional cxgb pci +dev/cxgb/cxgb_sge.c optional cxgb pci +dev/cxgb/cxgb_multiq.c optional cxgb pci +dev/cxgb/common/cxgb_mc5.c optional cxgb pci +dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci +dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci +dev/cxgb/common/cxgb_ael1002.c optional cxgb pci +dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci +dev/cxgb/common/cxgb_xgmac.c optional cxgb pci +dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci +dev/cxgb/sys/uipc_mvec.c optional cxgb pci +dev/cxgb/sys/cxgb_support.c optional cxgb pci +dev/cxgb/cxgb_t3fw.c optional cxgb_t3fw dev/cy/cy.c optional cy dev/cy/cy_isa.c optional cy isa dev/cy/cy_pci.c optional cy pci ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#19 (text+ko) ==== @@ -2682,3 +2682,6 @@ reg_block_dump(sc, buf, XGM_REG(A_XGM_SERDES_STATUS0, 1), XGM_REG(A_XGM_RX_SPI4_SOP_EOP_CNT, 1)); } + + +MODULE_DEPEND(if_cxgb, cxgb_t3fw, 1, 1, 1); ==== //depot/projects/iwarp/sys/modules/cxgb/Makefile#5 (text+ko) ==== @@ -3,5 +3,6 @@ SUBDIR+= toecore SUBDIR+= tom SUBDIR+= iw_cxgb +SUBDIR+= cxgb_t3fw .include ==== //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#10 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS+= cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c SRCS+= cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h opt_global.h -SRCS+= uipc_mvec.c cxgb_support.c cxgb_t3fw.c +SRCS+= uipc_mvec.c cxgb_support.c SRCS+= cxgb_multiq.c CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP @@ -41,6 +41,4 @@ .endif - - .include From owner-p4-projects@FreeBSD.ORG Tue Feb 26 02:42:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BBD216A403; Tue, 26 Feb 2008 02:42:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F65C16A400 for ; Tue, 26 Feb 2008 02:42:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1667013C46A for ; Tue, 26 Feb 2008 02:42:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q2gHXd080582 for ; Tue, 26 Feb 2008 02:42:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q2gHQk080579 for perforce@freebsd.org; Tue, 26 Feb 2008 02:42:17 GMT (envelope-from sam@freebsd.org) Date: Tue, 26 Feb 2008 02:42:17 GMT Message-Id: <200802260242.m1Q2gHQk080579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 02:42:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=136203 Change 136203 by sam@sam_ebb on 2008/02/26 02:42:06 default opmode to STA to soothe default media status Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#17 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#17 (text) ==== @@ -275,6 +275,7 @@ IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ /* set device capabilities */ From owner-p4-projects@FreeBSD.ORG Tue Feb 26 02:43:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 564A816A403; Tue, 26 Feb 2008 02:43:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 199B916A400 for ; Tue, 26 Feb 2008 02:43:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07AA013C459 for ; Tue, 26 Feb 2008 02:43:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q2hJBP080606 for ; Tue, 26 Feb 2008 02:43:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q2hJ0O080603 for perforce@freebsd.org; Tue, 26 Feb 2008 02:43:19 GMT (envelope-from sam@freebsd.org) Date: Tue, 26 Feb 2008 02:43:19 GMT Message-Id: <200802260243.m1Q2hJ0O080603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 02:43:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=136204 Change 136204 by sam@sam_ebb on 2008/02/26 02:42:27 o return proper error code from ioctl handler o default opmode to STA Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2661.c#14 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2661.c#14 (text) ==== @@ -302,6 +302,7 @@ IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ /* set device capabilities */ @@ -1929,7 +1930,7 @@ error = ether_ioctl(ifp, cmd, data); break; } - return 0; + return error; } static void From owner-p4-projects@FreeBSD.ORG Tue Feb 26 03:22:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A593016A404; Tue, 26 Feb 2008 03:22:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62A8416A400 for ; Tue, 26 Feb 2008 03:22:18 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3940B13C455 for ; Tue, 26 Feb 2008 03:22:18 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q3MI0G083400 for ; Tue, 26 Feb 2008 03:22:18 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q3MHgs083397 for perforce@freebsd.org; Tue, 26 Feb 2008 03:22:17 GMT (envelope-from csjp@freebsd.org) Date: Tue, 26 Feb 2008 03:22:17 GMT Message-Id: <200802260322.m1Q3MHgs083397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136206 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 03:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136206 Change 136206 by csjp@ibm01 on 2008/02/26 03:22:05 Test submit, cosmetic change. Affected files ... .. //depot/projects/trustedbsd/netauditd/component.c#4 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/component.c#4 (text+ko) ==== @@ -108,6 +108,7 @@ void component_destroy(struct au_cmpnt *ptr) { + if (ptr->ac_name != NULL) free(ptr->ac_name); if (ptr->ac_path != NULL) From owner-p4-projects@FreeBSD.ORG Tue Feb 26 04:03:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CEDB16A404; Tue, 26 Feb 2008 04:03:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0067216A403 for ; Tue, 26 Feb 2008 04:03:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CAABA13C45A for ; Tue, 26 Feb 2008 04:03:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1Q43Eap085948 for ; Tue, 26 Feb 2008 04:03:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1Q43E7K085945 for perforce@freebsd.org; Tue, 26 Feb 2008 04:03:14 GMT (envelope-from sam@freebsd.org) Date: Tue, 26 Feb 2008 04:03:14 GMT Message-Id: <200802260403.m1Q43E7K085945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 04:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=136208 Change 136208 by sam@sam_ebb on 2008/02/26 04:02:38 nuke dead code Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#3 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#3 (text+kox) ==== @@ -4349,12 +4349,6 @@ break; case IWN_SET_CHAN: IWN_LOCK(sc); -#if 0 - if (sc->flags & IWN_FLAG_AUTH) { - DPRINTF(sc, IWN_DEBUG_ANY, "%s\n", - "Authenticating, not changing channel"); - } else -#endif error = iwn_config(sc); IWN_UNLOCK(sc); if (error != 0) { From owner-p4-projects@FreeBSD.ORG Tue Feb 26 12:04:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5E721065674; Tue, 26 Feb 2008 12:04:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A637B1065672 for ; Tue, 26 Feb 2008 12:04:36 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A777213C448 for ; Tue, 26 Feb 2008 12:04:36 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QC4a8v029554 for ; Tue, 26 Feb 2008 12:04:36 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QC4aBq029551 for perforce@freebsd.org; Tue, 26 Feb 2008 12:04:36 GMT (envelope-from taleks@FreeBSD.org) Date: Tue, 26 Feb 2008 12:04:36 GMT Message-Id: <200802261204.m1QC4aBq029551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 136227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 12:04:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=136227 Change 136227 by taleks@taleks_th on 2008/02/26 12:03:47 added early look of socketfs, used to read/write sockets as files. other submitted files contain telnet-client implementation related files. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/ptelnet/README#2 edit .. //depot/projects/soc2007/taleks-pxe_http/ptelnet/options.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/ptelnet/telnet_fsm.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/ptelnet/telnet_fsm.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/socketfs.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/socketfs.h#1 add Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/ptelnet/README#2 (text+ko) ==== @@ -1,1 +1,2 @@ -simple telnet client modules.+simple telnet client modules. +based on code from D.E. Comer, D.L. Stevens, "Internetworking with TCP/IP", vol. III From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:11:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69F2A10657E7; Tue, 26 Feb 2008 14:11:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29AC010657E4 for ; Tue, 26 Feb 2008 14:11:49 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D5A013C43E for ; Tue, 26 Feb 2008 14:11:49 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEBm8b046115 for ; Tue, 26 Feb 2008 14:11:48 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEBmRE046112 for perforce@freebsd.org; Tue, 26 Feb 2008 14:11:48 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:11:48 GMT Message-Id: <200802261411.m1QEBmRE046112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:11:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=136237 Change 136237 by rrs@rrs-mips2-jnpr on 2008/02/26 14:11:29 correct typo in led display & s9indent. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#18 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_machdep.c#18 (text+ko) ==== @@ -316,21 +316,21 @@ } static char progress[15][8] = { - {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '}, /* 0 */ - {' ', ' ', ' ', ' ', ' ', ' ', ' ', 'F'}, /* 1 */ - {' ', ' ', ' ', ' ', ' ', ' ', 'F', 'r'}, /* 2 */ - {' ', ' ', ' ', ' ', ' ', 'F', 'r', 'e'}, /* 3 */ - {' ', ' ', ' ', ' ', 'F', 'r', 'e', 'e'}, /* 4 */ - {' ', ' ', ' ', 'F', 'r', 'e', 'e', 'B'}, /* 5 */ - {' ', ' ', 'F', 'r', 'e', 'e', 'B', 'S'}, /* 6 */ - {' ', 'F', 'r', 'e', 'e', 'B', 'S', 'D'}, /* 7 */ - {'r', 'e', 'e', 'B', 'S', 'D', '!', ' '}, /* 8 */ - {'e', 'e', 'B', 'S', 'D', '!', ' ', ' '}, /* 9 */ - {'e', 'B', 'S', 'D', '!', ' ', ' ', ' '}, /* 10 */ - {'B', 'S', 'D', '!', ' ', ' ', ' ', ' '}, /* 11 */ - {'S', 'D', '!', ' ', ' ', ' ', ' ', ' '}, /* 12 */ - {'D', '!', ' ', ' ', ' ', ' ', ' ', ' '}, /* 13 */ - {'!', '!', ' ', ' ', ' ', ' ', ' ', ' '} /* 14 */ + {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '}, /* 0 */ + {' ', ' ', ' ', ' ', ' ', ' ', ' ', 'F'}, /* 1 */ + {' ', ' ', ' ', ' ', ' ', ' ', 'F', 'r'}, /* 2 */ + {' ', ' ', ' ', ' ', ' ', 'F', 'r', 'e'}, /* 3 */ + {' ', ' ', ' ', ' ', 'F', 'r', 'e', 'e'}, /* 4 */ + {' ', ' ', ' ', 'F', 'r', 'e', 'e', 'B'}, /* 5 */ + {' ', ' ', 'F', 'r', 'e', 'e', 'B', 'S'}, /* 6 */ + {' ', 'F', 'r', 'e', 'e', 'B', 'S', 'D'}, /* 7 */ + {'r', 'e', 'e', 'B', 'S', 'D', '!', ' '}, /* 8 */ + {'e', 'e', 'B', 'S', 'D', '!', ' ', ' '}, /* 9 */ + {'e', 'B', 'S', 'D', '!', ' ', ' ', ' '}, /* 10 */ + {'B', 'S', 'D', '!', ' ', ' ', ' ', ' '}, /* 11 */ + {'S', 'D', '!', ' ', ' ', ' ', ' ', ' '}, /* 12 */ + {'D', '!', ' ', ' ', ' ', ' ', ' ', ' '}, /* 13 */ + {'!', ' ', ' ', ' ', ' ', ' ', ' ', ' '} /* 14 */ }; int prog_count = 0; @@ -338,15 +338,16 @@ void octeon_led_run_wheel(void) { - int i; - if (!octeon_board_real()) + int i; + + if (!octeon_board_real()) return; if (prog_count > 14) { - prog_count = 0; + prog_count = 0; } for (i = 0; i < 8; i++) { - octeon_led_write_char(i, progress[prog_count][i]); + octeon_led_write_char(i, progress[prog_count][i]); } prog_count++; } @@ -643,7 +644,7 @@ /* * ciu_get_int_summary */ -uint64_t +uint64_t ciu_get_int_summary(int core_num, int intx, int enx) { uint64_t ciu_intr_sum_reg_addr; @@ -948,8 +949,8 @@ uint32_t octeon_cpu_clock; uint64_t octeon_dram = 0; -uint32_t octeon_bd_ver = 0, octeon_cvmx_bd_ver = 0, octeon_board_rev_major, octeon_board_rev_minor, - octeon_board_type; +uint32_t octeon_bd_ver = 0, octeon_cvmx_bd_ver = 0, octeon_board_rev_major, + octeon_board_rev_minor, octeon_board_type; uint8_t octeon_mac_addr[6] = {0}; int octeon_core_mask, octeon_mac_addr_count; int octeon_chip_rev_major = 0, octeon_chip_rev_minor = 0, octeon_chip_type = 0; @@ -1338,8 +1339,8 @@ kernend = round_page((vm_offset_t)&end); /* - * Quick Default. To avoid divide-by-0 Later we will - * get it from Bootloader/Rom-Mon + * Quick Default. To avoid divide-by-0 Later we will get it from + * Bootloader/Rom-Mon */ mips_timer_early_init(OCTEON_CLOCK_DEFAULT); cninit(); From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:12:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5805B1065672; Tue, 26 Feb 2008 14:12:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18F79106566B for ; Tue, 26 Feb 2008 14:12:52 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CF7313C45D for ; Tue, 26 Feb 2008 14:12:52 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QECpXu046173 for ; Tue, 26 Feb 2008 14:12:51 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QECpLG046170 for perforce@freebsd.org; Tue, 26 Feb 2008 14:12:51 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:12:51 GMT Message-Id: <200802261412.m1QECpLG046170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=136238 Change 136238 by rrs@rrs-mips2-jnpr on 2008/02/26 14:12:37 Quick hack, disable int's while doing read64/write64 since our 64 bit reg's get trashed by an interrupt. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_pcmap_regs.h#5 (text+ko) ==== @@ -136,7 +136,6 @@ #else - /* ABI o32 */ @@ -153,7 +152,9 @@ uint32_t tmp1; uint32_t tmp2; uint32_t tmp3; + uint32_t rupt_state; + rupt_state = disableintr(); __asm __volatile( ".set mips64\n" "dsll %0, %3, 32\n" @@ -170,6 +171,9 @@ : "r"(valh), "r"(vall), "r"(csr_addrh), "r"(csr_addrl) ); + if (rupt_state) { + enableintr(); + } } static inline void @@ -182,7 +186,9 @@ uint32_t tmp1; uint32_t tmp2; uint32_t tmp3; + uint32_t rupt_state; + rupt_state = disableintr(); __asm __volatile( ".set mips64\n" "dsll %0, %3, 32\n" @@ -199,6 +205,9 @@ : "r"(valh), "r"(vall), "r"(csr_addrh), "r"(csr_addrl) ); + if (rupt_state) { + enableintr(); + } } @@ -385,7 +394,9 @@ uint32_t csr_addrl = csr_addr; uint32_t valh; uint32_t vall; + uint32_t rupt_state; + rupt_state = disableintr(); __asm __volatile( ".set mips64\n" "dsll %0, %2, 32\n" @@ -400,7 +411,9 @@ : "=&r"(valh), "=&r"(vall) : "r"(csr_addrh), "r"(csr_addrl) ); - + if (rupt_state) { + enableintr(); + } return ((uint64_t) valh << 32) | vall; } From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:13:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D0171065672; Tue, 26 Feb 2008 14:13:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DC40106566B for ; Tue, 26 Feb 2008 14:13:56 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 228F713C469 for ; Tue, 26 Feb 2008 14:13:56 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEDuRB046190 for ; Tue, 26 Feb 2008 14:13:56 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEDrYp046187 for perforce@freebsd.org; Tue, 26 Feb 2008 14:13:53 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:13:53 GMT Message-Id: <200802261413.m1QEDrYp046187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:13:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=136239 Change 136239 by rrs@rrs-mips2-jnpr on 2008/02/26 14:13:42 get rid of unused debug temp's Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/tick.c#9 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/tick.c#9 (text+ko) ==== @@ -264,7 +264,6 @@ struct clk_ticks *cpu_ticks; struct trapframe *tf; uint32_t ltick; - uint8_t a=0, b=0, c=0, d=0; /* * Set next clock edge. */ @@ -275,7 +274,6 @@ if (ltick < counter_lower_last) { counter_upper++; counter_lower_last = ltick; - a = 1; } /* * Magic. Setting up with an arg of NULL means we get passed tf. @@ -285,7 +283,6 @@ /* Fire hardclock at hz. */ cpu_ticks->hard_ticks += cycles_per_tick; if (cpu_ticks->hard_ticks >= cycles_per_hz) { - b = 1; cpu_ticks->hard_ticks -= cycles_per_hz; if (PCPU_GET(cpuid) == 0) hardclock(USERMODE(tf->sr), tf->pc); @@ -295,7 +292,6 @@ /* Fire statclock at stathz. */ cpu_ticks->stat_ticks += stathz; if (cpu_ticks->stat_ticks >= cycles_per_hz) { - c = 1; cpu_ticks->stat_ticks -= cycles_per_hz; statclock(USERMODE(tf->sr)); } @@ -303,7 +299,6 @@ /* Fire profclock at profhz, but only when needed. */ cpu_ticks->prof_ticks += profhz; if (cpu_ticks->prof_ticks >= cycles_per_hz) { - d = 1; cpu_ticks->prof_ticks -= cycles_per_hz; if (profprocs != 0) profclock(USERMODE(tf->sr), tf->pc); From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:14:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FF561065678; Tue, 26 Feb 2008 14:14:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 214401065671 for ; Tue, 26 Feb 2008 14:14:58 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1595213C46A for ; Tue, 26 Feb 2008 14:14:58 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEEviD046224 for ; Tue, 26 Feb 2008 14:14:57 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEEvQx046221 for perforce@freebsd.org; Tue, 26 Feb 2008 14:14:57 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:14:57 GMT Message-Id: <200802261414.m1QEEvQx046221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:14:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=136240 Change 136240 by rrs@rrs-mips2-jnpr on 2008/02/26 14:14:27 For octeon we use di/ei (this should be generalized with a ifdef for mips64 or something). Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#4 (text+ko) ==== @@ -130,17 +130,41 @@ LEAF(disableintr) +#ifdef TARGET_OCTEON + .set mips64 + .word 0x041626000 #di v0 + +#if defined(ISA_MIPS32) + .set mips32 +#elif defined(ISA_MIPS64) + .set mips64 +#elif defined(ISA_MIPS3) + .set mips3 +#endif +#else mfc0 v0, COP_0_STATUS_REG # read status register nop and v1, v0, ~SR_INT_ENAB mtc0 v1, COP_0_STATUS_REG # disable all interrupts MIPS_CPU_NOP_DELAY and v0, SR_INT_ENAB # return old interrupt enable +#endif j ra nop END(disableintr) LEAF(set_intr_mask) +#ifdef TARGET_OCTEON + .set mips64 + .word 0x041626020 #ei v0 +#if defined(ISA_MIPS32) + .set mips32 +#elif defined(ISA_MIPS64) + .set mips64 +#elif defined(ISA_MIPS3) + .set mips3 +#endif +#else li t0, SR_INT_MASK # 1 means masked so invert. not a0, a0 # 1 means masked so invert. and a0, t0 # 1 means masked so invert. @@ -151,6 +175,7 @@ mtc0 v1, COP_0_STATUS_REG MIPS_CPU_NOP_DELAY move v0, v1 +#endif jr ra nop @@ -167,6 +192,7 @@ END(get_intr_mask) + LEAF(getsr) mfc0 v0, COP_0_STATUS_REG From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:16:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4740F1065674; Tue, 26 Feb 2008 14:16:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0769B1065671 for ; Tue, 26 Feb 2008 14:16:00 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F06A113C45B for ; Tue, 26 Feb 2008 14:15:59 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEFxmM046279 for ; Tue, 26 Feb 2008 14:15:59 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEFxLw046276 for perforce@freebsd.org; Tue, 26 Feb 2008 14:15:59 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:15:59 GMT Message-Id: <200802261415.m1QEFxLw046276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:16:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=136241 Change 136241 by rrs@rrs-mips2-jnpr on 2008/02/26 14:15:13 Changes needed to make it compile with the new argument in pmap_enter. We ignore this arg for now. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#23 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#23 (text+ko) ==== @@ -1690,7 +1690,7 @@ * insert this page into the given map NOW. */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t fault_type, vm_page_t m, vm_prot_t prot, boolean_t wired) { vm_offset_t pa, opa; @@ -2074,7 +2074,12 @@ psize = atop(end - start); m = m_start; while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { - pmap_enter(pmap, start + ptoa(diff), m, prot & + /* FIX ME FIX ME - prot is passed in both the + * the normal spot m, prot but also as the fault_type + * which we don't use. If we ever use it in pmap_enter + * we will have to fix this. + */ + pmap_enter(pmap, start + ptoa(diff), prot, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); m = TAILQ_NEXT(m, listq); } From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:16:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D625E106571B; Tue, 26 Feb 2008 14:16:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 793D210656C8 for ; Tue, 26 Feb 2008 14:16:00 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67FBA13C45E for ; Tue, 26 Feb 2008 14:16:00 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEG0QF046288 for ; Tue, 26 Feb 2008 14:16:00 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEFx6U046282 for perforce@freebsd.org; Tue, 26 Feb 2008 14:15:59 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:15:59 GMT Message-Id: <200802261415.m1QEFx6U046282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:16:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=136242 Change 136242 by rrs@rrs-mips2-jnpr on 2008/02/26 14:15:35 For octeon get rid of the warning that breaks the build. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#6 (text+ko) ==== @@ -360,7 +360,9 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { - +#ifdef TARGET_OCTEON + uint64_t temp; +#endif /* * If this is a memory resource, track the direct mapping * in the uncached MIPS KSEG1 segment. @@ -371,7 +373,13 @@ vaddr = (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(r)); rman_set_virtual(r, vaddr); rman_set_bustag(r, MIPS_BUS_SPACE_MEM); +#ifdef TARGET_OCTEON + temp = 0x0000000000000000; + temp |= (uint32_t)vaddr; + rman_set_bushandle(r, (bus_space_handle_t)temp); +#else rman_set_bushandle(r, (bus_space_handle_t)vaddr); +#endif } return (rman_activate_resource(r)); From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:17:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5225C10656F1; Tue, 26 Feb 2008 14:17:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E88C10656E2 for ; Tue, 26 Feb 2008 14:17:03 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D622613C4CC for ; Tue, 26 Feb 2008 14:17:02 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEH2bD046344 for ; Tue, 26 Feb 2008 14:17:02 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEH2WY046341 for perforce@freebsd.org; Tue, 26 Feb 2008 14:17:02 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:17:02 GMT Message-Id: <200802261417.m1QEH2WY046341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:17:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=136243 Change 136243 by rrs@rrs-mips2-jnpr on 2008/02/26 14:16:06 For octeon get rid of warning that now breaks the build. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mainbus.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/mainbus.c#3 (text+ko) ==== @@ -257,6 +257,9 @@ /* * If this is a memory resource, map it into the kernel. */ +#ifdef TARGET_OCTEON + uint64_t temp; +#endif if (rman_get_bustag(r) == MIPS_BUS_SPACE_MEM) { caddr_t vaddr = 0; { @@ -271,7 +274,13 @@ } rman_set_virtual(r, vaddr); /* IBM-PC: the type of bus_space_handle_t is u_int */ +#ifdef TARGET_OCTEON + temp = 0x0000000000000000; + temp |= (uint32_t)vaddr; + rman_set_bushandle(r, (bus_space_handle_t) temp); +#else rman_set_bushandle(r, (bus_space_handle_t) vaddr); +#endif } return (rman_activate_resource(r)); } From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:18:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15BD7106567A; Tue, 26 Feb 2008 14:18:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAEA31065675 for ; Tue, 26 Feb 2008 14:18:05 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF4B513C459 for ; Tue, 26 Feb 2008 14:18:05 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEI5wo046360 for ; Tue, 26 Feb 2008 14:18:05 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEI5Vb046357 for perforce@freebsd.org; Tue, 26 Feb 2008 14:18:05 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:18:05 GMT Message-Id: <200802261418.m1QEI5Vb046357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:18:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=136244 Change 136244 by rrs@rrs-mips2-jnpr on 2008/02/26 14:17:20 Rework the exception code to store all registers and for user interrupts where we save all reg, do the ast. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#16 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#16 (text+ko) ==== @@ -291,6 +291,15 @@ SAVE_REG(t8, T8, sp) ;\ SAVE_REG(t9, T9, sp) ;\ SAVE_REG(gp, GP, sp) ;\ + SAVE_REG(s0, S0, sp) ;\ + SAVE_REG(s1, S1, sp) ;\ + SAVE_REG(s2, S2, sp) ;\ + SAVE_REG(s3, S3, sp) ;\ + SAVE_REG(s4, S4, sp) ;\ + SAVE_REG(s5, S5, sp) ;\ + SAVE_REG(s6, S6, sp) ;\ + SAVE_REG(s7, S7, sp) ;\ + SAVE_REG(s8, S8, sp) ;\ mflo v0 ;\ mfhi v1 ;\ mfc0 a0, COP_0_STATUS_REG ;\ @@ -310,21 +319,6 @@ addu a0, sp, STAND_ARG_SIZE ;\ ITLBNOPFIX -#ifdef DDB -#define SAVE_CPU_DDB \ - SAVE_REG(s0, S0, sp) ;\ - SAVE_REG(s1, S1, sp) ;\ - SAVE_REG(s2, S2, sp) ;\ - SAVE_REG(s3, S3, sp) ;\ - SAVE_REG(s4, S4, sp) ;\ - SAVE_REG(s5, S5, sp) ;\ - SAVE_REG(s6, S6, sp) ;\ - SAVE_REG(s7, S7, sp) ;\ - SAVE_REG(s8, S8, sp) -#else -#define SAVE_CPU_DDB -#endif - #define RESTORE_REG(reg, offs, base) \ LOAD reg, STAND_ARG_SIZE + (RSIZE * offs) (base) @@ -354,6 +348,15 @@ RESTORE_REG(t7, T7, sp) ;\ RESTORE_REG(t8, T8, sp) ;\ RESTORE_REG(t9, T9, sp) ;\ + RESTORE_REG(s0, S0, sp) ;\ + RESTORE_REG(s1, S1, sp) ;\ + RESTORE_REG(s2, S2, sp) ;\ + RESTORE_REG(s3, S3, sp) ;\ + RESTORE_REG(s4, S4, sp) ;\ + RESTORE_REG(s5, S5, sp) ;\ + RESTORE_REG(s6, S6, sp) ;\ + RESTORE_REG(s7, S7, sp) ;\ + RESTORE_REG(s8, S8, sp) ;\ RESTORE_REG(gp, GP, sp) ;\ RESTORE_REG(ra, RA, sp) ;\ addu sp, sp, KERN_EXC_FRAME_SIZE @@ -374,9 +377,7 @@ /* * Save CPU state, building 'frame'. */ - SAVE_CPU - SAVE_CPU_DDB /* * Call the exception handler. a0 points at the saved frame. */ @@ -385,11 +386,11 @@ jalr k0 sw a3, STAND_RA_OFFSET + KERN_REG_SIZE(sp) # for debugging - .set at - move s0, v0 - DO_AST - move v0, s0 - .set noat +/* .set at*/ + +/* Should I DO the AST stuff here? */ + +/* .set noat*/ RESTORE_CPU # v0 contains the return address. sync @@ -496,26 +497,25 @@ mtc0 v0, COP_0_STATUS_REG # set exeption level ITLBNOPFIX - GET_CPU_PCPU(a1) - lw a1, PC_CURPCB(a1) - - - RESTORE_U_PCB_REG(t0, MULLO, a1) - RESTORE_U_PCB_REG(t1, MULHI, a1) - mtlo t0 - mthi t1 - RESTORE_U_PCB_REG(a0, PC, a1) - .set noat - RESTORE_U_PCB_REG(AT, AST, a1) - RESTORE_U_PCB_REG(v0, V0, a1) - _MTC0 a0, COP_0_EXC_PC # set return address - + DO_AST + /* * The use of k1 for storing the PCB pointer must be done only * after interrupts are disabled. Otherwise it will get overwritten * by the interrupt code. */ - move k1, a1 + GET_CPU_PCPU(k1) + lw k1, PC_CURPCB(k1) + + RESTORE_U_PCB_REG(t0, MULLO, k1) + RESTORE_U_PCB_REG(t1, MULHI, k1) + mtlo t0 + mthi t1 + RESTORE_U_PCB_REG(a0, PC, k1) + .set noat + RESTORE_U_PCB_REG(AT, AST, k1) + RESTORE_U_PCB_REG(v0, V0, k1) + _MTC0 a0, COP_0_EXC_PC # set return address RESTORE_U_PCB_REG(v1, V1, k1) RESTORE_U_PCB_REG(a0, A0, k1) RESTORE_U_PCB_REG(a1, A1, k1) @@ -544,7 +544,6 @@ RESTORE_U_PCB_REG(k0, SR, k1) RESTORE_U_PCB_REG(s8, S8, k1) RESTORE_U_PCB_REG(ra, RA, k1) - /* * The restoration of the user SR must be done only after * k1 is no longer needed. Otherwise, k1 will get clobbered after @@ -580,8 +579,6 @@ .mask 0x80000000, (STAND_RA_OFFSET - KERN_EXC_FRAME_SIZE) /* * Save the relevant kernel registers onto the stack. - * We don't need to save s0 - s8, sp and gp because - * the compiler does it for us. */ SAVE_CPU /* @@ -652,6 +649,19 @@ SAVE_U_PCB_REG(gp, GP, k1) SAVE_U_PCB_REG(sp, SP, k1) SAVE_U_PCB_REG(ra, RA, k1) +/* + * save remaining user state in u.u_pcb. + */ + SAVE_U_PCB_REG(s0, S0, k1) + SAVE_U_PCB_REG(s1, S1, k1) + SAVE_U_PCB_REG(s2, S2, k1) + SAVE_U_PCB_REG(s3, S3, k1) + SAVE_U_PCB_REG(s4, S4, k1) + SAVE_U_PCB_REG(s5, S5, k1) + SAVE_U_PCB_REG(s6, S6, k1) + SAVE_U_PCB_REG(s7, S7, k1) + SAVE_U_PCB_REG(s8, S8, k1) + mflo v0 # get lo/hi late to avoid stall mfhi v1 mfc0 a0, COP_0_STATUS_REG @@ -665,7 +675,7 @@ subu sp, k1, STAND_FRAME_SIZE # switch to kernel SP la gp, _C_LABEL(_gp) # switch to kernel GP -# Turn off fpu and enter kernel mode +# Turn off fpu, disable interrupts, set kernel mode kernel mode, clear exception level. .set at and t0, a0, ~(SR_COP_1_BIT | SR_EXL | SR_INT_ENAB | SR_KSU_MASK) mtc0 t0, COP_0_STATUS_REG @@ -677,47 +687,16 @@ la k0, _C_LABEL(cpu_intr) jalr k0 sw a3, STAND_RA_OFFSET(sp) # for debugging - - DO_AST /* * Since interrupts are enabled at this point, we use a1 instead of * k0 or k1 to store the PCB pointer. This is because k0 and k1 - * are not preserved across interrupts. + * are not preserved across interrupts. ** RRS - And how did the + * get enabled? cpu_intr clears the cause register but it does + * not touch the sr as far as I can see thus intr are still + * disabled. */ - GET_CPU_PCPU(a1) - lw a1, PC_CURPCB(a1) - -/* - * save remaining user state in u.u_pcb. - */ - SAVE_U_PCB_REG(s0, S0, a1) - SAVE_U_PCB_REG(s1, S1, a1) - SAVE_U_PCB_REG(s2, S2, a1) - SAVE_U_PCB_REG(s3, S3, a1) - SAVE_U_PCB_REG(s4, S4, a1) - SAVE_U_PCB_REG(s5, S5, a1) - SAVE_U_PCB_REG(s6, S6, a1) - SAVE_U_PCB_REG(s7, S7, a1) - SAVE_U_PCB_REG(s8, S8, a1) - - /* Handle pending asynchronous softwre traps */ - la s0, _C_LABEL(disableintr) - jalr s0 - nop - GET_CPU_PCPU(s1) - lw s3, PC_CURPCB(s1) - lw s1, PC_CURTHREAD(s1) - lw s2, TD_FLAGS(s1) - li s0, TDF_ASTPENDING | TDF_NEEDRESCHED - and s2, s0 - la s0, _C_LABEL(enableintr) - jalr s0 - nop - beq s2, zero, 4f - nop - la s0, _C_LABEL(ast) - jalr s0 - addu a0, s3, U_PCB_REGS # only arg is frame + DO_AST + /* * Restore user registers and return. NOTE: interrupts are enabled. */ @@ -727,7 +706,6 @@ * k0 or k1 to store the PCB pointer. This is because k0 and k1 * are not preserved across interrupts. */ -4: GET_CPU_PCPU(a1) lw a1, PC_CURPCB(a1) RESTORE_U_PCB_REG(s0, S0, a1) From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:18:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 705C71065725; Tue, 26 Feb 2008 14:18:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 299281065718 for ; Tue, 26 Feb 2008 14:18:06 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6FD13C467 for ; Tue, 26 Feb 2008 14:18:06 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEI6kv046366 for ; Tue, 26 Feb 2008 14:18:06 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEI5nD046363 for perforce@freebsd.org; Tue, 26 Feb 2008 14:18:05 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:18:05 GMT Message-Id: <200802261418.m1QEI5nD046363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:18:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=136245 Change 136245 by rrs@rrs-mips2-jnpr on 2008/02/26 14:17:52 New do_ast Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#13 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#13 (text+ko) ==== @@ -306,21 +306,30 @@ /* * Call ast if required */ -#define DO_AST \ - GET_CPU_PCPU(a0) \ - lw a0, PC_CURTHREAD(a0); \ - lw t0, TD_FLAGS(a0); \ - and t0, t0, (TDF_ASTPENDING|TDF_NEEDRESCHED); \ - beq t0, zero, 27f; \ - nop; \ - lw a0, TD_FRAME(a0); \ - lw t0, TF_REG_SR(a0); \ - and t0, t0, SR_KSU_USER; \ - beq t0, zero, 27f; \ - nop; \ - jal ast; \ - nop; \ -27: +#define DO_AST \ +44: \ + GET_CPU_PCPU(a1) ;\ + lw a1, PC_CURPCB(a1) ;\ + la s0, _C_LABEL(disableintr) ;\ + jalr s0 ;\ + nop ;\ + GET_CPU_PCPU(s1) ;\ + lw s3, PC_CURPCB(s1) ;\ + lw s1, PC_CURTHREAD(s1) ;\ + lw s2, TD_FLAGS(s1) ;\ + li s0, TDF_ASTPENDING | TDF_NEEDRESCHED;\ + and s2, s0 ;\ + la s0, _C_LABEL(enableintr) ;\ + jalr s0 ;\ + nop ;\ + beq s2, zero, 4f ;\ + nop ;\ + la s0, _C_LABEL(ast) ;\ + jalr s0 ;\ + addu a0, s3, U_PCB_REGS ;\ + j 44b ;\ +4: + /* * XXX retain dialects XXX From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:19:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08AEB1065680; Tue, 26 Feb 2008 14:19:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB02F106567E for ; Tue, 26 Feb 2008 14:19:09 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B070513C474 for ; Tue, 26 Feb 2008 14:19:09 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEJ9xk046423 for ; Tue, 26 Feb 2008 14:19:09 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEJ9nd046420 for perforce@freebsd.org; Tue, 26 Feb 2008 14:19:09 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:19:09 GMT Message-Id: <200802261419.m1QEJ9nd046420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:19:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=136246 Change 136246 by rrs@rrs-mips2-jnpr on 2008/02/26 14:18:32 New vm define for the latest code, Guessed the same value is arm.. i.e. disable feature. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#6 (text+ko) ==== @@ -109,6 +109,15 @@ #define VM_KERNEL_WIRED_ADDR_END (VM_MIN_KERNEL_ADDRESS + VM_KERNEL_ALLOC_OFFSET) #define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xFFFFC000) +/* + * Disable superpage reservations. (not sure if this is right + * I copied it from ARM) + */ +#ifndef VM_NRESERVLEVEL +#define VM_NRESERVLEVEL 0 +#endif + + /* virtual sizes (bytes) for various kernel submaps */ #ifndef VM_KMEM_SIZE #define VM_KMEM_SIZE (12 * 1024 * 1024) From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:20:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 780971065679; Tue, 26 Feb 2008 14:20:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 389E51065677 for ; Tue, 26 Feb 2008 14:20:12 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D03813C45D for ; Tue, 26 Feb 2008 14:20:12 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEKCeq046513 for ; Tue, 26 Feb 2008 14:20:12 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEKBJ2046510 for perforce@freebsd.org; Tue, 26 Feb 2008 14:20:11 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:20:11 GMT Message-Id: <200802261420.m1QEKBJ2046510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=136248 Change 136248 by rrs@rrs-mips2-jnpr on 2008/02/26 14:19:40 gets rid of warning Affected files ... .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.c#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_pko.c#4 (text+ko) ==== @@ -278,11 +278,11 @@ octeon_pko_queue_cfg.word64 = oct_read64(OCTEON_PKO_MEM_QUEUE_PTRS); if (!octeon_pko_queue_cfg.bits.buf_ptr) continue; - printf("\n Port # %d Queue %3d [%d] BufPtr: 0x%llX Mask: %X%s", + printf("\n Port # %d Queue %3d [%d] BufPtr: 0x%llx Mask: %X%s", octeon_pko_queue_cfg.bits.port, octeon_pko_queue_cfg.bits.queue, octeon_pko_queue_cfg.bits.index, - octeon_pko_queue_cfg.bits.buf_ptr, + (uint64_t)octeon_pko_queue_cfg.bits.buf_ptr, octeon_pko_queue_cfg.bits.qos_mask, (octeon_pko_queue_cfg.bits.tail) ? " Last" : ""); } From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:20:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2151C1065722; Tue, 26 Feb 2008 14:20:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B517E10656E0 for ; Tue, 26 Feb 2008 14:20:12 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C3D713C465 for ; Tue, 26 Feb 2008 14:20:12 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEKCUr046519 for ; Tue, 26 Feb 2008 14:20:12 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEKCTg046516 for perforce@freebsd.org; Tue, 26 Feb 2008 14:20:12 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:20:12 GMT Message-Id: <200802261420.m1QEKCTg046516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=136249 Change 136249 by rrs@rrs-mips2-jnpr on 2008/02/26 14:19:56 gets rid of warning. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/dev/rgmii/octeon_rgmx.h#4 (text+ko) ==== @@ -510,7 +510,7 @@ printf("WQE Result: 0x%llX No-work %x Addr %llX Ptr: %p\n", result.word64, result.s_work.no_work, - result.s_work.addr, + (uint64_t)result.s_work.addr, OCTEON_PHYS2PTR(result.s_work.addr)); if (result.s_work.no_work || !result.s_work.addr) { From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:30:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D7841065675; Tue, 26 Feb 2008 14:30:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0788106566C for ; Tue, 26 Feb 2008 14:30:26 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE0E413C474 for ; Tue, 26 Feb 2008 14:30:26 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEUQdS046833 for ; Tue, 26 Feb 2008 14:30:26 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEUQtO046830 for perforce@freebsd.org; Tue, 26 Feb 2008 14:30:26 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:30:26 GMT Message-Id: <200802261430.m1QEUQtO046830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:30:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=136250 Change 136250 by rrs@rrs-mips2-jnpr on 2008/02/26 14:29:35 adds more notes/options Affected files ... .. //depot/projects/mips2-jnpr/src/buildnotes#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/buildnotes#2 (text+ko) ==== @@ -5,7 +5,9 @@ so -make -DWITHOUT_MAGIC -DWITHOUT_RESCUE -DWITHOUT_KERBEROS buildworld TARGET=mips +make -DWITHOUT_MAGIC -DWITHOUT_RESCUE -DWITHOUT_KERBEROS buildworld TARGET=mips TARGET_BIG_ENDIAN=true + +-DNO_DYNAMICROOT can be added to have static binaries. Then after that completes make a local dir From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:31:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40C541065676; Tue, 26 Feb 2008 14:31:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 018E31065673 for ; Tue, 26 Feb 2008 14:31:30 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB8F413C465 for ; Tue, 26 Feb 2008 14:31:29 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEVT00046868 for ; Tue, 26 Feb 2008 14:31:29 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEVTJX046865 for perforce@freebsd.org; Tue, 26 Feb 2008 14:31:29 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:31:29 GMT Message-Id: <200802261431.m1QEVTJX046865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:31:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=136251 Change 136251 by rrs@rrs-mips2-jnpr on 2008/02/26 14:31:04 Comment out the panic so we maybe can get a core. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#14 (text+ko) ==== @@ -324,7 +324,7 @@ register_t addr = 0; trapdebug_enter(trapframe, 0); - + type = (trapframe->cause & CR_EXC_CODE) >> CR_EXC_CODE_SHIFT; if (USERMODE(trapframe->sr)) { type |= T_USER; @@ -1705,7 +1705,7 @@ log(LOG_ERR, "pc address 0x%x is inaccessible, pde = 0x%p, pte = 0x%lx\n", pc, *pdep, ptep ? *ptep : 0); } - panic("Bad trap"); + /* panic("Bad trap");*/ } From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:32:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 565241065678; Tue, 26 Feb 2008 14:32:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 167CA1065675 for ; Tue, 26 Feb 2008 14:32:33 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06C0413C455 for ; Tue, 26 Feb 2008 14:32:33 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEWWPY046903 for ; Tue, 26 Feb 2008 14:32:32 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEWWxn046900 for perforce@freebsd.org; Tue, 26 Feb 2008 14:32:32 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 14:32:32 GMT Message-Id: <200802261432.m1QEWWxn046900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:32:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=136252 Change 136252 by rrs@rrs-mips2-jnpr on 2008/02/26 14:31:39 adds witness. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/OCTEON_rrs#14 (text+ko) ==== @@ -57,9 +57,9 @@ # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options WITNESS_KDB # break to debugger on witness warnings +options WITNESS #Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options WITNESS_KDB # break to debugger on witness warnings device genclock device loop @@ -83,5 +83,4 @@ #options MD_ROOT #options ROOTDEVNAME = \"ufs:md0\" #options MD_ROOT_SIZE = 25200 - #options TARGET_EMULATOR From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:43:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6A861065680; Tue, 26 Feb 2008 14:43:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7305106569B; Tue, 26 Feb 2008 14:43:18 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 64C0C13C46A; Tue, 26 Feb 2008 14:43:18 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id m1QEfQmL012911; Tue, 26 Feb 2008 07:41:26 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 26 Feb 2008 07:41:55 -0700 (MST) Message-Id: <20080226.074155.906763861.imp@bsdimp.com> To: rrs@freebsd.org From: "M. Warner Losh" In-Reply-To: <200802261414.m1QEEvQx046221@repoman.freebsd.org> References: <200802261414.m1QEEvQx046221@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 136240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:43:20 -0000 In message: <200802261414.m1QEEvQx046221@repoman.freebsd.org> "Randall R. Stewart" writes: : http://perforce.freebsd.org/chv.cgi?CH=136240 : : Change 136240 by rrs@rrs-mips2-jnpr on 2008/02/26 14:14:27 : : For octeon we use di/ei (this should be generalized : with a ifdef for mips64 or something). I was actually thinking that we just put the enable/disable instructions into the I/O routines directly, not hack the disable/enable intr routines and call them. Warner : Affected files ... : : .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#4 edit : : Differences ... : : ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#4 (text+ko) ==== : : @@ -130,17 +130,41 @@ : : : LEAF(disableintr) : +#ifdef TARGET_OCTEON : + .set mips64 : + .word 0x041626000 #di v0 : + : +#if defined(ISA_MIPS32) : + .set mips32 : +#elif defined(ISA_MIPS64) : + .set mips64 : +#elif defined(ISA_MIPS3) : + .set mips3 : +#endif : +#else : mfc0 v0, COP_0_STATUS_REG # read status register : nop : and v1, v0, ~SR_INT_ENAB : mtc0 v1, COP_0_STATUS_REG # disable all interrupts : MIPS_CPU_NOP_DELAY : and v0, SR_INT_ENAB # return old interrupt enable : +#endif : j ra : nop : END(disableintr) : : LEAF(set_intr_mask) : +#ifdef TARGET_OCTEON : + .set mips64 : + .word 0x041626020 #ei v0 : +#if defined(ISA_MIPS32) : + .set mips32 : +#elif defined(ISA_MIPS64) : + .set mips64 : +#elif defined(ISA_MIPS3) : + .set mips3 : +#endif : +#else : li t0, SR_INT_MASK # 1 means masked so invert. : not a0, a0 # 1 means masked so invert. : and a0, t0 # 1 means masked so invert. : @@ -151,6 +175,7 @@ : mtc0 v1, COP_0_STATUS_REG : MIPS_CPU_NOP_DELAY : move v0, v1 : +#endif : jr ra : nop : : @@ -167,6 +192,7 @@ : : END(get_intr_mask) : : + : : LEAF(getsr) : mfc0 v0, COP_0_STATUS_REG : From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:46:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEF601065678; Tue, 26 Feb 2008 14:46:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FC9D106566B; Tue, 26 Feb 2008 14:46:35 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 498FB13C4E3; Tue, 26 Feb 2008 14:46:35 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id m1QEgtjK012928; Tue, 26 Feb 2008 07:42:55 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 26 Feb 2008 07:43:24 -0700 (MST) Message-Id: <20080226.074324.-476161772.imp@bsdimp.com> To: rrs@freebsd.org From: "M. Warner Losh" In-Reply-To: <200802261431.m1QEVTJX046865@repoman.freebsd.org> References: <200802261431.m1QEVTJX046865@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 136251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:46:36 -0000 In message: <200802261431.m1QEVTJX046865@repoman.freebsd.org> "Randall R. Stewart" writes: : http://perforce.freebsd.org/chv.cgi?CH=136251 : : Change 136251 by rrs@rrs-mips2-jnpr on 2008/02/26 14:31:04 : : Comment out the panic so we maybe can get a core. The core file should have been generated much earlier than the bad trap, no? Warner : Affected files ... : : .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#14 edit : : Differences ... : : ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#14 (text+ko) ==== : : @@ -324,7 +324,7 @@ : register_t addr = 0; : : trapdebug_enter(trapframe, 0); : - : + : type = (trapframe->cause & CR_EXC_CODE) >> CR_EXC_CODE_SHIFT; : if (USERMODE(trapframe->sr)) { : type |= T_USER; : @@ -1705,7 +1705,7 @@ : log(LOG_ERR, "pc address 0x%x is inaccessible, pde = 0x%p, pte = 0x%lx\n", : pc, *pdep, ptep ? *ptep : 0); : } : - panic("Bad trap"); : + /* panic("Bad trap");*/ : } : : : From owner-p4-projects@FreeBSD.ORG Tue Feb 26 14:46:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6374A1065672; Tue, 26 Feb 2008 14:46:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06390106566C for ; Tue, 26 Feb 2008 14:46:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE55613C4E1 for ; Tue, 26 Feb 2008 14:46:55 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEkruE047506 for ; Tue, 26 Feb 2008 14:46:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEkr2Y047503 for perforce@freebsd.org; Tue, 26 Feb 2008 14:46:53 GMT (envelope-from imp@freebsd.org) Date: Tue, 26 Feb 2008 14:46:53 GMT Message-Id: <200802261446.m1QEkr2Y047503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 14:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=136255 Change 136255 by imp@imp_paco-paco on 2008/02/26 14:46:10 IFC @136252 Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#15 integrate .. //depot/projects/mips2/src/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/mips2/src/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/k_rem_pio2.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/math_private.h#4 integrate .. //depot/projects/mips2/src/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/setup.c#3 integrate .. //depot/projects/mips2/src/sbin/ping6/ping6.c#5 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_LOCK.9#4 integrate .. //depot/projects/mips2/src/share/man/man9/lock.9#6 integrate .. //depot/projects/mips2/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#14 integrate .. //depot/projects/mips2/src/sys/conf/files#17 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/mips2/src/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/mips2/src/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete .. //depot/projects/mips2/src/sys/fs/coda/TODO#3 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/mips2/src/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/mips2/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/mips2/src/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/mips2/src/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/mips2/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/mips2/src/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/mips2/src/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/mips2/src/sys/kern/vfs_default.c#5 integrate .. //depot/projects/mips2/src/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/mips2/src/sys/kern/vnode_if.src#5 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/mips2/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/mips2/src/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_iod.c#4 integrate .. //depot/projects/mips2/src/sys/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/mips2/src/sys/security/audit/audit.c#8 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/mips2/src/sys/sys/buf.h#4 integrate .. //depot/projects/mips2/src/sys/sys/lockmgr.h#6 integrate .. //depot/projects/mips2/src/sys/sys/param.h#11 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/mips2/src/usr.bin/ar/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/du/du.1#3 integrate .. //depot/projects/mips2/src/usr.bin/du/du.c#4 integrate Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -847,6 +847,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -856,18 +864,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -943,6 +948,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/mips2/src/contrib/tcpdump/print-802_11.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/mips2/src/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ar -#MAN= gnu-ar.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar -.endif SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/mips2/src/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ranlib -#MAN= gnu-ranlib.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 +.endif + PROG= ranlib -.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $ */ #ifndef _KGDB_H_ @@ -49,7 +49,6 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); -void kgdb_auto_load_klds(void); void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); ==== //depot/projects/mips2/src/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -34,7 +34,7 @@ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ static inline uint16_t -be16dec(const void *pp) +archive_be16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -42,7 +42,7 @@ } static inline uint32_t -be32dec(const void *pp) +archive_be32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -50,15 +50,15 @@ } static inline uint64_t -be64dec(const void *pp) +archive_be64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); + return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4)); } static inline uint16_t -le16dec(const void *pp) +archive_le16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -66,7 +66,7 @@ } static inline uint32_t -le32dec(const void *pp) +archive_le32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -74,15 +74,15 @@ } static inline uint64_t -le64dec(const void *pp) +archive_le64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p)); + return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p)); } static inline void -be16enc(void *pp, uint16_t u) +archive_be16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -91,7 +91,7 @@ } static inline void -be32enc(void *pp, uint32_t u) +archive_be32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -102,16 +102,16 @@ } static inline void -be64enc(void *pp, uint64_t u) +archive_be64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - be32enc(p, u >> 32); - be32enc(p + 4, u & 0xffffffff); + archive_be32enc(p, u >> 32); + archive_be32enc(p + 4, u & 0xffffffff); } static inline void -le16enc(void *pp, uint16_t u) +archive_le16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -120,7 +120,7 @@ } static inline void -le32enc(void *pp, uint32_t u) +archive_le32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -131,12 +131,12 @@ } static inline void -le64enc(void *pp, uint64_t u) +archive_le64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - le32enc(p, u & 0xffffffff); - le32enc(p + 4, u >> 32); + archive_le32enc(p, u & 0xffffffff); + archive_le32enc(p + 4, u >> 32); } #endif ==== //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.20 2008/01/15 16:27:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.21 2008/02/26 07:17:47 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -278,8 +278,8 @@ zip->version = p->version[0]; zip->system = p->version[1]; - zip->flags = le16dec(p->flags); - zip->compression = le16dec(p->compression); + zip->flags = archive_le16dec(p->flags); + zip->compression = archive_le16dec(p->compression); if (zip->compression < sizeof(compression_names)/sizeof(compression_names[0])) zip->compression_name = compression_names[zip->compression]; @@ -291,11 +291,11 @@ zip->mode = 0; zip->uid = 0; zip->gid = 0; - zip->crc32 = le32dec(p->crc32); - zip->filename_length = le16dec(p->filename_length); - zip->extra_length = le16dec(p->extra_length); - zip->uncompressed_size = le32dec(p->uncompressed_size); - zip->compressed_size = le32dec(p->compressed_size); + zip->crc32 = archive_le32dec(p->crc32); + zip->filename_length = archive_le16dec(p->filename_length); + zip->extra_length = archive_le16dec(p->extra_length); + zip->uncompressed_size = archive_le32dec(p->uncompressed_size); + zip->compressed_size = archive_le32dec(p->compressed_size); (a->decompressor->consume)(a, sizeof(struct zip_file_header)); @@ -397,9 +397,9 @@ "Truncated ZIP end-of-file record"); return (ARCHIVE_FATAL); } - zip->crc32 = le32dec(p + 4); - zip->compressed_size = le32dec(p + 8); - zip->uncompressed_size = le32dec(p + 12); + zip->crc32 = archive_le32dec(p + 4); + zip->compressed_size = archive_le32dec(p + 8); + zip->uncompressed_size = archive_le32dec(p + 12); (a->decompressor->consume)(a, 16); } @@ -707,8 +707,8 @@ const char *p = (const char *)extra; while (offset < zip->extra_length - 4) { - unsigned short headerid = le16dec(p + offset); - unsigned short datasize = le16dec(p + offset + 2); + unsigned short headerid = archive_le16dec(p + offset); + unsigned short datasize = archive_le16dec(p + offset + 2); offset += 4; if (offset + datasize > zip->extra_length) break; @@ -720,9 +720,9 @@ case 0x0001: /* Zip64 extended information extra field. */ if (datasize >= 8) - zip->uncompressed_size = le64dec(p + offset); + zip->uncompressed_size = archive_le64dec(p + offset); if (datasize >= 16) - zip->compressed_size = le64dec(p + offset + 8); + zip->compressed_size = archive_le64dec(p + offset + 8); break; case 0x5455: { @@ -735,11 +735,12 @@ { #ifdef DEBUG fprintf(stderr, "mtime: %lld -> %d\n", - (long long)zip->mtime, le32dec(p + offset)); + (long long)zip->mtime, + archive_le32dec(p + offset)); #endif if (datasize < 4) break; - zip->mtime = le32dec(p + offset); + zip->mtime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -747,7 +748,7 @@ { if (datasize < 4) break; - zip->atime = le32dec(p + offset); + zip->atime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -755,7 +756,7 @@ { if (datasize < 4) break; - zip->ctime = le32dec(p + offset); + zip->ctime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -765,12 +766,13 @@ /* Info-ZIP Unix Extra Field (type 2) "Ux". */ #ifdef DEBUG fprintf(stderr, "uid %d gid %d\n", - le16dec(p + offset), le16dec(p + offset + 2)); + archive_le16dec(p + offset), + archive_le16dec(p + offset + 2)); #endif if (datasize >= 2) - zip->uid = le16dec(p + offset); + zip->uid = archive_le16dec(p + offset); if (datasize >= 4) - zip->gid = le16dec(p + offset + 2); + zip->gid = archive_le16dec(p + offset + 2); break; default: break; ==== //depot/projects/mips2/src/lib/libc/sys/clock_gettime.2#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.24 2007/01/09 00:28:14 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.25 2008/02/25 13:03:18 brueffer Exp $ .\" .Dd November 4, 2006 .Dt CLOCK_GETTIME 2 @@ -52,8 +52,8 @@ .Fn clock_gettime and .Fn clock_settime -allow the calling process to retrieve or set the value used by a clock -which is specified by +system calls allow the calling process to retrieve or set the value +used by a clock which is specified by .Fa clock_id . .Pp The ==== //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.15 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -56,7 +56,7 @@ __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; - double tx[3]; + double tx[3],ty[2]; int32_t e0,i,j,nx,n,ix,hx; u_int32_t low; @@ -182,7 +182,7 @@ tx[2] = z; nx = 3; while(tx[nx-1]==zero) nx--; /* skip zero term */ - n = __kernel_rem_pio2(tx,y,e0,nx,2); - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,nx,1); + if(hx<0) {y[0] = -ty[0]; y[1] = -ty[1]; return -n;} + y[0] = ty[0]; y[1] = ty[1]; return n; } ==== //depot/projects/mips2/src/lib/msun/src/e_rem_pio2f.c#3 (text+ko) ==== @@ -15,12 +15,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.24 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * - * return the remainder of x rem pi/2 in y[0]+y[1] - * use double precision internally + * return the remainder of x rem pi/2 in *y + * use double precision for everything except passing x * use __kernel_rem_pio2() for large x */ @@ -41,11 +41,14 @@ pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +#ifdef INLINE_REM_PIO2F +extern inline +#endif int -__ieee754_rem_pio2f(float x, float *y) +__ieee754_rem_pio2f(float x, double *y) { double w,r,fn; - double tx[1],ty[2]; + double tx[1],ty[1]; float z; int32_t e0,n,ix,hx; @@ -63,23 +66,20 @@ #endif r = x-fn*pio2_1; w = fn*pio2_1t; - y[0] = r-w; - y[1] = (r-y[0])-w; + *y = r-w; return n; } /* * all other (large) arguments */ if(ix>=0x7f800000) { /* x is inf or NaN */ - y[0]=y[1]=x-x; return 0; + *y=x-x; return 0; } /* set z = scalbn(|x|,ilogb(|x|)-23) */ e0 = (ix>>23)-150; /* e0 = ilogb(|x|)-23; */ SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23))); tx[0] = z; - n = __kernel_rem_pio2(tx,ty,e0,1,1); - y[0] = ty[0]; - y[1] = ty[0] - y[0]; - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,1,0); + if(hx<0) {*y = -ty[0]; return -n;} + *y = ty[0]; return n; } ==== //depot/projects/mips2/src/lib/msun/src/k_rem_pio2.c#3 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.10 2008/02/17 07:31:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.11 2008/02/25 11:43:20 bde Exp $"); /* * __kernel_rem_pio2(x,y,e0,nx,prec) @@ -78,8 +78,13 @@ * Here is the description of some local variables: * * jk jk+1 is the initial number of terms of ipio2[] needed - * in the computation. The recommended value is 2,3,4, - * 6 for single, double, extended,and quad. + * in the computation. The minimum and recommended value + * for jk is 3,4,4,6 for single, double, extended, and quad. + * jk+1 must be 2 larger than you might expect so that our + * recomputation test works. (Up to 24 bits in the integer + * part (the 24 bits of it that we compute) and 23 bits in + * the fraction part may be lost to cancelation before we + * recompute.) * * jz local integer variable indicating the number of * terms of ipio2[] used. @@ -129,7 +134,7 @@ #include "math.h" #include "math_private.h" -static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ +static const int init_jk[] = {3,4,4,6}; /* initial value for jk */ /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi ==== //depot/projects/mips2/src/lib/msun/src/math_private.h#4 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.25 2008/02/22 14:11:03 bde Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.26 2008/02/25 13:33:20 bde Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -320,7 +320,7 @@ double __kernel_tan(double,double,int); /* float precision kernel functions */ -int __ieee754_rem_pio2f(float,float*); +int __ieee754_rem_pio2f(float,double*); float __kernel_sindf(double); float __kernel_cosdf(double); float __kernel_tandf(double,int); ==== //depot/projects/mips2/src/lib/msun/src/s_cosf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.16 2008/02/22 02:30:35 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float cosf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -71,13 +75,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_cosdf((double)y[0]+y[1]); - case 1: return __kernel_sindf(-(double)y[0]-y[1]); - case 2: return -__kernel_cosdf((double)y[0]+y[1]); + case 0: return __kernel_cosdf(y); + case 1: return __kernel_sindf(-y); + case 2: return -__kernel_cosdf(y); default: - return __kernel_sindf((double)y[0]+y[1]); + return __kernel_sindf(y); } } } ==== //depot/projects/mips2/src/lib/msun/src/s_sinf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float sinf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -69,13 +73,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_sindf((double)y[0]+y[1]); - case 1: return __kernel_cosdf((double)y[0]+y[1]); - case 2: return __kernel_sindf(-(double)y[0]-y[1]); + case 0: return __kernel_sindf(y); + case 1: return __kernel_cosdf(y); + case 2: return __kernel_sindf(-y); default: - return -__kernel_cosdf((double)y[0]+y[1]); + return -__kernel_cosdf(y); } } } ==== //depot/projects/mips2/src/lib/msun/src/s_tanf.c#3 (text+ko) ==== @@ -15,11 +15,15 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_TANDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_tanf.c" /* Small multiples of pi/2 rounded to double precision. */ @@ -32,7 +36,7 @@ float tanf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -61,8 +65,8 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); /* integer parameter: 1 -- n even; -1 -- n odd */ - return __kernel_tandf((double)y[0]+y[1],1-((n&1)<<1)); + return __kernel_tandf(y,1-((n&1)<<1)); } } ==== //depot/projects/mips2/src/sbin/fsck_ffs/pass1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.44 2008/02/26 03:08:22 delphij Exp $"); #include #include @@ -93,9 +93,11 @@ inumber = c * sblock.fs_ipg; setinodebuf(inumber); getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); - if (sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) { inosused = cgrp.cg_initediblk; - else + if (inosused > sblock.fs_ipg) + inosused = sblock.fs_ipg; + } else inosused = sblock.fs_ipg; if (got_siginfo) { printf("%s: phase 1: cyl group %d of %d (%d%%)\n", ==== //depot/projects/mips2/src/sbin/fsck_ffs/pass2.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.27 2008/02/26 03:05:48 delphij Exp $"); #include @@ -242,6 +242,8 @@ /* * check for "." */ + if (dirp->d_ino > maxino) + goto chk2; if (idesc->id_entryno != 0) goto chk1; if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) { ==== //depot/projects/mips2/src/sbin/fsck_ffs/setup.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.51 2008/02/26 03:03:17 delphij Exp $"); #include #include @@ -349,7 +349,7 @@ sblock.fs_sblockloc == sblock_try[i])) && sblock.fs_ncg >= 1 && sblock.fs_bsize >= MINBSIZE && - sblock.fs_bsize >= sizeof(struct fs)) + sblock.fs_sbsize >= roundup(sizeof(struct fs), dev_bsize)) break; } if (sblock_try[i] == -1) { ==== //depot/projects/mips2/src/sbin/ping6/ping6.c#5 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.32 2007/11/20 01:58:34 dd Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.33 2008/02/25 10:45:25 silby Exp $"; #endif /* not lint */ /* @@ -457,9 +457,9 @@ if (interval.tv_sec < 0) errx(1, "illegal timing interval %s", optarg); /* less than 1/hz does not make sense */ - if (interval.tv_sec == 0 && interval.tv_usec < 10000) { - warnx("too small interval, raised to 0.01"); - interval.tv_usec = 10000; + if (interval.tv_sec == 0 && interval.tv_usec < 1) { + warnx("too small interval, raised to .000001"); + interval.tv_usec = 1; } options |= F_INTERVAL; break; ==== //depot/projects/mips2/src/share/man/man9/VOP_LOCK.9#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.22 2008/01/18 22:09:29 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.23 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd January 19, 2008 +.Dd February 25, 2008 .Os .Dt VOP_LOCK 9 .Sh NAME @@ -46,7 +46,7 @@ .Ft int .Fn VOP_UNLOCK "struct vnode *vp" "int flags" .Ft int -.Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td" +.Fn VOP_ISLOCKED "struct vnode *vp" .Ft int .Fn vn_lock "struct vnode *vp" "int flags" .Sh DESCRIPTION @@ -101,9 +101,6 @@ .It Dv LK_RETRY Retry until locked. .El -.It Fa td -Thread context to use for the locks. -.El .Pp Kernel code should use .Fn vn_lock ==== //depot/projects/mips2/src/share/man/man9/lock.9#6 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.25 2008/02/14 19:39:09 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.26 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd February 13, 2008 +.Dd February 25, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -49,7 +49,7 @@ .Ft int .Fn lockmgr "struct lock *lkp" "u_int flags" "struct mtx *interlkp" .Ft int -.Fn lockstatus "struct lock *lkp" "struct thread *td" +.Fn lockstatus "struct lock *lkp" .Ft void .Fn lockmgr_disown "struct lock *lkp" .Ft void @@ -180,20 +180,11 @@ .Pp The .Fn lockstatus -function returns the status of the lock in relation to the -.Vt thread -passed to it. -Note that if -.Fa td -is -.Dv NULL -and an exclusive lock is held, -.Dv LK_EXCLUSIVE -will be returned. +function returns the status of the lock in relation to the current thread. .Pp The .Fn lockmgr_disown -function switches the owner from curthread to be +function switches the owner from the current thread to be .Dv LK_KERNPROC, if the lock is already held. .Pp @@ -283,11 +274,9 @@ function returns: .Bl -tag -width ".Dv LK_EXCLUSIVE" .It Dv LK_EXCLUSIVE -An exclusive lock is held by the thread -.Fa td . +An exclusive lock is held by the current thread. .It Dv LK_EXCLOTHER -An exclusive lock is held by someone other than the thread -.Fa td . +An exclusive lock is held by someone other than the current thread. .It Dv LK_SHARED A shared lock is held. .It Li 0 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:19:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49125106568E; Tue, 26 Feb 2008 15:19:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0447A106567F for ; Tue, 26 Feb 2008 15:19:51 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08C6A13C45E for ; Tue, 26 Feb 2008 15:19:50 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QFJnX7049801 for ; Tue, 26 Feb 2008 15:19:49 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QFJngv049798 for perforce@freebsd.org; Tue, 26 Feb 2008 15:19:49 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 15:19:49 GMT Message-Id: <200802261519.m1QFJngv049798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 15:19:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=136258 Change 136258 by rrs@rrs-mips2-jnpr on 2008/02/26 15:19:26 Lops off the status. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#5 (text+ko) ==== @@ -133,7 +133,7 @@ #ifdef TARGET_OCTEON .set mips64 .word 0x041626000 #di v0 - + and v0, SR_INT_ENAB # return old interrupt enable bit #if defined(ISA_MIPS32) .set mips32 #elif defined(ISA_MIPS64) @@ -143,6 +143,7 @@ #endif #else mfc0 v0, COP_0_STATUS_REG # read status register + and v0, v0, SR_INT_ENAB nop and v1, v0, ~SR_INT_ENAB mtc0 v1, COP_0_STATUS_REG # disable all interrupts @@ -157,6 +158,7 @@ #ifdef TARGET_OCTEON .set mips64 .word 0x041626020 #ei v0 + and v0, SR_INT_ENAB # return old interrupt enable bit #if defined(ISA_MIPS32) .set mips32 #elif defined(ISA_MIPS64) From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:22:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FF6D1065677; Tue, 26 Feb 2008 15:22:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C5BF1065672 for ; Tue, 26 Feb 2008 15:22:56 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25BFB13C43E for ; Tue, 26 Feb 2008 15:22:56 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QFMuU6050021 for ; Tue, 26 Feb 2008 15:22:56 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QFMtIV050018 for perforce@freebsd.org; Tue, 26 Feb 2008 15:22:55 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 15:22:55 GMT Message-Id: <200802261522.m1QFMtIV050018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 15:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=136260 Change 136260 by rrs@rrs-mips2-jnpr on 2008/02/26 15:22:00 Puts the enable in the right place. Still not sure why the ei/di instruction blows up in the assembly and I have to use .word Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#6 (text+ko) ==== @@ -119,11 +119,24 @@ */ LEAF(enableintr) +#ifdef TARGET_OCTEON + .set mips64 + .word 0x041626020 #ei v0 + and v0, SR_INT_ENAB # return old interrupt enable bit +#if defined(ISA_MIPS32) + .set mips32 +#elif defined(ISA_MIPS64) + .set mips64 +#elif defined(ISA_MIPS3) + .set mips3 +#endif +#else mfc0 v0, COP_0_STATUS_REG # read status register nop or v1, v0, SR_INT_ENAB mtc0 v1, COP_0_STATUS_REG # enable all interrupts and v0, SR_INT_ENAB # return old interrupt enable +#endif j ra nop END(enableintr) @@ -155,18 +168,6 @@ END(disableintr) LEAF(set_intr_mask) -#ifdef TARGET_OCTEON - .set mips64 - .word 0x041626020 #ei v0 - and v0, SR_INT_ENAB # return old interrupt enable bit -#if defined(ISA_MIPS32) - .set mips32 -#elif defined(ISA_MIPS64) - .set mips64 -#elif defined(ISA_MIPS3) - .set mips3 -#endif -#else li t0, SR_INT_MASK # 1 means masked so invert. not a0, a0 # 1 means masked so invert. and a0, t0 # 1 means masked so invert. @@ -177,7 +178,6 @@ mtc0 v1, COP_0_STATUS_REG MIPS_CPU_NOP_DELAY move v0, v1 -#endif jr ra nop From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:36:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1E121065675; Tue, 26 Feb 2008 15:36:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B23431065671 for ; Tue, 26 Feb 2008 15:36:16 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA11D13C46A for ; Tue, 26 Feb 2008 15:36:16 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QFaGfa050460 for ; Tue, 26 Feb 2008 15:36:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QFaGNU050457 for perforce@freebsd.org; Tue, 26 Feb 2008 15:36:16 GMT (envelope-from imp@freebsd.org) Date: Tue, 26 Feb 2008 15:36:16 GMT Message-Id: <200802261536.m1QFaGNU050457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 15:36:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=136261 Change 136261 by imp@imp_paco-paco on 2008/02/26 15:35:39 IFC @136255 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#34 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#10 integrate .. //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#5 integrate .. //depot/projects/arm/src/lib/msun/src/e_rem_pio2.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/k_rem_pio2.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/math_private.h#3 integrate .. //depot/projects/arm/src/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/arm/src/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/setup.c#3 integrate .. //depot/projects/arm/src/sbin/ping6/ping6.c#5 integrate .. //depot/projects/arm/src/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/arm/src/share/man/man9/lock.9#7 integrate .. //depot/projects/arm/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#26 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#25 integrate .. //depot/projects/arm/src/sys/conf/NOTES#57 integrate .. //depot/projects/arm/src/sys/conf/files#82 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#9 integrate .. //depot/projects/arm/src/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#12 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/arm/src/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete .. //depot/projects/arm/src/sys/fs/coda/TODO#3 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#22 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#12 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vnops.c#11 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#24 integrate .. //depot/projects/arm/src/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#14 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/arm/src/sys/kern/vfs_default.c#14 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#40 integrate .. //depot/projects/arm/src/sys/kern/vnode_if.src#11 integrate .. //depot/projects/arm/src/sys/modules/cxgb/Makefile#9 integrate .. //depot/projects/arm/src/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/arm/src/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/arm/src/sys/netncp/ncp_conn.c#8 integrate .. //depot/projects/arm/src/sys/netsmb/smb_conn.c#7 integrate .. //depot/projects/arm/src/sys/netsmb/smb_iod.c#4 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#11 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_subs.c#11 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#22 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#16 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#16 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm_klib.c#9 integrate .. //depot/projects/arm/src/sys/security/audit/audit_private.h#11 integrate .. //depot/projects/arm/src/sys/sys/buf.h#9 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#9 integrate .. //depot/projects/arm/src/sys/sys/param.h#39 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_rawread.c#7 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#15 integrate .. //depot/projects/arm/src/usr.bin/ar/Makefile#3 integrate .. //depot/projects/arm/src/usr.bin/du/du.1#3 integrate .. //depot/projects/arm/src/usr.bin/du/du.c#5 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/add/main.c#6 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -873,6 +873,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -882,18 +890,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -969,6 +974,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/arm/src/contrib/tcpdump/print-802_11.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/arm/src/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ar -#MAN= gnu-ar.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar -.endif SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/arm/src/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ranlib -#MAN= gnu-ranlib.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 +.endif + PROG= ranlib -.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $ */ #ifndef _KGDB_H_ @@ -49,7 +49,6 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); -void kgdb_auto_load_klds(void); void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); ==== //depot/projects/arm/src/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -34,7 +34,7 @@ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ static inline uint16_t -be16dec(const void *pp) +archive_be16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -42,7 +42,7 @@ } static inline uint32_t -be32dec(const void *pp) +archive_be32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -50,15 +50,15 @@ } static inline uint64_t -be64dec(const void *pp) +archive_be64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); + return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4)); } static inline uint16_t -le16dec(const void *pp) +archive_le16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -66,7 +66,7 @@ } static inline uint32_t -le32dec(const void *pp) +archive_le32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -74,15 +74,15 @@ } static inline uint64_t -le64dec(const void *pp) +archive_le64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p)); + return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p)); } static inline void -be16enc(void *pp, uint16_t u) +archive_be16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -91,7 +91,7 @@ } static inline void -be32enc(void *pp, uint32_t u) +archive_be32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -102,16 +102,16 @@ } static inline void -be64enc(void *pp, uint64_t u) +archive_be64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - be32enc(p, u >> 32); - be32enc(p + 4, u & 0xffffffff); + archive_be32enc(p, u >> 32); + archive_be32enc(p + 4, u & 0xffffffff); } static inline void -le16enc(void *pp, uint16_t u) +archive_le16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -120,7 +120,7 @@ } static inline void -le32enc(void *pp, uint32_t u) +archive_le32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -131,12 +131,12 @@ } static inline void -le64enc(void *pp, uint64_t u) +archive_le64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - le32enc(p, u & 0xffffffff); - le32enc(p + 4, u >> 32); + archive_le32enc(p, u & 0xffffffff); + archive_le32enc(p + 4, u >> 32); } #endif ==== //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.20 2008/01/15 16:27:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.21 2008/02/26 07:17:47 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -278,8 +278,8 @@ zip->version = p->version[0]; zip->system = p->version[1]; - zip->flags = le16dec(p->flags); - zip->compression = le16dec(p->compression); + zip->flags = archive_le16dec(p->flags); + zip->compression = archive_le16dec(p->compression); if (zip->compression < sizeof(compression_names)/sizeof(compression_names[0])) zip->compression_name = compression_names[zip->compression]; @@ -291,11 +291,11 @@ zip->mode = 0; zip->uid = 0; zip->gid = 0; - zip->crc32 = le32dec(p->crc32); - zip->filename_length = le16dec(p->filename_length); - zip->extra_length = le16dec(p->extra_length); - zip->uncompressed_size = le32dec(p->uncompressed_size); - zip->compressed_size = le32dec(p->compressed_size); + zip->crc32 = archive_le32dec(p->crc32); + zip->filename_length = archive_le16dec(p->filename_length); + zip->extra_length = archive_le16dec(p->extra_length); + zip->uncompressed_size = archive_le32dec(p->uncompressed_size); + zip->compressed_size = archive_le32dec(p->compressed_size); (a->decompressor->consume)(a, sizeof(struct zip_file_header)); @@ -397,9 +397,9 @@ "Truncated ZIP end-of-file record"); return (ARCHIVE_FATAL); } - zip->crc32 = le32dec(p + 4); - zip->compressed_size = le32dec(p + 8); - zip->uncompressed_size = le32dec(p + 12); + zip->crc32 = archive_le32dec(p + 4); + zip->compressed_size = archive_le32dec(p + 8); + zip->uncompressed_size = archive_le32dec(p + 12); (a->decompressor->consume)(a, 16); } @@ -707,8 +707,8 @@ const char *p = (const char *)extra; while (offset < zip->extra_length - 4) { - unsigned short headerid = le16dec(p + offset); - unsigned short datasize = le16dec(p + offset + 2); + unsigned short headerid = archive_le16dec(p + offset); + unsigned short datasize = archive_le16dec(p + offset + 2); offset += 4; if (offset + datasize > zip->extra_length) break; @@ -720,9 +720,9 @@ case 0x0001: /* Zip64 extended information extra field. */ if (datasize >= 8) - zip->uncompressed_size = le64dec(p + offset); + zip->uncompressed_size = archive_le64dec(p + offset); if (datasize >= 16) - zip->compressed_size = le64dec(p + offset + 8); + zip->compressed_size = archive_le64dec(p + offset + 8); break; case 0x5455: { @@ -735,11 +735,12 @@ { #ifdef DEBUG fprintf(stderr, "mtime: %lld -> %d\n", - (long long)zip->mtime, le32dec(p + offset)); + (long long)zip->mtime, + archive_le32dec(p + offset)); #endif if (datasize < 4) break; - zip->mtime = le32dec(p + offset); + zip->mtime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -747,7 +748,7 @@ { if (datasize < 4) break; - zip->atime = le32dec(p + offset); + zip->atime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -755,7 +756,7 @@ { if (datasize < 4) break; - zip->ctime = le32dec(p + offset); + zip->ctime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -765,12 +766,13 @@ /* Info-ZIP Unix Extra Field (type 2) "Ux". */ #ifdef DEBUG fprintf(stderr, "uid %d gid %d\n", - le16dec(p + offset), le16dec(p + offset + 2)); + archive_le16dec(p + offset), + archive_le16dec(p + offset + 2)); #endif if (datasize >= 2) - zip->uid = le16dec(p + offset); + zip->uid = archive_le16dec(p + offset); if (datasize >= 4) - zip->gid = le16dec(p + offset + 2); + zip->gid = archive_le16dec(p + offset + 2); break; default: break; ==== //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#5 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.24 2007/01/09 00:28:14 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.25 2008/02/25 13:03:18 brueffer Exp $ .\" .Dd November 4, 2006 .Dt CLOCK_GETTIME 2 @@ -52,8 +52,8 @@ .Fn clock_gettime and .Fn clock_settime -allow the calling process to retrieve or set the value used by a clock -which is specified by +system calls allow the calling process to retrieve or set the value +used by a clock which is specified by .Fa clock_id . .Pp The ==== //depot/projects/arm/src/lib/msun/src/e_rem_pio2.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.15 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -56,7 +56,7 @@ __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; - double tx[3]; + double tx[3],ty[2]; int32_t e0,i,j,nx,n,ix,hx; u_int32_t low; @@ -182,7 +182,7 @@ tx[2] = z; nx = 3; while(tx[nx-1]==zero) nx--; /* skip zero term */ - n = __kernel_rem_pio2(tx,y,e0,nx,2); - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,nx,1); + if(hx<0) {y[0] = -ty[0]; y[1] = -ty[1]; return -n;} + y[0] = ty[0]; y[1] = ty[1]; return n; } ==== //depot/projects/arm/src/lib/msun/src/e_rem_pio2f.c#3 (text+ko) ==== @@ -15,12 +15,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.24 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * - * return the remainder of x rem pi/2 in y[0]+y[1] - * use double precision internally + * return the remainder of x rem pi/2 in *y + * use double precision for everything except passing x * use __kernel_rem_pio2() for large x */ @@ -41,11 +41,14 @@ pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +#ifdef INLINE_REM_PIO2F +extern inline +#endif int -__ieee754_rem_pio2f(float x, float *y) +__ieee754_rem_pio2f(float x, double *y) { double w,r,fn; - double tx[1],ty[2]; + double tx[1],ty[1]; float z; int32_t e0,n,ix,hx; @@ -63,23 +66,20 @@ #endif r = x-fn*pio2_1; w = fn*pio2_1t; - y[0] = r-w; - y[1] = (r-y[0])-w; + *y = r-w; return n; } /* * all other (large) arguments */ if(ix>=0x7f800000) { /* x is inf or NaN */ - y[0]=y[1]=x-x; return 0; + *y=x-x; return 0; } /* set z = scalbn(|x|,ilogb(|x|)-23) */ e0 = (ix>>23)-150; /* e0 = ilogb(|x|)-23; */ SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23))); tx[0] = z; - n = __kernel_rem_pio2(tx,ty,e0,1,1); - y[0] = ty[0]; - y[1] = ty[0] - y[0]; - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,1,0); + if(hx<0) {*y = -ty[0]; return -n;} + *y = ty[0]; return n; } ==== //depot/projects/arm/src/lib/msun/src/k_rem_pio2.c#3 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.10 2008/02/17 07:31:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.11 2008/02/25 11:43:20 bde Exp $"); /* * __kernel_rem_pio2(x,y,e0,nx,prec) @@ -78,8 +78,13 @@ * Here is the description of some local variables: * * jk jk+1 is the initial number of terms of ipio2[] needed - * in the computation. The recommended value is 2,3,4, - * 6 for single, double, extended,and quad. + * in the computation. The minimum and recommended value + * for jk is 3,4,4,6 for single, double, extended, and quad. + * jk+1 must be 2 larger than you might expect so that our + * recomputation test works. (Up to 24 bits in the integer + * part (the 24 bits of it that we compute) and 23 bits in + * the fraction part may be lost to cancelation before we + * recompute.) * * jz local integer variable indicating the number of * terms of ipio2[] used. @@ -129,7 +134,7 @@ #include "math.h" #include "math_private.h" -static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ +static const int init_jk[] = {3,4,4,6}; /* initial value for jk */ /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi ==== //depot/projects/arm/src/lib/msun/src/math_private.h#3 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.25 2008/02/22 14:11:03 bde Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.26 2008/02/25 13:33:20 bde Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -320,7 +320,7 @@ double __kernel_tan(double,double,int); /* float precision kernel functions */ -int __ieee754_rem_pio2f(float,float*); +int __ieee754_rem_pio2f(float,double*); float __kernel_sindf(double); float __kernel_cosdf(double); float __kernel_tandf(double,int); ==== //depot/projects/arm/src/lib/msun/src/s_cosf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.16 2008/02/22 02:30:35 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float cosf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -71,13 +75,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_cosdf((double)y[0]+y[1]); - case 1: return __kernel_sindf(-(double)y[0]-y[1]); - case 2: return -__kernel_cosdf((double)y[0]+y[1]); + case 0: return __kernel_cosdf(y); + case 1: return __kernel_sindf(-y); + case 2: return -__kernel_cosdf(y); default: - return __kernel_sindf((double)y[0]+y[1]); + return __kernel_sindf(y); } } } ==== //depot/projects/arm/src/lib/msun/src/s_sinf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float sinf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -69,13 +73,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_sindf((double)y[0]+y[1]); - case 1: return __kernel_cosdf((double)y[0]+y[1]); - case 2: return __kernel_sindf(-(double)y[0]-y[1]); + case 0: return __kernel_sindf(y); + case 1: return __kernel_cosdf(y); + case 2: return __kernel_sindf(-y); default: - return -__kernel_cosdf((double)y[0]+y[1]); + return -__kernel_cosdf(y); } } } ==== //depot/projects/arm/src/lib/msun/src/s_tanf.c#3 (text+ko) ==== @@ -15,11 +15,15 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_TANDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_tanf.c" /* Small multiples of pi/2 rounded to double precision. */ @@ -32,7 +36,7 @@ float tanf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -61,8 +65,8 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); /* integer parameter: 1 -- n even; -1 -- n odd */ - return __kernel_tandf((double)y[0]+y[1],1-((n&1)<<1)); + return __kernel_tandf(y,1-((n&1)<<1)); } } ==== //depot/projects/arm/src/sbin/fsck_ffs/pass1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.44 2008/02/26 03:08:22 delphij Exp $"); #include #include @@ -93,9 +93,11 @@ inumber = c * sblock.fs_ipg; setinodebuf(inumber); getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); - if (sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) { inosused = cgrp.cg_initediblk; - else + if (inosused > sblock.fs_ipg) + inosused = sblock.fs_ipg; + } else inosused = sblock.fs_ipg; if (got_siginfo) { printf("%s: phase 1: cyl group %d of %d (%d%%)\n", ==== //depot/projects/arm/src/sbin/fsck_ffs/pass2.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.27 2008/02/26 03:05:48 delphij Exp $"); #include @@ -242,6 +242,8 @@ /* * check for "." */ + if (dirp->d_ino > maxino) + goto chk2; if (idesc->id_entryno != 0) goto chk1; if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) { ==== //depot/projects/arm/src/sbin/fsck_ffs/setup.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.51 2008/02/26 03:03:17 delphij Exp $"); #include #include @@ -349,7 +349,7 @@ sblock.fs_sblockloc == sblock_try[i])) && sblock.fs_ncg >= 1 && sblock.fs_bsize >= MINBSIZE && - sblock.fs_bsize >= sizeof(struct fs)) + sblock.fs_sbsize >= roundup(sizeof(struct fs), dev_bsize)) break; } if (sblock_try[i] == -1) { ==== //depot/projects/arm/src/sbin/ping6/ping6.c#5 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.32 2007/11/20 01:58:34 dd Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.33 2008/02/25 10:45:25 silby Exp $"; #endif /* not lint */ /* @@ -457,9 +457,9 @@ if (interval.tv_sec < 0) errx(1, "illegal timing interval %s", optarg); /* less than 1/hz does not make sense */ - if (interval.tv_sec == 0 && interval.tv_usec < 10000) { - warnx("too small interval, raised to 0.01"); - interval.tv_usec = 10000; + if (interval.tv_sec == 0 && interval.tv_usec < 1) { + warnx("too small interval, raised to .000001"); + interval.tv_usec = 1; } options |= F_INTERVAL; break; ==== //depot/projects/arm/src/share/man/man9/VOP_LOCK.9#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.22 2008/01/18 22:09:29 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.23 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd January 19, 2008 +.Dd February 25, 2008 .Os .Dt VOP_LOCK 9 .Sh NAME @@ -46,7 +46,7 @@ .Ft int .Fn VOP_UNLOCK "struct vnode *vp" "int flags" .Ft int -.Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td" +.Fn VOP_ISLOCKED "struct vnode *vp" .Ft int .Fn vn_lock "struct vnode *vp" "int flags" .Sh DESCRIPTION @@ -101,9 +101,6 @@ .It Dv LK_RETRY Retry until locked. .El -.It Fa td -Thread context to use for the locks. -.El .Pp Kernel code should use .Fn vn_lock ==== //depot/projects/arm/src/share/man/man9/lock.9#7 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.25 2008/02/14 19:39:09 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.26 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd February 13, 2008 +.Dd February 25, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -49,7 +49,7 @@ .Ft int .Fn lockmgr "struct lock *lkp" "u_int flags" "struct mtx *interlkp" .Ft int -.Fn lockstatus "struct lock *lkp" "struct thread *td" +.Fn lockstatus "struct lock *lkp" .Ft void .Fn lockmgr_disown "struct lock *lkp" .Ft void @@ -180,20 +180,11 @@ .Pp The .Fn lockstatus -function returns the status of the lock in relation to the -.Vt thread -passed to it. -Note that if -.Fa td -is -.Dv NULL -and an exclusive lock is held, -.Dv LK_EXCLUSIVE -will be returned. +function returns the status of the lock in relation to the current thread. .Pp The .Fn lockmgr_disown -function switches the owner from curthread to be +function switches the owner from the current thread to be .Dv LK_KERNPROC, if the lock is already held. .Pp @@ -283,11 +274,9 @@ function returns: .Bl -tag -width ".Dv LK_EXCLUSIVE" .It Dv LK_EXCLUSIVE -An exclusive lock is held by the thread -.Fa td . +An exclusive lock is held by the current thread. .It Dv LK_EXCLOTHER -An exclusive lock is held by someone other than the thread -.Fa td . +An exclusive lock is held by someone other than the current thread. .It Dv LK_SHARED A shared lock is held. .It Li 0 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:42:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E69541065678; Tue, 26 Feb 2008 15:42:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A824F1065675 for ; Tue, 26 Feb 2008 15:42:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A269313C4D3 for ; Tue, 26 Feb 2008 15:42:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QFgShX050699 for ; Tue, 26 Feb 2008 15:42:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QFgQZD050696 for perforce@freebsd.org; Tue, 26 Feb 2008 15:42:26 GMT (envelope-from imp@freebsd.org) Date: Tue, 26 Feb 2008 15:42:26 GMT Message-Id: <200802261542.m1QFgQZD050696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 15:42:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=136262 Change 136262 by imp@imp_paco-paco on 2008/02/26 15:41:48 IFC 136261 # Note: lots of files want to be deleted not. Ignoring them for # now since they are needed... Affected files ... .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/main.c#5 integrate Differences ... ==== //depot/projects/mips2/src/usr.sbin/pkg_install/add/main.c#5 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.75 2007/11/10 09:40:39 krion Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.76 2008/02/26 14:35:01 kensmith Exp $"); #include #include @@ -77,12 +77,14 @@ { 600000, 600099, "/packages-6.0-release" }, { 601000, 601099, "/packages-6.1-release" }, { 602000, 602099, "/packages-6.2-release" }, + { 603000, 603099, "/packages-6.3-release" }, + { 700000, 700099, "/packages-7.0-release" }, { 300000, 399000, "/packages-3-stable" }, { 400000, 499000, "/packages-4-stable" }, { 502100, 502128, "/packages-5-current" }, { 503100, 599000, "/packages-5-stable" }, { 600100, 699000, "/packages-6-stable" }, - { 700000, 799000, "/packages-7-stable" }, + { 700100, 799000, "/packages-7-stable" }, { 800000, 899000, "/packages-8-current" }, { 0, 9999999, "/packages-current" }, { 0, 0, NULL } From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:42:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E3611065675; Tue, 26 Feb 2008 15:42:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDF7E10656F1 for ; Tue, 26 Feb 2008 15:42:29 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19F3713C4D5 for ; Tue, 26 Feb 2008 15:42:29 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QFgSPo050705 for ; Tue, 26 Feb 2008 15:42:28 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QFgSGZ050702 for perforce@freebsd.org; Tue, 26 Feb 2008 15:42:28 GMT (envelope-from swise@FreeBSD.org) Date: Tue, 26 Feb 2008 15:42:28 GMT Message-Id: <200802261542.m1QFgSGZ050702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 136263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 15:42:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=136263 Change 136263 by swise@swise:vic10:iwarp on 2008/02/26 15:42:22 Discover TOE capable devs via ifaddr events. - removed t3c_client registration. - register for ifaddr events. - when an addr is bound to a undiscovered TOE ifnet, then register the device with the rdma core. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#2 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 (text+ko) ==== @@ -52,6 +52,10 @@ #include #include #include +#include + +#include +#include #include @@ -88,18 +92,10 @@ static void open_rnic_dev(struct t3cdev *); static void close_rnic_dev(struct t3cdev *); -struct cxgb_client t3c_client = { - .name = "iw_cxgb3", - .add = open_rnic_dev, - .remove = close_rnic_dev, - .handlers = t3c_handlers, -#if 0 - .redirect = iwch_ep_redirect -#endif -}; - static TAILQ_HEAD( ,iwch_dev) dev_list; static struct mtx dev_mutex; +static eventhandler_tag event_tag; + static void rnic_init(struct iwch_dev *rnicp) { @@ -204,10 +200,24 @@ mtx_unlock(&dev_mutex); } +static ifaddr_event_handler_t ifaddr_event_handler(void *arg, struct ifnet *ifp) +{ + printf("%s if name %s \n", __FUNCTION__, ifp->if_xname); + if (ifp->if_capabilities & IFCAP_TOE4) { + KASSERT(T3CDEV(ifp) != NULL, ("null t3cdev ptr!")); + if (cxio_hal_find_rdev_by_t3cdev(T3CDEV(ifp)) == NULL) + open_rnic_dev(T3CDEV(ifp)); + } + return 0; +} + + static int __init iwch_init_module(void) { int err; + struct ifnet *ifp; + printf("%s enter\n", __FUNCTION__); TAILQ_INIT(&dev_list); mtx_init(&dev_mutex, "iwch dev_list lock", NULL, MTX_DEF); @@ -218,13 +228,23 @@ if (err) return err; cxio_register_ev_cb(iwch_ev_dispatch); - cxgb_register_client(&t3c_client); + + /* Register for ifaddr events to dynamically add TOE devs */ + event_tag = EVENTHANDLER_REGISTER(ifaddr_event, ifaddr_event_handler, + NULL, EVENTHANDLER_PRI_ANY); + + /* Register existing TOE interfaces by walking the ifnet chain */ + IFNET_RLOCK(); + TAILQ_FOREACH(ifp, &ifnet, if_link) { + (void)ifaddr_event_handler(NULL, ifp); + } + IFNET_RUNLOCK(); return 0; } static void __exit iwch_exit_module(void) { - cxgb_unregister_client(&t3c_client); + EVENTHANDLER_DEREGISTER(ifaddr_event, event_tag); cxio_unregister_ev_cb(iwch_ev_dispatch); iwch_cm_term(); cxio_hal_exit(); ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 (text+ko) ==== @@ -95,7 +95,7 @@ return NULL; } -static struct cxio_rdev * +struct cxio_rdev * cxio_hal_find_rdev_by_t3cdev(struct t3cdev *tdev) { struct cxio_rdev *rdev; ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#2 (text+ko) ==== @@ -290,5 +290,6 @@ mtx_unlock_spin(lockp); \ __ret; \ }) +extern struct cxio_rdev *cxio_hal_find_rdev_by_t3cdev(struct t3cdev *tdev); #endif From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:43:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E9D51065677; Tue, 26 Feb 2008 15:43:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3F061065676 for ; Tue, 26 Feb 2008 15:43:31 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A53B013C478 for ; Tue, 26 Feb 2008 15:43:31 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QFhVte050793 for ; Tue, 26 Feb 2008 15:43:31 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QFhV3Z050790 for perforce@freebsd.org; Tue, 26 Feb 2008 15:43:31 GMT (envelope-from swise@FreeBSD.org) Date: Tue, 26 Feb 2008 15:43:31 GMT Message-Id: <200802261543.m1QFhV3Z050790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 136265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 15:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=136265 Change 136265 by swise@swise:vic10:iwarp on 2008/02/26 15:43:16 remove printf. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#11 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#11 (text+ko) ==== @@ -2057,7 +2057,6 @@ soclose(so); return ret; } - printf("%s created/bound id_priv %p socket %p\n", __FUNCTION__, id_priv, so); id_priv->so = so; return 0; } From owner-p4-projects@FreeBSD.ORG Tue Feb 26 15:49:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEBF31065676; Tue, 26 Feb 2008 15:49:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF6931065674 for ; Tue, 26 Feb 2008 15:49:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A856213C4DB for ; Tue, 26 Feb 2008 15:49:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QFnfmt050975 for ; Tue, 26 Feb 2008 15:49:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QFne5H050972 for perforce@freebsd.org; Tue, 26 Feb 2008 15:49:40 GMT (envelope-from imp@freebsd.org) Date: Tue, 26 Feb 2008 15:49:40 GMT Message-Id: <200802261549.m1QFne5H050972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 136266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 15:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=136266 Change 136266 by imp@imp_paco-paco on 2008/02/26 15:48:40 IFC @136262 Affected files ... .. //depot/projects/mips2-jnpr/src/Makefile.inc1#7 integrate .. //depot/projects/mips2-jnpr/src/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/k_rem_pio2.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/math_private.h#4 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ping6/ping6.c#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/NOTES#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files#4 integrate .. //depot/projects/mips2-jnpr/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete .. //depot/projects/mips2-jnpr/src/sys/fs/coda/TODO#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/buf.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/lockmgr.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/param.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ar/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/du/du.1#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/du/du.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/pkg_install/add/main.c#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -847,6 +847,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -856,18 +864,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -943,6 +948,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/mips2-jnpr/src/contrib/tcpdump/print-802_11.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ar -#MAN= gnu-ar.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar -.endif SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ranlib -#MAN= gnu-ranlib.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 +.endif + PROG= ranlib -.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/kgdb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $ */ #ifndef _KGDB_H_ @@ -49,7 +49,6 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); -void kgdb_auto_load_klds(void); void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); ==== //depot/projects/mips2-jnpr/src/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -34,7 +34,7 @@ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ static inline uint16_t -be16dec(const void *pp) +archive_be16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -42,7 +42,7 @@ } static inline uint32_t -be32dec(const void *pp) +archive_be32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -50,15 +50,15 @@ } static inline uint64_t -be64dec(const void *pp) +archive_be64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); + return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4)); } static inline uint16_t -le16dec(const void *pp) +archive_le16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -66,7 +66,7 @@ } static inline uint32_t -le32dec(const void *pp) +archive_le32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -74,15 +74,15 @@ } static inline uint64_t -le64dec(const void *pp) +archive_le64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p)); + return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p)); } static inline void -be16enc(void *pp, uint16_t u) +archive_be16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -91,7 +91,7 @@ } static inline void -be32enc(void *pp, uint32_t u) +archive_be32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -102,16 +102,16 @@ } static inline void -be64enc(void *pp, uint64_t u) +archive_be64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - be32enc(p, u >> 32); - be32enc(p + 4, u & 0xffffffff); + archive_be32enc(p, u >> 32); + archive_be32enc(p + 4, u & 0xffffffff); } static inline void -le16enc(void *pp, uint16_t u) +archive_le16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -120,7 +120,7 @@ } static inline void -le32enc(void *pp, uint32_t u) +archive_le32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -131,12 +131,12 @@ } static inline void -le64enc(void *pp, uint64_t u) +archive_le64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - le32enc(p, u & 0xffffffff); - le32enc(p + 4, u >> 32); + archive_le32enc(p, u & 0xffffffff); + archive_le32enc(p + 4, u >> 32); } #endif ==== //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_zip.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.20 2008/01/15 16:27:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.21 2008/02/26 07:17:47 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -278,8 +278,8 @@ zip->version = p->version[0]; zip->system = p->version[1]; - zip->flags = le16dec(p->flags); - zip->compression = le16dec(p->compression); + zip->flags = archive_le16dec(p->flags); + zip->compression = archive_le16dec(p->compression); if (zip->compression < sizeof(compression_names)/sizeof(compression_names[0])) zip->compression_name = compression_names[zip->compression]; @@ -291,11 +291,11 @@ zip->mode = 0; zip->uid = 0; zip->gid = 0; - zip->crc32 = le32dec(p->crc32); - zip->filename_length = le16dec(p->filename_length); - zip->extra_length = le16dec(p->extra_length); - zip->uncompressed_size = le32dec(p->uncompressed_size); - zip->compressed_size = le32dec(p->compressed_size); + zip->crc32 = archive_le32dec(p->crc32); + zip->filename_length = archive_le16dec(p->filename_length); + zip->extra_length = archive_le16dec(p->extra_length); + zip->uncompressed_size = archive_le32dec(p->uncompressed_size); + zip->compressed_size = archive_le32dec(p->compressed_size); (a->decompressor->consume)(a, sizeof(struct zip_file_header)); @@ -397,9 +397,9 @@ "Truncated ZIP end-of-file record"); return (ARCHIVE_FATAL); } - zip->crc32 = le32dec(p + 4); - zip->compressed_size = le32dec(p + 8); - zip->uncompressed_size = le32dec(p + 12); + zip->crc32 = archive_le32dec(p + 4); + zip->compressed_size = archive_le32dec(p + 8); + zip->uncompressed_size = archive_le32dec(p + 12); (a->decompressor->consume)(a, 16); } @@ -707,8 +707,8 @@ const char *p = (const char *)extra; while (offset < zip->extra_length - 4) { - unsigned short headerid = le16dec(p + offset); - unsigned short datasize = le16dec(p + offset + 2); + unsigned short headerid = archive_le16dec(p + offset); + unsigned short datasize = archive_le16dec(p + offset + 2); offset += 4; if (offset + datasize > zip->extra_length) break; @@ -720,9 +720,9 @@ case 0x0001: /* Zip64 extended information extra field. */ if (datasize >= 8) - zip->uncompressed_size = le64dec(p + offset); + zip->uncompressed_size = archive_le64dec(p + offset); if (datasize >= 16) - zip->compressed_size = le64dec(p + offset + 8); + zip->compressed_size = archive_le64dec(p + offset + 8); break; case 0x5455: { @@ -735,11 +735,12 @@ { #ifdef DEBUG fprintf(stderr, "mtime: %lld -> %d\n", - (long long)zip->mtime, le32dec(p + offset)); + (long long)zip->mtime, + archive_le32dec(p + offset)); #endif if (datasize < 4) break; - zip->mtime = le32dec(p + offset); + zip->mtime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -747,7 +748,7 @@ { if (datasize < 4) break; - zip->atime = le32dec(p + offset); + zip->atime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -755,7 +756,7 @@ { if (datasize < 4) break; - zip->ctime = le32dec(p + offset); + zip->ctime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -765,12 +766,13 @@ /* Info-ZIP Unix Extra Field (type 2) "Ux". */ #ifdef DEBUG fprintf(stderr, "uid %d gid %d\n", - le16dec(p + offset), le16dec(p + offset + 2)); + archive_le16dec(p + offset), + archive_le16dec(p + offset + 2)); #endif if (datasize >= 2) - zip->uid = le16dec(p + offset); + zip->uid = archive_le16dec(p + offset); if (datasize >= 4) - zip->gid = le16dec(p + offset + 2); + zip->gid = archive_le16dec(p + offset + 2); break; default: break; ==== //depot/projects/mips2-jnpr/src/lib/libc/sys/clock_gettime.2#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.24 2007/01/09 00:28:14 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.25 2008/02/25 13:03:18 brueffer Exp $ .\" .Dd November 4, 2006 .Dt CLOCK_GETTIME 2 @@ -52,8 +52,8 @@ .Fn clock_gettime and .Fn clock_settime -allow the calling process to retrieve or set the value used by a clock -which is specified by +system calls allow the calling process to retrieve or set the value +used by a clock which is specified by .Fa clock_id . .Pp The ==== //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.15 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -56,7 +56,7 @@ __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; - double tx[3]; + double tx[3],ty[2]; int32_t e0,i,j,nx,n,ix,hx; u_int32_t low; @@ -182,7 +182,7 @@ tx[2] = z; nx = 3; while(tx[nx-1]==zero) nx--; /* skip zero term */ - n = __kernel_rem_pio2(tx,y,e0,nx,2); - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,nx,1); + if(hx<0) {y[0] = -ty[0]; y[1] = -ty[1]; return -n;} + y[0] = ty[0]; y[1] = ty[1]; return n; } ==== //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2f.c#4 (text+ko) ==== @@ -15,12 +15,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.24 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * - * return the remainder of x rem pi/2 in y[0]+y[1] - * use double precision internally + * return the remainder of x rem pi/2 in *y + * use double precision for everything except passing x * use __kernel_rem_pio2() for large x */ @@ -41,11 +41,14 @@ pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +#ifdef INLINE_REM_PIO2F +extern inline +#endif int -__ieee754_rem_pio2f(float x, float *y) +__ieee754_rem_pio2f(float x, double *y) { double w,r,fn; - double tx[1],ty[2]; + double tx[1],ty[1]; float z; int32_t e0,n,ix,hx; @@ -63,23 +66,20 @@ #endif r = x-fn*pio2_1; w = fn*pio2_1t; - y[0] = r-w; - y[1] = (r-y[0])-w; + *y = r-w; return n; } /* * all other (large) arguments */ if(ix>=0x7f800000) { /* x is inf or NaN */ - y[0]=y[1]=x-x; return 0; + *y=x-x; return 0; } /* set z = scalbn(|x|,ilogb(|x|)-23) */ e0 = (ix>>23)-150; /* e0 = ilogb(|x|)-23; */ SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23))); tx[0] = z; - n = __kernel_rem_pio2(tx,ty,e0,1,1); - y[0] = ty[0]; - y[1] = ty[0] - y[0]; - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,1,0); + if(hx<0) {*y = -ty[0]; return -n;} + *y = ty[0]; return n; } ==== //depot/projects/mips2-jnpr/src/lib/msun/src/k_rem_pio2.c#3 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.10 2008/02/17 07:31:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.11 2008/02/25 11:43:20 bde Exp $"); /* * __kernel_rem_pio2(x,y,e0,nx,prec) @@ -78,8 +78,13 @@ * Here is the description of some local variables: * * jk jk+1 is the initial number of terms of ipio2[] needed - * in the computation. The recommended value is 2,3,4, - * 6 for single, double, extended,and quad. + * in the computation. The minimum and recommended value + * for jk is 3,4,4,6 for single, double, extended, and quad. + * jk+1 must be 2 larger than you might expect so that our + * recomputation test works. (Up to 24 bits in the integer + * part (the 24 bits of it that we compute) and 23 bits in + * the fraction part may be lost to cancelation before we + * recompute.) * * jz local integer variable indicating the number of * terms of ipio2[] used. @@ -129,7 +134,7 @@ #include "math.h" #include "math_private.h" -static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ +static const int init_jk[] = {3,4,4,6}; /* initial value for jk */ /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi ==== //depot/projects/mips2-jnpr/src/lib/msun/src/math_private.h#4 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.25 2008/02/22 14:11:03 bde Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.26 2008/02/25 13:33:20 bde Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -322,7 +322,7 @@ double __kernel_tan(double,double,int); /* float precision kernel functions */ -int __ieee754_rem_pio2f(float,float*); +int __ieee754_rem_pio2f(float,double*); float __kernel_sindf(double); float __kernel_cosdf(double); float __kernel_tandf(double,int); ==== //depot/projects/mips2-jnpr/src/lib/msun/src/s_cosf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.16 2008/02/22 02:30:35 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float cosf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -71,13 +75,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_cosdf((double)y[0]+y[1]); - case 1: return __kernel_sindf(-(double)y[0]-y[1]); - case 2: return -__kernel_cosdf((double)y[0]+y[1]); + case 0: return __kernel_cosdf(y); + case 1: return __kernel_sindf(-y); + case 2: return -__kernel_cosdf(y); default: - return __kernel_sindf((double)y[0]+y[1]); + return __kernel_sindf(y); } } } ==== //depot/projects/mips2-jnpr/src/lib/msun/src/s_sinf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float sinf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -69,13 +73,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_sindf((double)y[0]+y[1]); - case 1: return __kernel_cosdf((double)y[0]+y[1]); - case 2: return __kernel_sindf(-(double)y[0]-y[1]); + case 0: return __kernel_sindf(y); + case 1: return __kernel_cosdf(y); + case 2: return __kernel_sindf(-y); default: - return -__kernel_cosdf((double)y[0]+y[1]); + return -__kernel_cosdf(y); } } } ==== //depot/projects/mips2-jnpr/src/lib/msun/src/s_tanf.c#3 (text+ko) ==== @@ -15,11 +15,15 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_TANDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_tanf.c" /* Small multiples of pi/2 rounded to double precision. */ @@ -32,7 +36,7 @@ float tanf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -61,8 +65,8 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); /* integer parameter: 1 -- n even; -1 -- n odd */ - return __kernel_tandf((double)y[0]+y[1],1-((n&1)<<1)); + return __kernel_tandf(y,1-((n&1)<<1)); } } ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/pass1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.44 2008/02/26 03:08:22 delphij Exp $"); #include #include @@ -93,9 +93,11 @@ inumber = c * sblock.fs_ipg; setinodebuf(inumber); getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); - if (sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) { inosused = cgrp.cg_initediblk; - else + if (inosused > sblock.fs_ipg) + inosused = sblock.fs_ipg; + } else inosused = sblock.fs_ipg; if (got_siginfo) { printf("%s: phase 1: cyl group %d of %d (%d%%)\n", ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/pass2.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.27 2008/02/26 03:05:48 delphij Exp $"); #include @@ -242,6 +242,8 @@ /* * check for "." */ + if (dirp->d_ino > maxino) + goto chk2; if (idesc->id_entryno != 0) goto chk1; if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) { ==== //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/setup.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.51 2008/02/26 03:03:17 delphij Exp $"); #include #include @@ -349,7 +349,7 @@ sblock.fs_sblockloc == sblock_try[i])) && sblock.fs_ncg >= 1 && sblock.fs_bsize >= MINBSIZE && - sblock.fs_bsize >= sizeof(struct fs)) + sblock.fs_sbsize >= roundup(sizeof(struct fs), dev_bsize)) break; } if (sblock_try[i] == -1) { ==== //depot/projects/mips2-jnpr/src/sbin/ping6/ping6.c#2 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.32 2007/11/20 01:58:34 dd Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.33 2008/02/25 10:45:25 silby Exp $"; #endif /* not lint */ /* @@ -457,9 +457,9 @@ if (interval.tv_sec < 0) errx(1, "illegal timing interval %s", optarg); /* less than 1/hz does not make sense */ - if (interval.tv_sec == 0 && interval.tv_usec < 10000) { - warnx("too small interval, raised to 0.01"); - interval.tv_usec = 10000; + if (interval.tv_sec == 0 && interval.tv_usec < 1) { + warnx("too small interval, raised to .000001"); + interval.tv_usec = 1; } options |= F_INTERVAL; break; ==== //depot/projects/mips2-jnpr/src/share/man/man9/VOP_LOCK.9#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.22 2008/01/18 22:09:29 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.23 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd January 19, 2008 +.Dd February 25, 2008 .Os .Dt VOP_LOCK 9 .Sh NAME @@ -46,7 +46,7 @@ .Ft int .Fn VOP_UNLOCK "struct vnode *vp" "int flags" .Ft int -.Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td" +.Fn VOP_ISLOCKED "struct vnode *vp" .Ft int .Fn vn_lock "struct vnode *vp" "int flags" .Sh DESCRIPTION @@ -101,9 +101,6 @@ .It Dv LK_RETRY Retry until locked. .El -.It Fa td -Thread context to use for the locks. -.El .Pp Kernel code should use .Fn vn_lock ==== //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#3 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.25 2008/02/14 19:39:09 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.26 2008/02/25 19:12:01 attilio Exp $ .\" -.Dd February 13, 2008 +.Dd February 25, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -49,7 +49,7 @@ .Ft int .Fn lockmgr "struct lock *lkp" "u_int flags" "struct mtx *interlkp" .Ft int -.Fn lockstatus "struct lock *lkp" "struct thread *td" +.Fn lockstatus "struct lock *lkp" .Ft void .Fn lockmgr_disown "struct lock *lkp" .Ft void @@ -180,20 +180,11 @@ .Pp The .Fn lockstatus -function returns the status of the lock in relation to the -.Vt thread -passed to it. -Note that if -.Fa td -is -.Dv NULL -and an exclusive lock is held, -.Dv LK_EXCLUSIVE -will be returned. +function returns the status of the lock in relation to the current thread. .Pp The .Fn lockmgr_disown -function switches the owner from curthread to be +function switches the owner from the current thread to be .Dv LK_KERNPROC, if the lock is already held. .Pp @@ -283,11 +274,9 @@ function returns: .Bl -tag -width ".Dv LK_EXCLUSIVE" .It Dv LK_EXCLUSIVE -An exclusive lock is held by the thread -.Fa td . +An exclusive lock is held by the current thread. .It Dv LK_EXCLOTHER -An exclusive lock is held by someone other than the thread -.Fa td . +An exclusive lock is held by someone other than the current thread. .It Dv LK_SHARED A shared lock is held. .It Li 0 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 26 16:40:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A04471065677; Tue, 26 Feb 2008 16:40:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61B241065672 for ; Tue, 26 Feb 2008 16:40:02 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60CF813C448 for ; Tue, 26 Feb 2008 16:40:02 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QGe2mf053733 for ; Tue, 26 Feb 2008 16:40:02 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QGe0wd053703 for perforce@freebsd.org; Tue, 26 Feb 2008 16:40:00 GMT (envelope-from rrs@cisco.com) Date: Tue, 26 Feb 2008 16:40:00 GMT Message-Id: <200802261640.m1QGe0wd053703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 16:40:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=136268 Change 136268 by rrs@rrs-mips2-jnpr on 2008/02/26 16:39:52 Move to mips64r2 and do mips0 for restoral Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#7 (text+ko) ==== @@ -120,16 +120,10 @@ LEAF(enableintr) #ifdef TARGET_OCTEON - .set mips64 - .word 0x041626020 #ei v0 + .set mips64r2 + ei v0 and v0, SR_INT_ENAB # return old interrupt enable bit -#if defined(ISA_MIPS32) - .set mips32 -#elif defined(ISA_MIPS64) - .set mips64 -#elif defined(ISA_MIPS3) - .set mips3 -#endif + .set mips0 #else mfc0 v0, COP_0_STATUS_REG # read status register nop @@ -144,16 +138,10 @@ LEAF(disableintr) #ifdef TARGET_OCTEON - .set mips64 - .word 0x041626000 #di v0 + .set mips64r2 + di v0 and v0, SR_INT_ENAB # return old interrupt enable bit -#if defined(ISA_MIPS32) - .set mips32 -#elif defined(ISA_MIPS64) - .set mips64 -#elif defined(ISA_MIPS3) - .set mips3 -#endif + .set mips0 #else mfc0 v0, COP_0_STATUS_REG # read status register and v0, v0, SR_INT_ENAB From owner-p4-projects@FreeBSD.ORG Tue Feb 26 22:45:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33CF21065672; Tue, 26 Feb 2008 22:45:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA364106566C for ; Tue, 26 Feb 2008 22:45:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D600C13C45B for ; Tue, 26 Feb 2008 22:45:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QMjssj099447 for ; Tue, 26 Feb 2008 22:45:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QMjs2S099444 for perforce@freebsd.org; Tue, 26 Feb 2008 22:45:54 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 26 Feb 2008 22:45:54 GMT Message-Id: <200802262245.m1QMjs2S099444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 22:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=136296 Change 136296 by kmacy@kmacy:entropy:iwarp on 2008/02/26 22:45:30 parameterize slightly better to allow creation of multiple of blob headers Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/bin2h.pl#2 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/bin2h.pl#2 (text+ko) ==== @@ -12,7 +12,7 @@ print "failed to open input\n"; exit 1; } -$success = open OUTPUT, ">$ARGV[1]"; +$success = open OUTPUT, ">$ARGV[1].h"; unless ($success) { print "failed to open output\n"; exit 1; @@ -64,13 +64,13 @@ print OUTPUT "#define U (unsigned char)\n\n"; -print OUTPUT "static unsigned int t3fw_length = $size;\n"; -print OUTPUT "static unsigned char t3fw[$size] = {\n"; +print OUTPUT "static unsigned int $ARGV[1]_length = $size;\n"; +print OUTPUT "static unsigned char $ARGV[1]" . "[$size]" . " = {\n"; for (my $i = 0; $i < $size; $i += 4) { my $number_read = read(INPUT, $binary, 4); my ($a, $b, $c, $d) = unpack("C C C C", $binary); - $buf = sprintf("U 0x%02X, U 0x%02X, U 0x%02X, U 0x%02X, \n", $a, $b, $c, $d); + $buf = sprintf("\tU 0x%02X, U 0x%02X, U 0x%02X, U 0x%02X, \n", $a, $b, $c, $d); print OUTPUT $buf; } print OUTPUT "};\n"; From owner-p4-projects@FreeBSD.ORG Tue Feb 26 22:47:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 712CF1065681; Tue, 26 Feb 2008 22:47:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 318BF106567D for ; Tue, 26 Feb 2008 22:47:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D55C13C465 for ; Tue, 26 Feb 2008 22:47:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QMlvh9099552 for ; Tue, 26 Feb 2008 22:47:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QMlvue099549 for perforce@freebsd.org; Tue, 26 Feb 2008 22:47:57 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 26 Feb 2008 22:47:57 GMT Message-Id: <200802262247.m1QMlvue099549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 22:47:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=136297 Change 136297 by kmacy@kmacy:entropy:iwarp on 2008/02/26 22:47:34 move remaining binaries in to blob headers to be compiled in to the firmware module Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#20 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_t3fw.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/iwarp/sys/dev/cxgb/t3b_protocol_sram.h#1 add .. //depot/projects/iwarp/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/iwarp/sys/dev/cxgb/t3b_tp_eeprom.h#1 add Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#20 (text+ko) ==== @@ -389,8 +389,8 @@ } #define FW_FNAME "cxgb_t3fw" -#define TPEEPROM_NAME "t3%ctpe%d%d%d" -#define TPSRAM_NAME "t3%cps%d%d%d" +#define TPEEPROM_NAME "t3b_tp_eeprom" +#define TPSRAM_NAME "t3b_protocol_sram" static int upgrade_fw(adapter_t *sc) @@ -1475,7 +1475,6 @@ struct firmware *tpeeprom; #endif - char buf[64]; uint32_t version; unsigned int major, minor; int ret, len; @@ -1490,13 +1489,10 @@ rev = t3rev2char(adap); - snprintf(buf, sizeof(buf), TPEEPROM_NAME, rev, - TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO); - - tpeeprom = firmware_get(buf); + tpeeprom = firmware_get(TPEEPROM_NAME); if (tpeeprom == NULL) { device_printf(adap->dev, "could not load TP EEPROM: unable to load %s\n", - buf); + TPEEPROM_NAME); return; } @@ -1507,7 +1503,7 @@ goto release_tpeeprom; if (len != TP_SRAM_LEN) { - device_printf(adap->dev, "%s length is wrong len=%d expected=%d\n", buf, len, TP_SRAM_LEN); + device_printf(adap->dev, "%s length is wrong len=%d expected=%d\n", TPEEPROM_NAME, len, TP_SRAM_LEN); return; } @@ -1535,7 +1531,6 @@ #else struct firmware *tpsram; #endif - char buf[64]; int ret; char rev; @@ -1545,16 +1540,12 @@ update_tpeeprom(adap); - snprintf(buf, sizeof(buf), TPSRAM_NAME, rev, - TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO); - - tpsram = firmware_get(buf); + tpsram = firmware_get(TPSRAM_NAME); if (tpsram == NULL){ - device_printf(adap->dev, "could not load TP SRAM: unable to load %s\n", - buf); + device_printf(adap->dev, "could not load TP SRAM\n"); return (EINVAL); } else - device_printf(adap->dev, "updating TP SRAM with %s\n", buf); + device_printf(adap->dev, "updating TP SRAM\n"); ret = t3_check_tpsram(adap, tpsram->data, tpsram->datasize); if (ret) ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_t3fw.c#2 (text+ko) ==== @@ -11,6 +11,8 @@ #include #include #include +#include +#include static int cxgb_t3fw_modevent(module_t mod, int type, void *unused) @@ -45,3 +47,69 @@ MODULE_VERSION(cxgb_t3fw, 1); MODULE_DEPEND(cxgb_t3fw, firmware, 1, 1, 1); +static int +cxgb_t3b_protocol_sram_modevent(module_t mod, int type, void *unused) +{ + const struct firmware *fp, *parent; + int error; + switch (type) { + case MOD_LOAD: + + fp = firmware_register("cxgb_t3b_protocol_sram", t3b_protocol_sram, + (size_t)t3b_protocol_sram_length, + 0, NULL); + if (fp == NULL) + goto fail_0; + parent = fp; + return (0); + fail_0: + return (ENXIO); + case MOD_UNLOAD: + error = firmware_unregister("cxgb_t3b_protocol_sram"); + return (error); + } + return (EINVAL); +} + +static moduledata_t cxgb_t3b_protocol_sram_mod = { + "cxgb_t3b_protocol_sram", + cxgb_t3b_protocol_sram_modevent, + 0 +}; +DECLARE_MODULE(cxgb_t3b_protocol_sram, cxgb_t3b_protocol_sram_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); +MODULE_VERSION(cxgb_t3b_protocol_sram, 1); +MODULE_DEPEND(cxgb_t3b_protocol_sram, firmware, 1, 1, 1); + + +static int +cxgb_t3b_tp_eeprom_modevent(module_t mod, int type, void *unused) +{ + const struct firmware *fp, *parent; + int error; + switch (type) { + case MOD_LOAD: + + fp = firmware_register("cxgb_t3b_tp_eeprom", t3b_tp_eeprom, + (size_t)t3b_tp_eeprom_length, + 0, NULL); + if (fp == NULL) + goto fail_0; + parent = fp; + return (0); + fail_0: + return (ENXIO); + case MOD_UNLOAD: + error = firmware_unregister("cxgb_t3b_tp_eeprom"); + return (error); + } + return (EINVAL); +} + +static moduledata_t cxgb_t3b_tp_eeprom_mod = { + "cxgb_t3b_tp_eeprom", + cxgb_t3b_tp_eeprom_modevent, + 0 +}; +DECLARE_MODULE(cxgb_t3b_tp_eeprom, cxgb_t3b_tp_eeprom_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); +MODULE_VERSION(cxgb_t3b_tp_eeprom, 1); +MODULE_DEPEND(cxgb_t3b_tp_eeprom, firmware, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Tue Feb 26 23:56:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89ABF1065672; Tue, 26 Feb 2008 23:56:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BB42106566B for ; Tue, 26 Feb 2008 23:56:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 352FB13C46A for ; Tue, 26 Feb 2008 23:56:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QNuwng003407 for ; Tue, 26 Feb 2008 23:56:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QNuvZn003404 for perforce@freebsd.org; Tue, 26 Feb 2008 23:56:57 GMT (envelope-from sam@freebsd.org) Date: Tue, 26 Feb 2008 23:56:57 GMT Message-Id: <200802262356.m1QNuvZn003404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2008 23:56:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=136306 Change 136306 by sam@sam_ebb on 2008/02/26 23:56:32 vap setup/test scripts I've used for years Affected files ... .. //depot/projects/vap/tools/tools/net80211/scripts/config#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.dfs#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.fixed#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.local#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.simple#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.simple2#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.sta#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wds#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wdsmain#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wdsrelay#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wep#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#1 add .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 27 00:14:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9949C1065674; Wed, 27 Feb 2008 00:14:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5928E1065673 for ; Wed, 27 Feb 2008 00:14:31 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4058513C455 for ; Wed, 27 Feb 2008 00:14:31 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R0EVZq005191 for ; Wed, 27 Feb 2008 00:14:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R0EUUs005188 for perforce@freebsd.org; Wed, 27 Feb 2008 00:14:30 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Feb 2008 00:14:30 GMT Message-Id: <200802270014.m1R0EUUs005188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 00:14:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=136308 Change 136308 by marcel@marcel_cluster on 2008/02/27 00:14:29 IFC @136307 Affected files ... .. //depot/projects/e500/Makefile.inc1#9 integrate .. //depot/projects/e500/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/e500/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/e500/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate .. //depot/projects/e500/include/unistd.h#4 integrate .. //depot/projects/e500/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/e500/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/e500/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/e500/lib/msun/src/e_rem_pio2.c#5 integrate .. //depot/projects/e500/lib/msun/src/e_rem_pio2f.c#5 integrate .. //depot/projects/e500/lib/msun/src/k_rem_pio2.c#5 integrate .. //depot/projects/e500/lib/msun/src/math_private.h#6 integrate .. //depot/projects/e500/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/e500/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/e500/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/e500/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/e500/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/e500/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/e500/sbin/ping6/ping6.c#4 integrate .. //depot/projects/e500/share/man/man9/Makefile#6 integrate .. //depot/projects/e500/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/e500/share/man/man9/insmntque.9#1 branch .. //depot/projects/e500/share/man/man9/lock.9#6 integrate .. //depot/projects/e500/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/e500/share/man/man9/vgone.9#2 integrate .. //depot/projects/e500/share/man/man9/vhold.9#2 integrate .. //depot/projects/e500/share/man/man9/vput.9#2 integrate .. //depot/projects/e500/share/man/man9/vref.9#2 integrate .. //depot/projects/e500/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/e500/share/man/man9/vrele.9#2 integrate .. //depot/projects/e500/share/misc/committers-ports.dot#6 integrate .. //depot/projects/e500/sys/arm/include/_bus.h#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/e500/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/e500/sys/conf/NOTES#13 integrate .. //depot/projects/e500/sys/conf/files#14 integrate .. //depot/projects/e500/sys/conf/ldscript.powerpc#3 integrate .. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/e500/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/e500/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/e500/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/e500/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete .. //depot/projects/e500/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/e500/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/e500/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/e500/sys/fs/coda/TODO#3 integrate .. //depot/projects/e500/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/e500/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/e500/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/e500/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/e500/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/e500/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/e500/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/e500/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/e500/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/e500/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/e500/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/e500/sys/kern/kern_lock.c#7 integrate .. //depot/projects/e500/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/e500/sys/kern/vfs_default.c#6 integrate .. //depot/projects/e500/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/e500/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/e500/sys/kern/vnode_if.src#5 integrate .. //depot/projects/e500/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/e500/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/e500/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/e500/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/e500/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/e500/sys/netsmb/smb_conn.c#4 integrate .. //depot/projects/e500/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/projects/e500/sys/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/e500/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/e500/sys/powerpc/aim/locore.S#4 integrate .. //depot/projects/e500/sys/powerpc/powerpc/genassym.c#7 integrate .. //depot/projects/e500/sys/security/audit/audit.c#8 integrate .. //depot/projects/e500/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/e500/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/e500/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/e500/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/e500/sys/sys/buf.h#5 integrate .. //depot/projects/e500/sys/sys/lockmgr.h#6 integrate .. //depot/projects/e500/sys/sys/param.h#11 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/e500/sys/vm/vm_object.c#10 integrate .. //depot/projects/e500/usr.bin/ar/Makefile#2 integrate .. //depot/projects/e500/usr.bin/calendar/calendars/calendar.freebsd#8 integrate .. //depot/projects/e500/usr.bin/du/du.1#2 integrate .. //depot/projects/e500/usr.bin/du/du.c#4 integrate .. //depot/projects/e500/usr.sbin/pkg_install/add/main.c#4 integrate Differences ... ==== //depot/projects/e500/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -872,6 +872,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,18 +889,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -967,6 +972,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/e500/contrib/tcpdump/print-802_11.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/e500/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.16 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ar -#MAN= gnu-ar.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar -.endif SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/e500/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,15 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.17 2008/02/21 16:59:02 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if defined(WITH_BSDAR) -PROG= gnu-ranlib -#MAN= gnu-ranlib.1 -.else +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 +.endif + PROG= ranlib -.endif SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils ==== //depot/projects/e500/gnu/usr.bin/gdb/kgdb/kgdb.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $ */ #ifndef _KGDB_H_ @@ -49,7 +49,6 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); -void kgdb_auto_load_klds(void); void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); ==== //depot/projects/e500/include/unistd.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.83 2008/02/12 20:09:03 ru Exp $ + * $FreeBSD: src/include/unistd.h,v 1.84 2008/02/26 20:33:52 ru Exp $ */ #ifndef _UNISTD_H_ @@ -405,7 +405,7 @@ /* 1003.1-2001 */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE int fchown(int, uid_t, gid_t); -ssize_t readlink(const char *, char *, size_t); +ssize_t readlink(const char * __restrict, char * __restrict, size_t); #endif #if __POSIX_VISIBLE >= 200112 int gethostname(char *, size_t); ==== //depot/projects/e500/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -34,7 +34,7 @@ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ static inline uint16_t -be16dec(const void *pp) +archive_be16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -42,7 +42,7 @@ } static inline uint32_t -be32dec(const void *pp) +archive_be32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -50,15 +50,15 @@ } static inline uint64_t -be64dec(const void *pp) +archive_be64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); + return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4)); } static inline uint16_t -le16dec(const void *pp) +archive_le16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -66,7 +66,7 @@ } static inline uint32_t -le32dec(const void *pp) +archive_le32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -74,15 +74,15 @@ } static inline uint64_t -le64dec(const void *pp) +archive_le64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p)); + return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p)); } static inline void -be16enc(void *pp, uint16_t u) +archive_be16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -91,7 +91,7 @@ } static inline void -be32enc(void *pp, uint32_t u) +archive_be32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -102,16 +102,16 @@ } static inline void -be64enc(void *pp, uint64_t u) +archive_be64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - be32enc(p, u >> 32); - be32enc(p + 4, u & 0xffffffff); + archive_be32enc(p, u >> 32); + archive_be32enc(p + 4, u & 0xffffffff); } static inline void -le16enc(void *pp, uint16_t u) +archive_le16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -120,7 +120,7 @@ } static inline void -le32enc(void *pp, uint32_t u) +archive_le32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -131,12 +131,12 @@ } static inline void -le64enc(void *pp, uint64_t u) +archive_le64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - le32enc(p, u & 0xffffffff); - le32enc(p + 4, u >> 32); + archive_le32enc(p, u & 0xffffffff); + archive_le32enc(p + 4, u >> 32); } #endif ==== //depot/projects/e500/lib/libarchive/archive_read_support_format_zip.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.20 2008/01/15 16:27:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.21 2008/02/26 07:17:47 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -278,8 +278,8 @@ zip->version = p->version[0]; zip->system = p->version[1]; - zip->flags = le16dec(p->flags); - zip->compression = le16dec(p->compression); + zip->flags = archive_le16dec(p->flags); + zip->compression = archive_le16dec(p->compression); if (zip->compression < sizeof(compression_names)/sizeof(compression_names[0])) zip->compression_name = compression_names[zip->compression]; @@ -291,11 +291,11 @@ zip->mode = 0; zip->uid = 0; zip->gid = 0; - zip->crc32 = le32dec(p->crc32); - zip->filename_length = le16dec(p->filename_length); - zip->extra_length = le16dec(p->extra_length); - zip->uncompressed_size = le32dec(p->uncompressed_size); - zip->compressed_size = le32dec(p->compressed_size); + zip->crc32 = archive_le32dec(p->crc32); + zip->filename_length = archive_le16dec(p->filename_length); + zip->extra_length = archive_le16dec(p->extra_length); + zip->uncompressed_size = archive_le32dec(p->uncompressed_size); + zip->compressed_size = archive_le32dec(p->compressed_size); (a->decompressor->consume)(a, sizeof(struct zip_file_header)); @@ -397,9 +397,9 @@ "Truncated ZIP end-of-file record"); return (ARCHIVE_FATAL); } - zip->crc32 = le32dec(p + 4); - zip->compressed_size = le32dec(p + 8); - zip->uncompressed_size = le32dec(p + 12); + zip->crc32 = archive_le32dec(p + 4); + zip->compressed_size = archive_le32dec(p + 8); + zip->uncompressed_size = archive_le32dec(p + 12); (a->decompressor->consume)(a, 16); } @@ -707,8 +707,8 @@ const char *p = (const char *)extra; while (offset < zip->extra_length - 4) { - unsigned short headerid = le16dec(p + offset); - unsigned short datasize = le16dec(p + offset + 2); + unsigned short headerid = archive_le16dec(p + offset); + unsigned short datasize = archive_le16dec(p + offset + 2); offset += 4; if (offset + datasize > zip->extra_length) break; @@ -720,9 +720,9 @@ case 0x0001: /* Zip64 extended information extra field. */ if (datasize >= 8) - zip->uncompressed_size = le64dec(p + offset); + zip->uncompressed_size = archive_le64dec(p + offset); if (datasize >= 16) - zip->compressed_size = le64dec(p + offset + 8); + zip->compressed_size = archive_le64dec(p + offset + 8); break; case 0x5455: { @@ -735,11 +735,12 @@ { #ifdef DEBUG fprintf(stderr, "mtime: %lld -> %d\n", - (long long)zip->mtime, le32dec(p + offset)); + (long long)zip->mtime, + archive_le32dec(p + offset)); #endif if (datasize < 4) break; - zip->mtime = le32dec(p + offset); + zip->mtime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -747,7 +748,7 @@ { if (datasize < 4) break; - zip->atime = le32dec(p + offset); + zip->atime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -755,7 +756,7 @@ { if (datasize < 4) break; - zip->ctime = le32dec(p + offset); + zip->ctime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -765,12 +766,13 @@ /* Info-ZIP Unix Extra Field (type 2) "Ux". */ #ifdef DEBUG fprintf(stderr, "uid %d gid %d\n", - le16dec(p + offset), le16dec(p + offset + 2)); + archive_le16dec(p + offset), + archive_le16dec(p + offset + 2)); #endif if (datasize >= 2) - zip->uid = le16dec(p + offset); + zip->uid = archive_le16dec(p + offset); if (datasize >= 4) - zip->gid = le16dec(p + offset + 2); + zip->gid = archive_le16dec(p + offset + 2); break; default: break; ==== //depot/projects/e500/lib/libc/sys/clock_gettime.2#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.24 2007/01/09 00:28:14 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/clock_gettime.2,v 1.25 2008/02/25 13:03:18 brueffer Exp $ .\" .Dd November 4, 2006 .Dt CLOCK_GETTIME 2 @@ -52,8 +52,8 @@ .Fn clock_gettime and .Fn clock_settime -allow the calling process to retrieve or set the value used by a clock -which is specified by +system calls allow the calling process to retrieve or set the value +used by a clock which is specified by .Fa clock_id . .Pp The ==== //depot/projects/e500/lib/libc/sys/readlink.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)readlink.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.15 2008/02/12 20:09:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.16 2008/02/26 20:33:52 ru Exp $ .\" -.Dd February 12, 2008 +.Dd February 26, 2008 .Dt READLINK 2 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .In unistd.h .Ft ssize_t -.Fn readlink "const char *path" "char *buf" "size_t bufsiz" +.Fn readlink "const char *restrict path" "char *restrict buf" "size_t bufsiz" .Sh DESCRIPTION The .Fn readlink ==== //depot/projects/e500/lib/msun/src/e_rem_pio2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.15 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -56,7 +56,7 @@ __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; - double tx[3]; + double tx[3],ty[2]; int32_t e0,i,j,nx,n,ix,hx; u_int32_t low; @@ -182,7 +182,7 @@ tx[2] = z; nx = 3; while(tx[nx-1]==zero) nx--; /* skip zero term */ - n = __kernel_rem_pio2(tx,y,e0,nx,2); - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,nx,1); + if(hx<0) {y[0] = -ty[0]; y[1] = -ty[1]; return -n;} + y[0] = ty[0]; y[1] = ty[1]; return n; } ==== //depot/projects/e500/lib/msun/src/e_rem_pio2f.c#5 (text+ko) ==== @@ -15,12 +15,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.24 2008/02/23 12:53:21 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * - * return the remainder of x rem pi/2 in y[0]+y[1] - * use double precision internally + * return the remainder of x rem pi/2 in *y + * use double precision for everything except passing x * use __kernel_rem_pio2() for large x */ @@ -41,11 +41,14 @@ pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +#ifdef INLINE_REM_PIO2F +extern inline +#endif int -__ieee754_rem_pio2f(float x, float *y) +__ieee754_rem_pio2f(float x, double *y) { double w,r,fn; - double tx[1],ty[2]; + double tx[1],ty[1]; float z; int32_t e0,n,ix,hx; @@ -63,23 +66,20 @@ #endif r = x-fn*pio2_1; w = fn*pio2_1t; - y[0] = r-w; - y[1] = (r-y[0])-w; + *y = r-w; return n; } /* * all other (large) arguments */ if(ix>=0x7f800000) { /* x is inf or NaN */ - y[0]=y[1]=x-x; return 0; + *y=x-x; return 0; } /* set z = scalbn(|x|,ilogb(|x|)-23) */ e0 = (ix>>23)-150; /* e0 = ilogb(|x|)-23; */ SET_FLOAT_WORD(z, ix - ((int32_t)(e0<<23))); tx[0] = z; - n = __kernel_rem_pio2(tx,ty,e0,1,1); - y[0] = ty[0]; - y[1] = ty[0] - y[0]; - if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} - return n; + n = __kernel_rem_pio2(tx,ty,e0,1,0); + if(hx<0) {*y = -ty[0]; return -n;} + *y = ty[0]; return n; } ==== //depot/projects/e500/lib/msun/src/k_rem_pio2.c#5 (text+ko) ==== @@ -12,7 +12,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.10 2008/02/17 07:31:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.11 2008/02/25 11:43:20 bde Exp $"); /* * __kernel_rem_pio2(x,y,e0,nx,prec) @@ -78,8 +78,13 @@ * Here is the description of some local variables: * * jk jk+1 is the initial number of terms of ipio2[] needed - * in the computation. The recommended value is 2,3,4, - * 6 for single, double, extended,and quad. + * in the computation. The minimum and recommended value + * for jk is 3,4,4,6 for single, double, extended, and quad. + * jk+1 must be 2 larger than you might expect so that our + * recomputation test works. (Up to 24 bits in the integer + * part (the 24 bits of it that we compute) and 23 bits in + * the fraction part may be lost to cancelation before we + * recompute.) * * jz local integer variable indicating the number of * terms of ipio2[] used. @@ -129,7 +134,7 @@ #include "math.h" #include "math_private.h" -static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ +static const int init_jk[] = {3,4,4,6}; /* initial value for jk */ /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi ==== //depot/projects/e500/lib/msun/src/math_private.h#6 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.25 2008/02/22 14:11:03 bde Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.26 2008/02/25 13:33:20 bde Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -320,7 +320,7 @@ double __kernel_tan(double,double,int); /* float precision kernel functions */ -int __ieee754_rem_pio2f(float,float*); +int __ieee754_rem_pio2f(float,double*); float __kernel_sindf(double); float __kernel_cosdf(double); float __kernel_tandf(double,int); ==== //depot/projects/e500/lib/msun/src/s_cosf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.16 2008/02/22 02:30:35 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_cosf.c,v 1.18 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float cosf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -71,13 +75,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_cosdf((double)y[0]+y[1]); - case 1: return __kernel_sindf(-(double)y[0]-y[1]); - case 2: return -__kernel_cosdf((double)y[0]+y[1]); + case 0: return __kernel_cosdf(y); + case 1: return __kernel_sindf(-y); + case 2: return -__kernel_cosdf(y); default: - return __kernel_sindf((double)y[0]+y[1]); + return __kernel_sindf(y); } } } ==== //depot/projects/e500/lib/msun/src/s_sinf.c#3 (text+ko) ==== @@ -15,12 +15,16 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_sinf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_COSDF #define INLINE_KERNEL_SINDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_cosf.c" #include "k_sinf.c" @@ -34,7 +38,7 @@ float sinf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -69,13 +73,13 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); switch(n&3) { - case 0: return __kernel_sindf((double)y[0]+y[1]); - case 1: return __kernel_cosdf((double)y[0]+y[1]); - case 2: return __kernel_sindf(-(double)y[0]-y[1]); + case 0: return __kernel_sindf(y); + case 1: return __kernel_cosdf(y); + case 2: return __kernel_sindf(-y); default: - return -__kernel_cosdf((double)y[0]+y[1]); + return -__kernel_cosdf(y); } } } ==== //depot/projects/e500/lib/msun/src/s_tanf.c#3 (text+ko) ==== @@ -15,11 +15,15 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.15 2008/02/22 02:30:36 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_tanf.c,v 1.17 2008/02/25 22:19:17 bde Exp $"); + +#include #include "math.h" #define INLINE_KERNEL_TANDF +#define INLINE_REM_PIO2F #include "math_private.h" +#include "e_rem_pio2f.c" #include "k_tanf.c" /* Small multiples of pi/2 rounded to double precision. */ @@ -32,7 +36,7 @@ float tanf(float x) { - float y[2]; + double y; int32_t n, hx, ix; GET_FLOAT_WORD(hx,x); @@ -61,8 +65,8 @@ /* general argument reduction needed */ else { - n = __ieee754_rem_pio2f(x,y); + n = __ieee754_rem_pio2f(x,&y); /* integer parameter: 1 -- n even; -1 -- n odd */ - return __kernel_tandf((double)y[0]+y[1],1-((n&1)<<1)); + return __kernel_tandf(y,1-((n&1)<<1)); } } ==== //depot/projects/e500/sbin/fsck_ffs/pass1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.44 2008/02/26 03:08:22 delphij Exp $"); #include #include @@ -93,9 +93,11 @@ inumber = c * sblock.fs_ipg; setinodebuf(inumber); getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); - if (sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) { inosused = cgrp.cg_initediblk; - else + if (inosused > sblock.fs_ipg) + inosused = sblock.fs_ipg; + } else inosused = sblock.fs_ipg; if (got_siginfo) { printf("%s: phase 1: cyl group %d of %d (%d%%)\n", ==== //depot/projects/e500/sbin/fsck_ffs/pass2.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.27 2008/02/26 03:05:48 delphij Exp $"); #include @@ -242,6 +242,8 @@ /* * check for "." */ + if (dirp->d_ino > maxino) + goto chk2; if (idesc->id_entryno != 0) goto chk1; if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) { ==== //depot/projects/e500/sbin/fsck_ffs/setup.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.51 2008/02/26 03:03:17 delphij Exp $"); #include #include @@ -349,7 +349,7 @@ sblock.fs_sblockloc == sblock_try[i])) && sblock.fs_ncg >= 1 && sblock.fs_bsize >= MINBSIZE && - sblock.fs_bsize >= sizeof(struct fs)) + sblock.fs_sbsize >= roundup(sizeof(struct fs), dev_bsize)) break; } if (sblock_try[i] == -1) { ==== //depot/projects/e500/sbin/ping6/ping6.c#4 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.32 2007/11/20 01:58:34 dd Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.33 2008/02/25 10:45:25 silby Exp $"; #endif /* not lint */ /* @@ -457,9 +457,9 @@ if (interval.tv_sec < 0) errx(1, "illegal timing interval %s", optarg); /* less than 1/hz does not make sense */ - if (interval.tv_sec == 0 && interval.tv_usec < 10000) { - warnx("too small interval, raised to 0.01"); - interval.tv_usec = 10000; + if (interval.tv_sec == 0 && interval.tv_usec < 1) { + warnx("too small interval, raised to .000001"); + interval.tv_usec = 1; } options |= F_INTERVAL; break; ==== //depot/projects/e500/share/man/man9/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.326 2008/02/13 21:54:16 attilio Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.330 2008/02/26 21:40:30 davidc Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -124,6 +124,7 @@ ieee80211_radiotap.9 \ ifnet.9 \ inittodr.9 \ + insmntque.9 \ intro.9 \ ithread.9 \ KASSERT.9 \ @@ -253,6 +254,7 @@ VFS_LOCK_GIANT.9 \ VFS_MOUNT.9 \ vfs_mount.9 \ + vfs_mountedfrom.9 \ vfs_mountedon.9 \ VFS_QUOTACTL.9 \ VFS_ROOT.9 \ @@ -349,6 +351,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 27 00:46:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED8661065675; Wed, 27 Feb 2008 00:46:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE5B21065671 for ; Wed, 27 Feb 2008 00:46:20 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 947C613C45E for ; Wed, 27 Feb 2008 00:46:20 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R0kKbB006195 for ; Wed, 27 Feb 2008 00:46:20 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R0kKgr006192 for perforce@freebsd.org; Wed, 27 Feb 2008 00:46:20 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Feb 2008 00:46:20 GMT Message-Id: <200802270046.m1R0kKgr006192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 00:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=136310 Change 136310 by marcel@marcel_xcllnt on 2008/02/27 00:46:16 Eliminate redundant declarations and remove makeoptions WERROR. While here, add -Wa,-me500 to makeoptions DEBUG so that it's possible to build the kernel without doing make buildkernel from the top. Affected files ... .. //depot/projects/e500/sys/powerpc/booke/interrupt.c#6 edit .. //depot/projects/e500/sys/powerpc/booke/trap.c#6 edit .. //depot/projects/e500/sys/powerpc/conf/MPC85XX#2 edit Differences ... ==== //depot/projects/e500/sys/powerpc/booke/interrupt.c#6 (text+ko) ==== @@ -62,7 +62,6 @@ #include "pic_if.h" extern void decr_intr(struct trapframe *); -extern void trap(struct trapframe *); void powerpc_decr_interrupt(struct trapframe *); void powerpc_extr_interrupt(struct trapframe *); ==== //depot/projects/e500/sys/powerpc/booke/trap.c#6 (text+ko) ==== @@ -87,8 +87,6 @@ #define FAULTBUF_XER 5 #define FAULTBUF_R13 6 -void trap(struct trapframe *); - static void trap_fatal(struct trapframe *frame); static void printtrap(u_int vector, struct trapframe *frame, int isfatal, int user); ==== //depot/projects/e500/sys/powerpc/conf/MPC85XX#2 (text+ko) ==== @@ -1,9 +1,8 @@ cpu E500 ident MPC85XX -makeoptions DEBUG=-g +makeoptions DEBUG="-Wa,-me500 -g" makeoptions NO_MODULES=yes -makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" options FPU_EMU From owner-p4-projects@FreeBSD.ORG Wed Feb 27 01:28:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6B1C1065674; Wed, 27 Feb 2008 01:28:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 784C11065670 for ; Wed, 27 Feb 2008 01:28:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60D7513C45D for ; Wed, 27 Feb 2008 01:28:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R1SML7017532 for ; Wed, 27 Feb 2008 01:28:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R1SLaj017529 for perforce@freebsd.org; Wed, 27 Feb 2008 01:28:21 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 01:28:21 GMT Message-Id: <200802270128.m1R1SLaj017529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 01:28:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=136312 Change 136312 by sam@sam_ebb on 2008/02/27 01:27:55 indicate we are capable of WDS Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#37 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#37 (text+ko) ==== @@ -511,6 +511,7 @@ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_AHDEMO /* adhoc demo mode */ + | IEEE80211_C_WDS /* 4-address traffic works */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ From owner-p4-projects@FreeBSD.ORG Wed Feb 27 01:29:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D474F1065670; Wed, 27 Feb 2008 01:29:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AC9B106566B for ; Wed, 27 Feb 2008 01:29:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6346713C442 for ; Wed, 27 Feb 2008 01:29:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R1TO4X017566 for ; Wed, 27 Feb 2008 01:29:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R1TNLK017563 for perforce@freebsd.org; Wed, 27 Feb 2008 01:29:23 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 01:29:23 GMT Message-Id: <200802270129.m1R1TNLK017563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 01:29:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=136313 Change 136313 by sam@sam_ebb on 2008/02/27 01:29:05 use EOPNOTSUPP for all requests that are rejected because the underlying device is not capable; there are so many cases of EINVAL that it's important to disambiguate these cases Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#32 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#32 (text+ko) ==== @@ -1535,7 +1535,7 @@ int isbss, ac; if ((ic->ic_caps & IEEE80211_C_WME) == 0) - return EINVAL; + return EOPNOTSUPP; isbss = (ireq->i_len & IEEE80211_WMEPARAM_BSS); ac = (ireq->i_len & IEEE80211_WMEPARAM_VAL); @@ -2531,7 +2531,7 @@ break; case IEEE80211_POWERSAVE_ON: if ((vap->iv_caps & IEEE80211_C_PMGT) == 0) - error = EINVAL; + error = EOPNOTSUPP; else if ((vap->iv_flags & IEEE80211_F_PMGTON) == 0) { ieee80211_syncflag(vap, IEEE80211_F_PMGTON); error = ERESTART; @@ -2566,7 +2566,7 @@ break; case IEEE80211_IOC_TXPOWER: if ((ic->ic_caps & IEEE80211_C_TXPMGT) == 0) - return EINVAL; + return EOPNOTSUPP; if (!(IEEE80211_TXPOWER_MIN <= ireq->i_val && ireq->i_val <= IEEE80211_TXPOWER_MAX)) return EINVAL; @@ -2605,7 +2605,7 @@ case IEEE80211_IOC_COUNTERMEASURES: if (ireq->i_val) { if ((vap->iv_flags & IEEE80211_F_WPA) == 0) - return EINVAL; + return EOPNOTSUPP; vap->iv_flags |= IEEE80211_F_COUNTERM; } else vap->iv_flags &= ~IEEE80211_F_COUNTERM; @@ -2631,7 +2631,7 @@ case IEEE80211_IOC_WME: if (ireq->i_val) { if ((vap->iv_caps & IEEE80211_C_WME) == 0) - return EINVAL; + return EOPNOTSUPP; ieee80211_syncflag(vap, IEEE80211_F_WME); } else ieee80211_syncflag(vap, -IEEE80211_F_WME); @@ -2769,7 +2769,7 @@ case IEEE80211_IOC_FF: if (ireq->i_val) { if ((vap->iv_caps & IEEE80211_C_FF) == 0) - return EINVAL; + return EOPNOTSUPP; vap->iv_flags |= IEEE80211_F_FF; } else vap->iv_flags &= ~IEEE80211_F_FF; @@ -2778,7 +2778,7 @@ case IEEE80211_IOC_TURBOP: if (ireq->i_val) { if ((vap->iv_caps & IEEE80211_C_TURBOP) == 0) - return EINVAL; + return EOPNOTSUPP; vap->iv_flags |= IEEE80211_F_TURBOP; } else vap->iv_flags &= ~IEEE80211_F_TURBOP; @@ -2787,7 +2787,7 @@ case IEEE80211_IOC_BGSCAN: if (ireq->i_val) { if ((vap->iv_caps & IEEE80211_C_BGSCAN) == 0) - return EINVAL; + return EOPNOTSUPP; vap->iv_flags |= IEEE80211_F_BGSCAN; } else vap->iv_flags &= ~IEEE80211_F_BGSCAN; @@ -2813,7 +2813,7 @@ case IEEE80211_IOC_FRAGTHRESHOLD: if ((vap->iv_caps & IEEE80211_C_TXFRAG) == 0 && ireq->i_val != IEEE80211_FRAG_MAX) - return EINVAL; + return EOPNOTSUPP; if (!(IEEE80211_FRAG_MIN <= ireq->i_val && ireq->i_val <= IEEE80211_FRAG_MAX)) return EINVAL; @@ -2823,7 +2823,7 @@ case IEEE80211_IOC_BURST: if (ireq->i_val) { if ((vap->iv_caps & IEEE80211_C_BURST) == 0) - return EINVAL; + return EOPNOTSUPP; ieee80211_syncflag(vap, IEEE80211_F_BURST); } else ieee80211_syncflag(vap, -IEEE80211_F_BURST); @@ -2922,7 +2922,7 @@ #if 0 /* XXX no capability */ if ((vap->iv_caps & IEEE80211_C_DOTH) == 0) - return EINVAL; + return EOPNOTSUPP; #endif vap->iv_flags |= IEEE80211_F_DOTH; } else @@ -2941,7 +2941,7 @@ case IEEE80211_IOC_HTCOMPAT: if (ireq->i_val) { if ((vap->iv_flags_ext & IEEE80211_FEXT_HT) == 0) - return EINVAL; + return EOPNOTSUPP; vap->iv_flags_ext |= IEEE80211_FEXT_HTCOMPAT; } else vap->iv_flags_ext &= ~IEEE80211_FEXT_HTCOMPAT; @@ -2953,7 +2953,7 @@ if (ireq->i_val) { /* NB: DWDS only makes sense for WDS-capable devices */ if ((ic->ic_caps & IEEE80211_C_WDS) == 0) - return EINVAL; + return EOPNOTSUPP; /* NB: DWDS is used only with ap+sta vaps */ if (vap->iv_opmode != IEEE80211_M_HOSTAP && vap->iv_opmode != IEEE80211_M_STA) @@ -2974,7 +2974,7 @@ case IEEE80211_IOC_WPS: if (ireq->i_val) { if ((vap->iv_caps & IEEE80211_C_WPA) == 0) - return EINVAL; + return EOPNOTSUPP; vap->iv_flags_ext |= IEEE80211_FEXT_WPS; } else vap->iv_flags_ext &= ~IEEE80211_FEXT_WPS; @@ -2982,7 +2982,7 @@ case IEEE80211_IOC_TSN: if (ireq->i_val) { if ((vap->iv_caps & IEEE80211_C_WPA) == 0) - return EINVAL; + return EOPNOTSUPP; vap->iv_flags_ext |= IEEE80211_FEXT_TSN; } else vap->iv_flags_ext &= ~IEEE80211_FEXT_TSN; @@ -2995,7 +2995,7 @@ #if 0 /* XXX no capability */ if ((vap->iv_caps & IEEE80211_C_DFS) == 0) - return EINVAL; + return EOPNOTSUPP; #endif /* NB: DFS requires 11h support */ if ((vap->iv_flags & IEEE80211_F_DOTH) == 0) From owner-p4-projects@FreeBSD.ORG Wed Feb 27 01:34:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ACD1065672; Wed, 27 Feb 2008 01:34:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94FF71065670 for ; Wed, 27 Feb 2008 01:34:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7807413C467 for ; Wed, 27 Feb 2008 01:34:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R1YWMo017742 for ; Wed, 27 Feb 2008 01:34:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R1YWE9017739 for perforce@freebsd.org; Wed, 27 Feb 2008 01:34:32 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 01:34:32 GMT Message-Id: <200802270134.m1R1YWE9017739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 01:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=136314 Change 136314 by sam@sam_ebb on 2008/02/27 01:33:35 dwds is meaningful on both ap+sta so don't display it only for ap Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#11 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#11 (text+ko) ==== @@ -4631,6 +4631,12 @@ else if (verbose) LINE_CHECK("-dturbo"); } + if (get80211val(s, IEEE80211_IOC_DWDS, &val) != -1) { + if (val) + LINE_CHECK("dwds"); + else if (verbose) + LINE_CHECK("-dwds"); + } if (opmode == IEEE80211_M_HOSTAP) { if (get80211val(s, IEEE80211_IOC_HIDESSID, &val) != -1) { @@ -4660,12 +4666,6 @@ else if (verbose) LINE_CHECK("dfs"); } - if (get80211val(s, IEEE80211_IOC_DWDS, &val) != -1) { - if (val) - LINE_CHECK("dwds"); - else if (verbose) - LINE_CHECK("-dwds"); - } if (get80211val(s, IEEE80211_IOC_INACTIVITY, &val) != -1) { if (!val) LINE_CHECK("-inact"); From owner-p4-projects@FreeBSD.ORG Wed Feb 27 01:45:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 523AB1065671; Wed, 27 Feb 2008 01:45:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13D97106566C for ; Wed, 27 Feb 2008 01:45:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F038113C474 for ; Wed, 27 Feb 2008 01:45:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R1jokK018195 for ; Wed, 27 Feb 2008 01:45:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R1jnlE018191 for perforce@freebsd.org; Wed, 27 Feb 2008 01:45:49 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 01:45:49 GMT Message-Id: <200802270145.m1R1jnlE018191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 01:45:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=136315 Change 136315 by sam@sam_ebb on 2008/02/27 01:45:19 use unlocked variant as intended Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#18 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#18 (text+ko) ==== @@ -163,7 +163,7 @@ #define IEEE80211_NODE_WDSQ_LOCK(_ni) IF_LOCK(&(_ni)->ni_wdsq) #define IEEE80211_NODE_WDSQ_UNLOCK(_ni) IF_UNLOCK(&(_ni)->ni_wdsq) #define _IEEE80211_NODE_WDSQ_DEQUEUE_HEAD(_ni, _m) do { \ - IF_DEQUEUE(&(_ni)->ni_wdsq, m); \ + _IF_DEQUEUE(&(_ni)->ni_wdsq, m); \ } while (0) #define _IEEE80211_NODE_WDSQ_ENQUEUE(_ni, _m, _qlen, _age) do { \ _AGEQ_ENQUEUE(&ni->ni_wdsq, _m, _qlen, _age); \ From owner-p4-projects@FreeBSD.ORG Wed Feb 27 02:38:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C30D310656C1; Wed, 27 Feb 2008 02:38:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F6EA1065739 for ; Wed, 27 Feb 2008 02:38:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFC1213C6BC for ; Wed, 27 Feb 2008 02:34:50 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R2YK6m021101 for ; Wed, 27 Feb 2008 02:34:25 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R2YAN6021090 for perforce@freebsd.org; Wed, 27 Feb 2008 02:34:10 GMT (envelope-from julian@freebsd.org) Date: Wed, 27 Feb 2008 02:34:10 GMT Message-Id: <200802270234.m1R2YAN6021090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 136317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 02:38:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=136317 Change 136317 by julian@julian_trafmon1 on 2008/02/27 02:33:54 add scritps to generate good diffs and speed up MFCs Affected files ... .. //depot/projects/vimage/makediff.pl#1 add .. //depot/projects/vimage/update.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 27 03:38:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93F751065671; Wed, 27 Feb 2008 03:38:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51FCB106566C for ; Wed, 27 Feb 2008 03:38:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A0BA13C46B for ; Wed, 27 Feb 2008 03:38:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R3c01W024673 for ; Wed, 27 Feb 2008 03:38:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R3bxXx024670 for perforce@freebsd.org; Wed, 27 Feb 2008 03:37:59 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 03:37:59 GMT Message-Id: <200802270337.m1R3bxXx024670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 03:38:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=136318 Change 136318 by sam@sam_ebb on 2008/02/27 03:37:31 Bandaid ieee80211_send_error; it can be called from various places before a vap reached RUN state which is wrong. We need to stamp out these cases but for now add this WAR. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#28 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#28 (text+ko) ==== @@ -475,6 +475,17 @@ int istmp; if (ni == vap->iv_bss) { + if (vap->iv_state != IEEE80211_S_RUN) { + /* + * XXX hack until we get rid of this routine. + * We can be called prior to the vap reaching + * run state under certain conditions in which + * case iv_bss->ni_chan will not be setup. + * Check for this explicitly and and just ignore + * the request. + */ + return; + } ni = ieee80211_tmp_node(vap, mac); if (ni == NULL) { /* XXX msg */ From owner-p4-projects@FreeBSD.ORG Wed Feb 27 03:40:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1371C1065672; Wed, 27 Feb 2008 03:40:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE27F106566B for ; Wed, 27 Feb 2008 03:40:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95A2F13C461 for ; Wed, 27 Feb 2008 03:40:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R3e3Nh024758 for ; Wed, 27 Feb 2008 03:40:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R3e3ZY024755 for perforce@freebsd.org; Wed, 27 Feb 2008 03:40:03 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 03:40:03 GMT Message-Id: <200802270340.m1R3e3ZY024755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 03:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=136319 Change 136319 by sam@sam_ebb on 2008/02/27 03:39:17 Add wds support: o indicate we're capable o allow multiple vaps (1 ap+any number of wds) o shuffle newstate so the bss node is setup prior to use Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2661.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2661.c#15 (text) ==== @@ -307,17 +307,20 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS | /* IBSS mode supported */ - IEEE80211_C_MONITOR | /* monitor mode supported */ - IEEE80211_C_HOSTAP | /* HostAp mode supported */ - IEEE80211_C_TXPMGT | /* tx power management */ - IEEE80211_C_SHPREAMBLE | /* short preamble supported */ - IEEE80211_C_SHSLOT | /* short slot time supported */ + IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ + | IEEE80211_C_HOSTAP /* hostap mode */ + | IEEE80211_C_MONITOR /* monitor mode */ + | IEEE80211_C_AHDEMO /* adhoc demo mode */ + | IEEE80211_C_WDS /* 4-address traffic works */ + | IEEE80211_C_SHPREAMBLE /* short preamble supported */ + | IEEE80211_C_SHSLOT /* short slot time supported */ + | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ + | IEEE80211_C_BGSCAN /* capable of bg scanning */ #ifdef notyet - IEEE80211_C_WME | /* 802.11e */ + | IEEE80211_C_TXFRAG /* handle tx frags */ + | IEEE80211_C_WME /* 802.11e */ #endif - IEEE80211_C_BGSCAN | /* bg scanning support */ - IEEE80211_C_WPA; /* 802.11i */ + ; bands = 0; setbit(&bands, IEEE80211_MODE_11B); @@ -329,7 +332,9 @@ ieee80211_ifattach(ic); ic->ic_newassoc = rt2661_newassoc; ic->ic_node_alloc = rt2661_node_alloc; -/* ic->ic_wme.wme_update = rt2661_wme_update;*/ +#if 0 + ic->ic_wme.wme_update = rt2661_wme_update; +#endif ic->ic_scan_start = rt2661_scan_start; ic->ic_scan_end = rt2661_scan_end; ic->ic_set_channel = rt2661_set_channel; @@ -402,19 +407,46 @@ const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]) { + struct ifnet *ifp = ic->ic_ifp; struct rt2661_vap *rvp; struct ieee80211vap *vap; - if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ + switch (opmode) { + case IEEE80211_M_STA: + case IEEE80211_M_IBSS: + case IEEE80211_M_AHDEMO: + case IEEE80211_M_MONITOR: + case IEEE80211_M_HOSTAP: + if (!TAILQ_EMPTY(&ic->ic_vaps)) { + if_printf(ifp, "only 1 vap supported\n"); + return NULL; + } + if (opmode == IEEE80211_M_STA) + flags |= IEEE80211_CLONE_NOBEACONS; + break; + case IEEE80211_M_WDS: + if (TAILQ_EMPTY(&ic->ic_vaps) || + ic->ic_opmode != IEEE80211_M_HOSTAP) { + if_printf(ifp, "wds only supported in ap mode\n"); + return NULL; + } + /* + * Silently remove any request for a unique + * bssid; WDS vap's always share the local + * mac address. + */ + flags &= ~IEEE80211_CLONE_BSSID; + break; + default: + if_printf(ifp, "unknown opmode %d\n", opmode); return NULL; + } rvp = (struct rt2661_vap *) malloc(sizeof(struct rt2661_vap), M_80211_VAP, M_NOWAIT | M_ZERO); if (rvp == NULL) return NULL; vap = &rvp->ral_vap; - /* enable s/w bmiss handling for sta mode */ - ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); /* override state transition machine */ rvp->ral_newstate = vap->iv_newstate; @@ -428,7 +460,8 @@ /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); - ic->ic_opmode = opmode; + if (TAILQ_FIRST(&ic->ic_vaps) == vap) + ic->ic_opmode = opmode; return vap; } @@ -823,26 +856,23 @@ struct rt2661_vap *rvp = RT2661_VAP(vap); struct ieee80211com *ic = vap->iv_ic; struct rt2661_softc *sc = ic->ic_ifp->if_softc; - const struct ieee80211_txparam *tp; - enum ieee80211_state ostate; - struct ieee80211_node *ni; - uint32_t tmp; - int error = 0; + int error; + + if (nstate == IEEE80211_S_INIT && vap->iv_state == IEEE80211_S_RUN) { + uint32_t tmp; + + callout_stop(&rvp->rssadapt_ch); - ostate = vap->iv_state; + /* abort TSF synchronization */ + tmp = RAL_READ(sc, RT2661_TXRX_CSR9); + RAL_WRITE(sc, RT2661_TXRX_CSR9, tmp & ~0x00ffffff); + } - switch (nstate) { - case IEEE80211_S_INIT: - if (ostate == IEEE80211_S_RUN) { - callout_stop(&rvp->rssadapt_ch); + error = rvp->ral_newstate(vap, nstate, arg); - /* abort TSF synchronization */ - tmp = RAL_READ(sc, RT2661_TXRX_CSR9); - RAL_WRITE(sc, RT2661_TXRX_CSR9, tmp & ~0x00ffffff); - } - break; - case IEEE80211_S_RUN: - ni = vap->iv_bss; + if (error == 0 && nstate == IEEE80211_S_RUN) { + struct ieee80211_node *ni = vap->iv_bss; + const struct ieee80211_txparam *tp; if (vap->iv_opmode != IEEE80211_M_MONITOR) { rt2661_enable_mrr(sc); @@ -853,16 +883,15 @@ if (vap->iv_opmode == IEEE80211_M_HOSTAP || vap->iv_opmode == IEEE80211_M_IBSS) { - if ((error = rt2661_prepare_beacon(sc, vap)) != 0) - break; + error = rt2661_prepare_beacon(sc, vap); + if (error != 0) + return error; } - if (vap->iv_opmode != IEEE80211_M_MONITOR) { if (vap->iv_opmode == IEEE80211_M_STA) { /* fake a join to init the tx rate */ rt2661_newassoc(ni, 1); } - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) callout_reset(&rvp->rssadapt_ch, hz / 10, @@ -870,12 +899,8 @@ rt2661_enable_tsf_sync(sc); } - break; - default: - break; - } - - return (error != 0) ? error : rvp->ral_newstate(vap, nstate, arg); + } + return error; } /* From owner-p4-projects@FreeBSD.ORG Wed Feb 27 03:48:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 701821065676; Wed, 27 Feb 2008 03:48:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16A021065672 for ; Wed, 27 Feb 2008 03:48:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F11C113C457 for ; Wed, 27 Feb 2008 03:48:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R3mFFa025157 for ; Wed, 27 Feb 2008 03:48:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R3mFjS025154 for perforce@freebsd.org; Wed, 27 Feb 2008 03:48:15 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 03:48:15 GMT Message-Id: <200802270348.m1R3mFjS025154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 03:48:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=136320 Change 136320 by sam@sam_ebb on 2008/02/27 03:47:36 blindly apply the same change as the 2661 so wds works; I can't test it any more as I've given away all my 2560 cards Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#18 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#18 (text) ==== @@ -280,14 +280,19 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS | /* IBSS mode supported */ - IEEE80211_C_MONITOR | /* monitor mode supported */ - IEEE80211_C_HOSTAP | /* HostAp mode supported */ - IEEE80211_C_TXPMGT | /* tx power management */ - IEEE80211_C_SHPREAMBLE | /* short preamble supported */ - IEEE80211_C_SHSLOT | /* short slot time supported */ - IEEE80211_C_BGSCAN | /* bg scanning support */ - IEEE80211_C_WPA; /* 802.11i */ + IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ + | IEEE80211_C_HOSTAP /* hostap mode */ + | IEEE80211_C_MONITOR /* monitor mode */ + | IEEE80211_C_AHDEMO /* adhoc demo mode */ + | IEEE80211_C_WDS /* 4-address traffic works */ + | IEEE80211_C_SHPREAMBLE /* short preamble supported */ + | IEEE80211_C_SHSLOT /* short slot time supported */ + | IEEE80211_C_WPA /* capable of WPA1+WPA2 */ + | IEEE80211_C_BGSCAN /* capable of bg scanning */ +#ifdef notyet + | IEEE80211_C_TXFRAG /* handle tx frags */ +#endif + ; bands = 0; setbit(&bands, IEEE80211_MODE_11B); @@ -382,19 +387,46 @@ const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]) { + struct ifnet *ifp = ic->ic_ifp; struct rt2560_vap *rvp; struct ieee80211vap *vap; - if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ + switch (opmode) { + case IEEE80211_M_STA: + case IEEE80211_M_IBSS: + case IEEE80211_M_AHDEMO: + case IEEE80211_M_MONITOR: + case IEEE80211_M_HOSTAP: + if (!TAILQ_EMPTY(&ic->ic_vaps)) { + if_printf(ifp, "only 1 vap supported\n"); + return NULL; + } + if (opmode == IEEE80211_M_STA) + flags |= IEEE80211_CLONE_NOBEACONS; + break; + case IEEE80211_M_WDS: + if (TAILQ_EMPTY(&ic->ic_vaps) || + ic->ic_opmode != IEEE80211_M_HOSTAP) { + if_printf(ifp, "wds only supported in ap mode\n"); + return NULL; + } + /* + * Silently remove any request for a unique + * bssid; WDS vap's always share the local + * mac address. + */ + flags &= ~IEEE80211_CLONE_BSSID; + break; + default: + if_printf(ifp, "unknown opmode %d\n", opmode); return NULL; + } rvp = (struct rt2560_vap *) malloc(sizeof(struct rt2560_vap), M_80211_VAP, M_NOWAIT | M_ZERO); if (rvp == NULL) return NULL; vap = &rvp->ral_vap; - /* enable s/w bmiss handling for sta mode */ - ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); /* override state transition machine */ rvp->ral_newstate = vap->iv_newstate; @@ -406,7 +438,8 @@ /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); - ic->ic_opmode = opmode; + if (TAILQ_FIRST(&ic->ic_vaps) == vap) + ic->ic_opmode = opmode; return vap; } @@ -790,29 +823,26 @@ rt2560_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { struct rt2560_vap *rvp = RT2560_VAP(vap); - struct rt2560_softc *sc = vap->iv_ic->ic_ifp->if_softc; - const struct ieee80211_txparam *tp; - enum ieee80211_state ostate; - struct ieee80211_node *ni; - struct mbuf *m; - int error = 0; + struct ifnet *ifp = vap->iv_ic->ic_ifp; + struct rt2560_softc *sc = ifp->if_softc; + int error; + + if (nstate == IEEE80211_S_INIT && vap->iv_state == IEEE80211_S_RUN) { + callout_stop(&rvp->rssadapt_ch); - ostate = vap->iv_state; + /* abort TSF synchronization */ + RAL_WRITE(sc, RT2560_CSR14, 0); - switch (nstate) { - case IEEE80211_S_INIT: - if (ostate == IEEE80211_S_RUN) { - callout_stop(&rvp->rssadapt_ch); + /* turn association led off */ + rt2560_update_led(sc, 0, 0); + } - /* abort TSF synchronization */ - RAL_WRITE(sc, RT2560_CSR14, 0); + error = rvp->ral_newstate(vap, nstate, arg); - /* turn association led off */ - rt2560_update_led(sc, 0, 0); - } - break; - case IEEE80211_S_RUN: - ni = vap->iv_bss; + if (error == 0 && nstate == IEEE80211_S_RUN) { + struct ieee80211_node *ni = vap->iv_bss; + const struct ieee80211_txparam *tp; + struct mbuf *m; if (vap->iv_opmode != IEEE80211_M_MONITOR) { rt2560_update_plcp(sc); @@ -824,16 +854,13 @@ vap->iv_opmode == IEEE80211_M_IBSS) { m = ieee80211_beacon_alloc(ni, &rvp->ral_bo); if (m == NULL) { - device_printf(sc->sc_dev, - "could not allocate beacon\n"); - error = ENOBUFS; - break; + if_printf(ifp, "could not allocate beacon\n"); + return ENOBUFS; } - ieee80211_ref_node(ni); error = rt2560_tx_bcn(sc, m, ni); if (error != 0) - break; + return error; } /* turn assocation led on */ @@ -844,7 +871,6 @@ /* fake a join to init the tx rate */ rt2560_newassoc(ni, 1); } - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) callout_reset(&rvp->rssadapt_ch, hz / 10, @@ -852,12 +878,8 @@ rt2560_enable_tsf_sync(sc); } - break; - default: - break; } - - return (error != 0) ? error : rvp->ral_newstate(vap, nstate, arg); + return error; } /* From owner-p4-projects@FreeBSD.ORG Wed Feb 27 06:01:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C0E51065670; Wed, 27 Feb 2008 06:01:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08642106566B for ; Wed, 27 Feb 2008 06:01:37 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E583B13C458 for ; Wed, 27 Feb 2008 06:01:36 +0000 (UTC) (envelope-from alm@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R61aGe040649 for ; Wed, 27 Feb 2008 06:01:36 GMT (envelope-from alm@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R61aFm040646 for perforce@freebsd.org; Wed, 27 Feb 2008 06:01:36 GMT (envelope-from alm@freebsd.org) Date: Wed, 27 Feb 2008 06:01:36 GMT Message-Id: <200802270601.m1R61aFm040646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alm@freebsd.org using -f From: Aaron Meihm To: Perforce Change Reviews Cc: Subject: PERFORCE change 136321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 06:01:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=136321 Change 136321 by alm@alm_praetorian on 2008/02/27 06:00:37 Various style changes and improved error handling. Reduce the size of the store buffer to 2048. Affected files ... .. //depot/projects/trustedbsd/netauditd/component.c#5 edit .. //depot/projects/trustedbsd/netauditd/conf.c#4 edit .. //depot/projects/trustedbsd/netauditd/netauditd.c#11 edit .. //depot/projects/trustedbsd/netauditd/netauditd.h#8 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/component.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ new = malloc(sizeof(struct au_cmpnt)); if (new == NULL) return (NULL); - memset(new, 0, sizeof(struct au_cmpnt)); + (void) memset(new, 0, sizeof(struct au_cmpnt)); if (is_src) { if (strcmp(type, "net") == 0) new->ac_type = NETAUDIT_SRC_NET; @@ -117,7 +117,7 @@ freeaddrinfo(ptr->ac_ainfo); if (ptr->ac_consumers != NULL) free(ptr->ac_consumers); - component_clear_oq(ptr); + (void) component_clear_oq(ptr); free(ptr); } ==== //depot/projects/trustedbsd/netauditd/conf.c#4 (text+ko) ==== @@ -45,6 +45,11 @@ #include "netauditd.h" +#define SYNTAX_ERROR(x, y) { (void) fprintf(stderr, \ + "netauditd: Syntax error: %s:%d\n", \ + x, y); \ + exit(1); } + static const struct conf_ent { char *c_mode; char *c_type; @@ -74,7 +79,7 @@ svc = a->args[4]; if ((new = component_init(is_src, a->args[2], a->args[1])) == NULL) exit(2); - memset(&hints, 0, sizeof(hints)); + (void) memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; if (is_src) { @@ -162,7 +167,7 @@ ret = malloc(sizeof(args_t)); if (ret == NULL) exit(2); - memset(ret, 0, sizeof(args_t)); + (void) memset(ret, 0, sizeof(args_t)); for (s0 = buf; (ptr = strsep(&s0, " ")) != NULL;) { ret->args[ret->args_n] = strdup(ptr); if (ret->args[ret->args_n] == NULL) @@ -202,35 +207,21 @@ return; dprintf("%d: \"%s\"\n", lc, buf); a = conf_parse_args(buf); - /* Ensure three arguments are present */ - if (a->args_n < 3) { - fprintf(stderr, "netauditd: Syntax error: %s:%d\n", conf_path, - lc); - exit(1); - } + /* The minimum number of arguments for a command is 3. */ + if (a->args_n < 3) + SYNTAX_ERROR(conf_path, lc) for (cptr = conftab; cptr->c_type != NULL; cptr++) { if ((strcmp(cptr->c_mode, a->args[0]) == 0) && (strcmp(cptr->c_type, a->args[2]) == 0)) { - if (a->args_n < cptr->c_min_args) { - fprintf(stderr, - "netauditd: Syntax error: %s:%d\n", - conf_path, lc); - exit(1); - } - if (cptr->c_func(a) == -1) { - fprintf(stderr, - "netauditd: Syntax error: %s:%d\n", - conf_path, lc); - exit(1); - } + if (a->args_n < cptr->c_min_args) + SYNTAX_ERROR(conf_path, lc) + if (cptr->c_func(a) == -1) + SYNTAX_ERROR(conf_path, lc) break; } } - if (cptr->c_type == NULL) { /* Command not found */ - fprintf(stderr, "netauditd: Syntax error: %s:%d\n", - conf_path, lc); - exit(1); - } + if (cptr->c_type == NULL) + SYNTAX_ERROR(conf_path, lc) conf_free_args(a); } @@ -245,5 +236,5 @@ err(1, "%s", path); while (fgets(confbuf, sizeof(confbuf), fp) != NULL) conf_parse(confbuf, ++lc); - fclose(fp); + (void) fclose(fp); } ==== //depot/projects/trustedbsd/netauditd/netauditd.c#11 (text+ko) ==== @@ -64,9 +64,9 @@ if (!(netaudit_flags & FLAG_DEBUG)) return; va_start(ap, fmt); - vsnprintf(buf, sizeof(buf), fmt, ap); + (void) vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - fprintf(stderr, "debug: %s", buf); + (void) fprintf(stderr, "debug: %s", buf); } int @@ -95,7 +95,7 @@ TAILQ_INIT(&au_srclist); TAILQ_INIT(&au_dstlist); conf_load(conf_path); - signal(SIGPIPE, SIG_IGN); + (void) signal(SIGPIPE, SIG_IGN); netaudit_run(); return (0); } @@ -141,10 +141,19 @@ TAILQ_FOREACH_SAFE(asb, &au->ac_sbufq, sb_glue, tmp) if (FD_ISSET(asb->sb_fd, rfds)) if (netaudit_socket_read(asb) == -1) { - close(asb->sb_fd); + /* A read error occurred while reading + * a record from a connected client. + * We remove the client and continue. + * This may occur after an sb_recbuf + * object has been allocated. */ + (void) close(asb->sb_fd); TAILQ_REMOVE(&au->ac_sbufq, asb, sb_glue); free(asb->sb_sockaddr); + if (asb->sb_recbuf != NULL) { + free(asb->sb_recbuf->ar_rec); + free(asb->sb_recbuf); + } free(asb); } } @@ -156,7 +165,7 @@ fd_set rfds; struct timeval tv; struct au_cmpnt *au; - int ret; + int ret, fd; #ifdef AUDITPIPE_SET_BUFMODE int opt; #endif @@ -189,10 +198,19 @@ err(1, "fork"); if (ret != 0) exit(0); + fd = open("/dev/null", O_RDWR); + if (fd == -1) + err(1, "/dev/null"); + (void) dup2(fd, STDIN_FILENO); + (void) dup2(fd, STDOUT_FILENO); + (void) dup2(fd, STDERR_FILENO); + if (fd > 2) + (void) close(fd); + if (setsid() == -1) + err(1, "setsid"); } - netaudit_establish(); - memset(&tv, 0, sizeof(tv)); - tv.tv_usec = 100000; + (void) memset(&tv, 0, sizeof(tv)); + tv.tv_sec = 1; for (;;) { FD_ZERO(&rfds); netaudit_build_rfds(&rfds); @@ -274,7 +292,13 @@ if (errno == EAGAIN) break; else { - close(au->ac_fd); + /* Check if we submitted a partial + * record. If so we reset aq_remain + * and retransmit when the consumer + * is reestablished. */ + if (q->aq_remain != r->ar_reclen) + q->aq_remain = r->ar_reclen; + (void) close(au->ac_fd); au->ac_established = 0; break; } @@ -306,7 +330,7 @@ new = malloc(sizeof(struct au_queue_ent)); if (new == NULL) exit(2); - memset(new, 0, sizeof(struct au_queue_ent)); + (void) memset(new, 0, sizeof(struct au_queue_ent)); new->aq_ptr = rec; new->aq_remain = rec->ar_reclen; TAILQ_INSERT_TAIL(&au->ac_consumers[i]->ac_oq, new, aq_glue); @@ -320,16 +344,18 @@ struct au_recbuf *new; if ((new = malloc(sizeof(struct au_recbuf))) == NULL) - exit(2); - if ((new->ar_rec = malloc(NETAUDIT_PIPE_BUFSIZE)) == NULL) - exit(2); + return; + if ((new->ar_rec = malloc(NETAUDIT_PIPE_BUFSIZE)) == NULL) { + free(new); + return; + } /* * XXXCSJP: It is possible that the audit record will be greater then * NETAUDIT_PIPE_BUFSIZE, in which case the pipe will truncate it. */ new->ar_reclen = read(au->ac_fd, new->ar_rec, NETAUDIT_PIPE_BUFSIZE); if (new->ar_reclen == -1) { - if (errno != EAGAIN) + if ((errno != EAGAIN) && (errno != EINTR)) exit(2); else return; @@ -344,15 +370,21 @@ struct au_srcbuffer *new; new = malloc(sizeof(struct au_srcbuffer)); - memset(new, 0, sizeof(struct au_srcbuffer)); + if (new == NULL) + exit(2); + (void) memset(new, 0, sizeof(struct au_srcbuffer)); new->sb_socklen = au->ac_ainfo->ai_addrlen; if ((new->sb_sockaddr = malloc(new->sb_socklen)) == NULL) exit(2); new->sb_fd = accept(au->ac_fd, new->sb_sockaddr, &new->sb_socklen); if (new->sb_fd == -1) { - free(new->sb_sockaddr); - free(new); - return; + if ((errno == EWOULDBLOCK) || (errno == ECONNABORTED)) { + free(new->sb_sockaddr); + free(new); + return; + } + else + exit(2); } new->sb_parent = au; TAILQ_INSERT_TAIL(&au->ac_sbufq, new, sb_glue); @@ -385,9 +417,7 @@ { u_char *bufptr, *recbufptr; int ret, left; - u_int32_t hdr_remain; - u_int32_t val; - u_int32_t need; + u_int32_t hdr_remain, val, need; ret = read(asb->sb_fd, asb->sb_buf, sizeof(asb->sb_buf)); if (ret == -1) { @@ -405,13 +435,14 @@ hdr_remain = sizeof(asb->sb_header) - asb->sb_read; if (left >= hdr_remain) { - memcpy(asb->sb_header + asb->sb_read, bufptr, - hdr_remain); + (void) memcpy(asb->sb_header + asb->sb_read, + bufptr, hdr_remain); asb->sb_read += hdr_remain; left -= hdr_remain; bufptr += hdr_remain; - memcpy(&val, asb->sb_header + 1, sizeof(val)); - asb->sb_recbuf = \ + (void) memcpy(&val, asb->sb_header + 1, + sizeof(val)); + asb->sb_recbuf = malloc(sizeof(struct au_recbuf)); if (asb->sb_recbuf == NULL) exit(2); @@ -422,16 +453,15 @@ malloc(asb->sb_recbuf->ar_reclen); if (asb->sb_recbuf->ar_rec == NULL) exit(2); - memcpy(asb->sb_recbuf->ar_rec, + (void) memcpy(asb->sb_recbuf->ar_rec, asb->sb_header, sizeof(asb->sb_header)); continue; } else { - dprintf("PARTIAL HEADER READ\n"); - memcpy(asb->sb_header + asb->sb_read, bufptr, - left); + dprintf("read partial header\n"); + (void) memcpy(asb->sb_header + asb->sb_read, + bufptr, left); asb->sb_read += left; - left = 0; return (0); } } @@ -439,15 +469,14 @@ recbufptr = asb->sb_recbuf->ar_rec + asb->sb_read; dprintf("still need %u bytes\n", need); if (left < need) { - memcpy(recbufptr, bufptr, left); + (void) memcpy(recbufptr, bufptr, left); asb->sb_read += left; return (0); } else { - memcpy(recbufptr, bufptr, need); + (void) memcpy(recbufptr, bufptr, need); left -= need; bufptr += need; - /* We have a full record at this point */ netaudit_queue_record(asb->sb_parent, asb->sb_recbuf); asb->sb_recbuf = NULL; asb->sb_read = 0; @@ -459,6 +488,6 @@ void usage() { - fputs("usage: netauditd [-Ddh] [-f path]\n", stderr); + (void) fputs("usage: netauditd [-Ddh] [-f path]\n", stderr); exit(1); } ==== //depot/projects/trustedbsd/netauditd/netauditd.h#8 (text+ko) ==== @@ -52,7 +52,7 @@ int sb_fd; struct au_recbuf *sb_recbuf; u_int32_t sb_read; - u_char sb_buf[8192]; + u_char sb_buf[2048]; u_char sb_header[5]; TAILQ_ENTRY(au_srcbuffer) sb_glue; }; From owner-p4-projects@FreeBSD.ORG Wed Feb 27 08:49:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D8241065674; Wed, 27 Feb 2008 08:49:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E76FA1065672 for ; Wed, 27 Feb 2008 08:49:06 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D44F213C455 for ; Wed, 27 Feb 2008 08:49:06 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1R8n5n5061566 for ; Wed, 27 Feb 2008 08:49:05 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1R8muYO061558 for perforce@freebsd.org; Wed, 27 Feb 2008 08:48:56 GMT (envelope-from scottl@freebsd.org) Date: Wed, 27 Feb 2008 08:48:56 GMT Message-Id: <200802270848.m1R8muYO061558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 136326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 08:49:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=136326 Change 136326 by scottl@scottl-deimos on 2008/02/27 08:48:02 Integrate from parent Affected files ... .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#15 edit .. //depot/projects/xen31-xenbus/LOCKS#2 integrate .. //depot/projects/xen31-xenbus/MAINTAINERS#2 integrate .. //depot/projects/xen31-xenbus/Makefile#2 integrate .. //depot/projects/xen31-xenbus/Makefile.inc1#2 integrate .. //depot/projects/xen31-xenbus/ObsoleteFiles.inc#2 integrate .. //depot/projects/xen31-xenbus/UPDATING#2 integrate .. //depot/projects/xen31-xenbus/bin/date/date.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31-xenbus/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/xen31-xenbus/contrib/file/Magdir/chi#2 delete .. //depot/projects/xen31-xenbus/contrib/file/Magdir/cvs#2 delete .. //depot/projects/xen31-xenbus/contrib/file/Magdir/hdf#2 delete .. //depot/projects/xen31-xenbus/contrib/file/Magdir/impulse#2 delete .. //depot/projects/xen31-xenbus/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/xen31-xenbus/contrib/file/acconfig.h#2 delete .. //depot/projects/xen31-xenbus/contrib/file/magic.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/file/missing#2 delete .. //depot/projects/xen31-xenbus/contrib/file/stamp-h.in#2 delete .. //depot/projects/xen31-xenbus/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/xen31-xenbus/contrib/libiberty/cp-demangle.c#2 delete .. //depot/projects/xen31-xenbus/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/xen31-xenbus/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/NEWS#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/xen31-xenbus/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/xen31-xenbus/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/xen31-xenbus/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/xen31-xenbus/contrib/top/display.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/top/layout.h#2 integrate .. //depot/projects/xen31-xenbus/contrib/top/machine.h#2 integrate .. //depot/projects/xen31-xenbus/contrib/top/top.c#2 integrate .. //depot/projects/xen31-xenbus/contrib/top/top.h#2 integrate .. //depot/projects/xen31-xenbus/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/xen31-xenbus/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31-xenbus/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/xen31-xenbus/etc/defaults/rc.conf#2 integrate .. //depot/projects/xen31-xenbus/etc/devd.conf#2 integrate .. //depot/projects/xen31-xenbus/etc/mail/access.sample#2 integrate .. //depot/projects/xen31-xenbus/etc/namedb/named.root#2 integrate .. //depot/projects/xen31-xenbus/etc/netstart#2 integrate .. //depot/projects/xen31-xenbus/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/xen31-xenbus/etc/rc#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.d/dhclient#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.d/hostid#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.d/ipfw#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.d/kerberos#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.d/netif#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.d/ppp#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.firewall#2 integrate .. //depot/projects/xen31-xenbus/etc/rc.subr#2 integrate .. //depot/projects/xen31-xenbus/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/xen31-xenbus/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/xen31-xenbus/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/xen31-xenbus/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/xen31-xenbus/include/fts.h#2 integrate .. //depot/projects/xen31-xenbus/include/pthread_np.h#2 integrate .. //depot/projects/xen31-xenbus/include/unistd.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/xen31-xenbus/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/xen31-xenbus/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/xen31-xenbus/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/gen/fts.3#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/gen/fts.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/i386/_fpmath.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/include/namespace.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/locale/ascii.c#1 branch .. //depot/projects/xen31-xenbus/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/sparc64/_fpmath.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/sys/access.2#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/sys/flock.2#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/xen31-xenbus/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/xen31-xenbus/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libdisk/disk.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/xen31-xenbus/lib/libfetch/common.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libfetch/fetch.3#2 integrate .. //depot/projects/xen31-xenbus/lib/libfetch/ftp.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libfetch/http.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libkse/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/libkse/kse.map#2 integrate .. //depot/projects/xen31-xenbus/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libmilter/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/libpmc/pmc.3#2 integrate .. //depot/projects/xen31-xenbus/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/arm/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/pthread.map#2 integrate .. //depot/projects/xen31-xenbus/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/Symbol.map#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/amd64/e_remainder.S#1 branch .. //depot/projects/xen31-xenbus/lib/msun/amd64/e_remainderf.S#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld128/k_cosl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld128/k_sinl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld128/k_tanl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld128/s_exp2l.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld80/k_cosl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld80/k_sinl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld80/k_tanl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/ld80/s_exp2l.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/man/cos.3#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/man/exp.3#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/man/log.3#1 branch .. //depot/projects/xen31-xenbus/lib/msun/man/sin.3#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/man/tan.3#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_exp.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_expf.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_hypot.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_hypotf.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_pow.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_powf.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_remainder.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/e_remainderf.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/k_rem_pio2.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/k_rem_pio2f.c#2 delete .. //depot/projects/xen31-xenbus/lib/msun/src/math.h#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/math_private.h#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_cos.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_cosl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/src/s_exp2.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_exp2f.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_expm1.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_expm1f.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_logb.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_sin.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_sinl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/src/s_tan.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_tanl.c#1 branch .. //depot/projects/xen31-xenbus/lib/msun/src/s_trunc.c#2 integrate .. //depot/projects/xen31-xenbus/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/xen31-xenbus/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/xen31-xenbus/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/xen31-xenbus/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/xen31-xenbus/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/xen31-xenbus/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/xen31-xenbus/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/xen31-xenbus/release/fixit.profile#2 integrate .. //depot/projects/xen31-xenbus/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/xen31-xenbus/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/xen31-xenbus/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/xen31-xenbus/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/xen31-xenbus/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/xen31-xenbus/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/xen31-xenbus/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/xen31-xenbus/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/fsck_msdosfs/fat.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/geom/core/geom.8#2 integrate .. //depot/projects/xen31-xenbus/sbin/geom/core/geom.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/gpt/gpt.8#2 integrate .. //depot/projects/xen31-xenbus/sbin/gpt/gpt.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/gpt/migrate.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/gpt/show.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/xen31-xenbus/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/md5/md5.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/mount/getmntopts.3#2 integrate .. //depot/projects/xen31-xenbus/sbin/mount/mount.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/xen31-xenbus/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/natd/natd.8#2 integrate .. //depot/projects/xen31-xenbus/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/xen31-xenbus/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/xen31-xenbus/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/xen31-xenbus/share/colldef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/Makefile#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/ath.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/atkbd.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/awi.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/axe.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/ciss.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/coda.4#1 branch .. //depot/projects/xen31-xenbus/share/man/man4/dcons.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/ed.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/geom_lvm.4#1 branch .. //depot/projects/xen31-xenbus/share/man/man4/hptiop.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/hptrr.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/mfi.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/mxge.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/oldcard.4#2 delete .. //depot/projects/xen31-xenbus/share/man/man4/pcib.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/puc.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/rr232x.4#2 delete .. //depot/projects/xen31-xenbus/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/sf.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/sk.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/syncache.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/vlan.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/wi.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man4/xl.4#2 integrate .. //depot/projects/xen31-xenbus/share/man/man5/fstab.5#2 integrate .. //depot/projects/xen31-xenbus/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/xen31-xenbus/share/man/man7/clocks.7#2 integrate .. //depot/projects/xen31-xenbus/share/man/man7/ports.7#2 integrate .. //depot/projects/xen31-xenbus/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/xen31-xenbus/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/xen31-xenbus/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/xen31-xenbus/share/man/man9/Makefile#2 integrate .. //depot/projects/xen31-xenbus/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/xen31-xenbus/share/man/man9/lock.9#2 integrate .. //depot/projects/xen31-xenbus/share/man/man9/mbuf.9#2 integrate .. //depot/projects/xen31-xenbus/share/man/man9/pci.9#2 integrate .. //depot/projects/xen31-xenbus/share/man/man9/style.9#2 integrate .. //depot/projects/xen31-xenbus/share/misc/bsd-family-tree#2 integrate .. //depot/projects/xen31-xenbus/share/misc/committers-src.dot#2 integrate .. //depot/projects/xen31-xenbus/share/misc/pci_vendors#2 integrate .. //depot/projects/xen31-xenbus/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/xen31-xenbus/share/mk/bsd.own.mk#2 integrate .. //depot/projects/xen31-xenbus/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/xen31-xenbus/share/msgdef/Makefile#2 integrate .. //depot/projects/xen31-xenbus/share/msgdef/ko_KR.UTF-8.src#1 branch .. //depot/projects/xen31-xenbus/share/msgdef/ko_KR.eucKR.src#2 integrate .. //depot/projects/xen31-xenbus/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/xen31-xenbus/sys/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/include/_types.h#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/include/float.h#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/include/proc.h#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/xen31-xenbus/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/arm/locore.S#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/include/atomic.h#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/include/pmap.h#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/xen31-xenbus/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/xen31-xenbus/sys/boot/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/xen31-xenbus/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/xen31-xenbus/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/xen31-xenbus/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/xen31-xenbus/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/xen31-xenbus/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/xen31-xenbus/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/Makefile#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/xen31-xenbus/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/xen31-xenbus/sys/cam/cam_periph.c#2 integrate .. //depot/projects/xen31-xenbus/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/xen31-xenbus/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/Makefile.arm#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/NOTES#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/files#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/files.amd64#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/files.i386#4 integrate .. //depot/projects/xen31-xenbus/sys/conf/files.powerpc#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/files.sparc64#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/kern.post.mk#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/xen31-xenbus/sys/conf/options#2 integrate .. //depot/projects/xen31-xenbus/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ddb/db_capture.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/xen31-xenbus/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/amr/amr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/an/if_an.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/array.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/him.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/list.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mii/miidevs#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/xen31-xenbus/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/xen31-xenbus/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/pci/pci.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/re/if_re.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/rr232x/LICENSE#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/README#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/array.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/him.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/hptintf.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/ldm.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/list.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/os_bsd.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/osm.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/osm_bsd.c#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/xen31-xenbus/sys/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/xen31-xenbus/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/xen31-xenbus/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/xen31-xenbus/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/xen31-xenbus/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/xen31-xenbus/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/twe/twe.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/usb/uark.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/xen31-xenbus/sys/dev/xen/blkfront/blkfront.c#5 edit .. //depot/projects/xen31-xenbus/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/xen31-xenbus/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/TODO#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_kernel.h#2 delete .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_namecache.c#2 delete .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_namecache.h#2 delete .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/geom/geom_disk.c#2 integrate .. //depot/projects/xen31-xenbus/sys/geom/lvm/g_lvm.c#1 branch .. //depot/projects/xen31-xenbus/sys/geom/lvm/g_lvm.h#1 branch .. //depot/projects/xen31-xenbus/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/xen31-xenbus/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/conf/NOTES#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/conf/XEN#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/geode.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/trap.c#4 integrate .. //depot/projects/xen31-xenbus/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/pmap.h#3 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/proc.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/xen/hypercall.h#3 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/xen/hypervisor.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/xen31-xenbus/sys/i386/isa/clock.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/i386/xen/pmap.c#7 integrate .. //depot/projects/xen31-xenbus/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/xen31-xenbus/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/xen31-xenbus/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/xen31-xenbus/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/genassym.sh#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/init_sysent.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_exit.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_jail.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_lock.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_mib.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_module.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_switch.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_tc.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_time.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/sched_ule.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/subr_bus.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/subr_lock.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/subr_trap.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/syscalls.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/syscalls.master#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/systrace_args.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/tty_pty.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/vfs_default.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/xen31-xenbus/sys/modules/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/modules/coda/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/modules/geom/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/modules/geom/geom_lvm/Makefile#1 branch .. //depot/projects/xen31-xenbus/sys/modules/mii/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/modules/rr232x/Makefile#2 delete .. //depot/projects/xen31-xenbus/sys/modules/sf/Makefile#2 integrate .. //depot/projects/xen31-xenbus/sys/net/bpf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/net/if_bridge.c#2 integrate .. //depot/projects/xen31-xenbus/sys/net/route.c#2 integrate .. //depot/projects/xen31-xenbus/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/xen31-xenbus/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/xen31-xenbus/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/in.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/ip_id.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/ip_options.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/ip_output.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/sctputil.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet6/in6.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/xen31-xenbus/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/xen31-xenbus/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/xen31-xenbus/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/xen31-xenbus/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/xen31-xenbus/sys/pci/amdsmb.c#2 integrate .. //depot/projects/xen31-xenbus/sys/pci/if_sf.c#2 delete .. //depot/projects/xen31-xenbus/sys/pci/if_sfreg.h#2 delete .. //depot/projects/xen31-xenbus/sys/pci/if_wb.c#2 integrate .. //depot/projects/xen31-xenbus/sys/pci/nfsmb.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/xen31-xenbus/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/xen31-xenbus/sys/security/audit/audit.c#2 integrate .. //depot/projects/xen31-xenbus/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/xen31-xenbus/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/xen31-xenbus/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/xen31-xenbus/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/xen31-xenbus/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/buf.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/bus.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/conf.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/event.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/ipc.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/lock.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/lockmgr.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/mbuf.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/module.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/param.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/priv.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/proc.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/rwlock.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/shm.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/signal.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/socket.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/socketvar.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/syscall.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/syscall.mk#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/sysproto.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/time.h#2 integrate .. //depot/projects/xen31-xenbus/sys/sys/user.h#2 integrate .. //depot/projects/xen31-xenbus/sys/tools/embed_mfs.sh#1 branch .. //depot/projects/xen31-xenbus/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/xen31-xenbus/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/xen31-xenbus/sys/xen/features.c#2 integrate .. //depot/projects/xen31-xenbus/tools/build/Makefile#2 integrate .. //depot/projects/xen31-xenbus/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/xen31-xenbus/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/xen31-xenbus/tools/regression/lib/msun/test-exponential.c#1 branch .. //depot/projects/xen31-xenbus/tools/regression/lib/msun/test-exponential.t#1 branch .. //depot/projects/xen31-xenbus/tools/regression/lib/msun/test-trig.c#1 branch .. //depot/projects/xen31-xenbus/tools/regression/lib/msun/test-trig.t#1 branch .. //depot/projects/xen31-xenbus/tools/regression/netinet/ip_id_period/ip_id_period.py#1 branch .. //depot/projects/xen31-xenbus/tools/regression/posixshm/Makefile#1 branch .. //depot/projects/xen31-xenbus/tools/regression/posixshm/posixshm.c#1 branch .. //depot/projects/xen31-xenbus/tools/regression/posixshm/posixshm.t#1 branch .. //depot/projects/xen31-xenbus/tools/regression/posixshm/test.c#1 branch .. //depot/projects/xen31-xenbus/tools/regression/posixshm/test.h#1 branch .. //depot/projects/xen31-xenbus/tools/regression/pthread/mutex_isowned_np/Makefile#1 branch .. //depot/projects/xen31-xenbus/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c#1 branch .. //depot/projects/xen31-xenbus/tools/regression/security/open_to_operation/Makefile#1 branch .. //depot/projects/xen31-xenbus/tools/regression/security/open_to_operation/open_to_operation.c#1 branch .. //depot/projects/xen31-xenbus/tools/regression/sockets/unix_sorflush/Makefile#1 branch .. //depot/projects/xen31-xenbus/tools/regression/sockets/unix_sorflush/unix_sorflush.c#1 branch .. //depot/projects/xen31-xenbus/tools/sched/schedgraph.py#2 integrate .. //depot/projects/xen31-xenbus/tools/tools/aac/aac_checkq.c#2 integrate .. //depot/projects/xen31-xenbus/tools/tools/crypto/cryptostats.c#2 integrate .. //depot/projects/xen31-xenbus/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/file/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/file/file.1#2 delete .. //depot/projects/xen31-xenbus/usr.bin/file/magic.5#2 delete .. //depot/projects/xen31-xenbus/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/gzip/znew#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/kdump/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/kdump/mkioctls#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/logger/logger.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/ministat/ministat.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/mklocale/mklocale.1#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/mt/mt.1#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/netstat/route.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/procstat/procstat.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/procstat/procstat_kstack.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/procstat/procstat_threads.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/procstat/procstat_vm.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/quota/quota.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/sed/compile.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/sed/defs.h#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/sed/main.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/sed/process.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/cmds.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/devs.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/fetch.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/icmp.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/icmp6.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/ip.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/ip6.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/keyboard.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/main.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/mbufs.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/netcmds.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/netstat.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/swap.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/tcp.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/systat/vmstat.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/top/machine.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/truss/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/uniq/uniq.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/xen31-xenbus/usr.bin/xargs/xargs.1#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/bootparamd/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/bootparamd/Makefile.inc#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/kbdcontrol/kbdcontrol.1#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/kbdcontrol/kbdmap.5#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/ofwdump/Makefile#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/ofwdump/ofwdump.8#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/timed/timed/timed.8#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/traceroute6/traceroute6.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/watch/watch.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/ypserv/yp_main.c#2 integrate .. //depot/projects/xen31-xenbus/usr.sbin/ypserv/ypserv.8#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#15 (text+ko) ==== @@ -1785,6 +1785,11 @@ return (0); } + /* The first loop traverses up the KOBJ inheretence tree. This is + * technically unsafe. One fix is to have children in the inherentence + * tree copy their parents information, then mark the parent as + * permanently busy until the inheretence child goes away. + */ for (; dc; dc = dc->parent) { for (dl = first_matching_driver(dc, child); dl; ==== //depot/projects/xen31-xenbus/LOCKS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/LOCKS,v 1.3 2006/01/13 06:51:43 ru Exp $ +$FreeBSD: src/LOCKS,v 1.4 2008/01/24 22:07:03 cperciva Exp $ This file documents formal review/approval requirements that have been approved by core. @@ -10,3 +10,4 @@ src/* RELENG_4_* Requires Security Officer approval. src/* RELENG_5_* Requires Security Officer approval. src/* RELENG_6_* Requires Security Officer approval. +src/* RELENG_7_* Requires Security Officer approval. ==== //depot/projects/xen31-xenbus/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $ +$FreeBSD: src/MAINTAINERS,v 1.146 2008/01/26 21:58:52 brueffer Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -33,7 +33,6 @@ ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. -OLDCARD imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. ==== //depot/projects/xen31-xenbus/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ +# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $ # # The user-driven targets are: # @@ -75,6 +75,8 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # +# For more information, see the build(7) manual page. +# TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ ==== //depot/projects/xen31-xenbus/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -227,7 +227,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ @@ -313,8 +313,9 @@ .endif .else rm -rf ${WORLDTMP}/legacy/usr/include -# XXX - These two can depend on any header file. +# XXX - These three can depend on any header file. rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c + rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ @@ -841,8 +842,8 @@ # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 - @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ +.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \ false .endif .for _tool in tools/build @@ -871,26 +872,6 @@ .endif .endif -.if ${BOOTSTRAPPING} < 600029 -_texinfo= gnu/usr.bin/texinfo -.endif - -.if ${BOOTSTRAPPING} < 600015 -_cap_mkdb= usr.bin/cap_mkdb -.endif - -.if ${BOOTSTRAPPING} < 600018 -_colldef= usr.bin/colldef -.endif - -.if ${BOOTSTRAPPING} < 600017 -_gencat= usr.bin/gencat -.endif - -.if ${BOOTSTRAPPING} < 600016 -_mklocale= usr.bin/mklocale -.endif - .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -900,28 +881,23 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale .endif bootstrap-tools: .for _tool in \ + ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ - ${_texinfo} \ - ${_cap_mkdb} \ - ${_colldef} \ - ${_gencat} \ usr.bin/lorder \ usr.bin/makewhatis \ - ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/xen31-xenbus/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.130 2008/02/06 19:45:25 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 27 19:59:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14F891065678; Wed, 27 Feb 2008 19:59:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA4A21065675 for ; Wed, 27 Feb 2008 19:59:27 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF7D28FC17 for ; Wed, 27 Feb 2008 19:59:27 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RJxROW015174 for ; Wed, 27 Feb 2008 19:59:27 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RJxRxt015171 for perforce@freebsd.org; Wed, 27 Feb 2008 19:59:27 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Feb 2008 19:59:27 GMT Message-Id: <200802271959.m1RJxRxt015171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 19:59:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=136364 Change 136364 by marcel@marcel_jnpr on 2008/02/27 19:59:25 We don't have to include . KERNBASE comes from assym.s Affected files ... .. //depot/projects/e500/sys/powerpc/aim/locore.S#5 edit Differences ... ==== //depot/projects/e500/sys/powerpc/aim/locore.S#5 (text+ko) ==== @@ -66,7 +66,6 @@ #include #include #include -#include /* Locate the per-CPU data structure */ #define GET_CPUINFO(r) \ From owner-p4-projects@FreeBSD.ORG Wed Feb 27 20:06:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8D101065681; Wed, 27 Feb 2008 20:06:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99254106567E for ; Wed, 27 Feb 2008 20:06:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 972778FC1F for ; Wed, 27 Feb 2008 20:06:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RK6cwB016629 for ; Wed, 27 Feb 2008 20:06:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RK6bPe016626 for perforce@freebsd.org; Wed, 27 Feb 2008 20:06:37 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 20:06:37 GMT Message-Id: <200802272006.m1RK6bPe016626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 20:06:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=136365 Change 136365 by sam@sam_ebb on 2008/02/27 20:06:21 load rt2661 firmware with firmware(9); still needs files glue Affected files ... .. //depot/projects/vap/sys/contrib/dev/ral/LICENSE#1 add .. //depot/projects/vap/sys/contrib/dev/ral/Makefile#1 add .. //depot/projects/vap/sys/contrib/dev/ral/rt2561.fw.uu#1 add .. //depot/projects/vap/sys/contrib/dev/ral/rt2561s.fw.uu#1 add .. //depot/projects/vap/sys/contrib/dev/ral/rt2661.fw.uu#1 add .. //depot/projects/vap/sys/contrib/dev/ral/rt2661_ucode.h#1 add .. //depot/projects/vap/sys/dev/ral/if_ral_pci.c#6 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#16 edit .. //depot/projects/vap/sys/dev/ral/rt2661_ucode.h#3 delete .. //depot/projects/vap/sys/dev/ral/rt2661var.h#8 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/if_ral_pci.c#6 (text+ko) ==== @@ -59,6 +59,7 @@ #include MODULE_DEPEND(ral, pci, 1, 1, 1); +MODULE_DEPEND(ral, firmware, 1, 1, 1); MODULE_DEPEND(ral, wlan, 1, 1, 1); MODULE_DEPEND(ral, wlan_rssadapt, 1, 1, 1); ==== //depot/projects/vap/sys/dev/ral/rt2661.c#16 (text) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -64,7 +65,6 @@ #include #include -#include #define RAL_DEBUG #ifdef RAL_DEBUG @@ -163,8 +163,7 @@ static void rt2661_init(void *); static void rt2661_stop(void *); static void rt2661_stop_locked(struct rt2661_softc *); -static int rt2661_load_microcode(struct rt2661_softc *, - const uint8_t *, int); +static int rt2661_load_microcode(struct rt2661_softc *); #ifdef notyet static void rt2661_rx_tune(struct rt2661_softc *); static void rt2661_radar_start(struct rt2661_softc *); @@ -205,10 +204,10 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp; uint32_t val; - const uint8_t *ucode = NULL; - int error, ac, ntries, size = 0; + int error, ac, ntries; uint8_t bands; + sc->sc_id = id; sc->sc_dev = dev; mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, @@ -236,30 +235,6 @@ rt2661_get_rf(sc->rf_rev)); /* - * Load 8051 microcode into NIC. - */ - switch (id) { - case 0x0301: - ucode = rt2561s_ucode; - size = sizeof rt2561s_ucode; - break; - case 0x0302: - ucode = rt2561_ucode; - size = sizeof rt2561_ucode; - break; - case 0x0401: - ucode = rt2661_ucode; - size = sizeof rt2661_ucode; - break; - } - - error = rt2661_load_microcode(sc, ucode, size); - if (error != 0) { - device_printf(sc->sc_dev, "could not load 8051 microcode\n"); - goto fail1; - } - - /* * Allocate Tx and Rx rings. */ for (ac = 0; ac < 4; ac++) { @@ -2508,10 +2483,22 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; uint32_t tmp, sta[3]; - int i, ntries; + int i, error, ntries; RAL_LOCK(sc); + if ((sc->sc_flags & RAL_FW_LOADED) == 0) { + error = rt2661_load_microcode(sc); + if (error != 0) { + if_printf(ifp, + "%s: could not load 8051 microcode, error %d\n", + __func__, error); + RAL_UNLOCK(sc); + return; + } + sc->sc_flags |= RAL_FW_LOADED; + } + rt2661_stop_locked(sc); /* initialize Tx rings */ @@ -2684,10 +2671,37 @@ } static int -rt2661_load_microcode(struct rt2661_softc *sc, const uint8_t *ucode, int size) +rt2661_load_microcode(struct rt2661_softc *sc) { - int ntries; + struct ifnet *ifp = sc->sc_ifp; + const struct firmware *fp; + const char *imagename; + int ntries, error; + + RAL_LOCK_ASSERT(sc); + + switch (sc->sc_id) { + case 0x0301: imagename = "rt2561sfw"; break; + case 0x0302: imagename = "rt2561fw"; break; + case 0x0401: imagename = "rt2661fw"; break; + default: + if_printf(ifp, "%s: unexpected pci device id 0x%x, " + "don't know how to retrieve firmware\n", + __func__, sc->sc_id); + return EINVAL; + } + RAL_UNLOCK(sc); + fp = firmware_get(imagename); + RAL_LOCK(sc); + if (fp == NULL) { + if_printf(ifp, "%s: unable to retrieve firmware image %s\n", + __func__, imagename); + return EINVAL; + } + /* + * Load 8051 microcode into NIC. + */ /* reset 8051 */ RAL_WRITE(sc, RT2661_MCU_CNTL_CSR, RT2661_MCU_RESET); @@ -2698,7 +2712,7 @@ /* write 8051's microcode */ RAL_WRITE(sc, RT2661_MCU_CNTL_CSR, RT2661_MCU_RESET | RT2661_MCU_SEL); - RAL_WRITE_REGION_1(sc, RT2661_MCU_CODE_BASE, ucode, size); + RAL_WRITE_REGION_1(sc, RT2661_MCU_CODE_BASE, fp->data, fp->datasize); RAL_WRITE(sc, RT2661_MCU_CNTL_CSR, RT2661_MCU_RESET); /* kick 8051's ass */ @@ -2711,10 +2725,14 @@ DELAY(100); } if (ntries == 500) { - printf("timeout waiting for MCU to initialize\n"); - return EIO; - } - return 0; + if_printf(ifp, "%s: timeout waiting for MCU to initialize\n", + __func__); + error = EIO; + } else + error = 0; + + firmware_put(fp, FIRMWARE_UNLOAD); + return error; } #ifdef notyet ==== //depot/projects/vap/sys/dev/ral/rt2661var.h#8 (text) ==== @@ -121,6 +121,10 @@ * ------------------------------------------------ */ + int sc_flags; +#define RAL_FW_LOADED 0x1 +#define RAL_INPUT_RUNNING 0x2 + int sc_id; struct ieee80211_channel *sc_curchan; uint8_t rf_rev; @@ -160,11 +164,8 @@ struct rt2661_rx_radiotap_header sc_rxtap; int sc_rxtap_len; - struct rt2661_tx_radiotap_header sc_txtap; int sc_txtap_len; -#define RAL_INPUT_RUNNING 1 - int sc_flags; }; int rt2661_attach(device_t, int); @@ -174,5 +175,6 @@ void rt2661_resume(void *); void rt2661_intr(void *); -#define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx) -#define RAL_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) +#define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx) +#define RAL_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) +#define RAL_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) From owner-p4-projects@FreeBSD.ORG Wed Feb 27 20:08:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5BAF1065692; Wed, 27 Feb 2008 20:08:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 959621065686 for ; Wed, 27 Feb 2008 20:08:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94B058FC26 for ; Wed, 27 Feb 2008 20:08:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RK8fp5016698 for ; Wed, 27 Feb 2008 20:08:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RK8fio016695 for perforce@freebsd.org; Wed, 27 Feb 2008 20:08:41 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 20:08:41 GMT Message-Id: <200802272008.m1RK8fio016695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 20:08:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=136366 Change 136366 by sam@sam_ebb on 2008/02/27 20:08:38 ral firmware build glue Affected files ... .. //depot/projects/vap/sys/modules/Makefile#12 edit .. //depot/projects/vap/sys/modules/ralfw/Makefile#1 add .. //depot/projects/vap/sys/modules/ralfw/Makefile.inc#1 add .. //depot/projects/vap/sys/modules/ralfw/rt2561/Makefile#1 add .. //depot/projects/vap/sys/modules/ralfw/rt2561s/Makefile#1 add .. //depot/projects/vap/sys/modules/ralfw/rt2661/Makefile#1 add Differences ... ==== //depot/projects/vap/sys/modules/Makefile#12 (text+ko) ==== @@ -213,6 +213,7 @@ ${_pst} \ puc \ ral \ + ralfw \ ${_random} \ ${_ray} \ rc \ From owner-p4-projects@FreeBSD.ORG Wed Feb 27 21:22:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC378106568E; Wed, 27 Feb 2008 21:22:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3704E1065682 for ; Wed, 27 Feb 2008 21:22:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29D7D8FC27 for ; Wed, 27 Feb 2008 21:22:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RLMcPH029360 for ; Wed, 27 Feb 2008 21:22:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RLMbLm029357 for perforce@freebsd.org; Wed, 27 Feb 2008 21:22:37 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 21:22:37 GMT Message-Id: <200802272122.m1RLMbLm029357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 21:22:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=136368 Change 136368 by sam@sam_ebb on 2008/02/27 21:22:13 add tx status codes Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwnreg.h#2 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwnreg.h#2 (text+kox) ==== @@ -639,6 +639,13 @@ uint16_t reserved; uint32_t power[2]; uint32_t status; +#define IWN_TX_SUCCESS 0x00 +#define IWN_TX_FAIL 0x80 /* all failures have 0x80 set */ +#define IWN_TX_FAIL_SHORT_LIMIT 0x82 /* too many RTS retries */ +#define IWN_TX_FAIL_LONG_LIMIT 0x83 /* too many retries */ +#define IWN_TX_FAIL_FIFO_UNDERRRUN 0x84 /* tx fifo not kept running */ +#define IWN_TX_FAIL_DEST_IN_PS 0x88 /* sta found in power save */ +#define IWN_TX_FAIL_TX_LOCKED 0x90 /* waiting to see traffic */ } __packed; /* structure for IWN_BEACON_MISSED notification */ From owner-p4-projects@FreeBSD.ORG Wed Feb 27 21:24:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FCC21065672; Wed, 27 Feb 2008 21:24:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6158A1065670 for ; Wed, 27 Feb 2008 21:24:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 53C2A8FC1D for ; Wed, 27 Feb 2008 21:24:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RLOf3Y029406 for ; Wed, 27 Feb 2008 21:24:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RLOe9g029403 for perforce@freebsd.org; Wed, 27 Feb 2008 21:24:40 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 21:24:40 GMT Message-Id: <200802272124.m1RLOe9g029403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 21:24:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=136369 Change 136369 by sam@sam_ebb on 2008/02/27 21:24:02 add a workaround for passive scan channels; still need to investigate what the linux code does but attempts to get the intel linux driver to associate to my 11a ap's have all failed (likely pilot error) Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#4 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#4 (text+kox) ==== @@ -1631,8 +1631,28 @@ m = data->m, data->m = NULL; ni = data->ni, data->ni = NULL; - if (m->m_flags & M_TXCB) - ieee80211_process_callback(ni, m, (status & 0x80) != 0); + if (m->m_flags & M_TXCB) { + /* + * Channels marked for "radar" require traffic to be received + * to unlock before we can transmit. Until traffic is seen + * any attempt to transmit is returned immediately with status + * set to IWN_TX_FAIL_TX_LOCKED. Unfortunately this can easily + * happen on first authenticate after scanning. To workaround + * this we ignore a failure of this sort in AUTH state so the + * 802.11 layer will fall back to using a timeout to wait for + * the AUTH reply. This allows the firmware time to see + * traffic so a subsequent retry of AUTH succeeds. It's + * unclear why the firmware does not maintain state for + * channels recently visited as this would allow immediate + * use of the channel after a scan (where we see traffic). + */ + if (status == IWN_TX_FAIL_TX_LOCKED && + ni->ni_vap->iv_state == IEEE80211_S_AUTH) + ieee80211_process_callback(ni, m, 0); + else + ieee80211_process_callback(ni, m, + (status & IWN_TX_FAIL) != 0); + } m_freem(m); ieee80211_free_node(ni); From owner-p4-projects@FreeBSD.ORG Wed Feb 27 21:29:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B9471065670; Wed, 27 Feb 2008 21:29:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 390E5106566B for ; Wed, 27 Feb 2008 21:29:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 289D98FC22 for ; Wed, 27 Feb 2008 21:29:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RLTqqo029623 for ; Wed, 27 Feb 2008 21:29:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RLTnee029620 for perforce@freebsd.org; Wed, 27 Feb 2008 21:29:49 GMT (envelope-from sam@freebsd.org) Date: Wed, 27 Feb 2008 21:29:49 GMT Message-Id: <200802272129.m1RLTnee029620@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 21:29:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=136370 Change 136370 by sam@sam_ebb on 2008/02/27 21:29:44 IFC @ 136369 Affected files ... .. //depot/projects/vap/Makefile.inc1#6 integrate .. //depot/projects/vap/bin/sh/cd.c#3 integrate .. //depot/projects/vap/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/vap/contrib/traceroute/as.c#1 branch .. //depot/projects/vap/contrib/traceroute/as.h#1 branch .. //depot/projects/vap/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/vap/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/vap/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#5 integrate .. //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/vap/include/unistd.h#6 integrate .. //depot/projects/vap/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/vap/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/flt_rounds.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpgetmask.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpgetround.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpgetsticky.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpsetmask.c#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/fpsetround.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fopen.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/vap/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/vap/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/vap/lib/msun/bsdsrc/b_exp.c#3 integrate .. //depot/projects/vap/lib/msun/bsdsrc/b_log.c#3 integrate .. //depot/projects/vap/lib/msun/bsdsrc/b_tgamma.c#3 integrate .. //depot/projects/vap/lib/msun/powerpc/fenv.h#3 integrate .. //depot/projects/vap/lib/msun/src/e_acos.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_acosf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_acosh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_acoshf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_asin.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_asinf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atan2.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atan2f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atanh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_atanhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_cosh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_coshf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_exp.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_expf.c#5 integrate .. //depot/projects/vap/lib/msun/src/e_fmod.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_fmodf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gamma.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gamma_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gammaf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_gammaf_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j0.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j0f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j1.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_j1f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_jn.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_jnf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgamma.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgamma_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgammaf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_lgammaf_r.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_log.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_log10.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_log10f.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_logf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/vap/lib/msun/src/e_scalb.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_scalbf.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_sinh.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_sinhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_cosf.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_rem_pio2.c#5 integrate .. //depot/projects/vap/lib/msun/src/k_sinf.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_tan.c#3 integrate .. //depot/projects/vap/lib/msun/src/k_tanf.c#3 integrate .. //depot/projects/vap/lib/msun/src/math_private.h#6 integrate .. //depot/projects/vap/lib/msun/src/s_asinh.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_asinhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_atan.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_atanf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_cbrt.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ceilf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_copysign.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_copysignf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_erf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_erff.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_exp2.c#5 integrate .. //depot/projects/vap/lib/msun/src/s_exp2f.c#6 integrate .. //depot/projects/vap/lib/msun/src/s_fabsf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_finite.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_finitef.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_floorf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_frexp.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ilogb.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ilogbf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_ilogbl.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_logbf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nextafter.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nextafterf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nextafterl.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nexttoward.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_nexttowardf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_rint.c#5 integrate .. //depot/projects/vap/lib/msun/src/s_rintf.c#4 integrate .. //depot/projects/vap/lib/msun/src/s_rintl.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_significand.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_significandf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_tanh.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_tanhf.c#3 integrate .. //depot/projects/vap/lib/msun/src/s_trunc.c#4 integrate .. //depot/projects/vap/lib/msun/src/w_cabs.c#4 integrate .. //depot/projects/vap/release/Makefile#4 integrate .. //depot/projects/vap/sbin/fsck_ffs/pass1.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/pass2.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/setup.c#3 integrate .. //depot/projects/vap/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/vap/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/vap/sbin/ping6/ping6.c#3 integrate .. //depot/projects/vap/share/man/man4/ip6.4#3 integrate .. //depot/projects/vap/share/man/man4/uscanner.4#3 integrate .. //depot/projects/vap/share/man/man9/Makefile#5 integrate .. //depot/projects/vap/share/man/man9/VOP_LOCK.9#5 integrate .. //depot/projects/vap/share/man/man9/insmntque.9#1 branch .. //depot/projects/vap/share/man/man9/lock.9#6 integrate .. //depot/projects/vap/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/vap/share/man/man9/vgone.9#3 integrate .. //depot/projects/vap/share/man/man9/vhold.9#3 integrate .. //depot/projects/vap/share/man/man9/vput.9#3 integrate .. //depot/projects/vap/share/man/man9/vref.9#3 integrate .. //depot/projects/vap/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/vap/share/man/man9/vrele.9#3 integrate .. //depot/projects/vap/share/misc/committers-doc.dot#3 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#4 integrate .. //depot/projects/vap/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/vap/sys/arm/include/_bus.h#3 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/vap/sys/boot/common/bootstrap.h#5 integrate .. //depot/projects/vap/sys/boot/common/load_elf.c#5 integrate .. //depot/projects/vap/sys/boot/powerpc/Makefile#4 integrate .. //depot/projects/vap/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/vap/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/vap/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/vap/sys/conf/NOTES#9 integrate .. //depot/projects/vap/sys/conf/files#19 integrate .. //depot/projects/vap/sys/conf/files.powerpc#8 integrate .. //depot/projects/vap/sys/conf/ldscript.powerpc#3 integrate .. //depot/projects/vap/sys/conf/options.powerpc#4 integrate .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/vap/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/vap/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/vap/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/vap/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_l2t.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_l2t.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/vap/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/mbufq.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#3 delete .. //depot/projects/vap/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/vap/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#3 delete .. //depot/projects/vap/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/vap/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#3 delete .. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/vap/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/vap/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/vap/sys/dev/usb/umass.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/vap/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/vap/sys/fs/coda/TODO#4 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_node.c#8 integrate .. //depot/projects/vap/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_io.c#7 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/vap/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/vap/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#9 integrate .. //depot/projects/vap/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_default.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/vap/sys/kern/vnode_if.src#7 integrate .. //depot/projects/vap/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/vap/sys/libkern/quad.h#3 integrate .. //depot/projects/vap/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/vap/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/vap/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/vap/sys/modules/hwpmc/Makefile#5 integrate .. //depot/projects/vap/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/vap/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/vap/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/vap/sys/netncp/ncp_conn.c#6 integrate .. //depot/projects/vap/sys/netsmb/smb_conn.c#6 integrate .. //depot/projects/vap/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/vap/sys/nfsclient/nfs_node.c#7 integrate .. //depot/projects/vap/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/vap/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/vap/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/vap/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/vap/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/vap/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/float.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/vap/sys/powerpc/include/metadata.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/vap/sys/sys/buf.h#9 integrate .. //depot/projects/vap/sys/sys/ktrace.h#5 integrate .. //depot/projects/vap/sys/sys/lockmgr.h#9 integrate .. //depot/projects/vap/sys/sys/param.h#10 integrate .. //depot/projects/vap/sys/sys/vnode.h#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_rawread.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/vap/sys/vm/vm_object.c#7 integrate .. //depot/projects/vap/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/vap/usr.bin/Makefile#4 integrate .. //depot/projects/vap/usr.bin/ar/Makefile#1 branch .. //depot/projects/vap/usr.bin/ar/ar.1#1 branch .. //depot/projects/vap/usr.bin/ar/ar.c#1 branch .. //depot/projects/vap/usr.bin/ar/ar.h#1 branch .. //depot/projects/vap/usr.bin/ar/read.c#1 branch .. //depot/projects/vap/usr.bin/ar/util.c#1 branch .. //depot/projects/vap/usr.bin/ar/write.c#1 branch .. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/vap/usr.bin/du/du.1#3 integrate .. //depot/projects/vap/usr.bin/du/du.c#3 integrate .. //depot/projects/vap/usr.bin/find/extern.h#3 integrate .. //depot/projects/vap/usr.bin/find/find.1#3 integrate .. //depot/projects/vap/usr.bin/find/find.h#3 integrate .. //depot/projects/vap/usr.bin/find/function.c#3 integrate .. //depot/projects/vap/usr.bin/find/option.c#3 integrate .. //depot/projects/vap/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/vap/usr.bin/kdump/kdump.c#4 integrate .. //depot/projects/vap/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/vap/usr.bin/ktrace/ktrace.1#3 integrate .. //depot/projects/vap/usr.bin/ktrace/ktrace.h#3 integrate .. //depot/projects/vap/usr.bin/ktrace/subr.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/vap/usr.sbin/pmcstat/Makefile#4 integrate .. //depot/projects/vap/usr.sbin/pw/pw.8#4 integrate .. //depot/projects/vap/usr.sbin/pw/pw.c#3 integrate .. //depot/projects/vap/usr.sbin/pw/pw_group.c#3 integrate .. //depot/projects/vap/usr.sbin/sa/db.c#3 integrate .. //depot/projects/vap/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/vap/usr.sbin/traceroute/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -872,6 +872,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,18 +889,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -967,6 +972,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/vap/bin/sh/cd.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); #include #include @@ -68,7 +68,9 @@ STATIC int cdphysical(char *); STATIC int docd(char *, int, int); STATIC char *getcomponent(void); -STATIC int updatepwd(char *); +STATIC char *findcwd(char *); +STATIC void updatepwd(char *); +STATIC char *getpwd2(char *, size_t); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -201,10 +203,11 @@ } INTOFF; - if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) { + if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -212,12 +215,14 @@ STATIC int cdphysical(char *dest) { + char *p; INTOFF; - if (chdir(dest) < 0 || updatepwd(NULL) < 0) { + if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -247,38 +252,20 @@ } -/* - * Update curdir (the name of the current directory) in response to a - * cd command. We also call hashcd to let the routines in exec.c know - * that the current directory has changed. - */ -STATIC int -updatepwd(char *dir) +STATIC char * +findcwd(char *dir) { char *new; char *p; - hashcd(); /* update command hash table */ - /* * If our argument is NULL, we don't know the current directory * any more because we traversed a symbolic link or something * we couldn't stat(). */ if (dir == NULL || curdir == NULL) { - if (prevdir) - ckfree(prevdir); - INTOFF; - prevdir = curdir; - curdir = NULL; - if (getpwd() == NULL) { - INTON; - return (-1); - } - setvar("PWD", curdir, VEXPORT); - setvar("OLDPWD", prevdir, VEXPORT); - INTON; - return (0); + p = stalloc(PATH_MAX); + return getpwd2(p, PATH_MAX); } cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); @@ -302,16 +289,25 @@ if (new == stackblock()) STPUTC('/', new); STACKSTRNUL(new); - INTOFF; + return stackblock(); +} + +/* + * Update curdir (the name of the current directory) in response to a + * cd command. We also call hashcd to let the routines in exec.c know + * that the current directory has changed. + */ +STATIC void +updatepwd(char *dir) +{ + hashcd(); /* update command hash table */ + if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(stackblock()); + curdir = savestr(dir); setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); - INTON; - - return (0); } int @@ -355,17 +351,31 @@ } /* - * Find out what the current directory is. If we already know the current - * directory, this routine returns immediately. + * Get the current directory and cache the result in curdir. */ char * getpwd(void) { char buf[PATH_MAX]; + char *p; if (curdir) return curdir; - if (getcwd(buf, sizeof(buf)) == NULL) { + + p = getpwd2(buf, sizeof(buf)); + if (p != NULL) + curdir = savestr(p); + + return curdir; +} + +/* + * Return the current directory. + */ +STATIC char * +getpwd2(char *buf, size_t size) +{ + if (getcwd(buf, size) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -373,12 +383,9 @@ stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - curdir = savestr(pwd); - return curdir; + return pwd; } return NULL; } - curdir = savestr(buf); - - return curdir; + return buf; } ==== //depot/projects/vap/contrib/tcpdump/print-802_11.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/vap/contrib/traceroute/traceroute.8#3 (text+ko) ==== @@ -14,9 +14,9 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.17 2008/02/20 23:29:52 rpaulo Exp $ .\" -.TH TRACEROUTE 8 "21 September 2000" +.TH TRACEROUTE 8 "19 February 2008" .UC 6 .SH NAME traceroute \- print the route packets take to network host @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dDeFISnrvx +.B \-adDeFISnrvx ] [ .B \-f .I first_ttl @@ -71,6 +71,9 @@ .B \-w .I waittime ] [ +.B \-A +.I as_server +] [ .B \-z .I pausemsecs ] @@ -98,6 +101,13 @@ .PP Other options are: .TP +.B \-a +Turn on AS# lookups for each hop encountered. +.TP +.B -A +Turn on AS# lookups and use the given server instead of the +default. +.TP .B \-e Firewall evasion mode. Use fixed destination ports for UDP and TCP probes. @@ -443,3 +453,7 @@ router that's filtering packets), but this is not implemented yet. .PP Please send bug reports to traceroute@ee.lbl.gov. +.PP +The AS number capability reports information that may sometimes be +inaccurate due to discrepancies between the contents of the +routing database server and the current state of the Internet. ==== //depot/projects/vap/contrib/traceroute/traceroute.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34 2007/07/01 12:08:05 gnn Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $"; #endif /* @@ -263,6 +263,7 @@ #include "findsaddr.h" #include "ifaddrlist.h" +#include "as.h" #include "traceroute.h" /* Maximum number of gateways (include room for one noop) */ @@ -350,6 +351,9 @@ int verbose; int waittime = 5; /* time to wait for response (in seconds) */ int nflag; /* print addresses numerically */ +int as_path; /* print as numbers for each hop */ +char *as_server = NULL; +void *asn; #ifdef CANT_HACK_IPCKSUM int doipcksum = 0; /* don't calculate ip checksums by default */ #else @@ -535,9 +539,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "aA:edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { - + case 'a': + as_path = 1; + break; + + case 'A': + as_path = 1; + as_server = optarg; + break; + case 'd': options |= SO_DEBUG; break; @@ -913,6 +925,16 @@ exit (1); } + if (as_path) { + asn = as_setup(as_server); + if (asn == NULL) { + Fprintf(stderr, "%s: as_setup failed, AS# lookups" + " disabled\n", prog); + (void)fflush(stderr); + as_path = 0; + } + } + #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) if (setpolicy(sndsock, "in bypass") < 0) errx(1, "%s", ipsec_strerror()); @@ -1118,6 +1140,8 @@ (unreachable > 0 && unreachable >= nprobes - 1)) break; } + if (as_path) + as_shutdown(asn); exit(0); } @@ -1458,6 +1482,9 @@ hlen = ip->ip_hl << 2; cc -= hlen; + if (as_path) + Printf(" [AS%d]", as_lookup(asn, &from->sin_addr)); + if (nflag) Printf(" %s", inet_ntoa(from->sin_addr)); else @@ -1764,8 +1791,8 @@ Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" + "Usage: %s [-adDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" - "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog); + "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog); exit(1); } ==== //depot/projects/vap/gnu/lib/libgcc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -122,7 +122,7 @@ .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c +LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif ==== //depot/projects/vap/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,9 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE ==== //depot/projects/vap/gnu/usr.bin/binutils/ranlib/Makefile#3 (text+ko) ==== @@ -1,9 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ranlib +MAN= gnu-ranlib.1 +gnu-ranlib.1: ranlib.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ranlib.1 +.endif + PROG= ranlib SRCS= ar.c is-ranlib.c CFLAGS+= -D_GNU_SOURCE ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.11 2008/01/29 23:44:34 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.12 2008/02/25 22:04:07 jhb Exp $ */ #ifndef _KGDB_H_ @@ -49,7 +49,6 @@ extern struct kthr *curkthr; void kgdb_add_kld_cmd(char *, int); -void kgdb_auto_load_klds(void); void kgdb_kld_init(void); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); ==== //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.62 2007/11/27 10:00:33 jkoshy Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.63 2008/02/23 19:27:54 ru Exp $ .\" .\" %beginstrip% . @@ -64,7 +64,7 @@ .ds doc-volume-as-arm arm . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~7.0 +.ds doc-default-operating-system FreeBSD\~8.0 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 ==== //depot/projects/vap/include/unistd.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.83 2008/02/12 20:09:03 ru Exp $ + * $FreeBSD: src/include/unistd.h,v 1.84 2008/02/26 20:33:52 ru Exp $ */ #ifndef _UNISTD_H_ @@ -405,7 +405,7 @@ /* 1003.1-2001 */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE int fchown(int, uid_t, gid_t); -ssize_t readlink(const char *, char *, size_t); +ssize_t readlink(const char * __restrict, char * __restrict, size_t); #endif #if __POSIX_VISIBLE >= 200112 int gethostname(char *, size_t); ==== //depot/projects/vap/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -34,7 +34,7 @@ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ static inline uint16_t -be16dec(const void *pp) +archive_be16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -42,7 +42,7 @@ } static inline uint32_t -be32dec(const void *pp) +archive_be32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -50,15 +50,15 @@ } static inline uint64_t -be64dec(const void *pp) +archive_be64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); + return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4)); } static inline uint16_t -le16dec(const void *pp) +archive_le16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -66,7 +66,7 @@ } static inline uint32_t -le32dec(const void *pp) +archive_le32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -74,15 +74,15 @@ } static inline uint64_t -le64dec(const void *pp) +archive_le64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p)); + return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p)); } static inline void -be16enc(void *pp, uint16_t u) +archive_be16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -91,7 +91,7 @@ } static inline void -be32enc(void *pp, uint32_t u) +archive_be32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -102,16 +102,16 @@ } static inline void -be64enc(void *pp, uint64_t u) +archive_be64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - be32enc(p, u >> 32); - be32enc(p + 4, u & 0xffffffff); + archive_be32enc(p, u >> 32); + archive_be32enc(p + 4, u & 0xffffffff); } static inline void -le16enc(void *pp, uint16_t u) +archive_le16enc(void *pp, uint16_t u) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 27 22:35:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0B281065679; Wed, 27 Feb 2008 22:35:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2D6E1065677 for ; Wed, 27 Feb 2008 22:35:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A01448FC1B for ; Wed, 27 Feb 2008 22:35:28 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1RMZSGf033375 for ; Wed, 27 Feb 2008 22:35:28 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1RMZSTa033372 for perforce@freebsd.org; Wed, 27 Feb 2008 22:35:28 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 27 Feb 2008 22:35:28 GMT Message-Id: <200802272235.m1RMZSTa033372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 136373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2008 22:35:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=136373 Change 136373 by swise@swise:vic10:iwarp on 2008/02/27 22:35:25 Fixed recursive lock bugs. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#10 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#9 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#10 (text+ko) ==== @@ -308,12 +308,10 @@ cb->remote_rkey, (unsigned long long)cb->remote_addr, cb->remote_len); - mtx_lock_spin(&cb->lock); if (cb->state <= CONNECTED || cb->state == RDMA_WRITE_COMPLETE) cb->state = RDMA_READ_ADV; else cb->state = RDMA_WRITE_ADV; - mtx_unlock_spin(&cb->lock); return 0; } @@ -326,12 +324,10 @@ return -1; } - mtx_lock_spin(&cb->lock); if (cb->state == RDMA_READ_ADV) cb->state = RDMA_WRITE_ADV; else cb->state = RDMA_WRITE_COMPLETE; - mtx_unlock_spin(&cb->lock); return 0; } ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#9 (text+ko) ==== @@ -957,9 +957,7 @@ } } - mtx_lock_spin(&cm_id_priv->lock); atomic_inc(&cm_id_priv->refcount); - mtx_unlock_spin(&cm_id_priv->lock); if (TAILQ_EMPTY(&cm_id_priv->work_list)) { TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list); taskqueue_enqueue(iwcm_wq, &work->task); From owner-p4-projects@FreeBSD.ORG Thu Feb 28 00:15:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA2991065694; Thu, 28 Feb 2008 00:14:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 869C51065693 for ; Thu, 28 Feb 2008 00:14:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 562078FC13 for ; Thu, 28 Feb 2008 00:14:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1S0EvLE040016 for ; Thu, 28 Feb 2008 00:14:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1S0EvL4040013 for perforce@freebsd.org; Thu, 28 Feb 2008 00:14:57 GMT (envelope-from sam@freebsd.org) Date: Thu, 28 Feb 2008 00:14:57 GMT Message-Id: <200802280014.m1S0EvL4040013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2008 00:15:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=136378 Change 136378 by sam@sam_ebb on 2008/02/28 00:14:05 add wlanwds Affected files ... .. //depot/projects/vap/tools/tools/net80211/Makefile#3 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/tools/tools/net80211/Makefile,v 1.4 2007/07/28 00:18:23 thompsa Exp $ -SUBDIR= stumbler w00t wesside wlaninject wlanstats wlanwatch +SUBDIR= stumbler w00t wesside wlaninject wlanstats wlanwatch wlanwds .include From owner-p4-projects@FreeBSD.ORG Thu Feb 28 00:17:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94551106567C; Thu, 28 Feb 2008 00:17:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 537091065672 for ; Thu, 28 Feb 2008 00:17:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CF9F8FC20 for ; Thu, 28 Feb 2008 00:17:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1S0H32M040115 for ; Thu, 28 Feb 2008 00:17:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1S0H25T040112 for perforce@freebsd.org; Thu, 28 Feb 2008 00:17:02 GMT (envelope-from sam@freebsd.org) Date: Thu, 28 Feb 2008 00:17:02 GMT Message-Id: <200802280017.m1S0H25T040112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2008 00:17:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=136379 Change 136379 by sam@sam_ebb on 2008/02/28 00:16:59 remove wi until it's converted Affected files ... .. //depot/projects/vap/sys/i386/conf/GENERIC#8 edit Differences ... ==== //depot/projects/vap/sys/i386/conf/GENERIC#8 (text+ko) ==== @@ -258,7 +258,7 @@ device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. +#device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. # Pseudo devices. From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A7121065674; Fri, 29 Feb 2008 19:47:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 086DF106567D for ; Fri, 29 Feb 2008 19:47:23 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBA3D8FC1C for ; Fri, 29 Feb 2008 19:47:22 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlMsO092146 for ; Fri, 29 Feb 2008 19:47:22 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJl46n092144 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:04 GMT (envelope-from zec@FreeBSD.org) Date: Fri, 29 Feb 2008 19:47:04 GMT Message-Id: <200802291947.m1TJl46n092144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 136386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=136386 Change 136386 by zec@zec_tpx32 on 2008/02/28 02:46:51 IFC Affected files ... .. //depot/projects/vimage/src/sys/Makefile#7 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/vimage/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/float.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/vimage/src/sys/arm/arm/locore.S#4 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/vimage/src/sys/arm/arm/support.S#4 integrate .. //depot/projects/vimage/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/vimage/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/vimage/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/vimage/src/sys/arm/include/pmap.h#6 integrate .. //depot/projects/vimage/src/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/vimage/src/sys/boot/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/vimage/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/vimage/src/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/vimage/src/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/vimage/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#9 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/vimage/src/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/vimage/src/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.arm#4 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#20 integrate .. //depot/projects/vimage/src/sys/conf/files#23 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#10 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#10 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#8 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/vimage/src/sys/conf/kern.post.mk#4 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/vimage/src/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/vimage/src/sys/conf/options#22 integrate .. //depot/projects/vimage/src/sys/conf/options.powerpc#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/vimage/src/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/vimage/src/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_capture.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#8 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/vimage/src/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/vimage/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an.c#7 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#14 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/vimage/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/vimage/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/vimage/src/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/vimage/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/vimage/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/vimage/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/vimage/src/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/array.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/him.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/list.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mii/amphy.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#9 integrate .. //depot/projects/vimage/src/sys/dev/mii/nsphy.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/vimage/src/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#6 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/vimage/src/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/vimage/src/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/vimage/src/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/vimage/src/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#12 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#12 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560var.h#4 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#14 integrate .. //depot/projects/vimage/src/sys/dev/rr232x/LICENSE#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/README#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/array.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/him.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/hptintf.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/ldm.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/list.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/os_bsd.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/osm.h#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/osm_bsd.c#5 delete .. //depot/projects/vimage/src/sys/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/vimage/src/sys/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/vimage/src/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/vimage/src/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/vimage/src/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#8 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/stge/if_stge.c#6 integrate .. //depot/projects/vimage/src/sys/dev/stge/if_stgereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/streams/streams.c#5 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ti/if_ti.c#5 integrate .. //depot/projects/vimage/src/sys/dev/twe/twe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rum.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/uark.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/coda/TODO#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_kernel.h#2 delete .. //depot/projects/vimage/src/sys/fs/coda/coda_namecache.c#2 delete .. //depot/projects/vimage/src/sys/fs/coda/coda_namecache.h#2 delete .. //depot/projects/vimage/src/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_lookup.c#5 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#10 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/geom/geom_disk.c#4 integrate .. //depot/projects/vimage/src/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/vimage/src/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#14 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/geode.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/vimage/src/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/proc.h#3 integrate .. //depot/projects/vimage/src/sys/i386/isa/clock.c#7 integrate .. //depot/projects/vimage/src/sys/i386/linux/imgact_linux.c#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/locore.S#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/vimage/src/sys/kern/genassym.sh#2 integrate .. //depot/projects/vimage/src/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/vimage/src/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#17 integrate .. //depot/projects/vimage/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_acct.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_alq.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpu.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_linker.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_module.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_tc.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/vimage/src/sys/kern/link_elf.c#5 integrate .. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#20 integrate .. //depot/projects/vimage/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#10 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#9 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/vimage/src/sys/kern/sys_socket.c#8 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/vimage/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#12 integrate .. //depot/projects/vimage/src/sys/kern/tty_cons.c#4 integrate .. //depot/projects/vimage/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_shm.c#1 branch .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/vimage/src/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#5 integrate .. //depot/projects/vimage/src/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/vimage/src/sys/libkern/quad.h#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#16 integrate .. //depot/projects/vimage/src/sys/modules/coda/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/coda5/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/geom/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/mxge/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/rr232x/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/sf/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/sound/driver/emu10kx/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#18 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#11 integrate .. //depot/projects/vimage/src/sys/net/route.c#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#9 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pred1.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/ip_id.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#17 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#20 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#16 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#23 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#26 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#10 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#21 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#18 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec6.h#3 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#6 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#5 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#9 integrate .. //depot/projects/vimage/src/sys/pci/amdsmb.c#3 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/vimage/src/sys/pci/if_sf.c#4 delete .. //depot/projects/vimage/src/sys/pci/if_sfreg.h#2 delete .. //depot/projects/vimage/src/sys/pci/if_wb.c#4 integrate .. //depot/projects/vimage/src/sys/pci/nfsmb.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/include/bootinfo.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/float.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/intr_machdep.h#5 integrate .. //depot/projects/vimage/src/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/openpicvar.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/hrowpic.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pic_if.m#4 integrate .. //depot/projects/vimage/src/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#9 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/vimage/src/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sys/buf.h#3 integrate .. //depot/projects/vimage/src/sys/sys/bus.h#3 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#5 integrate .. //depot/projects/vimage/src/sys/sys/event.h#2 integrate .. //depot/projects/vimage/src/sys/sys/fcntl.h#2 integrate .. //depot/projects/vimage/src/sys/sys/file.h#4 integrate .. //depot/projects/vimage/src/sys/sys/ipc.h#2 integrate .. //depot/projects/vimage/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/vimage/src/sys/sys/lock.h#5 integrate .. //depot/projects/vimage/src/sys/sys/lockmgr.h#5 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#11 integrate .. //depot/projects/vimage/src/sys/sys/mman.h#2 integrate .. //depot/projects/vimage/src/sys/sys/module.h#2 integrate .. //depot/projects/vimage/src/sys/sys/param.h#15 integrate .. //depot/projects/vimage/src/sys/sys/pmc.h#3 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#8 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#16 integrate .. //depot/projects/vimage/src/sys/sys/rwlock.h#6 integrate .. //depot/projects/vimage/src/sys/sys/shm.h#2 integrate .. //depot/projects/vimage/src/sys/sys/signal.h#3 integrate .. //depot/projects/vimage/src/sys/sys/socket.h#6 integrate .. //depot/projects/vimage/src/sys/sys/socketvar.h#7 integrate .. //depot/projects/vimage/src/sys/sys/syscall.h#4 integrate .. //depot/projects/vimage/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/vimage/src/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/vimage/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/vimage/src/sys/sys/time.h#3 integrate .. //depot/projects/vimage/src/sys/sys/user.h#5 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#7 integrate .. //depot/projects/vimage/src/sys/tools/embed_mfs.sh#1 branch .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#10 integrate .. //depot/projects/vimage/src/sys/vm/vm_contig.c#8 integrate .. //depot/projects/vimage/src/sys/vm/vm_kern.c#7 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#12 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/vimage/src/sys/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $ +# $FreeBSD: src/sys/Makefile,v 1.46 2008/01/23 08:50:34 maxim Exp $ .include @@ -8,11 +8,11 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= bsm cam compat conf contrib crypto ddb dev fs geom gnu \ +CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom gnu \ i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ - ufs vm ${ARCHDIR} + netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ + pci rpc security sys ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/vimage/src/sys/amd64/acpica/madt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.25 2008/01/31 16:51:42 jhb Exp $"); #include #include @@ -109,9 +109,11 @@ /* * Code to abuse the crashdump map to map in the tables for the early * probe. We cheat and make the following assumptions about how we - * use this KVA: page 0 is used to map in the first page of each table - * found via the RSDT or XSDT and pages 1 to n are used to map in the - * RSDT or XSDT. The offset is in pages; the length is in bytes. + * use this KVA: pages 0 and 1 are used to map in the header of each + * table found via the RSDT or XSDT and pages 2 to n are used to map + * in the RSDT or XSDT. We have to use 2 pages for the table headers + * in case a header spans a page boundary. The offset is in pages; + * the length is in bytes. */ static void * madt_map(vm_paddr_t pa, int offset, vm_offset_t length) @@ -232,7 +234,7 @@ printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 2, ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) @@ -246,7 +248,7 @@ break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 2, ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) ==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.84 2007/11/27 17:28:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.85 2008/02/12 16:24:30 scottl Exp $"); #include #include @@ -598,14 +598,14 @@ * Count the number of bounce pages * needed in order to complete this transfer */ - vaddr = trunc_page((vm_offset_t)buf); + vaddr = (vm_offset_t)buf; vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; - vaddr += PAGE_SIZE; + vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); } CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } ==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); #include "opt_vimage.h" @@ -144,7 +144,7 @@ ptr += len; sz -= len; if (fragsz == DEV_BSIZE) { - error = di->dumper(di->priv, buffer, 0, dumplo, + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); if (error) return error; @@ -164,7 +164,7 @@ if (fragsz == 0) return (0); - error = di->dumper(di->priv, buffer, 0, dumplo, DEV_BSIZE); + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); dumplo += DEV_BSIZE; fragsz = 0; return (error); @@ -181,6 +181,7 @@ uint64_t pgs; size_t counter, sz, chunk; int i, c, error, twiddle; + u_int maxdumppgs; error = 0; /* catch case in which chunk size is 0 */ counter = 0; /* Update twiddle every 16MB */ @@ -188,13 +189,16 @@ va = 0; pgs = mdp->md_size / PAGE_SIZE; pa = mdp->md_start; + maxdumppgs = di->maxiosize / PAGE_SIZE; + if (maxdumppgs == 0) /* seatbelt */ + maxdumppgs = 1; printf(" chunk %d: %ldMB (%ld pages)", seqnr, PG2MB(pgs), pgs); while (pgs) { chunk = pgs; - if (chunk > MAXDUMPPGS) - chunk = MAXDUMPPGS; + if (chunk > maxdumppgs) + chunk = maxdumppgs; sz = chunk << PAGE_SHIFT; counter += sz; if (counter >> 24) { @@ -205,7 +209,7 @@ a = pa + i * PAGE_SIZE; va = pmap_kenter_temporary(trunc_page(a), i); } - error = di->dumper(di->priv, va, 0, dumplo, sz); + error = dump_write(di, va, 0, dumplo, sz); if (error) break; dumplo += sz; @@ -331,7 +335,7 @@ ehdr.e_phnum); /* Dump leader */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); @@ -362,12 +366,12 @@ goto fail; /* Dump trailer */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; /* Signal completion, signoff and exit stage left. */ - di->dumper(di->priv, NULL, 0, 0, 0); + dump_write(di, NULL, 0, 0, 0); printf("\nDump complete\n"); return; ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.155 2007/12/08 21:13:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.157 2008/02/02 23:17:27 das Exp $"); #include "opt_cpu.h" @@ -223,7 +223,7 @@ "\020" "\001SSE3" /* SSE3 */ "\002" - "\003RSVD2" /* "Reserved" bit 2 */ + "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ @@ -240,11 +240,11 @@ "\021" "\022" "\023DCA" /* Direct Cache Access */ - "\024" - "\025" - "\026" + "\024SSE4.1" + "\025SSE4.2" + "\026x2APIC" /* xAPIC Extensions */ "\027" - "\030" + "\030POPCNT" "\031" "\032" "\033" ==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#4 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $"); #include "opt_vimage.h" @@ -115,7 +115,7 @@ if (fragsz == 0) return (0); - error = di->dumper(di->priv, dump_va, 0, dumplo, fragsz); + error = dump_write(di, dump_va, 0, dumplo, fragsz); dumplo += fragsz; fragsz = 0; return (error); @@ -126,7 +126,11 @@ { size_t len; int error, i, c; + u_int maxdumpsz; + maxdumpsz = di->maxiosize; + if (maxdumpsz == 0) /* seatbelt */ + maxdumpsz = PAGE_SIZE; error = 0; if ((sz % PAGE_SIZE) != 0) { printf("size not page aligned\n"); @@ -147,7 +151,7 @@ return (error); } while (sz) { - len = (MAXDUMPPGS * PAGE_SIZE) - fragsz; + len = maxdumpsz - fragsz; if (len > sz) len = sz; counter += len; @@ -157,7 +161,7 @@ counter &= (1<<24) - 1; } if (ptr) { - error = di->dumper(di->priv, ptr, 0, dumplo, len); + error = dump_write(di, ptr, 0, dumplo, len); if (error) return (error); dumplo += len; @@ -169,7 +173,7 @@ fragsz += len; pa += len; sz -= len; - if (fragsz == (MAXDUMPPGS * PAGE_SIZE)) { + if (fragsz == maxdumpsz) { error = blk_flush(di); if (error) return (error); @@ -288,7 +292,7 @@ printf("Dumping %llu MB:", (long long)dumpsize >> 20); /* Dump leader */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); @@ -379,13 +383,13 @@ goto fail; /* Dump trailer */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); /* Signal completion, signoff and exit stage left. */ - di->dumper(di->priv, NULL, 0, 0, 0); + dump_write(di, NULL, 0, 0, 0); printf("\nDump complete\n"); return; ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.601 2008/01/03 07:34:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.605 2008/01/17 18:25:51 alc Exp $"); /* * Manages physical address maps. @@ -149,11 +149,7 @@ #define PMAP_SHPGPERPROC 200 #endif -#if defined(DIAGNOSTIC) -#define PMAP_DIAGNOSTIC -#endif - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25EA4106573A; Fri, 29 Feb 2008 19:47:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5F771065717 for ; Fri, 29 Feb 2008 19:47:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DC618FC16 for ; Fri, 29 Feb 2008 19:47:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlN11092156 for ; Fri, 29 Feb 2008 19:47:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlN64092154 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:23 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Feb 2008 19:47:23 GMT Message-Id: <200802291947.m1TJlN64092154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=136388 Change 136388 by sam@sam_ebb on 2008/02/28 04:38:05 ral needs wlan_rssadapt Affected files ... .. //depot/projects/vap/sys/i386/conf/GENERIC#9 edit Differences ... ==== //depot/projects/vap/sys/i386/conf/GENERIC#9 (text+ko) ==== @@ -252,6 +252,7 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm +device wlan_rssadapt # RSSADAPT transmit rate control algorithm device wlan_scan_sta # 802.11 STA mode scanning device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 564061065834; Fri, 29 Feb 2008 19:47:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 582F710657C3 for ; Fri, 29 Feb 2008 19:47:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 484A48FC26 for ; Fri, 29 Feb 2008 19:47:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlQWQ092186 for ; Fri, 29 Feb 2008 19:47:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlQBl092184 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:26 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Feb 2008 19:47:26 GMT Message-Id: <200802291947.m1TJlQBl092184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=136394 Change 136394 by sam@sam_ebb on 2008/02/28 04:58:43 blindly convert Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#6 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#6 (text+ko) ==== @@ -278,11 +278,12 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ieee80211com *ic = &sc->sc_ic; + struct ath_node *an = ATH_NODE(ni); + const struct ieee80211_txparam *tp = an->an_tp; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { + if (tp == NULL || tp->ucastrate == IEEE80211_FIXED_RATE_NONE) { /* * No fixed rate is requested. For 11b start with * the highest negotiated rate; otherwise, for 11g @@ -308,7 +309,7 @@ */ /* NB: the rate set is assumed sorted */ srate = ni->ni_rates.rs_nrates - 1; - for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) + for (; srate >= 0 && RATE(srate) != tp->ucastrate; srate--) ; } /* @@ -333,22 +334,24 @@ * Reset the rate control state for each 802.11 state transition. */ void -ath_rate_newstate(struct ath_softc *sc, enum ieee80211_state state) +ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state) { + struct ieee80211com *ic = vap->iv_ic; + struct ath_softc *sc = ic->ic_ifp->if_softc; struct amrr_softc *asc = (struct amrr_softc *) sc->sc_rc; - struct ieee80211com *ic = &sc->sc_ic; + const struct ieee80211_txparam *tp; struct ieee80211_node *ni; if (state == IEEE80211_S_INIT) { callout_stop(&asc->timer); return; } - if (ic->ic_opmode == IEEE80211_M_STA) { + if (vap->iv_opmode == IEEE80211_M_STA) { /* * Reset local xmit state; this is really only * meaningful when operating in station mode. */ - ni = ic->ic_bss; + ni = vap->iv_bss; if (state == IEEE80211_S_RUN) { ath_rate_ctl_start(sc, ni); } else { @@ -362,9 +365,10 @@ * tx rate state of each node. */ ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc); - ath_rate_update(sc, ic->ic_bss, 0); + ath_rate_update(sc, vap->iv_bss, 0); } - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE && + tp = ATH_NODE(vap->iv_bss)->an_tp; + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE && state == IEEE80211_S_RUN) { int interval; /* @@ -372,10 +376,10 @@ * are not configured to use a fixed xmit rate. */ interval = ath_rateinterval; - if (ic->ic_opmode == IEEE80211_M_STA) + if (vap->iv_opmode == IEEE80211_M_STA) interval /= 2; callout_reset(&asc->timer, (interval * hz) / 1000, - ath_ratectl, sc->sc_ifp); + ath_ratectl, vap); } } @@ -456,25 +460,25 @@ static void ath_ratectl(void *arg) { - struct ifnet *ifp = arg; + struct ieee80211vap *vap = arg; + struct ieee80211com *ic = vap->iv_ic; + struct ifnet *ifp = ic->ic_ifp; struct ath_softc *sc = ifp->if_softc; struct amrr_softc *asc = (struct amrr_softc *) sc->sc_rc; - struct ieee80211com *ic = &sc->sc_ic; int interval; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { sc->sc_stats.ast_rate_calls++; - if (ic->ic_opmode == IEEE80211_M_STA) - ath_rate_ctl(sc, ic->ic_bss); /* NB: no reference */ + if (vap->iv_opmode == IEEE80211_M_STA) + ath_rate_ctl(sc, vap->iv_bss); /* NB: no reference */ else ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_ctl, sc); } interval = ath_rateinterval; - if (ic->ic_opmode == IEEE80211_M_STA) + if (vap->iv_opmode == IEEE80211_M_STA) interval /= 2; - callout_reset(&asc->timer, (interval * hz) / 1000, - ath_ratectl, sc->sc_ifp); + callout_reset(&asc->timer, (interval * hz) / 1000, ath_ratectl, arg); } static void From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5AFC10658C0; Fri, 29 Feb 2008 19:47:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B1EA10657FD for ; Fri, 29 Feb 2008 19:47:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B1878FC27 for ; Fri, 29 Feb 2008 19:47:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlQdr092191 for ; Fri, 29 Feb 2008 19:47:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlQ5u092189 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:26 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Feb 2008 19:47:26 GMT Message-Id: <200802291947.m1TJlQ5u092189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=136395 Change 136395 by sam@sam_ebb on 2008/02/28 05:01:49 blindly convert Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#9 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#9 (text+ko) ==== @@ -255,11 +255,12 @@ ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ieee80211com *ic = &sc->sc_ic; + struct ath_node *an = ATH_NODE(ni); + const struct ieee80211_txparam *tp = an->an_tp; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { + if (tp == NULL || tp->ucastrate == IEEE80211_FIXED_RATE_NONE) { /* * No fixed rate is requested. For 11b start with * the highest negotiated rate; otherwise, for 11g @@ -285,7 +286,7 @@ */ /* NB: the rate set is assumed sorted */ srate = ni->ni_rates.rs_nrates - 1; - for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) + for (; srate >= 0 && RATE(srate) != tp->ucastrate; srate--) ; } /* @@ -310,22 +311,24 @@ * Reset the rate control state for each 802.11 state transition. */ void -ath_rate_newstate(struct ath_softc *sc, enum ieee80211_state state) +ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state) { + struct ieee80211com *ic = vap->iv_ic; + struct ath_softc *sc = ic->ic_ifp->if_softc; struct onoe_softc *osc = (struct onoe_softc *) sc->sc_rc; - struct ieee80211com *ic = &sc->sc_ic; + const struct ieee80211_txparam *tp; struct ieee80211_node *ni; if (state == IEEE80211_S_INIT) { callout_stop(&osc->timer); return; } - if (ic->ic_opmode == IEEE80211_M_STA) { + if (vap->iv_opmode == IEEE80211_M_STA) { /* * Reset local xmit state; this is really only * meaningful when operating in station mode. */ - ni = ic->ic_bss; + ni = vap->iv_bss; if (state == IEEE80211_S_RUN) { ath_rate_ctl_start(sc, ni); } else { @@ -339,9 +342,10 @@ * tx rate state of each node. */ ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc); - ath_rate_update(sc, ic->ic_bss, 0); + ath_rate_update(sc, vap->iv_bss, 0); } - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE && + tp = ATH_NODE(vap->iv_bss)->an_tp; + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE && state == IEEE80211_S_RUN) { int interval; /* @@ -349,10 +353,10 @@ * are not configured to use a fixed xmit rate. */ interval = ath_rateinterval; - if (ic->ic_opmode == IEEE80211_M_STA) + if (vap->iv_opmode == IEEE80211_M_STA) interval /= 2; callout_reset(&osc->timer, (interval * hz) / 1000, - ath_ratectl, sc->sc_ifp); + ath_ratectl, vap); } } @@ -430,25 +434,25 @@ static void ath_ratectl(void *arg) { - struct ifnet *ifp = arg; + struct ieee80211vap *vap = arg; + struct ieee80211com *ic = vap->iv_ic; + struct ifnet *ifp = ic->ic_ifp; struct ath_softc *sc = ifp->if_softc; struct onoe_softc *osc = (struct onoe_softc *) sc->sc_rc; - struct ieee80211com *ic = &sc->sc_ic; int interval; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { sc->sc_stats.ast_rate_calls++; - if (ic->ic_opmode == IEEE80211_M_STA) - ath_rate_ctl(sc, ic->ic_bss); /* NB: no reference */ + if (vap->iv_opmode == IEEE80211_M_STA) + ath_rate_ctl(sc, vap->iv_bss); /* NB: no reference */ else ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_ctl, sc); } interval = ath_rateinterval; - if (ic->ic_opmode == IEEE80211_M_STA) + if (vap->iv_opmode == IEEE80211_M_STA) interval /= 2; - callout_reset(&osc->timer, (interval * hz) / 1000, - ath_ratectl, sc->sc_ifp); + callout_reset(&osc->timer, (interval * hz) / 1000, ath_ratectl, arg); } static void From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B075610657D6; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CB791065735 for ; Fri, 29 Feb 2008 19:47:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CAAD8FC31 for ; Fri, 29 Feb 2008 19:47:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlcXb092236 for ; Fri, 29 Feb 2008 19:47:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlcOw092234 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 Feb 2008 19:47:38 GMT Message-Id: <200802291947.m1TJlcOw092234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 136404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=136404 Change 136404 by hselasky@hselasky_laptop001 on 2008/02/28 07:52:34 Add more documentation to "usb_subr.h". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#98 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#98 (text+ko) ==== @@ -38,10 +38,15 @@ #ifndef _USB_SUBR_H_ #define _USB_SUBR_H_ +/* + * The "USBD_STATUS" macro defines all the USB error codes. + * "USBD_ERR_NORMAL_COMPLETION" is not an error code. The reason all + * the error codes have been put inside a macro is so that the + * definition can be reused at various places in the code. + */ #define USBD_STATUS_DESC(enum,value) #enum #define USBD_STATUS(m)\ -m(USBD_ERR_NORMAL_COMPLETION,=0 /* must be zero*/)\ -/* errors */\ +m(USBD_ERR_NORMAL_COMPLETION,)\ m(USBD_ERR_PENDING_REQUESTS,)\ m(USBD_ERR_NOT_STARTED,)\ m(USBD_ERR_INVAL,)\ @@ -71,14 +76,31 @@ m(USBD_ERR_NO_INTR_THREAD,)\ /**/ +/* + * The MAKE_ENUM macro will transform the USBD_STATUS macro into + * enums. + */ MAKE_ENUM(USBD_STATUS, N_USBD_STATUS); +/* + * The following macro will return the current state of an USB + * transfer like defined by the "USBD_ST_XXX" enums. + */ #define USBD_GET_STATE(xfer) ((xfer)->usb_state) + +/* + * The following macro will tell if an USB transfer is currently + * receiving or transferring data. + */ #define USBD_GET_DATA_ISREAD(xfer) (((xfer)->flags_int.usb_mode == \ USB_MODE_DEVICE) ? ((xfer->endpoint & UE_DIR_IN) ? 0 : 1) : \ ((xfer->endpoint & UE_DIR_IN) ? 1 : 0)) +/* + * The following macro will return the previous element of a singly + * linked list. + */ #undef LIST_PREV #define LIST_PREV(head,elm,field) \ (((elm) == LIST_FIRST(head)) ? ((__typeof(elm))0) : \ @@ -93,6 +115,8 @@ USBD_ST_ERROR, }; +/* prototypes */ + struct usbd_xfer; struct usbd_pipe; struct usbd_bus; @@ -140,7 +164,7 @@ USBD_STD_ROOT_TR_PRE_CALLBACK, }; -/* USB contexts */ +/* Definition of USB contexts */ enum { USBD_CONTEXT_UNDEFINED, @@ -149,6 +173,10 @@ USBD_CONTEXT_CALLBACK, }; +/* + * The following structure is used when generating USB descriptors + * from USB templates. + */ struct usbd_temp_setup { void *buf; uint32_t size; @@ -161,6 +189,10 @@ usbd_status_t err; }; +/* + * The following structure is used to define all the USB BUS + * callbacks. + */ struct usbd_bus_methods { /* USB Device and Host mode - Mandatory */ @@ -186,6 +218,10 @@ void (*vbus_interrupt) (struct usbd_bus *, uint8_t is_on); }; +/* + * The following structure is used to define all the USB pipe + * callbacks. + */ struct usbd_pipe_methods { /* USB Device and Host mode: */ @@ -196,6 +232,9 @@ void (*start) (struct usbd_xfer *xfer); }; +/* + * The following structure defines an USB port. + */ struct usbd_port { uint8_t restartcnt; #define USBD_RESTART_MAX 5 @@ -204,12 +243,20 @@ uint8_t unused:7; }; +/* + * The following structure defines how many bytes are + * left in an 1ms USB time slot. + */ struct usbd_fs_isoc_schedule { uint16_t total_bytes; uint8_t frame_bytes; uint8_t frame_slot; }; +/* + * The following structure is used to keep the state of a standard + * root transfer. + */ struct usbd_std_root_transfer { usb_device_request_t req; struct usbd_xfer *xfer; @@ -219,6 +266,9 @@ usbd_status_t err; }; +/* + * The following structure defines an USB HUB. + */ struct usbd_hub { struct usbd_fs_isoc_schedule fs_isoc_schedule[USB_ISOC_TIME_MAX]; struct usbd_device *hubudev; /* the HUB device */ @@ -231,17 +281,30 @@ struct usbd_port ports[0]; }; +/* + * The following structure defines physical and non kernel virtual + * address of a memory page having size USB_PAGE_SIZE. + */ struct usbd_page { bus_size_t physaddr; void *buffer; /* non Kernel Virtual Address */ }; +/* + * The following structure is used when needing the kernel virtual + * pointer and the physical address belonging to an offset in an USB + * page cache. + */ struct usbd_page_search { void *buffer; bus_size_t physaddr; uint32_t length; }; +/* + * The following structure is used to keep information about a DMA + * memory allocation. + */ struct usbd_page_cache { #ifdef __FreeBSD__ @@ -261,11 +324,16 @@ #endif uint32_t page_offset_buf; uint32_t page_offset_end; - uint8_t isread:1; + uint8_t isread:1; /* set if we are currently reading + * from the memory. Else write. */ uint8_t ismultiseg:1; /* set if we can have multiple * segments */ }; +/* + * The following structure is used when setting up an array of USB + * transfers. + */ struct usbd_setup_params { struct usbd_dma_tag *dma_tag_p; struct usbd_page *dma_page_ptr; @@ -293,6 +361,10 @@ usbd_status_t err; }; +/* + * The following structure keeps information about what a hardware USB + * endpoint supports. + */ struct usbd_hw_ep_profile { uint16_t max_frame_size; uint8_t is_simplex:1; @@ -305,6 +377,10 @@ uint8_t support_out:1; /* OUT-token is supported */ }; +/* + * The following structure is used when trying to allocate hardware + * endpoints for an USB configuration in USB device side mode. + */ struct usbd_sw_ep_scratch { const struct usbd_hw_ep_profile *pf; uint16_t max_frame_size; @@ -315,6 +391,10 @@ uint8_t needs_out:1; }; +/* + * The following structure is used when trying to allocate hardware + * endpoints for an USB configuration in USB device side mode. + */ struct usbd_hw_ep_scratch { struct usbd_sw_ep_scratch ep[USB_MAX_ENDPOINTS]; struct usbd_sw_ep_scratch *ep_max; @@ -325,6 +405,9 @@ uint8_t bmInAlloc[(USB_MAX_ENDPOINTS + 15) / 16]; }; +/* + * The following structure keeps an USB DMA tag. + */ struct usbd_dma_tag { #ifdef __NetBSD__ bus_dma_segment_t *p_seg; @@ -344,8 +427,12 @@ #define USB_BUS_EXPLORE_STOP 2 #define USB_BUS_EXPLORE_SYNC 3 +/**/ + #define USB_BUS_DMA_TAG_MAX 8 +/* The following structure defines the explore state of an USB BUS. */ + struct usbd_bus_needs { uint8_t sync:1; /* Set if explore thread sync is * needed. */ @@ -358,9 +445,14 @@ uint8_t unused:3; }; +/* + * The following structure defines an USB BUS. There is one USB BUS + * for every Host or Device controller. + */ struct usbd_bus { struct usb_device_stats stats; - struct mtx mtx; + struct mtx mtx; /* this mutex protects the USB + * hardware */ LIST_HEAD(, usbd_xfer) intr_list_head; /* driver interrupt list */ device_t bdev; /* filled by HC driver */ @@ -387,6 +479,8 @@ uint8_t usb_clone_count; #define USB_BUS_MAX_CLONES 128 +/* Definition of USB revisions */ + #define USBREV_UNKNOWN 0 #define USBREV_PRE_1_0 1 #define USBREV_1_0 2 @@ -397,12 +491,19 @@ uint8_t usb_name[32]; }; +/* + * The following structure defines an USB interface. + */ struct usbd_interface { usb_interface_descriptor_t *idesc; device_t subdev; uint8_t alt_index; }; +/* + * The following structure defines an USB pipe which is equal to an + * USB endpoint. + */ struct usbd_pipe { LIST_HEAD(, usbd_xfer) list_head; @@ -418,6 +519,9 @@ uint8_t iface_index; /* not used by "default pipe" */ }; +/* + * The following structure defines the USB device flags. + */ struct usbd_device_flags { uint8_t usb_mode:1; /* USB mode (see USB_MODE_XXX) */ uint8_t self_powered:1; /* set if USB device is self powered */ @@ -429,6 +533,10 @@ uint8_t unused:2; }; +/* + * The following structure defines an USB device. There exists one of + * these structures for every USB device. + */ struct usbd_device { struct sx default_sx[1]; struct mtx default_mtx[1]; @@ -444,7 +552,7 @@ #error "USB_MAX_ENDPOINTS must be increased!" #endif - struct usbd_bus *bus; /* our controller */ + struct usbd_bus *bus; /* our USB BUS */ device_t parent_dev; /* parent device */ struct usbd_device *parent_hub; const struct usbd_quirks *quirks; /* device quirks, always set */ @@ -502,6 +610,9 @@ } scratch[1]; }; +/* + * The following structure defines a set of USB transfer flags. + */ struct usbd_xfer_flags { uint8_t force_short_xfer:1; /* force a short transmit transfer * last */ @@ -521,13 +632,18 @@ * before starting this transfer! */ }; +/* + * The following structure defines a set of internal USB transfer + * flags. + */ struct usbd_xfer_flags_int { uint16_t control_rem; /* remainder in bytes */ - uint8_t open:1; - uint8_t recursed_1:1; - uint8_t recursed_2:1; - uint8_t transferring:1; + uint8_t open:1; /* set if USB pipe has been opened */ + uint8_t recursed_1:1; /* see "usbd_callback_wrapper()" */ + uint8_t recursed_2:1; /* see "usbd_callback_wrapper()" */ + uint8_t transferring:1; /* set if an USB transfer is in + * progress */ uint8_t did_dma_delay:1; /* set if we waited for HW DMA */ uint8_t draining:1; /* set if we are draining an USB * transfer */ @@ -551,6 +667,10 @@ uint8_t curr_dma_set:1; /* used by USB HC/DC driver */ }; +/* + * The following structure defines the symmetric part of an USB config + * structure. + */ struct usbd_config_sub { usbd_callback_t *callback; /* USB transfer callback */ uint32_t bufsize; /* total pipe buffer size in bytes */ @@ -561,6 +681,10 @@ struct usbd_xfer_flags flags; /* transfer flags */ }; +/* + * The following structure define an USB configuration, that basically + * is used when setting up an USB transfer. + */ struct usbd_config { struct usbd_config_sub mh; /* parameters for USB_MODE_HOST */ struct usbd_config_sub md; /* parameters for USB_MODE_DEVICE */ @@ -571,6 +695,9 @@ uint8_t if_index; /* "ifaces" index to use */ }; +/* + * The following structure defines an USB transfer. + */ struct usbd_xfer { struct usb_callout timeout_handle; struct usbd_page_cache *buf_fixup; /* fixup buffer(s) */ @@ -580,7 +707,7 @@ LIST_ENTRY(usbd_xfer) dma_list;/* used by BUS-DMA */ struct usbd_page *dma_page_ptr; - struct usbd_pipe *pipe; + struct usbd_pipe *pipe; /* our USB pipe */ struct usbd_device *udev; struct mtx *priv_mtx; /* cannot be changed during operation */ struct mtx *usb_mtx; /* used by HC driver */ @@ -590,12 +717,15 @@ * The value of "usb_thread" is used to tell who has reserved * the USB transfer for callback: * - * NULL: - "usbd_transfer_start" + * case "NULL": + * - "usbd_transfer_start" * - "usbd_transfer_stop" * - "{ehci,ohci,uhci}_interrupt" * - "{ehci,ohci,uhci}_timeout" - * xfer->usb_root: + * + * case "xfer->usb_root": * - "usbd_callback_intr_td" + * * Else: * - the given thread in case of polling */ @@ -605,8 +735,8 @@ void *td_transfer_first; /* used by HC driver */ void *td_transfer_last; /* used by HC driver */ void *td_transfer_cache; /* used by HC driver */ - void *priv_sc; - void *priv_fifo; + void *priv_sc; /* device driver data pointer 1 */ + void *priv_fifo; /* device driver data pointer 2 */ void *local_buffer; uint32_t *frlengths; struct usbd_page_cache *frbuffers; @@ -630,8 +760,8 @@ uint16_t isoc_time_complete; /* in ms */ uint16_t interval; /* milliseconds */ - uint8_t address; - uint8_t endpoint; + uint8_t address; /* physical USB address */ + uint8_t endpoint; /* physical USB endpoint */ uint8_t max_packet_count; uint8_t usb_smask; uint8_t usb_cmask; @@ -644,6 +774,11 @@ struct usbd_xfer_flags_int flags_int; }; +/* + * The following structure is used to keep information about memory + * that should be automatically freed at the moment all USB transfers + * have been freed. + */ struct usbd_memory_info { LIST_HEAD(, usbd_xfer) dma_head; LIST_HEAD(, usbd_xfer) done_head; @@ -672,6 +807,10 @@ uint8_t done_sleep; /* set if done thread is sleeping */ }; +/* + * The following structure defines a minimum re-implementation of the + * mbuf system in the kernel. + */ struct usbd_mbuf { uint8_t *cur_data_ptr; uint8_t *min_data_ptr; @@ -683,6 +822,10 @@ uint32_t last_packet:1; }; +/* + * The following structure defines a minimum re-implementation of the + * ifqueue structure in the kernel. + */ struct usbd_ifqueue { struct usbd_mbuf *ifq_head; struct usbd_mbuf *ifq_tail; @@ -732,7 +875,7 @@ } while (0) /*------------------------------------------------------------------------* - * structures used by the usbd config thread system + * structures used by the USB config thread system *------------------------------------------------------------------------*/ struct usbd_config_td_softc; struct usbd_config_td_cc; @@ -740,6 +883,9 @@ typedef void (usbd_config_td_command_t)(struct usbd_config_td_softc *sc, struct usbd_config_td_cc *cc, uint16_t reference); typedef void (usbd_config_td_end_of_commands_t)(struct usbd_config_td_softc *sc); +/* + * The following structure defines an USB config thread. + */ struct usbd_config_td { struct usbd_ifqueue cmd_free; struct usbd_ifqueue cmd_used; @@ -757,6 +903,10 @@ uint8_t flag_config_td_gone; }; +/* + * The following structure defines a command that should be executed + * using the USB config thread system. + */ struct usbd_config_td_item { usbd_config_td_command_t *command_func; uint16_t command_ref; @@ -768,11 +918,17 @@ struct usb_devno { uint16_t ud_vendor; uint16_t ud_product; + + /* + * XXX this structure should be extended to also contain some + * flags --hps + */ } __packed; -#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_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 @@ -813,11 +969,9 @@ #define UMATCH_NONE (ENXIO) /*------------------------------------------------------------------------* - * prototypes + * prototypes from "usb_subr.c" *------------------------------------------------------------------------*/ -/* prototypes from usb_subr.c */ - #ifdef __FreeBSD__ #if (__FreeBSD_version >= 700020) #define device_get_dma_tag(dev) bus_get_dma_tag(dev) @@ -828,7 +982,6 @@ typedef void (usbd_bus_mem_sub_cb_t)(struct usbd_bus *bus, struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, uint32_t align); typedef void (usbd_bus_mem_cb_t)(struct usbd_bus *bus, usbd_bus_mem_sub_cb_t *scb); - void usbd_devinfo(struct usbd_device *udev, char *dst_ptr, uint16_t dst_len); const char *usbd_errstr(usbd_status_t err); void usb_delay_ms(struct usbd_bus *bus, uint32_t ms); @@ -895,7 +1048,9 @@ struct usbd_device *usbd_bus_port_get_device(struct usbd_bus *bus, struct usbd_port *up); void usbd_bus_port_set_device(struct usbd_bus *bus, struct usbd_port *up, struct usbd_device *udev, uint8_t device_index); -/* prototypes from usb.c */ +/*------------------------------------------------------------------------* + * prototypes from "usb.c" + *------------------------------------------------------------------------*/ #if 0 extern struct mtx usb_global_lock; @@ -908,13 +1063,17 @@ void usb_needs_explore(struct usbd_bus *bus, uint8_t what); void usb_needs_probe_and_attach(void); -/* prototypes from usb_template.c */ +/*------------------------------------------------------------------------* + * prototypes from "usb_template.c" + *------------------------------------------------------------------------*/ void usbd_temp_get_desc(struct usbd_device *udev, usb_device_request_t *req, const void **pPtr, uint16_t *pLen); usbd_status_t usbd_temp_setup(struct usbd_device *udev, const struct usb_temp_device_desc *tdd); void usbd_temp_unsetup(struct usbd_device *udev); -/* prototypes from usb_transfer.c */ +/*------------------------------------------------------------------------* + * prototypes from "usb_transfer.c" + *------------------------------------------------------------------------*/ #ifdef USB_DEBUG void usbd_dump_iface(struct usbd_interface *iface); @@ -959,7 +1118,9 @@ const struct usb_devno *usb_match_device(const struct usb_devno *tbl, uint32_t nentries, uint32_t size, uint16_t vendor, uint16_t product); int32_t usbd_driver_load(struct module *mod, int32_t what, void *arg); -/* prototypes from usb_requests.c */ +/*------------------------------------------------------------------------* + * prototypes from "usb_requests.c" + *------------------------------------------------------------------------*/ usbd_status_t usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, uint8_t port); usbd_status_t usbreq_get_desc(struct usbd_device *udev, struct mtx *mtx, void *desc, uint16_t min_len, uint16_t max_len, uint16_t id, uint8_t type, uint8_t index, uint8_t retries); @@ -1007,7 +1168,9 @@ #define USBD_MS_TO_TICKS(ms) \ (((uint32_t)((((uint32_t)(ms)) * ((uint32_t)(hz))) + 1023)) / 1024) -/* prototypes from "usb_cdev.c" */ +/*------------------------------------------------------------------------* + * prototypes from "usb_cdev.c" + *------------------------------------------------------------------------*/ struct usb_cdev; struct cdev; From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AA7B10659D0; Fri, 29 Feb 2008 19:47:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BE2510657C5 for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D5158FC34 for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlcvN092261 for ; Fri, 29 Feb 2008 19:47:38 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlc3M092259 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:38 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:38 GMT Message-Id: <200802291947.m1TJlc3M092259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=136409 Change 136409 by rrs@rrs-mips2-jnpr on 2008/02/28 09:27:27 Reg numbers for the kernel stack (we do not want numbers please) Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#6 (text+ko) ==== @@ -46,6 +46,26 @@ #define STAND_FRAME_SIZE 24 #define STAND_RA_OFFSET 20 +/* This must match the numbers + * in pcb.h and is used by + * swtch.S + */ +#define PREG_S0 0 +#define PREG_S1 1 +#define PREG_S2 2 +#define PREG_S3 3 +#define PREG_S4 4 +#define PREG_S5 5 +#define PREG_S6 6 +#define PREG_S7 7 +#define PREG_SP 8 +#define PREG_S8 9 +#define PREG_RA 10 +#define PREG_SR 11 +#define PREG_GP 12 + + + /* * Location of the saved registers relative to ZERO. * This must match struct trapframe defined in frame.h exactly. From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 706FB1065A65; Fri, 29 Feb 2008 19:47:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F3F210657CB for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30BD58FC35 for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJldIq092266 for ; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJldKx092264 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:39 GMT Message-Id: <200802291947.m1TJldKx092264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136410 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=136410 Change 136410 by rrs@rrs-mips2-jnpr on 2008/02/28 09:27:53 Cooresponding reg numbers to be used in the context structure Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcb.h#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/pcb.h#5 (text+ko) ==== @@ -54,6 +54,24 @@ int pcb_onfault; /* for copyin/copyout faults */ }; +/* these match the regnum's in regnum.h + * used by switch.S + */ +#define PCB_REG_S0 0 +#define PCB_REG_S1 1 +#define PCB_REG_S2 2 +#define PCB_REG_S3 3 +#define PCB_REG_S4 4 +#define PCB_REG_S5 5 +#define PCB_REG_S6 6 +#define PCB_REG_S7 7 +#define PCB_REG_SP 8 +#define PCB_REG_S8 9 +#define PCB_REG_RA 10 +#define PCB_REG_SR 11 +#define PCB_REG_GP 12 + + #ifdef _KERNEL extern struct pcb *curpcb; /* the current running pcb */ From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C048E1065AEF; Fri, 29 Feb 2008 19:47:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 635C510657CC for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 541CC8FC37 for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJldF2092271 for ; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJldN4092269 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:39 GMT Message-Id: <200802291947.m1TJldN4092269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=136411 Change 136411 by rrs@rrs-mips2-jnpr on 2008/02/28 09:29:45 Have assembly use pneumonics now please. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#14 (text+ko) ==== @@ -237,20 +237,20 @@ * savectx(struct pcb *pcbp); */ LEAF(savectx) - SAVE_U_PCB_CONTEXT(s0, 0, a0) - SAVE_U_PCB_CONTEXT(s1, 1, a0) - SAVE_U_PCB_CONTEXT(s2, 2, a0) - SAVE_U_PCB_CONTEXT(s3, 3, a0) + SAVE_U_PCB_CONTEXT(s0, PREG_S0, a0) + SAVE_U_PCB_CONTEXT(s1, PREG_S1, a0) + SAVE_U_PCB_CONTEXT(s2, PREG_S2, a0) + SAVE_U_PCB_CONTEXT(s3, PREG_S3, a0) mfc0 v0, COP_0_STATUS_REG - SAVE_U_PCB_CONTEXT(s4, 4, a0) - SAVE_U_PCB_CONTEXT(s5, 5, a0) - SAVE_U_PCB_CONTEXT(s6, 6, a0) - SAVE_U_PCB_CONTEXT(s7, 7, a0) - SAVE_U_PCB_CONTEXT(sp, 8, a0) - SAVE_U_PCB_CONTEXT(s8, 9, a0) - SAVE_U_PCB_CONTEXT(ra, 10, a0) - SAVE_U_PCB_CONTEXT(v0, 11, a0) - SAVE_U_PCB_CONTEXT(gp, 12, a0) + SAVE_U_PCB_CONTEXT(s4, PREG_S4, a0) + SAVE_U_PCB_CONTEXT(s5, PREG_S5, a0) + SAVE_U_PCB_CONTEXT(s6, PREG_S6, a0) + SAVE_U_PCB_CONTEXT(s7, PREG_S7, a0) + SAVE_U_PCB_CONTEXT(sp, PREG_SP, a0) + SAVE_U_PCB_CONTEXT(s8, PREG_S8, a0) + SAVE_U_PCB_CONTEXT(ra, PREG_RA, a0) + SAVE_U_PCB_CONTEXT(v0, PREG_SR, a0) + SAVE_U_PCB_CONTEXT(gp, PREG_GP, a0) /* * FREEBSD_DEVELOPERS_FIXME: * In case there are CPU-specific registers that need @@ -293,22 +293,22 @@ beqz a0, mips_sw1 move a3, a0 lw a0, TD_PCB(a0) # load PCB addr of curproc - SAVE_U_PCB_CONTEXT(sp, 8, a0) # save old sp + SAVE_U_PCB_CONTEXT(sp, PREG_SP, a0) # save old sp subu sp, sp, STAND_FRAME_SIZE sw ra, STAND_RA_OFFSET(sp) .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) - SAVE_U_PCB_CONTEXT(s0, 0, a0) # do a 'savectx()' - SAVE_U_PCB_CONTEXT(s1, 1, a0) - SAVE_U_PCB_CONTEXT(s2, 2, a0) - SAVE_U_PCB_CONTEXT(s3, 3, a0) - SAVE_U_PCB_CONTEXT(s4, 4, a0) - SAVE_U_PCB_CONTEXT(s5, 5, a0) - SAVE_U_PCB_CONTEXT(s6, 6, a0) - SAVE_U_PCB_CONTEXT(s7, 7, a0) - SAVE_U_PCB_CONTEXT(s8, 9, a0) - SAVE_U_PCB_CONTEXT(ra, 10, a0) # save return address - SAVE_U_PCB_CONTEXT(t0, 11, a0) # save status register - SAVE_U_PCB_CONTEXT(gp, 12, a0) + SAVE_U_PCB_CONTEXT(s0, PREG_S0, a0) # do a 'savectx()' + SAVE_U_PCB_CONTEXT(s1, PREG_S1, a0) + SAVE_U_PCB_CONTEXT(s2, PREG_S2, a0) + SAVE_U_PCB_CONTEXT(s3, PREG_S3, a0) + SAVE_U_PCB_CONTEXT(s4, PREG_S4, a0) + SAVE_U_PCB_CONTEXT(s5, PREG_S5, a0) + SAVE_U_PCB_CONTEXT(s6, PREG_S6, a0) + SAVE_U_PCB_CONTEXT(s7, PREG_S7, a0) + SAVE_U_PCB_CONTEXT(s8, PREG_S8, a0) + SAVE_U_PCB_CONTEXT(ra, PREG_RA, a0) # save return address + SAVE_U_PCB_CONTEXT(t0, PREG_SR, a0) # save status register + SAVE_U_PCB_CONTEXT(gp, PREG_GP, a0) /* * FREEBSD_DEVELOPERS_FIXME: * In case there are CPU-specific registers that need @@ -391,19 +391,19 @@ * Restore registers and return. */ lw a0, TD_PCB(s7) - RESTORE_U_PCB_CONTEXT(gp, 12, a0) - RESTORE_U_PCB_CONTEXT(v0, 11, a0) # restore kernel context - RESTORE_U_PCB_CONTEXT(ra, 10, a0) - RESTORE_U_PCB_CONTEXT(s0, 0, a0) - RESTORE_U_PCB_CONTEXT(s1, 1, a0) - RESTORE_U_PCB_CONTEXT(s2, 2, a0) - RESTORE_U_PCB_CONTEXT(s3, 3, a0) - RESTORE_U_PCB_CONTEXT(s4, 4, a0) - RESTORE_U_PCB_CONTEXT(s5, 5, a0) - RESTORE_U_PCB_CONTEXT(s6, 6, a0) - RESTORE_U_PCB_CONTEXT(s7, 7, a0) - RESTORE_U_PCB_CONTEXT(sp, 8, a0) - RESTORE_U_PCB_CONTEXT(s8, 9, a0) + RESTORE_U_PCB_CONTEXT(gp, PREG_GP, a0) + RESTORE_U_PCB_CONTEXT(v0, PREG_SR, a0) # restore kernel context + RESTORE_U_PCB_CONTEXT(ra, PREG_RA, a0) + RESTORE_U_PCB_CONTEXT(s0, PREG_S0, a0) + RESTORE_U_PCB_CONTEXT(s1, PREG_S1, a0) + RESTORE_U_PCB_CONTEXT(s2, PREG_S2, a0) + RESTORE_U_PCB_CONTEXT(s3, PREG_S3, a0) + RESTORE_U_PCB_CONTEXT(s4, PREG_S4, a0) + RESTORE_U_PCB_CONTEXT(s5, PREG_S5, a0) + RESTORE_U_PCB_CONTEXT(s6, PREG_S6, a0) + RESTORE_U_PCB_CONTEXT(s7, PREG_S7, a0) + RESTORE_U_PCB_CONTEXT(sp, PREG_SP, a0) + RESTORE_U_PCB_CONTEXT(s8, PREG_S8, a0) /* * FREEBSD_DEVELOPERS_FIXME: * In case there are CPU-specific registers that need From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3F321065B9C; Fri, 29 Feb 2008 19:47:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD35010657D4 for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DF588FC19 for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJldZR092281 for ; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJldWN092279 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:39 GMT Message-Id: <200802291947.m1TJldWN092279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=136413 Change 136413 by rrs@rrs-mips2-jnpr on 2008/02/28 09:35:01 make context use pnemonics too. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#18 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#18 (text+ko) ==== @@ -155,14 +155,14 @@ if (td1 == PCPU_GET(fpcurthread)) MipsSaveCurFPState(td1); - pcb2->pcb_context.val[10] = (register_t)fork_trampoline; + pcb2->pcb_context.val[PCB_REG_RA] = (register_t)fork_trampoline; /* Make sp 64-bit aligned */ - pcb2->pcb_context.val[8] = (register_t)(((vm_offset_t)td2->td_pcb & + pcb2->pcb_context.val[PCB_REG_SP] = (register_t)(((vm_offset_t)td2->td_pcb & ~(sizeof(__int64_t) - 1)) - STAND_FRAME_SIZE); - pcb2->pcb_context.val[0] = (register_t)fork_return; - pcb2->pcb_context.val[1] = (register_t)td2; - pcb2->pcb_context.val[2] = (register_t)td2->td_frame; - pcb2->pcb_context.val[11] = SR_INT_MASK; /* SR */ + pcb2->pcb_context.val[PCB_REG_S0] = (register_t)fork_return; + pcb2->pcb_context.val[PCB_REG_S1] = (register_t)td2; + pcb2->pcb_context.val[PCB_REG_S2] = (register_t)td2->td_frame; + pcb2->pcb_context.val[PCB_REG_SR] = SR_INT_MASK; /* SR */ /* * FREEBSD_DEVELOPERS_FIXME: * Setup any other CPU-Specific registers (Not MIPS Standard) @@ -173,7 +173,7 @@ td2->td_md.md_saved_intr = 1; td2->td_md.md_spinlock_count = 1; #ifdef TARGET_OCTEON - pcb2->pcb_context.val[11] |= MIPS_SR_COP_2_BIT | MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX; + pcb2->pcb_context.val[PCB_REG_SR] |= MIPS_SR_COP_2_BIT | MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX; #endif } @@ -191,8 +191,8 @@ * Note that the trap frame follows the args, so the function * is really called like this: func(arg, frame); */ - td->td_pcb->pcb_context.val[0] = (register_t) func; - td->td_pcb->pcb_context.val[1] = (register_t) arg; + td->td_pcb->pcb_context.val[PCB_REG_S0] = (register_t) func; + td->td_pcb->pcb_context.val[PCB_REG_S1] = (register_t) arg; } void @@ -305,18 +305,18 @@ * Set registers for trampoline to user mode. */ - pcb2->pcb_context.val[10] = (register_t)fork_trampoline; + pcb2->pcb_context.val[PCB_REG_RA] = (register_t)fork_trampoline; /* Make sp 64-bit aligned */ - pcb2->pcb_context.val[8] = (register_t)(((vm_offset_t)td->td_pcb & + pcb2->pcb_context.val[PCB_REG_SP] = (register_t)(((vm_offset_t)td->td_pcb & ~(sizeof(__int64_t) - 1)) - STAND_FRAME_SIZE); - pcb2->pcb_context.val[0] = (register_t)fork_return; - pcb2->pcb_context.val[1] = (register_t)td; - pcb2->pcb_context.val[2] = (register_t)td->td_frame; + pcb2->pcb_context.val[PCB_REG_S0] = (register_t)fork_return; + pcb2->pcb_context.val[PCB_REG_S1] = (register_t)td; + pcb2->pcb_context.val[PCB_REG_S2] = (register_t)td->td_frame; /* Dont set IE bit in SR. sched lock release will take care of it */ /* idle_mask is jmips pcb2->pcb_context.val[11] = (ALL_INT_MASK & idle_mask); */ - pcb2->pcb_context.val[11] = 0; + pcb2->pcb_context.val[PCB_REG_SR] = 0; #ifdef TARGET_OCTEON - pcb2->pcb_context.val[11] |= MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT | + pcb2->pcb_context.val[PCB_REG_SR] |= MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT | MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX; #endif From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAAB31065B9E; Fri, 29 Feb 2008 19:47:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2A0610657FC for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C26DD8FC1A for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJldLU092286 for ; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJld63092284 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:39 GMT Message-Id: <200802291947.m1TJld63092284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136414 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=136414 Change 136414 by rrs@rrs-mips2-jnpr on 2008/02/28 09:44:13 purge out duplicate code that is done in cpu_thread_alloc() Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#19 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#19 (text+ko) ==== @@ -107,21 +107,16 @@ { register struct proc *p1; struct pcb *pcb2; - pt_entry_t *pte; - int i; p1 = td1->td_proc; if ((flags & RFPROC) == 0) return; + /* It is assumed that the vm_thread_alloc called + * cpu_thread_alloc() before cpu_fork is called. + */ - if(td2->td_kstack & (1 << PAGE_SHIFT)) - td2->td_md.md_realstack = td2->td_kstack + PAGE_SIZE; - else - td2->td_md.md_realstack = td2->td_kstack; /* Point the pcb to the top of the stack */ - pcb2 = (struct pcb *)(td2->td_md.md_realstack + - (td2->td_kstack_pages - 1) * PAGE_SIZE) - 1; - td2->td_pcb = pcb2; + pcb2 = td2->td_pcb; /* Copy p1's pcb */ bcopy(td1->td_pcb, pcb2, sizeof(*pcb2)); @@ -130,10 +125,6 @@ * md_proc is empty for MIPS */ - /* Set up the trapframe pointer for the thread. trapframe - * is the first entry of the pcb - */ - td2->td_frame = &td2->td_pcb->pcb_regs; td2->td_md.md_flags = td1->td_md.md_flags & MDTD_FPUSED; /* @@ -143,15 +134,6 @@ td2->td_frame->v1 = 1; td2->td_frame->a3 = 0; - if (!(pte = pmap_segmap(kernel_pmap, td2->td_md.md_realstack))) - panic("cpu_fork: invalid segmap"); - pte += ((vm_offset_t)td2->td_md.md_realstack >> PGSHIFT) & (NPTEPG - 1); - - for (i = 0; i < KSTACK_PAGES - 1; i++) { - td2->td_md.md_upte[i] = *pte & ~(PG_RO|PG_WIRED); - pte++; - } - if (td1 == PCPU_GET(fpcurthread)) MipsSaveCurFPState(td1); From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B500710657A5; Fri, 29 Feb 2008 19:47:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04BB21065978 for ; Fri, 29 Feb 2008 19:47:40 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5DB98FC1C for ; Fri, 29 Feb 2008 19:47:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJld9I092291 for ; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJldwv092289 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:39 GMT Message-Id: <200802291947.m1TJldwv092289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136415 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=136415 Change 136415 by rrs@rrs-mips2-jnpr on 2008/02/28 10:09:33 use MIPS_SR_INT_IE not 1. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#20 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#20 (text+ko) ==== @@ -118,13 +118,17 @@ /* Point the pcb to the top of the stack */ pcb2 = td2->td_pcb; - /* Copy p1's pcb */ + /* Copy p1's pcb, note that in this case + * our pcb also includes the td_frame being copied + * too. The older mips2 code did an additional copy + * of the td_frame, for us thats not needed any + * longer (this copy does them both + */ bcopy(td1->td_pcb, pcb2, sizeof(*pcb2)); /* Point mdproc and then copy over td1's contents * md_proc is empty for MIPS */ - td2->td_md.md_flags = td1->td_md.md_flags & MDTD_FPUSED; /* @@ -152,7 +156,7 @@ * that are needed. */ - td2->td_md.md_saved_intr = 1; + td2->td_md.md_saved_intr = MIPS_SR_INT_IE; td2->td_md.md_spinlock_count = 1; #ifdef TARGET_OCTEON pcb2->pcb_context.val[PCB_REG_SR] |= MIPS_SR_COP_2_BIT | MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX; @@ -294,6 +298,8 @@ pcb2->pcb_context.val[PCB_REG_S0] = (register_t)fork_return; pcb2->pcb_context.val[PCB_REG_S1] = (register_t)td; pcb2->pcb_context.val[PCB_REG_S2] = (register_t)td->td_frame; + + /* Dont set IE bit in SR. sched lock release will take care of it */ /* idle_mask is jmips pcb2->pcb_context.val[11] = (ALL_INT_MASK & idle_mask); */ pcb2->pcb_context.val[PCB_REG_SR] = 0; @@ -310,7 +316,7 @@ /* SMP Setup to release sched_lock in fork_exit(). */ td->td_md.md_spinlock_count = 1; - td->td_md.md_saved_intr = 1; + td->td_md.md_saved_intr = MIPS_SR_INT_IE; #if 0 /* Maybe we need to fix this? */ td->td_md.md_saved_sr = ( (MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT) | From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A33B10658F8; Fri, 29 Feb 2008 19:47:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E8B2106598F for ; Fri, 29 Feb 2008 19:47:40 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 14CDA8FC1E for ; Fri, 29 Feb 2008 19:47:40 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJldCm092296 for ; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJldco092294 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:39 GMT (envelope-from sephe@FreeBSD.org) Date: Fri, 29 Feb 2008 19:47:39 GMT Message-Id: <200802291947.m1TJldco092294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 136416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=136416 Change 136416 by sephe@sephe_enigma:sam_vap on 2008/02/28 11:09:02 Unbreak build with INVARIANTS Affected files ... .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#3 edit Differences ... ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#3 (text+ko) ==== @@ -3811,7 +3811,7 @@ BWI_ASSERT_LOCKED(sc); KASSERT(sc->sc_ic.ic_opmode != IEEE80211_M_MONITOR, - ("opmode %d", sc->sc_ic->ic_opmode)); + ("opmode %d", sc->sc_ic.ic_opmode)); KASSERT(sc->sc_cur_regwin->rw_type == BWI_REGWIN_T_MAC, ("current regwin type %d", sc->sc_cur_regwin->rw_type)); From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEED61065CB4; Fri, 29 Feb 2008 19:47:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D42DF1065AF9 for ; Fri, 29 Feb 2008 19:47:41 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C518A8FC22 for ; Fri, 29 Feb 2008 19:47:41 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlfBP092356 for ; Fri, 29 Feb 2008 19:47:41 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlf4V092354 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:41 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:41 GMT Message-Id: <200802291947.m1TJlf4V092354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=136428 Change 136428 by rrs@rrs-mips2-jnpr on 2008/02/28 13:53:09 make sure the right mask is in place in all SR sets. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#21 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#21 (text+ko) ==== @@ -148,7 +148,7 @@ pcb2->pcb_context.val[PCB_REG_S0] = (register_t)fork_return; pcb2->pcb_context.val[PCB_REG_S1] = (register_t)td2; pcb2->pcb_context.val[PCB_REG_S2] = (register_t)td2->td_frame; - pcb2->pcb_context.val[PCB_REG_SR] = SR_INT_MASK; /* SR */ + pcb2->pcb_context.val[PCB_REG_SR] = SR_INT_MASK; /* * FREEBSD_DEVELOPERS_FIXME: * Setup any other CPU-Specific registers (Not MIPS Standard) @@ -302,7 +302,7 @@ /* Dont set IE bit in SR. sched lock release will take care of it */ /* idle_mask is jmips pcb2->pcb_context.val[11] = (ALL_INT_MASK & idle_mask); */ - pcb2->pcb_context.val[PCB_REG_SR] = 0; + pcb2->pcb_context.val[PCB_REG_SR] = SR_INT_MASK; #ifdef TARGET_OCTEON pcb2->pcb_context.val[PCB_REG_SR] |= MIPS_SR_COP_2_BIT | MIPS_SR_COP_0_BIT | MIPS32_SR_PX | MIPS_SR_UX | MIPS_SR_KX | MIPS_SR_SX; From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52E201065D40; Fri, 29 Feb 2008 19:47:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5FC01065B83 for ; Fri, 29 Feb 2008 19:47:42 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E85D48FC28 for ; Fri, 29 Feb 2008 19:47:41 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlf4C092361 for ; Fri, 29 Feb 2008 19:47:41 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlfu7092359 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:41 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:41 GMT Message-Id: <200802291947.m1TJlfu7092359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136429 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=136429 Change 136429 by rrs@rrs-mips2-jnpr on 2008/02/28 13:54:14 need a nop in delayed branch. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#14 (text+ko) ==== @@ -328,6 +328,7 @@ jalr s0 ;\ addu a0, s3, U_PCB_REGS ;\ j 44b ;\ + nop ;\ 4: From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:47:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E73F61065DC7; Fri, 29 Feb 2008 19:47:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B02EE1065B94 for ; Fri, 29 Feb 2008 19:47:42 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 173218FC2A for ; Fri, 29 Feb 2008 19:47:42 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJlfUA092366 for ; Fri, 29 Feb 2008 19:47:41 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlfmv092364 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:41 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:47:41 GMT Message-Id: <200802291947.m1TJlfmv092364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:47:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=136430 Change 136430 by rrs@rrs-mips2-jnpr on 2008/02/28 13:57:41 Fix for pmap.c (and also some more debug available). Note still need to find out who is setting P_G on pte entries in non kernel map. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#24 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#24 (text+ko) ==== @@ -618,7 +618,6 @@ return; } va = pmap_va_asid(pmap, va); - MachTLBUpdate(va, pte); } @@ -1823,8 +1822,16 @@ if (wired) newpte |= PG_W; - if (is_kernel_pmap(pmap)) - newpte |= PG_G; + if (is_kernel_pmap(pmap)) { + newpte |= PG_G; + } else { + /* non kernel map should + * should never have the PG_G + * bit on. FIX, need to find out + * who is turning it on in callers. + */ + newpte &= (~PG_G); + } /* * if the mapping or permission bits are different, we need to @@ -2861,8 +2868,9 @@ return addr; } +int pmap_pid_dump(int pid); -#if defined(PMAP_DEBUG) +int pmap_pid_dump(int pid) { pmap_t pmap; @@ -2878,6 +2886,8 @@ if (p->p_vmspace) { int i, j; + printf("vmspace is %p\n", + p->p_vmspace); index = 0; pmap = vmspace_pmap(p->p_vmspace); for (i = 0; i < NUSERPGTBLS; i++) { @@ -2915,13 +2925,15 @@ } } } + } else { + printf("Process pid:%d has no vm_space\n", pid); } + break; } sx_sunlock(&allproc_lock); return npte; } -#endif #if defined(DEBUG) @@ -3096,9 +3108,9 @@ while (tlbno <= last) { MachTLBRead(tlbno, &tlb); if (tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V) { - printf("TLB %2d vad 0x%08x ", tlbno, tlb.tlb_hi); + printf("TLB %2d vad 0x%08x ", tlbno, (tlb.tlb_hi & 0xffffff00)); } else { - printf("TLB*%2d vad 0x%08x ", tlbno, tlb.tlb_hi); + printf("TLB*%2d vad 0x%08x ", tlbno, (tlb.tlb_hi & 0xffffff00)); } printf("0=0x%08x ", pfn_to_vad(tlb.tlb_lo0)); printf("%c", tlb.tlb_lo0 & PG_M ? 'M' : ' '); @@ -3108,8 +3120,9 @@ printf("%c", tlb.tlb_lo1 & PG_M ? 'M' : ' '); printf("%c", tlb.tlb_lo1 & PG_G ? 'G' : ' '); printf(" atr %x ", (tlb.tlb_lo1 >> 3) & 7); - printf(" sz=%x\n", tlb.tlb_mask); - + printf(" sz=%x pid=%x\n", tlb.tlb_mask, + (tlb.tlb_hi & 0x000000ff) + ); tlbno++; } } From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C68E1065EF2; Fri, 29 Feb 2008 19:48:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB63A1065EED for ; Fri, 29 Feb 2008 19:48:08 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA82D8FC25 for ; Fri, 29 Feb 2008 19:48:08 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJm8Tx092406 for ; Fri, 29 Feb 2008 19:48:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJlggE092396 for perforce@freebsd.org; Fri, 29 Feb 2008 19:47:42 GMT (envelope-from piso@freebsd.org) Date: Fri, 29 Feb 2008 19:47:42 GMT Message-Id: <200802291947.m1TJlggE092396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 136436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=136436 Change 136436 by piso@piso_ferret on 2008/02/28 16:59:43 IFC@136432 Affected files ... .. //depot/projects/soc2005/libalias/COPYRIGHT#3 integrate .. //depot/projects/soc2005/libalias/LOCKS#2 integrate .. //depot/projects/soc2005/libalias/MAINTAINERS#9 integrate .. //depot/projects/soc2005/libalias/Makefile#14 integrate .. //depot/projects/soc2005/libalias/Makefile.inc1#15 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#24 integrate .. //depot/projects/soc2005/libalias/UPDATING#22 integrate .. //depot/projects/soc2005/libalias/bin/cp/cp.c#7 integrate .. //depot/projects/soc2005/libalias/bin/date/date.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ed/Makefile#3 integrate .. //depot/projects/soc2005/libalias/bin/ln/ln.1#2 integrate .. //depot/projects/soc2005/libalias/bin/ln/ln.c#2 integrate .. //depot/projects/soc2005/libalias/bin/mv/mv.c#2 integrate .. //depot/projects/soc2005/libalias/bin/ps/ps.c#3 integrate .. //depot/projects/soc2005/libalias/bin/sh/Makefile#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/cd.c#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/mksyntax.c#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/sh.1#7 integrate .. //depot/projects/soc2005/libalias/cddl/Makefile.inc#3 integrate .. //depot/projects/soc2005/libalias/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/soc2005/libalias/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/soc2005/libalias/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/AUTHORS#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/BUGS#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/COPYING#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/FAQ#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/NEWS#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/README.attrcache#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/README.ldap#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/map.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/bootstrap#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/ldap.schema#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/libamu/util.c#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/amindent#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/autopat#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/mkconf#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/soc2005/libalias/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/tasks#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/vers.m4#1 branch .. //depot/projects/soc2005/libalias/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/soc2005/libalias/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#8 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/README#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/configure.in#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/make/rules.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/version#8 integrate .. //depot/projects/soc2005/libalias/contrib/binutils/libiberty/cp-demangle.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/csup/mux.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/BUGS#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/FAQ#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/HACKING#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/NEWS#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/TESTS#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/TODO#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/config.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/configure.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/soc2005/libalias/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/soc2005/libalias/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/getdate#1 branch .. //depot/projects/soc2005/libalias/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/add.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/client.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/client.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/history.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/history.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/import.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/log.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/login.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/main.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/release.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/root.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/root.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/run.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/server.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/server.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/status.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/update.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/version.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/cvs/tools/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/ChangeLog#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/animation#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/apple#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/archive#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/audio#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/soc2005/libalias/contrib/file/Magdir/blender#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/chi#2 delete .. //depot/projects/soc2005/libalias/contrib/file/Magdir/commands#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/console#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/cvs#2 delete .. //depot/projects/soc2005/libalias/contrib/file/Magdir/database#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/efi#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/elf#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/fortran#1 branch .. //depot/projects/soc2005/libalias/contrib/file/Magdir/hdf#2 delete .. //depot/projects/soc2005/libalias/contrib/file/Magdir/impulse#2 delete .. //depot/projects/soc2005/libalias/contrib/file/Magdir/java#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/soc2005/libalias/contrib/file/Makefile.am#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/acconfig.h#2 delete .. //depot/projects/soc2005/libalias/contrib/file/acinclude.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/aclocal.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/apprentice.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/ascmagic.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/compress.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/config.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/configure#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/configure.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/file.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/file.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/file.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/file_opts.h#1 branch .. //depot/projects/soc2005/libalias/contrib/file/fsmagic.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/funcs.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/install-sh#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/is_tar.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/libmagic.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/magic.mime#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/missing#2 delete .. //depot/projects/soc2005/libalias/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/names.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/patchlevel.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/print.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/readelf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/readelf.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/file/softmagic.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/file/stamp-h.in#2 delete .. //depot/projects/soc2005/libalias/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/soc2005/libalias/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/hexnan.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtorQ.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/gdtoa/strtorx.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/libalias/contrib/less/LICENSE#3 integrate .. //depot/projects/soc2005/libalias/contrib/less/Makefile.dsm#2 delete .. //depot/projects/soc2005/libalias/contrib/less/NEWS#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/README#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/ch.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/command.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/configure#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/configure.ac#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/decode.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.ds#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.h.in#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.o2#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.o9#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/defines.wn#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/edit.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/filename.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/funcs.h#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.h#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.man#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/less.nro#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/lessecho.man#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/lessecho.nro#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/lesskey.man#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/lesskey.nro#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/line.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/optfunc.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/opttbl.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/screen.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/search.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/less/tags.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/less/version.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/complete.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/display.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/input.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/misc.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/readline.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/text.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/NEWS#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/config.guess#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/config.sub#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/configure#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/configure.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/dist.mk#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/html/ncurses-intro.html#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/headers#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/modules#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/curses.wide#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/headers#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/ncurses_dll.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/tic.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/install-sh#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/clear.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_attr.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_border.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_clear.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_extend.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_insstr.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_mouse.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_outopts.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_termattrs.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_termcap.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_trace.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/default_colors.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_new.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_validation.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/infocmp.1m#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/manlinks.sed#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/panel.3x#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/term.5#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/term.7#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/tic.1m#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/tput.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/tset.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/menu.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/modules#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/shlib#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/mk-1st.awk#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/mkinstalldirs#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/MKkeyname.awk#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/define_key.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/keyok.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_addstr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_color.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_insch.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_instr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_redrawln.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_refresh.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkclear.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkset.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/safe_sprintf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/modules#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/access.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/add_tries.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_error.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_parse.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_termcap.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/parse_entry.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/setbuf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/strings.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_traceatr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracebits.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracechr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_cchar.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/clear.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/modules#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/tic.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/COPYING#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/HISTORY#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/Makefile.in#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/README#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/ansi.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/charset.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/color.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/control.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/crum.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/edit.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/fun.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/init.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/menu.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/modes.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/modules#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/output.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/pad.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/scan.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/sync.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/sysdep.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/tack.1#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/tack.c#3 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/tack.h#3 delete .. //depot/projects/soc2005/libalias/contrib/openpam/CREDITS#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/soc2005/libalias/contrib/openpam/HISTORY#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/LICENSE#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/MANIFEST#2 delete .. //depot/projects/soc2005/libalias/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/compile#1 branch .. //depot/projects/soc2005/libalias/contrib/openpam/config.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/configure.ac#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/configure.in#2 delete .. //depot/projects/soc2005/libalias/contrib/openpam/depcomp#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/install-sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/openpam/lib/openpam_findenv.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8AB01066009; Fri, 29 Feb 2008 19:48:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AC421065FAC for ; Fri, 29 Feb 2008 19:48:10 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9FA8FC2B for ; Fri, 29 Feb 2008 19:48:10 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmA7s092446 for ; Fri, 29 Feb 2008 19:48:10 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJm9RJ092444 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:09 GMT (envelope-from piso@freebsd.org) Date: Fri, 29 Feb 2008 19:48:09 GMT Message-Id: <200802291948.m1TJm9RJ092444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 136444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=136444 Change 136444 by piso@piso_ferret on 2008/02/28 17:28:35 Toss away the previous modifications to make libalias mbuf safe: as i can't find the nat/samba share bug, the only thing i can do is to restart from a vanilla kernel, and reapply one by one all the patches. Affected files ... .. //depot/projects/soc2005/libalias/lib/msun/src/e_rem_pio2.c#3 edit .. //depot/projects/soc2005/libalias/lib/msun/src/e_rem_pio2f.c#3 edit .. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#13 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#53 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#61 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#15 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_cuseeme.c#17 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#26 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#20 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#22 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#28 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#28 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#25 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_nbt.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_pptp.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#24 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_skinny.c#15 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#20 edit Differences ... ==== //depot/projects/soc2005/libalias/lib/msun/src/e_rem_pio2.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.18 2008/02/28 16:22:36 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -126,7 +126,7 @@ } } } - if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ + if(ix<0x413921fb) { /* |x| ~< 2^20*(pi/2), medium size */ medium: /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); ==== //depot/projects/soc2005/libalias/lib/msun/src/e_rem_pio2f.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.29 2008/02/28 16:22:36 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * @@ -38,8 +38,8 @@ static const double half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ -pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ -pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +pio2_1 = 1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */ +pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */ #ifdef INLINE_REM_PIO2F extern inline @@ -55,7 +55,7 @@ GET_FLOAT_WORD(hx,x); ix = hx&0x7fffffff; /* 33+53 bit pi is good enough for medium size */ - if(ix<=0x49490f80) { /* |x| ~<= 2^19*(pi/2), medium size */ + if(ix<0x4dc90fdb) { /* |x| ~< 2^28*(pi/2), medium size */ /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); fn = fn-0x1.8p52; ==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#13 (text+ko) ==== @@ -254,6 +254,7 @@ struct mbuf *m; struct ip *ip; int rval, error = 0; + char *c; /* We have no required hooks. */ if (!(priv->flags & NGNAT_CONNECTED)) { @@ -267,7 +268,7 @@ m = NGI_M(item); - if ((m = m_pullup(m, sizeof(struct ip))) == NULL) { + if ((m = m_megapullup(m, m->m_pkthdr.len)) == NULL) { NGI_M(item) = NULL; /* avoid double free */ NG_FREE_ITEM(item); return (ENOBUFS); @@ -275,49 +276,33 @@ NGI_M(item) = m; + c = mtod(m, char *); ip = mtod(m, struct ip *); KASSERT(m->m_pkthdr.len == ntohs(ip->ip_len), ("ng_nat: ip_len != m_pkthdr.len")); if (hook == priv->in) { - rval = LibAliasIn(priv->lib, &m, 0); + rval = LibAliasIn(priv->lib, c, MCLBYTES); if (rval != PKT_ALIAS_OK && rval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) { - NGI_M(item) = m; NG_FREE_ITEM(item); return (EINVAL); } } else if (hook == priv->out) { - rval = LibAliasOut(priv->lib, &m, 0); + rval = LibAliasOut(priv->lib, c, MCLBYTES); if (rval != PKT_ALIAS_OK) { - NGI_M(item) = m; NG_FREE_ITEM(item); return (EINVAL); } } else panic("ng_nat: unknown hook!\n"); - if ((m = m_pullup(m, sizeof(struct ip))) == NULL) { - NGI_M(item) = NULL; /* avoid double free */ - NG_FREE_ITEM(item); - return (ENOBUFS); - } - ip = mtod(m, struct ip *); - m->m_pkthdr.len = ntohs(ip->ip_len); + m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len); if ((ip->ip_off & htons(IP_OFFMASK)) == 0 && - ip->ip_p == IPPROTO_TCP) { - struct tcphdr *th; - - if ((m = m_pullup(m, (ip->ip_hl << 2) + sizeof(struct tcphdr))) - == NULL) { - NGI_M(item) = NULL; /* avoid double free */ - NG_FREE_ITEM(item); - return (ENOBUFS); - } - ip = mtod(m, struct ip *); - th = (struct tcphdr *)((caddr_t)ip + + ip->ip_p == IPPROTO_TCP) { + struct tcphdr *th = (struct tcphdr *)((caddr_t)ip + (ip->ip_hl << 2)); /* @@ -357,7 +342,7 @@ ip->ip_len = htons(ip->ip_len); } } - NGI_M(item) = m; + send: if (hook == priv->in) NG_FWD_ITEM_HOOK(error, item, priv->out); ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#53 (text+ko) ==== @@ -122,7 +122,6 @@ static int fw_verbose; static int verbose_limit; -static int ldebug; static struct callout ipfw_timeout; static uma_zone_t ipfw_dyn_rule_zone; @@ -196,8 +195,6 @@ &fw_verbose, 0, "Log matches to ipfw rules"); SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &verbose_limit, 0, "Set upper limit of matches of ipfw rules logged"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, libalias_debug, CTLFLAG_RW, - &ldebug, 0, "LibAlias debug code"); /* * Description of dynamic rules. @@ -2242,66 +2239,6 @@ } #endif -int -m_csum(struct mbuf **m, struct libalias *la); - -int -m_csum(struct mbuf **m, struct libalias *la) -{ - struct ip *pip; - //struct tcphdr *th; - int off, len, sum = 0; - //u_short *ptr; - - *m = m_pullup(*m, sizeof(struct ip)); - pip = mtod(*m, struct ip *); - off = pip->ip_hl << 2; - len = ntohs(pip->ip_len); - if (ldebug != 0) - printf("off: %u len: %u\n", off, len); - if (pip->ip_p == IPPROTO_TCP) { - /* - m = m_pullup(m, off + sizeof(struct tcphdr)); - pip = mtod(m, struct ip *); - th = (struct tcphdr *)&(((char *)pip)[off]); - off += th->th_off << 2; - */ - } else if (pip->ip_p == IPPROTO_UDP) { - /* udp hdr is of fixed size - no opts */ - off += 8; - } else { - if (ldebug != 0) - printf("unkown protocol: %u\n", pip->ip_p); - return (-1); - } - if (len == off) - return (0); - if (len < off) { - if (ldebug != 0) - printf("len < off: %u, %u\n", len, off); - return (-1); - } - /* - len -= off; - m_copydata(m, off, len, la->buff); - ptr = (u_short *)la->buff; - sum = 0; - while (len > 1) { - sum += *ptr++; - len -= 2; - } - if (len == 1) { - oddbyte = 0; - ((u_char *) & oddbyte)[0] = *(u_char *) ptr; - ((u_char *) & oddbyte)[1] = 0; - sum += oddbyte; - } - sum = (sum >> 16) + (sum & 0xffff); - sum += (sum >> 16); - */ - return (~sum); -} - /* * The main check routine for the firewall. * @@ -3547,6 +3484,7 @@ #ifdef IPFIREWALL_NAT case O_NAT: { struct cfg_nat *t; + struct mbuf *mcl; /* XXX - libalias duct tape */ int ldt, nat_id; char *c; @@ -3566,17 +3504,15 @@ ((ipfw_insn_nat *)cmd)->nat = t; } - if ((m = m_pullup(m, sizeof(struct ip))) == + if ((mcl = m_megapullup(m, m->m_pkthdr.len)) == NULL) goto badnat; - ip = mtod(m, struct ip *); + ip = mtod(mcl, struct ip *); if (args->eh == NULL) { ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); } - if (ldebug != 0) - printf("payload csum: %u\n", - m_csum(&m, t->lib)); + /* * XXX - Libalias checksum offload 'duct tape': * @@ -3625,44 +3561,28 @@ * it can handle delayed checksum and tso) */ - if (m->m_pkthdr.rcvif == NULL && - m->m_pkthdr.csum_flags & + if (mcl->m_pkthdr.rcvif == NULL && + mcl->m_pkthdr.csum_flags & CSUM_DELAY_DATA) ldt = 1; - /*printf("-----------START HERE-----------" - "---------------------------------\n"); - printf("m->m_len: %u m->m_pkthdr.len: %u\n" - "m->m_next: %p\n", m->m_len, - m->m_pkthdr.len, m->m_next); - */ + c = mtod(mcl, char *); if (oif == NULL) - retval = LibAliasIn(t->lib, &m, 0); + retval = LibAliasIn(t->lib, c, + MCLBYTES); else - retval = LibAliasOut(t->lib, &m, 0); + retval = LibAliasOut(t->lib, c, + MCLBYTES); if (retval != PKT_ALIAS_OK) { /* XXX - should i add some logging? */ - m_free(m); + m_free(mcl); badnat: - printf("badnat "); - if (oif == NULL) - printf("LibAliasIn()"); - else - printf("LibAliasOut()"); - printf("\n"); args->m = NULL; retval = IP_FW_DENY; goto done; } - /*printf("m->m_len: %u m->m_pkthdr.len: %u\n" - "m->m_next: %p\n", m->m_len, - m->m_pkthdr.len, m->m_next);*/ - if ((m = m_pullup(m, sizeof(struct ip))) == - NULL) - goto badnat; - ip = mtod(m, struct ip *); - //printf("ip->ip_id: %u\n", ntohs(ip->ip_id)); - m->m_pkthdr.len = ntohs(ip->ip_len); + mcl->m_pkthdr.len = mcl->m_len = + ntohs(ip->ip_len); /* * XXX - libalias checksum offload @@ -3673,12 +3593,8 @@ ip->ip_p == IPPROTO_TCP) { struct tcphdr *th; - if ((m = m_pullup(m, (ip->ip_hl << 2) + - sizeof(struct tcphdr))) == NULL) - goto badnat; - ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); - if (th->th_x2) + if (th->th_x2) ldt = 1; } @@ -3697,12 +3613,6 @@ switch (ip->ip_p) { case IPPROTO_TCP: - if ((m = m_pullup(m, - (ip->ip_hl << 2) + - sizeof(struct tcphdr))) == - NULL) - goto badnat; - ip = mtod(m, struct ip *); th = (struct tcphdr *)(ip + 1); /* * Maybe it was set in @@ -3710,56 +3620,38 @@ */ th->th_x2 = 0; th->th_sum = cksum; - m->m_pkthdr.csum_data = + mcl->m_pkthdr.csum_data = offsetof(struct tcphdr, th_sum); break; case IPPROTO_UDP: - if ((m = m_pullup(m, - (ip->ip_hl << 2) + - sizeof(struct udphdr))) == - NULL) - goto badnat; - ip = mtod(m, struct ip *); uh = (struct udphdr *)(ip + 1); uh->uh_sum = cksum; - m->m_pkthdr.csum_data = + mcl->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); - break; + break; } /* * No hw checksum offloading: do it * by ourself. */ - if ((m->m_pkthdr.csum_flags & + if ((mcl->m_pkthdr.csum_flags & CSUM_DELAY_DATA) == 0) { - in_delayed_cksum(m); - m->m_pkthdr.csum_flags &= + in_delayed_cksum(mcl); + mcl->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } ip->ip_len = htons(ip->ip_len); } - if (ldebug != 0) - printf("payload csum: %u\n", - m_csum(&m, t->lib)); - if ((m = m_pullup(m, sizeof(struct ip))) == - NULL) - goto badnat; - ip = mtod(m, struct ip *); if (args->eh == NULL) { ip->ip_len = ntohs(ip->ip_len); ip->ip_off = ntohs(ip->ip_off); } - args->m = m; + args->m = mcl; retval = IP_FW_NAT; - /*printf("m->m_len: %u m->m_pkthdr.len: %u\n" - "m->m_next: %p\n", m->m_len, - m->m_pkthdr.len, m->m_next); - printf("-------------------------------" - "---------------------------------\n");*/ goto done; } #endif ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#61 (text+ko) ==== @@ -170,42 +170,48 @@ */ /* Local prototypes */ -static void TcpMonitorIn(struct alias_link *, u_char th_flags); +static void TcpMonitorIn(struct ip *, struct alias_link *); -static void TcpMonitorOut(struct alias_link *, u_char th_flags); +static void TcpMonitorOut(struct ip *, struct alias_link *); static void -TcpMonitorIn(struct alias_link *lnk, u_char th_flags) +TcpMonitorIn(struct ip *pip, struct alias_link *lnk) { + struct tcphdr *tc; + tc = (struct tcphdr *)ip_next(pip); + switch (GetStateIn(lnk)) { case ALIAS_TCP_STATE_NOT_CONNECTED: - if (th_flags & TH_RST) + if (tc->th_flags & TH_RST) SetStateIn(lnk, ALIAS_TCP_STATE_DISCONNECTED); - else if (th_flags & TH_SYN) + else if (tc->th_flags & TH_SYN) SetStateIn(lnk, ALIAS_TCP_STATE_CONNECTED); break; case ALIAS_TCP_STATE_CONNECTED: - if (th_flags & (TH_FIN | TH_RST)) + if (tc->th_flags & (TH_FIN | TH_RST)) SetStateIn(lnk, ALIAS_TCP_STATE_DISCONNECTED); break; } } static void -TcpMonitorOut(struct alias_link *lnk, u_char th_flags) +TcpMonitorOut(struct ip *pip, struct alias_link *lnk) { + struct tcphdr *tc; + tc = (struct tcphdr *)ip_next(pip); + switch (GetStateOut(lnk)) { case ALIAS_TCP_STATE_NOT_CONNECTED: - if (th_flags & TH_RST) + if (tc->th_flags & TH_RST) SetStateOut(lnk, ALIAS_TCP_STATE_DISCONNECTED); - else if (th_flags & TH_SYN) + else if (tc->th_flags & TH_SYN) SetStateOut(lnk, ALIAS_TCP_STATE_CONNECTED); break; case ALIAS_TCP_STATE_CONNECTED: - if (th_flags & (TH_FIN | TH_RST)) + if (tc->th_flags & (TH_FIN | TH_RST)) SetStateOut(lnk, ALIAS_TCP_STATE_DISCONNECTED); break; } @@ -258,32 +264,33 @@ /* Local prototypes */ static int IcmpAliasIn1(struct libalias *, struct ip *); static int IcmpAliasIn2(struct libalias *, struct ip *); -static int IcmpAliasIn(struct libalias *, pkt_t); +static int IcmpAliasIn(struct libalias *, struct ip *); static int IcmpAliasOut1(struct libalias *, struct ip *, int create); static int IcmpAliasOut2(struct libalias *, struct ip *); -static int IcmpAliasOut(struct libalias *, pkt_t, int create); +static int IcmpAliasOut(struct libalias *, struct ip *, int create); static int ProtoAliasIn(struct libalias *, struct ip *); static int ProtoAliasOut(struct libalias *, struct ip *, int create); -static int UdpAliasIn(struct libalias *, pkt_t); -static int UdpAliasOut(struct libalias *, pkt_t, int create); +static int UdpAliasIn(struct libalias *, struct ip *); +static int UdpAliasOut(struct libalias *, struct ip *, int create); -static int TcpAliasIn(struct libalias *, pkt_t); -static int TcpAliasOut(struct libalias *, pkt_t, int, int create); +static int TcpAliasIn(struct libalias *, struct ip *); +static int TcpAliasOut(struct libalias *, struct ip *, int, int create); static int IcmpAliasIn1(struct libalias *la, struct ip *pip) { - struct alias_link *lnk; - struct icmp *ic; + LIBALIAS_LOCK_ASSERT(la); /* De-alias incoming echo and timestamp replies. Alias incoming echo and timestamp requests. */ + struct alias_link *lnk; + struct icmp *ic; ic = (struct icmp *)ip_next(pip); @@ -321,6 +328,8 @@ static int IcmpAliasIn2(struct libalias *la, struct ip *pip) { + + LIBALIAS_LOCK_ASSERT(la); /* Alias incoming ICMP error messages containing IP header and first 64 bits of datagram. @@ -331,7 +340,6 @@ struct tcphdr *tc; struct alias_link *lnk; - LIBALIAS_LOCK_ASSERT(la); ic = (struct icmp *)ip_next(pip); ip = &ic->icmp_ip; @@ -420,10 +428,9 @@ static int -IcmpAliasIn(struct libalias *la, pkt_t ptr) +IcmpAliasIn(struct libalias *la, struct ip *pip) { int iresult; - struct ip *pip; struct icmp *ic; LIBALIAS_LOCK_ASSERT(la); @@ -431,12 +438,9 @@ if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) return (PKT_ALIAS_OK); - iresult = PKT_ALIAS_IGNORED; - PULLUP_ICMPHDR(pip, ptr); - if (pip == NULL) - return (iresult); ic = (struct icmp *)ip_next(pip); + iresult = PKT_ALIAS_IGNORED; switch (ic->icmp_type) { case ICMP_ECHOREPLY: case ICMP_TSTAMPREPLY: @@ -448,9 +452,6 @@ case ICMP_SOURCEQUENCH: case ICMP_TIMXCEED: case ICMP_PARAMPROB: - PULLUP_ICMPIP64(pip, ptr, ic); - if (pip == NULL) - return (iresult); iresult = IcmpAliasIn2(la, pip); break; case ICMP_ECHO: @@ -609,11 +610,10 @@ static int -IcmpAliasOut(struct libalias *la, pkt_t ptr, int create) +IcmpAliasOut(struct libalias *la, struct ip *pip, int create) { int iresult; struct icmp *ic; - struct ip *pip; LIBALIAS_LOCK_ASSERT(la); (void)create; @@ -622,12 +622,9 @@ if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) return (PKT_ALIAS_OK); - iresult = PKT_ALIAS_IGNORED; - PULLUP_ICMPHDR(pip, ptr); - if (pip == NULL) - return (iresult); ic = (struct icmp *)ip_next(pip); + iresult = PKT_ALIAS_IGNORED; switch (ic->icmp_type) { case ICMP_ECHO: case ICMP_TSTAMP: @@ -639,9 +636,6 @@ case ICMP_SOURCEQUENCH: case ICMP_TIMXCEED: case ICMP_PARAMPROB: - PULLUP_ICMPIP64(pip, ptr, ic); - if (pip == NULL) - return (iresult); iresult = IcmpAliasOut2(la, pip); break; case ICMP_ECHOREPLY: @@ -721,9 +715,8 @@ static int -UdpAliasIn(struct libalias *la, pkt_t ptr) +UdpAliasIn(struct libalias *la, struct ip *pip) { - struct ip *pip; struct udphdr *ud; struct alias_link *lnk; @@ -732,9 +725,6 @@ if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) return (PKT_ALIAS_OK); - PULLUP_UDPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); ud = (struct udphdr *)ip_next(pip); lnk = FindUdpTcpIn(la, pip->ip_src, pip->ip_dst, @@ -761,11 +751,8 @@ alias_port = ud->uh_dport; ud->uh_dport = GetOriginalPort(lnk); - error = find_handler(IN, UDP, la, ptr, &ad); - PULLUP_IPUDPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); - ud = (struct udphdr *)ip_next(pip); + /* Walk out chain. */ + error = find_handler(IN, UDP, la, pip, &ad); /* If UDP checksum is not zero, then adjust since destination port */ /* is being unaliased and destination address is being altered. */ @@ -793,9 +780,8 @@ } static int -UdpAliasOut(struct libalias *la, pkt_t ptr, int create) +UdpAliasOut(struct libalias *la, struct ip *pip, int create) { - struct ip *pip; struct udphdr *ud; struct alias_link *lnk; int error; @@ -805,9 +791,6 @@ if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) return (PKT_ALIAS_OK); - PULLUP_UDPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); ud = (struct udphdr *)ip_next(pip); lnk = FindUdpTcpOut(la, pip->ip_src, pip->ip_dst, @@ -829,11 +812,8 @@ alias_address = GetAliasAddress(lnk); alias_port = GetAliasPort(lnk); - error = find_handler(OUT, UDP, la, ptr, &ad); - PULLUP_IPUDPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); - ud = (struct udphdr *)ip_next(pip); + /* Walk out chain. */ + error = find_handler(OUT, UDP, la, pip, &ad); /* If UDP checksum is not zero, adjust since source port is */ /* being aliased and source address is being altered */ @@ -862,16 +842,12 @@ static int -TcpAliasIn(struct libalias *la, pkt_t ptr) +TcpAliasIn(struct libalias *la, struct ip *pip) { - struct ip *pip; struct tcphdr *tc; struct alias_link *lnk; LIBALIAS_LOCK_ASSERT(la); - PULLUP_TCPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); tc = (struct tcphdr *)ip_next(pip); lnk = FindUdpTcpIn(la, pip->ip_src, pip->ip_dst, @@ -902,11 +878,8 @@ .maxpktsize = 0 }; - error = find_handler(IN, TCP, la, ptr, &ad); - PULLUP_IPTCPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); - tc = (struct tcphdr *)ip_next(pip); + /* Walk out chain. */ + error = find_handler(IN, TCP, la, pip, &ad); alias_address = GetAliasAddress(lnk); original_address = GetOriginalAddress(lnk); @@ -957,7 +930,7 @@ if (GetAckModified(lnk) == 1) { int delta; - delta = GetDeltaAckIn(lnk, tc->th_ack); + delta = GetDeltaAckIn(pip, lnk); if (delta != 0) { accumulate += twowords(&tc->th_ack); tc->th_ack = htonl(ntohl(tc->th_ack) - delta); @@ -981,7 +954,7 @@ ADJUST_CHECKSUM(accumulate, pip->ip_sum); /* Monitor TCP connection state */ - TcpMonitorIn(lnk, tc->th_flags); + TcpMonitorIn(pip, lnk); return (PKT_ALIAS_OK); } @@ -989,28 +962,22 @@ } static int -TcpAliasOut(struct libalias *la, pkt_t ptr, int maxpacketsize, int create) +TcpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) { int proxy_type, error; - u_short dest_port, src_port; + u_short dest_port; u_short proxy_server_port; struct in_addr dest_address; struct in_addr proxy_server_address; - struct ip *pip; struct tcphdr *tc; struct alias_link *lnk; LIBALIAS_LOCK_ASSERT(la); - PULLUP_TCPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); tc = (struct tcphdr *)ip_next(pip); - dest_port = tc->th_dport; - src_port = tc->th_sport; if (create) - proxy_type = ProxyCheck(la, pip, &proxy_server_address, - &proxy_server_port, dest_port); + proxy_type = + ProxyCheck(la, pip, &proxy_server_address, &proxy_server_port); else proxy_type = 0; @@ -1019,6 +986,7 @@ /* If this is a transparent proxy, save original destination, then alter the destination and adjust checksums */ + dest_port = tc->th_dport; dest_address = pip->ip_dst; if (proxy_type != 0) { int accumulate; @@ -1060,11 +1028,7 @@ if (proxy_type != 0) { SetProxyPort(lnk, dest_port); SetProxyAddress(lnk, dest_address); - ProxyModify(la, lnk, ptr, maxpacketsize, proxy_type, - src_port); - PULLUP_IPTCPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); + ProxyModify(la, lnk, pip, maxpacketsize, proxy_type); tc = (struct tcphdr *)ip_next(pip); } /* Get alias address and port */ @@ -1072,13 +1036,10 @@ alias_address = GetAliasAddress(lnk); /* Monitor TCP connection state */ - TcpMonitorOut(lnk, tc->th_flags); + TcpMonitorOut(pip, lnk); - error = find_handler(OUT, TCP, la, ptr, &ad); - PULLUP_IPTCPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); - tc = (struct tcphdr *)ip_next(pip); + /* Walk out chain. */ + error = find_handler(OUT, TCP, la, pip, &ad); /* Adjust TCP checksum since source port is being aliased */ /* and source address is being altered */ @@ -1092,7 +1053,7 @@ if (GetAckModified(lnk) == 1) { int delta; - delta = GetDeltaSeqOut(lnk, tc->th_seq); + delta = GetDeltaSeqOut(pip, lnk); if (delta != 0) { accumulate += twowords(&tc->th_seq); tc->th_seq = htonl(ntohl(tc->th_seq) + delta); @@ -1187,20 +1148,16 @@ int -LibAliasSaveFragment(struct libalias *la, pkt_t ptr) +LibAliasSaveFragment(struct libalias *la, char *ptr) { int iresult; struct alias_link *lnk; struct ip *pip; LIBALIAS_LOCK(la); + pip = (struct ip *)ptr; + lnk = AddFragmentPtrLink(la, pip->ip_src, pip->ip_id); iresult = PKT_ALIAS_ERROR; - PULLUP_IPHDR(pip, ptr); - if (pip == NULL) { - LIBALIAS_UNLOCK(la); - return (iresult); - } - lnk = AddFragmentPtrLink(la, pip->ip_src, pip->ip_id); if (lnk != NULL) { SetFragmentPtr(lnk, ptr); iresult = PKT_ALIAS_OK; @@ -1209,27 +1166,16 @@ return (iresult); } -#ifdef _KERNEL -struct mbuf * -#else -char * -#endif -LibAliasGetFragment(struct libalias *la, pkt_t ptr) + +char * +LibAliasGetFragment(struct libalias *la, char *ptr) { struct alias_link *lnk; -#ifdef _KERNEL - struct mbuf *fptr; -#else char *fptr; -#endif struct ip *pip; LIBALIAS_LOCK(la); - PULLUP_IPHDR(pip, ptr); - if (pip == NULL) { - LIBALIAS_UNLOCK(la); - return (NULL); - } + pip = (struct ip *)ptr; lnk = FindFragmentPtr(la, pip->ip_src, pip->ip_id); if (lnk != NULL) { GetFragmentPtr(lnk, &fptr); @@ -1242,11 +1188,12 @@ return (fptr); } + void -LibAliasFragmentIn(struct libalias *la, pkt_t ptr, /* Points to correctly +LibAliasFragmentIn(struct libalias *la, char *ptr, /* Points to correctly * de-aliased header * fragment */ - pkt_t ptr_fragment /* Points to fragment which must be + char *ptr_fragment /* Points to fragment which must be * de-aliased */ ) { @@ -1254,17 +1201,10 @@ struct ip *fpip; LIBALIAS_LOCK(la); - PULLUP_IPHDR(pip, ptr); - if (pip == NULL) { - LIBALIAS_UNLOCK(la); - return; - } - PULLUP_IPHDR(fpip, ptr_fragment); - if (fpip == NULL) { - LIBALIAS_UNLOCK(la); - return; - } (void)la; + pip = (struct ip *)ptr; + fpip = (struct ip *)ptr_fragment; + DifferentialChecksum(&fpip->ip_sum, &pip->ip_dst, &fpip->ip_dst, 2); fpip->ip_dst = pip->ip_dst; @@ -1273,14 +1213,14 @@ /* Local prototypes */ static int -LibAliasOutLocked(struct libalias *la, pkt_t ptr, +LibAliasOutLocked(struct libalias *la, char *ptr, int maxpacketsize, int create); static int -LibAliasInLocked(struct libalias *la, pkt_t ptr, +LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize); int -LibAliasIn(struct libalias *la, pkt_t ptr, int maxpacketsize) +LibAliasIn(struct libalias *la, char *ptr, int maxpacketsize) { int res; @@ -1291,13 +1231,12 @@ } static int -LibAliasInLocked(struct libalias *la, pkt_t ptr, int maxpacketsize) +LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize) { struct in_addr alias_addr; struct ip *pip; int iresult; - iresult = PKT_ALIAS_IGNORED; if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasOutLocked(la, ptr, maxpacketsize, 1); @@ -1306,28 +1245,27 @@ } HouseKeeping(la); ClearCheckNewLink(la); - PULLUP_IPHDR(pip, ptr); - if (pip == NULL) - goto getout; + pip = (struct ip *)ptr; alias_addr = pip->ip_dst; /* Defense against mangled packets */ - if (maxpacketsize != 0) { - if (ntohs(pip->ip_len) > maxpacketsize - || (pip->ip_hl << 2) > maxpacketsize) - goto getout; + if (ntohs(pip->ip_len) > maxpacketsize + || (pip->ip_hl << 2) > maxpacketsize) { + iresult = PKT_ALIAS_IGNORED; + goto getout; } + iresult = PKT_ALIAS_IGNORED; if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) { switch (pip->ip_p) { case IPPROTO_ICMP: - iresult = IcmpAliasIn(la, ptr); + iresult = IcmpAliasIn(la, pip); break; case IPPROTO_UDP: - iresult = UdpAliasIn(la, ptr); + iresult = UdpAliasIn(la, pip); break; case IPPROTO_TCP: - iresult = TcpAliasIn(la, ptr); + iresult = TcpAliasIn(la, pip); break; case IPPROTO_GRE: { int error; @@ -1341,29 +1279,23 @@ .maxpktsize = 0 }; - error = find_handler(IN, IP, la, ptr, &ad); - PULLUP_IPHDR(pip, ptr); - if (pip == NULL) - return (PKT_ALIAS_IGNORED); + /* Walk out chain. */ + error = find_handler(IN, IP, la, pip, &ad); if (error == 0) iresult = PKT_ALIAS_OK; else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A13D106572D; Fri, 29 Feb 2008 19:48:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 279BB1065683 for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 160EC8FC16 for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmDqW092521 for ; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmCCj092519 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:12 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:12 GMT Message-Id: <200802291948.m1TJmCCj092519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=136459 Change 136459 by kmacy@pandemonium:kmacy:xen31_6 on 2008/02/28 22:31:56 Initial IFC of xen support on RELENG_6 branch Affected files ... .. //depot/projects/xen31_6/COPYRIGHT#1 branch .. //depot/projects/xen31_6/LOCKS#1 branch .. //depot/projects/xen31_6/MAINTAINERS#1 branch .. //depot/projects/xen31_6/Makefile#1 branch .. //depot/projects/xen31_6/Makefile.inc1#1 branch .. //depot/projects/xen31_6/ObsoleteFiles.inc#1 branch .. //depot/projects/xen31_6/README#1 branch .. //depot/projects/xen31_6/UPDATING#1 branch .. //depot/projects/xen31_6/bin/Makefile#1 branch .. //depot/projects/xen31_6/bin/Makefile.inc#1 branch .. //depot/projects/xen31_6/bin/cat/Makefile#1 branch .. //depot/projects/xen31_6/bin/cat/cat.1#1 branch .. //depot/projects/xen31_6/bin/cat/cat.c#1 branch .. //depot/projects/xen31_6/bin/chflags/Makefile#1 branch .. //depot/projects/xen31_6/bin/chflags/chflags.1#1 branch .. //depot/projects/xen31_6/bin/chflags/chflags.c#1 branch .. //depot/projects/xen31_6/bin/chio/Makefile#1 branch .. //depot/projects/xen31_6/bin/chio/chio.1#1 branch .. //depot/projects/xen31_6/bin/chio/chio.c#1 branch .. //depot/projects/xen31_6/bin/chio/defs.h#1 branch .. //depot/projects/xen31_6/bin/chio/pathnames.h#1 branch .. //depot/projects/xen31_6/bin/chmod/Makefile#1 branch .. //depot/projects/xen31_6/bin/chmod/chmod.1#1 branch .. //depot/projects/xen31_6/bin/chmod/chmod.c#1 branch .. //depot/projects/xen31_6/bin/cp/Makefile#1 branch .. //depot/projects/xen31_6/bin/cp/cp.1#1 branch .. //depot/projects/xen31_6/bin/cp/cp.c#1 branch .. //depot/projects/xen31_6/bin/cp/extern.h#1 branch .. //depot/projects/xen31_6/bin/cp/utils.c#1 branch .. //depot/projects/xen31_6/bin/csh/Makefile#1 branch .. //depot/projects/xen31_6/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/xen31_6/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/xen31_6/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/xen31_6/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/xen31_6/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/xen31_6/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/xen31_6/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/xen31_6/bin/csh/config.h#1 branch .. //depot/projects/xen31_6/bin/csh/config_p.h#1 branch .. //depot/projects/xen31_6/bin/csh/host.defs#1 branch .. //depot/projects/xen31_6/bin/csh/iconv.h#1 branch .. //depot/projects/xen31_6/bin/csh/iconv_stub.c#1 branch .. //depot/projects/xen31_6/bin/date/Makefile#1 branch .. //depot/projects/xen31_6/bin/date/date.1#1 branch .. //depot/projects/xen31_6/bin/date/date.c#1 branch .. //depot/projects/xen31_6/bin/date/extern.h#1 branch .. //depot/projects/xen31_6/bin/date/netdate.c#1 branch .. //depot/projects/xen31_6/bin/date/vary.c#1 branch .. //depot/projects/xen31_6/bin/date/vary.h#1 branch .. //depot/projects/xen31_6/bin/dd/Makefile#1 branch .. //depot/projects/xen31_6/bin/dd/args.c#1 branch .. //depot/projects/xen31_6/bin/dd/conv.c#1 branch .. //depot/projects/xen31_6/bin/dd/conv_tab.c#1 branch .. //depot/projects/xen31_6/bin/dd/dd.1#1 branch .. //depot/projects/xen31_6/bin/dd/dd.c#1 branch .. //depot/projects/xen31_6/bin/dd/dd.h#1 branch .. //depot/projects/xen31_6/bin/dd/extern.h#1 branch .. //depot/projects/xen31_6/bin/dd/gen.c#1 branch .. //depot/projects/xen31_6/bin/dd/misc.c#1 branch .. //depot/projects/xen31_6/bin/dd/position.c#1 branch .. //depot/projects/xen31_6/bin/dd/ref.ascii#1 branch .. //depot/projects/xen31_6/bin/dd/ref.ebcdic#1 branch .. //depot/projects/xen31_6/bin/dd/ref.ibm#1 branch .. //depot/projects/xen31_6/bin/dd/ref.lcase#1 branch .. //depot/projects/xen31_6/bin/dd/ref.oldascii#1 branch .. //depot/projects/xen31_6/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/xen31_6/bin/dd/ref.oldibm#1 branch .. //depot/projects/xen31_6/bin/dd/ref.pareven#1 branch .. //depot/projects/xen31_6/bin/dd/ref.parnone#1 branch .. //depot/projects/xen31_6/bin/dd/ref.parodd#1 branch .. //depot/projects/xen31_6/bin/dd/ref.parset#1 branch .. //depot/projects/xen31_6/bin/dd/ref.swab#1 branch .. //depot/projects/xen31_6/bin/dd/ref.ucase#1 branch .. //depot/projects/xen31_6/bin/df/Makefile#1 branch .. //depot/projects/xen31_6/bin/df/df.1#1 branch .. //depot/projects/xen31_6/bin/df/df.c#1 branch .. //depot/projects/xen31_6/bin/domainname/Makefile#1 branch .. //depot/projects/xen31_6/bin/domainname/domainname.1#1 branch .. //depot/projects/xen31_6/bin/domainname/domainname.c#1 branch .. //depot/projects/xen31_6/bin/echo/Makefile#1 branch .. //depot/projects/xen31_6/bin/echo/echo.1#1 branch .. //depot/projects/xen31_6/bin/echo/echo.c#1 branch .. //depot/projects/xen31_6/bin/ed/Makefile#1 branch .. //depot/projects/xen31_6/bin/ed/POSIX#1 branch .. //depot/projects/xen31_6/bin/ed/README#1 branch .. //depot/projects/xen31_6/bin/ed/buf.c#1 branch .. //depot/projects/xen31_6/bin/ed/cbc.c#1 branch .. //depot/projects/xen31_6/bin/ed/ed.1#1 branch .. //depot/projects/xen31_6/bin/ed/ed.h#1 branch .. //depot/projects/xen31_6/bin/ed/glbl.c#1 branch .. //depot/projects/xen31_6/bin/ed/io.c#1 branch .. //depot/projects/xen31_6/bin/ed/main.c#1 branch .. //depot/projects/xen31_6/bin/ed/re.c#1 branch .. //depot/projects/xen31_6/bin/ed/sub.c#1 branch .. //depot/projects/xen31_6/bin/ed/test/=.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/Makefile#1 branch .. //depot/projects/xen31_6/bin/ed/test/README#1 branch .. //depot/projects/xen31_6/bin/ed/test/TODO#1 branch .. //depot/projects/xen31_6/bin/ed/test/a.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/a.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/a.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/a1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/a2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/addr.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/addr.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/addr.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/addr1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/addr2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/xen31_6/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/xen31_6/bin/ed/test/ascii.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/bang1.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/bang1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/bang1.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/bang1.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/bang2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/c.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/c.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/c.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/c1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/c2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/xen31_6/bin/ed/test/d.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/d.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/d.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/d.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/e1.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/e1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/e1.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/e1.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/e2.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/e2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/e2.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/e2.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/e3.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/e3.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/e3.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/e3.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/e4.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/e4.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/e4.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/f1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/f2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/g1.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/g1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/g1.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/g1.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/g2.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/g2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/g2.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/g2.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/g3.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/g3.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/g3.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/g3.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/g4.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/g4.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/g4.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/g5.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/g5.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/g5.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/h.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/i.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/i.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/i.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/i1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/i2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/i3.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/j.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/j.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/j.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/k.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/k.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/k.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/k1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/k2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/k3.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/k4.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/l.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/l.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/l.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/m.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/m.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/m.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/m.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/xen31_6/bin/ed/test/n.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/n.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/n.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/nl.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/nl1.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/nl1.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/nl1.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/nl2.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/nl2.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/nl2.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/p.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/p.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/p.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/q.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/q.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/q.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/q1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/r1.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/r1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/r1.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/r1.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/r2.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/r2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/r2.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/r2.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/r3.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/r3.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/r3.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/s1.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/s1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s1.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/s1.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/s10.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s2.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/s2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s2.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/s2.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/s3.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/s3.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s3.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/s3.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/s4.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s5.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s6.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s7.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s8.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/s9.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/t.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/t.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/t1.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/t1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/t1.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/t1.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/t2.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/t2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/t2.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/t2.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/u.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/u.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/u.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/u.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/v.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/v.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/v.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/w.d#1 branch .. //depot/projects/xen31_6/bin/ed/test/w.r#1 branch .. //depot/projects/xen31_6/bin/ed/test/w.t#1 branch .. //depot/projects/xen31_6/bin/ed/test/w1.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/w2.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/w3.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/x.err#1 branch .. //depot/projects/xen31_6/bin/ed/test/z.err#1 branch .. //depot/projects/xen31_6/bin/ed/undo.c#1 branch .. //depot/projects/xen31_6/bin/expr/Makefile#1 branch .. //depot/projects/xen31_6/bin/expr/expr.1#1 branch .. //depot/projects/xen31_6/bin/expr/expr.y#1 branch .. //depot/projects/xen31_6/bin/getfacl/Makefile#1 branch .. //depot/projects/xen31_6/bin/getfacl/getfacl.1#1 branch .. //depot/projects/xen31_6/bin/getfacl/getfacl.c#1 branch .. //depot/projects/xen31_6/bin/hostname/Makefile#1 branch .. //depot/projects/xen31_6/bin/hostname/hostname.1#1 branch .. //depot/projects/xen31_6/bin/hostname/hostname.c#1 branch .. //depot/projects/xen31_6/bin/kenv/Makefile#1 branch .. //depot/projects/xen31_6/bin/kenv/kenv.1#1 branch .. //depot/projects/xen31_6/bin/kenv/kenv.c#1 branch .. //depot/projects/xen31_6/bin/kill/Makefile#1 branch .. //depot/projects/xen31_6/bin/kill/kill.1#1 branch .. //depot/projects/xen31_6/bin/kill/kill.c#1 branch .. //depot/projects/xen31_6/bin/ln/Makefile#1 branch .. //depot/projects/xen31_6/bin/ln/ln.1#1 branch .. //depot/projects/xen31_6/bin/ln/ln.c#1 branch .. //depot/projects/xen31_6/bin/ln/symlink.7#1 branch .. //depot/projects/xen31_6/bin/ls/Makefile#1 branch .. //depot/projects/xen31_6/bin/ls/cmp.c#1 branch .. //depot/projects/xen31_6/bin/ls/extern.h#1 branch .. //depot/projects/xen31_6/bin/ls/ls.1#1 branch .. //depot/projects/xen31_6/bin/ls/ls.c#1 branch .. //depot/projects/xen31_6/bin/ls/ls.h#1 branch .. //depot/projects/xen31_6/bin/ls/print.c#1 branch .. //depot/projects/xen31_6/bin/ls/util.c#1 branch .. //depot/projects/xen31_6/bin/mkdir/Makefile#1 branch .. //depot/projects/xen31_6/bin/mkdir/mkdir.1#1 branch .. //depot/projects/xen31_6/bin/mkdir/mkdir.c#1 branch .. //depot/projects/xen31_6/bin/mv/Makefile#1 branch .. //depot/projects/xen31_6/bin/mv/mv.1#1 branch .. //depot/projects/xen31_6/bin/mv/mv.c#1 branch .. //depot/projects/xen31_6/bin/pax/Makefile#1 branch .. //depot/projects/xen31_6/bin/pax/ar_io.c#1 branch .. //depot/projects/xen31_6/bin/pax/ar_subs.c#1 branch .. //depot/projects/xen31_6/bin/pax/buf_subs.c#1 branch .. //depot/projects/xen31_6/bin/pax/cache.c#1 branch .. //depot/projects/xen31_6/bin/pax/cache.h#1 branch .. //depot/projects/xen31_6/bin/pax/cpio.1#1 branch .. //depot/projects/xen31_6/bin/pax/cpio.c#1 branch .. //depot/projects/xen31_6/bin/pax/cpio.h#1 branch .. //depot/projects/xen31_6/bin/pax/extern.h#1 branch .. //depot/projects/xen31_6/bin/pax/file_subs.c#1 branch .. //depot/projects/xen31_6/bin/pax/ftree.c#1 branch .. //depot/projects/xen31_6/bin/pax/ftree.h#1 branch .. //depot/projects/xen31_6/bin/pax/gen_subs.c#1 branch .. //depot/projects/xen31_6/bin/pax/getoldopt.c#1 branch .. //depot/projects/xen31_6/bin/pax/options.c#1 branch .. //depot/projects/xen31_6/bin/pax/options.h#1 branch .. //depot/projects/xen31_6/bin/pax/pat_rep.c#1 branch .. //depot/projects/xen31_6/bin/pax/pat_rep.h#1 branch .. //depot/projects/xen31_6/bin/pax/pax.1#1 branch .. //depot/projects/xen31_6/bin/pax/pax.c#1 branch .. //depot/projects/xen31_6/bin/pax/pax.h#1 branch .. //depot/projects/xen31_6/bin/pax/sel_subs.c#1 branch .. //depot/projects/xen31_6/bin/pax/sel_subs.h#1 branch .. //depot/projects/xen31_6/bin/pax/tables.c#1 branch .. //depot/projects/xen31_6/bin/pax/tables.h#1 branch .. //depot/projects/xen31_6/bin/pax/tar.1#1 branch .. //depot/projects/xen31_6/bin/pax/tar.c#1 branch .. //depot/projects/xen31_6/bin/pax/tar.h#1 branch .. //depot/projects/xen31_6/bin/pax/tty_subs.c#1 branch .. //depot/projects/xen31_6/bin/ps/Makefile#1 branch .. //depot/projects/xen31_6/bin/ps/extern.h#1 branch .. //depot/projects/xen31_6/bin/ps/fmt.c#1 branch .. //depot/projects/xen31_6/bin/ps/keyword.c#1 branch .. //depot/projects/xen31_6/bin/ps/nlist.c#1 branch .. //depot/projects/xen31_6/bin/ps/print.c#1 branch .. //depot/projects/xen31_6/bin/ps/ps.1#1 branch .. //depot/projects/xen31_6/bin/ps/ps.c#1 branch .. //depot/projects/xen31_6/bin/ps/ps.h#1 branch .. //depot/projects/xen31_6/bin/pwd/Makefile#1 branch .. //depot/projects/xen31_6/bin/pwd/pwd.1#1 branch .. //depot/projects/xen31_6/bin/pwd/pwd.c#1 branch .. //depot/projects/xen31_6/bin/rcp/Makefile#1 branch .. //depot/projects/xen31_6/bin/rcp/extern.h#1 branch .. //depot/projects/xen31_6/bin/rcp/rcp.1#1 branch .. //depot/projects/xen31_6/bin/rcp/rcp.c#1 branch .. //depot/projects/xen31_6/bin/rcp/util.c#1 branch .. //depot/projects/xen31_6/bin/realpath/Makefile#1 branch .. //depot/projects/xen31_6/bin/realpath/realpath.1#1 branch .. //depot/projects/xen31_6/bin/realpath/realpath.c#1 branch .. //depot/projects/xen31_6/bin/rm/Makefile#1 branch .. //depot/projects/xen31_6/bin/rm/rm.1#1 branch .. //depot/projects/xen31_6/bin/rm/rm.c#1 branch .. //depot/projects/xen31_6/bin/rmail/Makefile#1 branch .. //depot/projects/xen31_6/bin/rmdir/Makefile#1 branch .. //depot/projects/xen31_6/bin/rmdir/rmdir.1#1 branch .. //depot/projects/xen31_6/bin/rmdir/rmdir.c#1 branch .. //depot/projects/xen31_6/bin/setfacl/Makefile#1 branch .. //depot/projects/xen31_6/bin/setfacl/file.c#1 branch .. //depot/projects/xen31_6/bin/setfacl/mask.c#1 branch .. //depot/projects/xen31_6/bin/setfacl/merge.c#1 branch .. //depot/projects/xen31_6/bin/setfacl/remove.c#1 branch .. //depot/projects/xen31_6/bin/setfacl/setfacl.1#1 branch .. //depot/projects/xen31_6/bin/setfacl/setfacl.c#1 branch .. //depot/projects/xen31_6/bin/setfacl/setfacl.h#1 branch .. //depot/projects/xen31_6/bin/setfacl/util.c#1 branch .. //depot/projects/xen31_6/bin/sh/Makefile#1 branch .. //depot/projects/xen31_6/bin/sh/TOUR#1 branch .. //depot/projects/xen31_6/bin/sh/alias.c#1 branch .. //depot/projects/xen31_6/bin/sh/alias.h#1 branch .. //depot/projects/xen31_6/bin/sh/arith.h#1 branch .. //depot/projects/xen31_6/bin/sh/arith.y#1 branch .. //depot/projects/xen31_6/bin/sh/arith_lex.l#1 branch .. //depot/projects/xen31_6/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/xen31_6/bin/sh/bltin/echo.1#1 branch .. //depot/projects/xen31_6/bin/sh/bltin/echo.c#1 branch .. //depot/projects/xen31_6/bin/sh/builtins.def#1 branch .. //depot/projects/xen31_6/bin/sh/cd.c#1 branch .. //depot/projects/xen31_6/bin/sh/cd.h#1 branch .. //depot/projects/xen31_6/bin/sh/error.c#1 branch .. //depot/projects/xen31_6/bin/sh/error.h#1 branch .. //depot/projects/xen31_6/bin/sh/eval.c#1 branch .. //depot/projects/xen31_6/bin/sh/eval.h#1 branch .. //depot/projects/xen31_6/bin/sh/exec.c#1 branch .. //depot/projects/xen31_6/bin/sh/exec.h#1 branch .. //depot/projects/xen31_6/bin/sh/expand.c#1 branch .. //depot/projects/xen31_6/bin/sh/expand.h#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/cmv#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/dirs#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/kill#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/login#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/newgrp#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/popd#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/pushd#1 branch .. //depot/projects/xen31_6/bin/sh/funcs/suspend#1 branch .. //depot/projects/xen31_6/bin/sh/histedit.c#1 branch .. //depot/projects/xen31_6/bin/sh/init.h#1 branch .. //depot/projects/xen31_6/bin/sh/input.c#1 branch .. //depot/projects/xen31_6/bin/sh/input.h#1 branch .. //depot/projects/xen31_6/bin/sh/jobs.c#1 branch .. //depot/projects/xen31_6/bin/sh/jobs.h#1 branch .. //depot/projects/xen31_6/bin/sh/mail.c#1 branch .. //depot/projects/xen31_6/bin/sh/mail.h#1 branch .. //depot/projects/xen31_6/bin/sh/main.c#1 branch .. //depot/projects/xen31_6/bin/sh/main.h#1 branch .. //depot/projects/xen31_6/bin/sh/memalloc.c#1 branch .. //depot/projects/xen31_6/bin/sh/memalloc.h#1 branch .. //depot/projects/xen31_6/bin/sh/miscbltin.c#1 branch .. //depot/projects/xen31_6/bin/sh/mkbuiltins#1 branch .. //depot/projects/xen31_6/bin/sh/mkinit.c#1 branch .. //depot/projects/xen31_6/bin/sh/mknodes.c#1 branch .. //depot/projects/xen31_6/bin/sh/mksyntax.c#1 branch .. //depot/projects/xen31_6/bin/sh/mktokens#1 branch .. //depot/projects/xen31_6/bin/sh/myhistedit.h#1 branch .. //depot/projects/xen31_6/bin/sh/mystring.c#1 branch .. //depot/projects/xen31_6/bin/sh/mystring.h#1 branch .. //depot/projects/xen31_6/bin/sh/nodes.c.pat#1 branch .. //depot/projects/xen31_6/bin/sh/nodetypes#1 branch .. //depot/projects/xen31_6/bin/sh/options.c#1 branch .. //depot/projects/xen31_6/bin/sh/options.h#1 branch .. //depot/projects/xen31_6/bin/sh/output.c#1 branch .. //depot/projects/xen31_6/bin/sh/output.h#1 branch .. //depot/projects/xen31_6/bin/sh/parser.c#1 branch .. //depot/projects/xen31_6/bin/sh/parser.h#1 branch .. //depot/projects/xen31_6/bin/sh/redir.c#1 branch .. //depot/projects/xen31_6/bin/sh/redir.h#1 branch .. //depot/projects/xen31_6/bin/sh/sh.1#1 branch .. //depot/projects/xen31_6/bin/sh/shell.h#1 branch .. //depot/projects/xen31_6/bin/sh/show.c#1 branch .. //depot/projects/xen31_6/bin/sh/show.h#1 branch .. //depot/projects/xen31_6/bin/sh/trap.c#1 branch .. //depot/projects/xen31_6/bin/sh/trap.h#1 branch .. //depot/projects/xen31_6/bin/sh/var.c#1 branch .. //depot/projects/xen31_6/bin/sh/var.h#1 branch .. //depot/projects/xen31_6/bin/sleep/Makefile#1 branch .. //depot/projects/xen31_6/bin/sleep/sleep.1#1 branch .. //depot/projects/xen31_6/bin/sleep/sleep.c#1 branch .. //depot/projects/xen31_6/bin/stty/Makefile#1 branch .. //depot/projects/xen31_6/bin/stty/cchar.c#1 branch .. //depot/projects/xen31_6/bin/stty/extern.h#1 branch .. //depot/projects/xen31_6/bin/stty/gfmt.c#1 branch .. //depot/projects/xen31_6/bin/stty/key.c#1 branch .. //depot/projects/xen31_6/bin/stty/modes.c#1 branch .. //depot/projects/xen31_6/bin/stty/print.c#1 branch .. //depot/projects/xen31_6/bin/stty/stty.1#1 branch .. //depot/projects/xen31_6/bin/stty/stty.c#1 branch .. //depot/projects/xen31_6/bin/stty/stty.h#1 branch .. //depot/projects/xen31_6/bin/stty/util.c#1 branch .. //depot/projects/xen31_6/bin/sync/Makefile#1 branch .. //depot/projects/xen31_6/bin/sync/sync.8#1 branch .. //depot/projects/xen31_6/bin/sync/sync.c#1 branch .. //depot/projects/xen31_6/bin/test/Makefile#1 branch .. //depot/projects/xen31_6/bin/test/TEST.README#1 branch .. //depot/projects/xen31_6/bin/test/TEST.csh#1 branch .. //depot/projects/xen31_6/bin/test/TEST.sh#1 branch .. //depot/projects/xen31_6/bin/test/test.1#1 branch .. //depot/projects/xen31_6/bin/test/test.c#1 branch .. //depot/projects/xen31_6/contrib/amd/AUTHORS#1 branch .. //depot/projects/xen31_6/contrib/amd/BUGS#1 branch .. //depot/projects/xen31_6/contrib/amd/COPYING#1 branch .. //depot/projects/xen31_6/contrib/amd/ChangeLog#1 branch .. //depot/projects/xen31_6/contrib/amd/FAQ#1 branch .. //depot/projects/xen31_6/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/xen31_6/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/xen31_6/contrib/amd/INSTALL#1 branch .. //depot/projects/xen31_6/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/xen31_6/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/xen31_6/contrib/amd/NEWS#1 branch .. //depot/projects/xen31_6/contrib/amd/README#1 branch .. //depot/projects/xen31_6/contrib/amd/README.attrcache#1 branch .. //depot/projects/xen31_6/contrib/amd/README.ldap#1 branch .. //depot/projects/xen31_6/contrib/amd/README.y2k#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amd.8#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amd.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amd.h#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/autil.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/clock.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/conf.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/map.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/opts.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/restart.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/sched.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amq/amq.8#1 branch .. //depot/projects/xen31_6/contrib/amd/amq/amq.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amq/amq.h#1 branch .. //depot/projects/xen31_6/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/xen31_6/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/xen31_6/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/xen31_6/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/xen31_6/contrib/amd/bootstrap#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/xen31_6/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/xen31_6/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/xen31_6/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/xen31_6/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/xen31_6/contrib/amd/doc/version.texi#1 branch .. //depot/projects/xen31_6/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/xen31_6/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/xen31_6/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/xen31_6/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/xen31_6/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/xen31_6/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/xen31_6/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31_6/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/xen31_6/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/xen31_6/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/xen31_6/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/xen31_6/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/xen31_6/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/xen31_6/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/xen31_6/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/xen31_6/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/xen31_6/contrib/amd/ldap.schema#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/xen31_6/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/xen31_6/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/xen31_6/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/xen31_6/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/xen31_6/contrib/amd/tasks#1 branch .. //depot/projects/xen31_6/contrib/amd/vers.m4#1 branch .. //depot/projects/xen31_6/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/xen31_6/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/xen31_6/contrib/bc/AUTHORS#1 branch .. //depot/projects/xen31_6/contrib/bc/ChangeLog#1 branch .. //depot/projects/xen31_6/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/xen31_6/contrib/bc/FAQ#1 branch .. //depot/projects/xen31_6/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/xen31_6/contrib/bc/INSTALL#1 branch .. //depot/projects/xen31_6/contrib/bc/Makefile.am#1 branch .. //depot/projects/xen31_6/contrib/bc/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bc/NEWS#1 branch .. //depot/projects/xen31_6/contrib/bc/README#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/array.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/atan.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/div.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/exp.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/fact.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/jn.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/ln.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/mul.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/raise.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/signum#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/sine.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/xen31_6/contrib/bc/Test/timetest#1 branch .. //depot/projects/xen31_6/contrib/bc/acconfig.h#1 branch .. //depot/projects/xen31_6/contrib/bc/aclocal.m4#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/bc.y#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/const.h#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/execute.c#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/global.c#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/global.h#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/load.c#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/main.c#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/proto.h#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/scan.l#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/storage.c#1 branch .. //depot/projects/xen31_6/contrib/bc/bc/util.c#1 branch .. //depot/projects/xen31_6/contrib/bc/config.h.in#1 branch .. //depot/projects/xen31_6/contrib/bc/configure#1 branch .. //depot/projects/xen31_6/contrib/bc/configure.in#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/array.c#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/dc.c#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/dc.h#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/eval.c#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/misc.c#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/stack.c#1 branch .. //depot/projects/xen31_6/contrib/bc/dc/string.c#1 branch .. //depot/projects/xen31_6/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/xen31_6/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bc/doc/bc.1#1 branch .. //depot/projects/xen31_6/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/xen31_6/contrib/bc/doc/dc.1#1 branch .. //depot/projects/xen31_6/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/xen31_6/contrib/bc/h/number.h#1 branch .. //depot/projects/xen31_6/contrib/bc/install-sh#1 branch .. //depot/projects/xen31_6/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/xen31_6/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bc/lib/number.c#1 branch .. //depot/projects/xen31_6/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/xen31_6/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/xen31_6/contrib/bc/missing#1 branch .. //depot/projects/xen31_6/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/xen31_6/contrib/bc/stamp-h.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/CHANGES#1 branch .. //depot/projects/xen31_6/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/xen31_6/contrib/bind9/FAQ#1 branch .. //depot/projects/xen31_6/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/xen31_6/contrib/bind9/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/README#1 branch .. //depot/projects/xen31_6/contrib/bind9/acconfig.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/xen31_6/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/xen31_6/contrib/bind9/config.guess#1 branch .. //depot/projects/xen31_6/contrib/bind9/config.sub#1 branch .. //depot/projects/xen31_6/contrib/bind9/config.threads.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/configure.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3513.txt#1 branch .. //depot/projects/xen31_6/contrib/bind9/doc/rfc/rfc3596.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8912010657B7; Fri, 29 Feb 2008 19:48:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47CE4106569D for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38D898FC1C for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmDwV092526 for ; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmDq8092524 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:48:13 GMT Message-Id: <200802291948.m1TJmDq8092524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=136460 Change 136460 by rrs@rrs-mips2-jnpr on 2008/02/28 22:33:23 add new bits and rename one Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/oct16550.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/oct16550.h#3 (text+ko) ==== @@ -42,7 +42,7 @@ #define IER_ETXRDY 0x02 #define IER_ERLS 0x04 #define IER_EMSC 0x08 - +#define IER_PTIME 0x80 /* Register 0x0001180000000810 */ /* Interupt Idenity Register */ #define OCT_REG_IIR 0x02 @@ -137,7 +137,7 @@ #define FCR_T_TRIG 0x30 /* 1/2 full */ #define FCR_TX_MEDH 0x20 /* 1/4 full */ #define FCR_TX_MEDL 0x10 /* 2 char in fifo */ -#define FCR_TX_ONE 0x00 /* empty fifo */ +#define FCR_TX_EMPTY 0x00 /* empty fifo */ #define FCR_RESV 0x08 /* Fifo controls */ #define FCR_XMT_RST 0x04 From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94E0510657BA; Fri, 29 Feb 2008 19:48:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B3C010656A1 for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C7398FC21 for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmDFQ092531 for ; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmDpb092529 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:48:13 GMT Message-Id: <200802291948.m1TJmDpb092529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=136461 Change 136461 by rrs@rrs-mips2-jnpr on 2008/02/28 22:33:43 enable transmit int Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#10 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#10 (text+ko) ==== @@ -454,7 +454,7 @@ oct16550_drain(bas, UART_DRAIN_TRANSMITTER); oct16550->mcr = uart_getreg(bas, OCT_REG_MCR); - oct16550->fcr = FCR_ENABLE | FCR_RX_MEDH; + oct16550->fcr = FCR_ENABLE | FCR_TX_EMPTY | FCR_RX_MEDH; uart_setreg(bas, OCT_REG_FCR, oct16550->fcr); uart_barrier(bas); oct16550_bus_flush(sc, UART_FLUSH_RECEIVER | UART_FLUSH_TRANSMITTER); @@ -467,7 +467,7 @@ oct16550_clrint(bas); oct16550->ier = uart_getreg(bas, OCT_REG_IER) & 0xf0; - oct16550->ier |= IER_EMSC | IER_ERLS | IER_ERXRDY; + oct16550->ier |= IER_PTIME| IER_EMSC | IER_ERLS |IER_ETXRDY | IER_ERXRDY; uart_setreg(bas, OCT_REG_IER, oct16550->ier); uart_barrier(bas); @@ -612,7 +612,6 @@ return (error); } - static int oct16550_bus_ipend(struct uart_softc *sc) { From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB2DE10658DD; Fri, 29 Feb 2008 19:48:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B255110656D2 for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A36DA8FC26 for ; Fri, 29 Feb 2008 19:48:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmDDd092541 for ; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmDg4092539 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:48:13 GMT Message-Id: <200802291948.m1TJmDg4092539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=136463 Change 136463 by rrs@rrs-mips2-jnpr on 2008/02/28 22:37:27 take back out the other mode. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#11 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#11 (text+ko) ==== @@ -467,7 +467,8 @@ oct16550_clrint(bas); oct16550->ier = uart_getreg(bas, OCT_REG_IER) & 0xf0; - oct16550->ier |= IER_PTIME| IER_EMSC | IER_ERLS |IER_ETXRDY | IER_ERXRDY; + /* IER_PTIME| */ + oct16550->ier |= IER_EMSC | IER_ERLS |IER_ETXRDY | IER_ERXRDY; uart_setreg(bas, OCT_REG_IER, oct16550->ier); uart_barrier(bas); From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D19DA10658DF; Fri, 29 Feb 2008 19:48:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7175D106570B for ; Fri, 29 Feb 2008 19:48:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FEF18FC1D for ; Fri, 29 Feb 2008 19:48:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmEoW092546 for ; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmDBb092544 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:13 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:13 GMT Message-Id: <200802291948.m1TJmDBb092544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=136464 Change 136464 by kmacy@pandemonium:kmacy:xen31_7 on 2008/02/28 22:45:00 integrate RELENG_7 for xen support Affected files ... .. //depot/projects/xen31_7/COPYRIGHT#1 branch .. //depot/projects/xen31_7/LOCKS#1 branch .. //depot/projects/xen31_7/MAINTAINERS#1 branch .. //depot/projects/xen31_7/Makefile#1 branch .. //depot/projects/xen31_7/Makefile.inc1#1 branch .. //depot/projects/xen31_7/ObsoleteFiles.inc#1 branch .. //depot/projects/xen31_7/README#1 branch .. //depot/projects/xen31_7/UPDATING#1 branch .. //depot/projects/xen31_7/bin/Makefile#1 branch .. //depot/projects/xen31_7/bin/Makefile.inc#1 branch .. //depot/projects/xen31_7/bin/cat/Makefile#1 branch .. //depot/projects/xen31_7/bin/cat/cat.1#1 branch .. //depot/projects/xen31_7/bin/cat/cat.c#1 branch .. //depot/projects/xen31_7/bin/chflags/Makefile#1 branch .. //depot/projects/xen31_7/bin/chflags/chflags.1#1 branch .. //depot/projects/xen31_7/bin/chflags/chflags.c#1 branch .. //depot/projects/xen31_7/bin/chio/Makefile#1 branch .. //depot/projects/xen31_7/bin/chio/chio.1#1 branch .. //depot/projects/xen31_7/bin/chio/chio.c#1 branch .. //depot/projects/xen31_7/bin/chio/defs.h#1 branch .. //depot/projects/xen31_7/bin/chio/pathnames.h#1 branch .. //depot/projects/xen31_7/bin/chmod/Makefile#1 branch .. //depot/projects/xen31_7/bin/chmod/chmod.1#1 branch .. //depot/projects/xen31_7/bin/chmod/chmod.c#1 branch .. //depot/projects/xen31_7/bin/cp/Makefile#1 branch .. //depot/projects/xen31_7/bin/cp/cp.1#1 branch .. //depot/projects/xen31_7/bin/cp/cp.c#1 branch .. //depot/projects/xen31_7/bin/cp/extern.h#1 branch .. //depot/projects/xen31_7/bin/cp/utils.c#1 branch .. //depot/projects/xen31_7/bin/csh/Makefile#1 branch .. //depot/projects/xen31_7/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/xen31_7/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/xen31_7/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/xen31_7/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/xen31_7/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/xen31_7/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/xen31_7/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/xen31_7/bin/csh/config.h#1 branch .. //depot/projects/xen31_7/bin/csh/config_p.h#1 branch .. //depot/projects/xen31_7/bin/csh/host.defs#1 branch .. //depot/projects/xen31_7/bin/csh/iconv.h#1 branch .. //depot/projects/xen31_7/bin/csh/iconv_stub.c#1 branch .. //depot/projects/xen31_7/bin/date/Makefile#1 branch .. //depot/projects/xen31_7/bin/date/date.1#1 branch .. //depot/projects/xen31_7/bin/date/date.c#1 branch .. //depot/projects/xen31_7/bin/date/extern.h#1 branch .. //depot/projects/xen31_7/bin/date/netdate.c#1 branch .. //depot/projects/xen31_7/bin/date/vary.c#1 branch .. //depot/projects/xen31_7/bin/date/vary.h#1 branch .. //depot/projects/xen31_7/bin/dd/Makefile#1 branch .. //depot/projects/xen31_7/bin/dd/args.c#1 branch .. //depot/projects/xen31_7/bin/dd/conv.c#1 branch .. //depot/projects/xen31_7/bin/dd/conv_tab.c#1 branch .. //depot/projects/xen31_7/bin/dd/dd.1#1 branch .. //depot/projects/xen31_7/bin/dd/dd.c#1 branch .. //depot/projects/xen31_7/bin/dd/dd.h#1 branch .. //depot/projects/xen31_7/bin/dd/extern.h#1 branch .. //depot/projects/xen31_7/bin/dd/gen.c#1 branch .. //depot/projects/xen31_7/bin/dd/misc.c#1 branch .. //depot/projects/xen31_7/bin/dd/position.c#1 branch .. //depot/projects/xen31_7/bin/dd/ref.ascii#1 branch .. //depot/projects/xen31_7/bin/dd/ref.ebcdic#1 branch .. //depot/projects/xen31_7/bin/dd/ref.ibm#1 branch .. //depot/projects/xen31_7/bin/dd/ref.lcase#1 branch .. //depot/projects/xen31_7/bin/dd/ref.oldascii#1 branch .. //depot/projects/xen31_7/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/xen31_7/bin/dd/ref.oldibm#1 branch .. //depot/projects/xen31_7/bin/dd/ref.pareven#1 branch .. //depot/projects/xen31_7/bin/dd/ref.parnone#1 branch .. //depot/projects/xen31_7/bin/dd/ref.parodd#1 branch .. //depot/projects/xen31_7/bin/dd/ref.parset#1 branch .. //depot/projects/xen31_7/bin/dd/ref.swab#1 branch .. //depot/projects/xen31_7/bin/dd/ref.ucase#1 branch .. //depot/projects/xen31_7/bin/df/Makefile#1 branch .. //depot/projects/xen31_7/bin/df/df.1#1 branch .. //depot/projects/xen31_7/bin/df/df.c#1 branch .. //depot/projects/xen31_7/bin/domainname/Makefile#1 branch .. //depot/projects/xen31_7/bin/domainname/domainname.1#1 branch .. //depot/projects/xen31_7/bin/domainname/domainname.c#1 branch .. //depot/projects/xen31_7/bin/echo/Makefile#1 branch .. //depot/projects/xen31_7/bin/echo/echo.1#1 branch .. //depot/projects/xen31_7/bin/echo/echo.c#1 branch .. //depot/projects/xen31_7/bin/ed/Makefile#1 branch .. //depot/projects/xen31_7/bin/ed/POSIX#1 branch .. //depot/projects/xen31_7/bin/ed/README#1 branch .. //depot/projects/xen31_7/bin/ed/buf.c#1 branch .. //depot/projects/xen31_7/bin/ed/cbc.c#1 branch .. //depot/projects/xen31_7/bin/ed/ed.1#1 branch .. //depot/projects/xen31_7/bin/ed/ed.h#1 branch .. //depot/projects/xen31_7/bin/ed/glbl.c#1 branch .. //depot/projects/xen31_7/bin/ed/io.c#1 branch .. //depot/projects/xen31_7/bin/ed/main.c#1 branch .. //depot/projects/xen31_7/bin/ed/re.c#1 branch .. //depot/projects/xen31_7/bin/ed/sub.c#1 branch .. //depot/projects/xen31_7/bin/ed/test/=.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/Makefile#1 branch .. //depot/projects/xen31_7/bin/ed/test/README#1 branch .. //depot/projects/xen31_7/bin/ed/test/TODO#1 branch .. //depot/projects/xen31_7/bin/ed/test/a.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/a.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/a.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/a1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/a2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/addr.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/addr.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/addr.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/addr1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/addr2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/xen31_7/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/xen31_7/bin/ed/test/ascii.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/bang1.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/bang1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/bang1.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/bang1.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/bang2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/c.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/c.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/c.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/c1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/c2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/xen31_7/bin/ed/test/d.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/d.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/d.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/d.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/e1.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/e1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/e1.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/e1.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/e2.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/e2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/e2.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/e2.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/e3.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/e3.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/e3.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/e3.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/e4.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/e4.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/e4.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/f1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/f2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/g1.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/g1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/g1.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/g1.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/g2.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/g2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/g2.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/g2.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/g3.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/g3.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/g3.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/g3.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/g4.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/g4.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/g4.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/g5.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/g5.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/g5.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/h.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/i.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/i.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/i.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/i1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/i2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/i3.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/j.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/j.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/j.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/k.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/k.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/k.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/k1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/k2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/k3.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/k4.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/l.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/l.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/l.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/m.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/m.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/m.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/m.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/xen31_7/bin/ed/test/n.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/n.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/n.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/nl.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/nl1.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/nl1.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/nl1.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/nl2.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/nl2.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/nl2.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/p.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/p.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/p.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/q.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/q.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/q.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/q1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/r1.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/r1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/r1.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/r1.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/r2.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/r2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/r2.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/r2.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/r3.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/r3.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/r3.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/s1.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/s1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s1.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/s1.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/s10.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s2.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/s2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s2.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/s2.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/s3.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/s3.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s3.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/s3.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/s4.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s5.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s6.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s7.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s8.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/s9.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/t.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/t.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/t1.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/t1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/t1.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/t1.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/t2.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/t2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/t2.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/t2.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/u.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/u.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/u.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/u.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/v.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/v.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/v.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/w.d#1 branch .. //depot/projects/xen31_7/bin/ed/test/w.r#1 branch .. //depot/projects/xen31_7/bin/ed/test/w.t#1 branch .. //depot/projects/xen31_7/bin/ed/test/w1.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/w2.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/w3.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/x.err#1 branch .. //depot/projects/xen31_7/bin/ed/test/z.err#1 branch .. //depot/projects/xen31_7/bin/ed/undo.c#1 branch .. //depot/projects/xen31_7/bin/expr/Makefile#1 branch .. //depot/projects/xen31_7/bin/expr/expr.1#1 branch .. //depot/projects/xen31_7/bin/expr/expr.y#1 branch .. //depot/projects/xen31_7/bin/getfacl/Makefile#1 branch .. //depot/projects/xen31_7/bin/getfacl/getfacl.1#1 branch .. //depot/projects/xen31_7/bin/getfacl/getfacl.c#1 branch .. //depot/projects/xen31_7/bin/hostname/Makefile#1 branch .. //depot/projects/xen31_7/bin/hostname/hostname.1#1 branch .. //depot/projects/xen31_7/bin/hostname/hostname.c#1 branch .. //depot/projects/xen31_7/bin/kenv/Makefile#1 branch .. //depot/projects/xen31_7/bin/kenv/kenv.1#1 branch .. //depot/projects/xen31_7/bin/kenv/kenv.c#1 branch .. //depot/projects/xen31_7/bin/kill/Makefile#1 branch .. //depot/projects/xen31_7/bin/kill/kill.1#1 branch .. //depot/projects/xen31_7/bin/kill/kill.c#1 branch .. //depot/projects/xen31_7/bin/ln/Makefile#1 branch .. //depot/projects/xen31_7/bin/ln/ln.1#1 branch .. //depot/projects/xen31_7/bin/ln/ln.c#1 branch .. //depot/projects/xen31_7/bin/ln/symlink.7#1 branch .. //depot/projects/xen31_7/bin/ls/Makefile#1 branch .. //depot/projects/xen31_7/bin/ls/cmp.c#1 branch .. //depot/projects/xen31_7/bin/ls/extern.h#1 branch .. //depot/projects/xen31_7/bin/ls/ls.1#1 branch .. //depot/projects/xen31_7/bin/ls/ls.c#1 branch .. //depot/projects/xen31_7/bin/ls/ls.h#1 branch .. //depot/projects/xen31_7/bin/ls/print.c#1 branch .. //depot/projects/xen31_7/bin/ls/util.c#1 branch .. //depot/projects/xen31_7/bin/mkdir/Makefile#1 branch .. //depot/projects/xen31_7/bin/mkdir/mkdir.1#1 branch .. //depot/projects/xen31_7/bin/mkdir/mkdir.c#1 branch .. //depot/projects/xen31_7/bin/mv/Makefile#1 branch .. //depot/projects/xen31_7/bin/mv/mv.1#1 branch .. //depot/projects/xen31_7/bin/mv/mv.c#1 branch .. //depot/projects/xen31_7/bin/pax/Makefile#1 branch .. //depot/projects/xen31_7/bin/pax/ar_io.c#1 branch .. //depot/projects/xen31_7/bin/pax/ar_subs.c#1 branch .. //depot/projects/xen31_7/bin/pax/buf_subs.c#1 branch .. //depot/projects/xen31_7/bin/pax/cache.c#1 branch .. //depot/projects/xen31_7/bin/pax/cache.h#1 branch .. //depot/projects/xen31_7/bin/pax/cpio.1#1 branch .. //depot/projects/xen31_7/bin/pax/cpio.c#1 branch .. //depot/projects/xen31_7/bin/pax/cpio.h#1 branch .. //depot/projects/xen31_7/bin/pax/extern.h#1 branch .. //depot/projects/xen31_7/bin/pax/file_subs.c#1 branch .. //depot/projects/xen31_7/bin/pax/ftree.c#1 branch .. //depot/projects/xen31_7/bin/pax/ftree.h#1 branch .. //depot/projects/xen31_7/bin/pax/gen_subs.c#1 branch .. //depot/projects/xen31_7/bin/pax/getoldopt.c#1 branch .. //depot/projects/xen31_7/bin/pax/options.c#1 branch .. //depot/projects/xen31_7/bin/pax/options.h#1 branch .. //depot/projects/xen31_7/bin/pax/pat_rep.c#1 branch .. //depot/projects/xen31_7/bin/pax/pat_rep.h#1 branch .. //depot/projects/xen31_7/bin/pax/pax.1#1 branch .. //depot/projects/xen31_7/bin/pax/pax.c#1 branch .. //depot/projects/xen31_7/bin/pax/pax.h#1 branch .. //depot/projects/xen31_7/bin/pax/sel_subs.c#1 branch .. //depot/projects/xen31_7/bin/pax/sel_subs.h#1 branch .. //depot/projects/xen31_7/bin/pax/tables.c#1 branch .. //depot/projects/xen31_7/bin/pax/tables.h#1 branch .. //depot/projects/xen31_7/bin/pax/tar.1#1 branch .. //depot/projects/xen31_7/bin/pax/tar.c#1 branch .. //depot/projects/xen31_7/bin/pax/tar.h#1 branch .. //depot/projects/xen31_7/bin/pax/tty_subs.c#1 branch .. //depot/projects/xen31_7/bin/ps/Makefile#1 branch .. //depot/projects/xen31_7/bin/ps/extern.h#1 branch .. //depot/projects/xen31_7/bin/ps/fmt.c#1 branch .. //depot/projects/xen31_7/bin/ps/keyword.c#1 branch .. //depot/projects/xen31_7/bin/ps/nlist.c#1 branch .. //depot/projects/xen31_7/bin/ps/print.c#1 branch .. //depot/projects/xen31_7/bin/ps/ps.1#1 branch .. //depot/projects/xen31_7/bin/ps/ps.c#1 branch .. //depot/projects/xen31_7/bin/ps/ps.h#1 branch .. //depot/projects/xen31_7/bin/pwd/Makefile#1 branch .. //depot/projects/xen31_7/bin/pwd/pwd.1#1 branch .. //depot/projects/xen31_7/bin/pwd/pwd.c#1 branch .. //depot/projects/xen31_7/bin/rcp/Makefile#1 branch .. //depot/projects/xen31_7/bin/rcp/extern.h#1 branch .. //depot/projects/xen31_7/bin/rcp/rcp.1#1 branch .. //depot/projects/xen31_7/bin/rcp/rcp.c#1 branch .. //depot/projects/xen31_7/bin/rcp/util.c#1 branch .. //depot/projects/xen31_7/bin/realpath/Makefile#1 branch .. //depot/projects/xen31_7/bin/realpath/realpath.1#1 branch .. //depot/projects/xen31_7/bin/realpath/realpath.c#1 branch .. //depot/projects/xen31_7/bin/rm/Makefile#1 branch .. //depot/projects/xen31_7/bin/rm/rm.1#1 branch .. //depot/projects/xen31_7/bin/rm/rm.c#1 branch .. //depot/projects/xen31_7/bin/rmail/Makefile#1 branch .. //depot/projects/xen31_7/bin/rmdir/Makefile#1 branch .. //depot/projects/xen31_7/bin/rmdir/rmdir.1#1 branch .. //depot/projects/xen31_7/bin/rmdir/rmdir.c#1 branch .. //depot/projects/xen31_7/bin/setfacl/Makefile#1 branch .. //depot/projects/xen31_7/bin/setfacl/file.c#1 branch .. //depot/projects/xen31_7/bin/setfacl/mask.c#1 branch .. //depot/projects/xen31_7/bin/setfacl/merge.c#1 branch .. //depot/projects/xen31_7/bin/setfacl/remove.c#1 branch .. //depot/projects/xen31_7/bin/setfacl/setfacl.1#1 branch .. //depot/projects/xen31_7/bin/setfacl/setfacl.c#1 branch .. //depot/projects/xen31_7/bin/setfacl/setfacl.h#1 branch .. //depot/projects/xen31_7/bin/setfacl/util.c#1 branch .. //depot/projects/xen31_7/bin/sh/Makefile#1 branch .. //depot/projects/xen31_7/bin/sh/TOUR#1 branch .. //depot/projects/xen31_7/bin/sh/alias.c#1 branch .. //depot/projects/xen31_7/bin/sh/alias.h#1 branch .. //depot/projects/xen31_7/bin/sh/arith.h#1 branch .. //depot/projects/xen31_7/bin/sh/arith.y#1 branch .. //depot/projects/xen31_7/bin/sh/arith_lex.l#1 branch .. //depot/projects/xen31_7/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/xen31_7/bin/sh/bltin/echo.1#1 branch .. //depot/projects/xen31_7/bin/sh/bltin/echo.c#1 branch .. //depot/projects/xen31_7/bin/sh/builtins.def#1 branch .. //depot/projects/xen31_7/bin/sh/cd.c#1 branch .. //depot/projects/xen31_7/bin/sh/cd.h#1 branch .. //depot/projects/xen31_7/bin/sh/error.c#1 branch .. //depot/projects/xen31_7/bin/sh/error.h#1 branch .. //depot/projects/xen31_7/bin/sh/eval.c#1 branch .. //depot/projects/xen31_7/bin/sh/eval.h#1 branch .. //depot/projects/xen31_7/bin/sh/exec.c#1 branch .. //depot/projects/xen31_7/bin/sh/exec.h#1 branch .. //depot/projects/xen31_7/bin/sh/expand.c#1 branch .. //depot/projects/xen31_7/bin/sh/expand.h#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/cmv#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/dirs#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/kill#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/login#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/newgrp#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/popd#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/pushd#1 branch .. //depot/projects/xen31_7/bin/sh/funcs/suspend#1 branch .. //depot/projects/xen31_7/bin/sh/histedit.c#1 branch .. //depot/projects/xen31_7/bin/sh/init.h#1 branch .. //depot/projects/xen31_7/bin/sh/input.c#1 branch .. //depot/projects/xen31_7/bin/sh/input.h#1 branch .. //depot/projects/xen31_7/bin/sh/jobs.c#1 branch .. //depot/projects/xen31_7/bin/sh/jobs.h#1 branch .. //depot/projects/xen31_7/bin/sh/mail.c#1 branch .. //depot/projects/xen31_7/bin/sh/mail.h#1 branch .. //depot/projects/xen31_7/bin/sh/main.c#1 branch .. //depot/projects/xen31_7/bin/sh/main.h#1 branch .. //depot/projects/xen31_7/bin/sh/memalloc.c#1 branch .. //depot/projects/xen31_7/bin/sh/memalloc.h#1 branch .. //depot/projects/xen31_7/bin/sh/miscbltin.c#1 branch .. //depot/projects/xen31_7/bin/sh/mkbuiltins#1 branch .. //depot/projects/xen31_7/bin/sh/mkinit.c#1 branch .. //depot/projects/xen31_7/bin/sh/mknodes.c#1 branch .. //depot/projects/xen31_7/bin/sh/mksyntax.c#1 branch .. //depot/projects/xen31_7/bin/sh/mktokens#1 branch .. //depot/projects/xen31_7/bin/sh/myhistedit.h#1 branch .. //depot/projects/xen31_7/bin/sh/mystring.c#1 branch .. //depot/projects/xen31_7/bin/sh/mystring.h#1 branch .. //depot/projects/xen31_7/bin/sh/nodes.c.pat#1 branch .. //depot/projects/xen31_7/bin/sh/nodetypes#1 branch .. //depot/projects/xen31_7/bin/sh/options.c#1 branch .. //depot/projects/xen31_7/bin/sh/options.h#1 branch .. //depot/projects/xen31_7/bin/sh/output.c#1 branch .. //depot/projects/xen31_7/bin/sh/output.h#1 branch .. //depot/projects/xen31_7/bin/sh/parser.c#1 branch .. //depot/projects/xen31_7/bin/sh/parser.h#1 branch .. //depot/projects/xen31_7/bin/sh/redir.c#1 branch .. //depot/projects/xen31_7/bin/sh/redir.h#1 branch .. //depot/projects/xen31_7/bin/sh/sh.1#1 branch .. //depot/projects/xen31_7/bin/sh/shell.h#1 branch .. //depot/projects/xen31_7/bin/sh/show.c#1 branch .. //depot/projects/xen31_7/bin/sh/show.h#1 branch .. //depot/projects/xen31_7/bin/sh/trap.c#1 branch .. //depot/projects/xen31_7/bin/sh/trap.h#1 branch .. //depot/projects/xen31_7/bin/sh/var.c#1 branch .. //depot/projects/xen31_7/bin/sh/var.h#1 branch .. //depot/projects/xen31_7/bin/sleep/Makefile#1 branch .. //depot/projects/xen31_7/bin/sleep/sleep.1#1 branch .. //depot/projects/xen31_7/bin/sleep/sleep.c#1 branch .. //depot/projects/xen31_7/bin/stty/Makefile#1 branch .. //depot/projects/xen31_7/bin/stty/cchar.c#1 branch .. //depot/projects/xen31_7/bin/stty/extern.h#1 branch .. //depot/projects/xen31_7/bin/stty/gfmt.c#1 branch .. //depot/projects/xen31_7/bin/stty/key.c#1 branch .. //depot/projects/xen31_7/bin/stty/modes.c#1 branch .. //depot/projects/xen31_7/bin/stty/print.c#1 branch .. //depot/projects/xen31_7/bin/stty/stty.1#1 branch .. //depot/projects/xen31_7/bin/stty/stty.c#1 branch .. //depot/projects/xen31_7/bin/stty/stty.h#1 branch .. //depot/projects/xen31_7/bin/stty/util.c#1 branch .. //depot/projects/xen31_7/bin/sync/Makefile#1 branch .. //depot/projects/xen31_7/bin/sync/sync.8#1 branch .. //depot/projects/xen31_7/bin/sync/sync.c#1 branch .. //depot/projects/xen31_7/bin/test/Makefile#1 branch .. //depot/projects/xen31_7/bin/test/TEST.README#1 branch .. //depot/projects/xen31_7/bin/test/TEST.csh#1 branch .. //depot/projects/xen31_7/bin/test/TEST.sh#1 branch .. //depot/projects/xen31_7/bin/test/test.1#1 branch .. //depot/projects/xen31_7/bin/test/test.c#1 branch .. //depot/projects/xen31_7/cddl/Makefile#1 branch .. //depot/projects/xen31_7/cddl/Makefile.inc#1 branch .. //depot/projects/xen31_7/cddl/lib/Makefile#1 branch .. //depot/projects/xen31_7/cddl/lib/Makefile.inc#1 branch .. //depot/projects/xen31_7/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/xen31_7/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/xen31_7/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/xen31_7/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/xen31_7/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/xen31_7/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/xen31_7/cddl/sbin/Makefile#1 branch .. //depot/projects/xen31_7/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/xen31_7/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/xen31_7/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/xen31_7/cddl/usr.bin/Makefile#1 branch .. //depot/projects/xen31_7/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/xen31_7/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/xen31_7/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/xen31_7/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/xen31_7/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/xen31_7/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/xen31_7/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/xen31_7/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/xen31_7/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/xen31_7/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/xen31_7/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/xen31_7/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/xen31_7/contrib/amd/AUTHORS#1 branch .. //depot/projects/xen31_7/contrib/amd/BUGS#1 branch .. //depot/projects/xen31_7/contrib/amd/COPYING#1 branch .. //depot/projects/xen31_7/contrib/amd/ChangeLog#1 branch .. //depot/projects/xen31_7/contrib/amd/FAQ#1 branch .. //depot/projects/xen31_7/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/xen31_7/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/xen31_7/contrib/amd/INSTALL#1 branch .. //depot/projects/xen31_7/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/xen31_7/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/xen31_7/contrib/amd/NEWS#1 branch .. //depot/projects/xen31_7/contrib/amd/README#1 branch .. //depot/projects/xen31_7/contrib/amd/README.attrcache#1 branch .. //depot/projects/xen31_7/contrib/amd/README.ldap#1 branch .. //depot/projects/xen31_7/contrib/amd/README.y2k#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amd.8#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amd.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amd.h#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/autil.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/clock.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/conf.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/map.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/opts.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/restart.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/sched.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amq/amq.8#1 branch .. //depot/projects/xen31_7/contrib/amd/amq/amq.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amq/amq.h#1 branch .. //depot/projects/xen31_7/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/xen31_7/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/xen31_7/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/xen31_7/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/xen31_7/contrib/amd/bootstrap#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/xen31_7/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/xen31_7/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/xen31_7/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/xen31_7/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/xen31_7/contrib/amd/doc/version.texi#1 branch .. //depot/projects/xen31_7/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/xen31_7/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/xen31_7/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/xen31_7/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/xen31_7/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/xen31_7/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/xen31_7/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31_7/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/xen31_7/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/xen31_7/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/xen31_7/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/xen31_7/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/xen31_7/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/xen31_7/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/xen31_7/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/xen31_7/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/xen31_7/contrib/amd/ldap.schema#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/xen31_7/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/xen31_7/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/xen31_7/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/xen31_7/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/xen31_7/contrib/amd/tasks#1 branch .. //depot/projects/xen31_7/contrib/amd/vers.m4#1 branch .. //depot/projects/xen31_7/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/xen31_7/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/xen31_7/contrib/bc/AUTHORS#1 branch .. //depot/projects/xen31_7/contrib/bc/ChangeLog#1 branch .. //depot/projects/xen31_7/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/xen31_7/contrib/bc/FAQ#1 branch .. //depot/projects/xen31_7/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/xen31_7/contrib/bc/INSTALL#1 branch .. //depot/projects/xen31_7/contrib/bc/Makefile.am#1 branch .. //depot/projects/xen31_7/contrib/bc/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bc/NEWS#1 branch .. //depot/projects/xen31_7/contrib/bc/README#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/array.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/atan.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/div.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/exp.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/fact.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/jn.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/ln.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/mul.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/raise.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/signum#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/sine.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/xen31_7/contrib/bc/Test/timetest#1 branch .. //depot/projects/xen31_7/contrib/bc/acconfig.h#1 branch .. //depot/projects/xen31_7/contrib/bc/aclocal.m4#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/bc.y#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/const.h#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/execute.c#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/global.c#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/global.h#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/load.c#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/main.c#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/proto.h#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/scan.l#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/storage.c#1 branch .. //depot/projects/xen31_7/contrib/bc/bc/util.c#1 branch .. //depot/projects/xen31_7/contrib/bc/config.h.in#1 branch .. //depot/projects/xen31_7/contrib/bc/configure#1 branch .. //depot/projects/xen31_7/contrib/bc/configure.in#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/array.c#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/dc.c#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/dc.h#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/eval.c#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/misc.c#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/stack.c#1 branch .. //depot/projects/xen31_7/contrib/bc/dc/string.c#1 branch .. //depot/projects/xen31_7/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/xen31_7/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bc/doc/bc.1#1 branch .. //depot/projects/xen31_7/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/xen31_7/contrib/bc/doc/dc.1#1 branch .. //depot/projects/xen31_7/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/xen31_7/contrib/bc/h/number.h#1 branch .. //depot/projects/xen31_7/contrib/bc/install-sh#1 branch .. //depot/projects/xen31_7/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/xen31_7/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bc/lib/number.c#1 branch .. //depot/projects/xen31_7/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/xen31_7/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/xen31_7/contrib/bc/missing#1 branch .. //depot/projects/xen31_7/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/xen31_7/contrib/bc/stamp-h.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/CHANGES#1 branch .. //depot/projects/xen31_7/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/xen31_7/contrib/bind9/FAQ#1 branch .. //depot/projects/xen31_7/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/xen31_7/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/xen31_7/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/xen31_7/contrib/bind9/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/README#1 branch .. //depot/projects/xen31_7/contrib/bind9/README.idnkit#1 branch .. //depot/projects/xen31_7/contrib/bind9/acconfig.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/xen31_7/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/xen31_7/contrib/bind9/config.guess#1 branch .. //depot/projects/xen31_7/contrib/bind9/config.sub#1 branch .. //depot/projects/xen31_7/contrib/bind9/config.threads.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/configure.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/xen31_7/contrib/bind9/doc/rfc/rfc2052.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F5001065A3B; Fri, 29 Feb 2008 19:48:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93697106570C for ; Fri, 29 Feb 2008 19:48:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8488A8FC23 for ; Fri, 29 Feb 2008 19:48:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmEaF092551 for ; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmECG092549 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:14 GMT Message-Id: <200802291948.m1TJmECG092549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136465 Change 136465 by kmacy@pandemonium:kmacy:xen31 on 2008/02/28 22:50:33 augment logging at time of SIGBUS Affected files ... .. //depot/projects/xen31/sys/i386/i386/trap.c#11 edit Differences ... ==== //depot/projects/xen31/sys/i386/i386/trap.c#11 (text+ko) ==== @@ -841,19 +841,21 @@ pteval = *(vtopte(va)); if (rv == KERN_PROTECTION_FAILURE) { - CTR5(KTR_PMAP, "SIGBUS: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x", - p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff)); - CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x", - vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err); - log(LOG_ERR, "SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", - p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval); + CTR6(KTR_PMAP, "SIGBUS: pmap=%p p=%s va=0x%08x eip=0x%08x *pde=0x%x *pte=%08x", + &p->p_vmspace->vm_pmap, p->p_comm, va, frame->tf_eip,(u_long)PTD[va >> PDRSHIFT], + (u_long)(pteval & 0xffffffff)); + CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x ftype=0x%x", + vtopte(va), map, frame->tf_err, ftype); + log(LOG_ERR, "SIGBUS: pmap=%p, p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", + &p->p_vmspace->vm_pmap, p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval); } else { - CTR5(KTR_PMAP, "SIGSEGV: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x", - p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff)); - CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x", - vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err); - log(LOG_ERR, "SIGSEGV: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", - p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval); + CTR6(KTR_PMAP, "SIGSEGV: pmap=%p, p=%s va=0x%08x eip=0x%08x *pde=0x%08x *pte=%08x", + &p->p_vmspace->vm_pmap, p->p_comm, va, frame->tf_eip, (u_long)PTD[va >> PDRSHIFT], + (u_long)(pteval & 0xffffffff)); + CTR4(KTR_PMAP,"\t pte=0x%08x map=%p err=0x%x ftype=0x%x", + vtopte(va), map, frame->tf_err, ftype); + log(LOG_ERR, "SIGSEGV: pmap=%p p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", + &p->p_vmspace->vm_pmap, p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval); } } From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19DFB10656D2; Fri, 29 Feb 2008 19:48:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBAAB1065712 for ; Fri, 29 Feb 2008 19:48:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA4978FC27 for ; Fri, 29 Feb 2008 19:48:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmEmH092556 for ; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmEML092554 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:14 GMT Message-Id: <200802291948.m1TJmEML092554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136466 Change 136466 by kmacy@pandemonium:kmacy:xen31 on 2008/02/28 22:53:49 remove noisy logging Affected files ... .. //depot/projects/xen31/sys/kern/sched_ule.c#8 edit Differences ... ==== //depot/projects/xen31/sys/kern/sched_ule.c#8 (text+ko) ==== @@ -467,7 +467,6 @@ THREAD_LOCK_ASSERT(ts->ts_thread, MA_OWNED); class = PRI_BASE(ts->ts_thread->td_pri_class); tdq->tdq_load++; - CTR2(KTR_SCHED, "cpu %d load: %d", TDQ_ID(tdq), tdq->tdq_load); if (class != PRI_ITHD && (ts->ts_thread->td_proc->p_flag & P_NOLOAD) == 0) #ifdef SMP @@ -499,7 +498,6 @@ KASSERT(tdq->tdq_load != 0, ("tdq_load_rem: Removing with 0 load on queue %d", TDQ_ID(tdq))); tdq->tdq_load--; - CTR1(KTR_SCHED, "load: %d", tdq->tdq_load); ts->ts_runq = NULL; } @@ -2395,9 +2393,7 @@ int cpuid; int cpu; #endif - CTR5(KTR_SCHED, "sched_add: %p(%s) prio %d by %p(%s)", - td, td->td_name, td->td_priority, curthread, - curthread->td_name); + THREAD_LOCK_ASSERT(td, MA_OWNED); ts = td->td_sched; /* From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD5710659F6; Fri, 29 Feb 2008 19:48:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 834AE106589C for ; Fri, 29 Feb 2008 19:48:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6F568FC21 for ; Fri, 29 Feb 2008 19:48:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmG6N092561 for ; Fri, 29 Feb 2008 19:48:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmEdo092559 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:14 GMT Message-Id: <200802291948.m1TJmEdo092559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=136467 Change 136467 by kmacy@pandemonium:kmacy:xen31 on 2008/02/28 22:59:38 IFC #136462 Affected files ... .. //depot/projects/xen31/Makefile.inc1#5 integrate .. //depot/projects/xen31/ObsoleteFiles.inc#10 integrate .. //depot/projects/xen31/UPDATING#5 integrate .. //depot/projects/xen31/bin/sh/cd.c#2 integrate .. //depot/projects/xen31/bin/sh/mksyntax.c#2 integrate .. //depot/projects/xen31/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/xen31/contrib/traceroute/as.c#1 branch .. //depot/projects/xen31/contrib/traceroute/as.h#1 branch .. //depot/projects/xen31/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/xen31/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/xen31/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/xen31/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/xen31/gnu/usr.bin/binutils/ar/Makefile#2 integrate .. //depot/projects/xen31/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate .. //depot/projects/xen31/gnu/usr.bin/gdb/kgdb/kgdb.h#4 integrate .. //depot/projects/xen31/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/xen31/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/xen31/gnu/usr.bin/man/manpath/manpath.c#2 integrate .. //depot/projects/xen31/include/unistd.h#4 integrate .. //depot/projects/xen31/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry_strmode.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/xen31/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/xen31/lib/libarchive/test/main.c#3 integrate .. //depot/projects/xen31/lib/libarchive/test/test.h#3 integrate .. //depot/projects/xen31/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/xen31/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/xen31/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/xen31/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/xen31/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/xen31/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/xen31/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/xen31/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/xen31/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/xen31/lib/libc/regex/grot/main.c#2 integrate .. //depot/projects/xen31/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/xen31/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/xen31/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/xen31/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/xen31/lib/msun/Makefile#5 integrate .. //depot/projects/xen31/lib/msun/Symbol.map#6 integrate .. //depot/projects/xen31/lib/msun/bsdsrc/b_exp.c#2 integrate .. //depot/projects/xen31/lib/msun/bsdsrc/b_log.c#2 integrate .. //depot/projects/xen31/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/xen31/lib/msun/ld80/k_tanl.c#2 integrate .. //depot/projects/xen31/lib/msun/man/j0.3#2 integrate .. //depot/projects/xen31/lib/msun/man/lgamma.3#2 integrate .. //depot/projects/xen31/lib/msun/powerpc/fenv.h#2 integrate .. //depot/projects/xen31/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_acosh.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_atan2f.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_atanh.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_cosh.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_exp.c#3 integrate .. //depot/projects/xen31/lib/msun/src/e_expf.c#3 integrate .. //depot/projects/xen31/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_gamma.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_gamma_r.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_j0.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_j1.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_jn.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_lgamma.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_log.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_rem_pio2.c#3 integrate .. //depot/projects/xen31/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/xen31/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_sinh.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/k_cos.c#3 integrate .. //depot/projects/xen31/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/k_rem_pio2.c#3 integrate .. //depot/projects/xen31/lib/msun/src/k_sin.c#2 integrate .. //depot/projects/xen31/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/k_tan.c#2 integrate .. //depot/projects/xen31/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/math.h#6 integrate .. //depot/projects/xen31/lib/msun/src/math_private.h#4 integrate .. //depot/projects/xen31/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_cos.c#3 integrate .. //depot/projects/xen31/lib/msun/src/s_cosf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_exp2.c#3 integrate .. //depot/projects/xen31/lib/msun/src/s_exp2f.c#3 integrate .. //depot/projects/xen31/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_frexp.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_ilogb.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_ilogbf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_modff.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_nextafter.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_nextafterf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_rint.c#4 integrate .. //depot/projects/xen31/lib/msun/src/s_rintf.c#3 integrate .. //depot/projects/xen31/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_significand.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_sin.c#3 integrate .. //depot/projects/xen31/lib/msun/src/s_sinf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_tan.c#3 integrate .. //depot/projects/xen31/lib/msun/src/s_tanf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_tanh.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_tgammaf.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_trunc.c#3 integrate .. //depot/projects/xen31/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/xen31/release/Makefile#6 integrate .. //depot/projects/xen31/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/xen31/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/xen31/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/xen31/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/xen31/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/xen31/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/xen31/sbin/ping6/ping6.c#3 integrate .. //depot/projects/xen31/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/xen31/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/xen31/share/man/man4/Makefile#7 integrate .. //depot/projects/xen31/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/xen31/share/man/man4/geom_lvm.4#2 delete .. //depot/projects/xen31/share/man/man4/ip6.4#2 integrate .. //depot/projects/xen31/share/man/man4/uscanner.4#2 integrate .. //depot/projects/xen31/share/man/man9/Makefile#7 integrate .. //depot/projects/xen31/share/man/man9/VOP_LOCK.9#5 integrate .. //depot/projects/xen31/share/man/man9/insmntque.9#1 branch .. //depot/projects/xen31/share/man/man9/lock.9#5 integrate .. //depot/projects/xen31/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/xen31/share/man/man9/vgone.9#2 integrate .. //depot/projects/xen31/share/man/man9/vhold.9#2 integrate .. //depot/projects/xen31/share/man/man9/vput.9#2 integrate .. //depot/projects/xen31/share/man/man9/vref.9#2 integrate .. //depot/projects/xen31/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/xen31/share/man/man9/vrele.9#2 integrate .. //depot/projects/xen31/share/misc/bsd-family-tree#5 integrate .. //depot/projects/xen31/share/misc/committers-doc.dot#3 integrate .. //depot/projects/xen31/share/misc/committers-ports.dot#4 integrate .. //depot/projects/xen31/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/xen31/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/xen31/sys/arm/include/_bus.h#2 integrate .. //depot/projects/xen31/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/xen31/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/xen31/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/xen31/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/xen31/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/xen31/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/xen31/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/xen31/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/xen31/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/xen31/sys/boot/powerpc/ofw/Makefile#4 integrate .. //depot/projects/xen31/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/xen31/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/xen31/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/xen31/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/xen31/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/xen31/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/xen31/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/xen31/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/xen31/sys/conf/NOTES#11 integrate .. //depot/projects/xen31/sys/conf/files#17 integrate .. //depot/projects/xen31/sys/conf/files.powerpc#7 integrate .. //depot/projects/xen31/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/xen31/sys/conf/options#9 integrate .. //depot/projects/xen31/sys/conf/options.powerpc#3 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/xen31/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/xen31/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/xen31/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/xen31/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_l2t.c#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/xen31/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/xen31/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/xen31/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/xen31/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/xen31/sys/dev/md/md.c#4 integrate .. //depot/projects/xen31/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/xen31/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/umass.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/xen31/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/xen31/sys/fs/coda/TODO#3 integrate .. //depot/projects/xen31/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/xen31/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/xen31/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/xen31/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/xen31/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/xen31/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/xen31/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/xen31/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/xen31/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/xen31/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/xen31/sys/geom/lvm/g_lvm.c#2 delete .. //depot/projects/xen31/sys/geom/lvm/g_lvm.h#2 delete .. //depot/projects/xen31/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/xen31/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/xen31/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_lock.c#7 integrate .. //depot/projects/xen31/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/xen31/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_default.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/xen31/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/xen31/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/xen31/sys/kern/vnode_if.src#3 integrate .. //depot/projects/xen31/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/xen31/sys/libkern/quad.h#2 integrate .. //depot/projects/xen31/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/xen31/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/xen31/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/xen31/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/xen31/sys/modules/geom/Makefile#4 integrate .. //depot/projects/xen31/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/xen31/sys/modules/geom/geom_lvm/Makefile#2 delete .. //depot/projects/xen31/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/xen31/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/xen31/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/xen31/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/xen31/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/xen31/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/xen31/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/xen31/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/xen31/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/xen31/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/xen31/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/xen31/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/xen31/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/xen31/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/xen31/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/xen31/sys/powerpc/include/bootinfo.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/float.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/xen31/sys/security/audit/audit.c#6 integrate .. //depot/projects/xen31/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/xen31/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/xen31/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/xen31/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/xen31/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/xen31/sys/sys/buf.h#4 integrate .. //depot/projects/xen31/sys/sys/ktrace.h#2 integrate .. //depot/projects/xen31/sys/sys/lockmgr.h#6 integrate .. //depot/projects/xen31/sys/sys/param.h#13 integrate .. //depot/projects/xen31/sys/sys/vnode.h#3 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/xen31/sys/vm/vm_object.c#5 integrate .. //depot/projects/xen31/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/xen31/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/xen31/usr.bin/Makefile#4 integrate .. //depot/projects/xen31/usr.bin/ar/Makefile#1 branch .. //depot/projects/xen31/usr.bin/ar/ar.1#1 branch .. //depot/projects/xen31/usr.bin/ar/ar.c#1 branch .. //depot/projects/xen31/usr.bin/ar/ar.h#1 branch .. //depot/projects/xen31/usr.bin/ar/read.c#1 branch .. //depot/projects/xen31/usr.bin/ar/util.c#1 branch .. //depot/projects/xen31/usr.bin/ar/write.c#1 branch .. //depot/projects/xen31/usr.bin/awk/Makefile#3 integrate .. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/xen31/usr.bin/du/du.1#2 integrate .. //depot/projects/xen31/usr.bin/du/du.c#3 integrate .. //depot/projects/xen31/usr.bin/find/extern.h#2 integrate .. //depot/projects/xen31/usr.bin/find/find.1#2 integrate .. //depot/projects/xen31/usr.bin/find/find.h#2 integrate .. //depot/projects/xen31/usr.bin/find/function.c#2 integrate .. //depot/projects/xen31/usr.bin/find/option.c#2 integrate .. //depot/projects/xen31/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/xen31/usr.bin/kdump/kdump.c#4 integrate .. //depot/projects/xen31/usr.bin/kdump/mksubr#3 integrate .. //depot/projects/xen31/usr.bin/ktrace/ktrace.1#2 integrate .. //depot/projects/xen31/usr.bin/ktrace/ktrace.h#2 integrate .. //depot/projects/xen31/usr.bin/ktrace/subr.c#2 integrate .. //depot/projects/xen31/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/xen31/usr.bin/tar/write.c#2 integrate .. //depot/projects/xen31/usr.sbin/cdcontrol/cdcontrol.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/xen31/usr.sbin/pmcstat/Makefile#3 integrate .. //depot/projects/xen31/usr.sbin/powerd/powerd.c#2 integrate .. //depot/projects/xen31/usr.sbin/pw/pw.8#3 integrate .. //depot/projects/xen31/usr.sbin/pw/pw.c#2 integrate .. //depot/projects/xen31/usr.sbin/pw/pw_group.c#2 integrate .. //depot/projects/xen31/usr.sbin/sa/db.c#3 integrate .. //depot/projects/xen31/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/xen31/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate .. //depot/projects/xen31/usr.sbin/zic/zdump.c#2 integrate Differences ... ==== //depot/projects/xen31/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -872,6 +872,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,18 +889,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ @@ -967,6 +972,10 @@ .endif .endif +.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 +.MAKEFLAGS+= -D_WITH_GNUAR +.endif + cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/xen31/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.130 2008/02/06 19:45:25 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080220: geom_lvm rename to geom_linux_lvm +OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal OLD_FILES+=usr/share/man/man4/card.4.gz OLD_FILES+=usr/share/man/man4/oldcard.4.gz ==== //depot/projects/xen31/UPDATING#5 (text+ko) ==== @@ -22,6 +22,10 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080220: + The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), + likewise the kernel option is now GEOM_LINUX_LVM. + 20080211: The default NFS mount mode has changed from UDP to TCP for increased reliability. If you rely on (insecurely) NFS @@ -979,4 +983,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.519 2008/02/11 23:23:20 kris Exp $ +$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ ==== //depot/projects/xen31/bin/sh/cd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); #include #include @@ -68,7 +68,9 @@ STATIC int cdphysical(char *); STATIC int docd(char *, int, int); STATIC char *getcomponent(void); -STATIC int updatepwd(char *); +STATIC char *findcwd(char *); +STATIC void updatepwd(char *); +STATIC char *getpwd2(char *, size_t); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -201,10 +203,11 @@ } INTOFF; - if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) { + if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -212,12 +215,14 @@ STATIC int cdphysical(char *dest) { + char *p; INTOFF; - if (chdir(dest) < 0 || updatepwd(NULL) < 0) { + if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { INTON; return (-1); } + updatepwd(p); INTON; return (0); } @@ -247,38 +252,20 @@ } -/* - * Update curdir (the name of the current directory) in response to a - * cd command. We also call hashcd to let the routines in exec.c know - * that the current directory has changed. - */ -STATIC int -updatepwd(char *dir) +STATIC char * +findcwd(char *dir) { char *new; char *p; - hashcd(); /* update command hash table */ - /* * If our argument is NULL, we don't know the current directory * any more because we traversed a symbolic link or something * we couldn't stat(). */ if (dir == NULL || curdir == NULL) { - if (prevdir) - ckfree(prevdir); - INTOFF; - prevdir = curdir; - curdir = NULL; - if (getpwd() == NULL) { - INTON; - return (-1); - } - setvar("PWD", curdir, VEXPORT); - setvar("OLDPWD", prevdir, VEXPORT); - INTON; - return (0); + p = stalloc(PATH_MAX); + return getpwd2(p, PATH_MAX); } cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); @@ -302,16 +289,25 @@ if (new == stackblock()) STPUTC('/', new); STACKSTRNUL(new); - INTOFF; + return stackblock(); +} + +/* + * Update curdir (the name of the current directory) in response to a + * cd command. We also call hashcd to let the routines in exec.c know + * that the current directory has changed. + */ +STATIC void +updatepwd(char *dir) +{ + hashcd(); /* update command hash table */ + if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(stackblock()); + curdir = savestr(dir); setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); - INTON; - - return (0); } int @@ -355,17 +351,31 @@ } /* - * Find out what the current directory is. If we already know the current - * directory, this routine returns immediately. + * Get the current directory and cache the result in curdir. */ char * getpwd(void) { char buf[PATH_MAX]; + char *p; if (curdir) return curdir; - if (getcwd(buf, sizeof(buf)) == NULL) { + + p = getpwd2(buf, sizeof(buf)); + if (p != NULL) + curdir = savestr(p); + + return curdir; +} + +/* + * Return the current directory. + */ +STATIC char * +getpwd2(char *buf, size_t size) +{ + if (getcwd(buf, size) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -373,12 +383,9 @@ stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - curdir = savestr(pwd); - return curdir; + return pwd; } return NULL; } - curdir = savestr(buf); - - return curdir; + return buf; } ==== //depot/projects/xen31/bin/sh/mksyntax.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.24 2005/08/13 15:47:13 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.25 2008/02/18 20:01:33 marcel Exp $"); /* * This program creates syntax.h and syntax.c. @@ -139,10 +139,7 @@ /* Determine the characteristics of chars. */ c = -1; - if (c < 0) - sign = 1; - else - sign = 0; + sign = (c > 0) ? 0 : 1; for (nbits = 1 ; ; nbits++) { d = (1 << nbits) - 1; if (d == c) ==== //depot/projects/xen31/contrib/tcpdump/print-802_11.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/xen31/contrib/traceroute/traceroute.8#2 (text+ko) ==== @@ -14,9 +14,9 @@ .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ -.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $ +.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.17 2008/02/20 23:29:52 rpaulo Exp $ .\" -.TH TRACEROUTE 8 "21 September 2000" +.TH TRACEROUTE 8 "19 February 2008" .UC 6 .SH NAME traceroute \- print the route packets take to network host @@ -24,7 +24,7 @@ .na .B traceroute [ -.B \-dDeFISnrvx +.B \-adDeFISnrvx ] [ .B \-f .I first_ttl @@ -71,6 +71,9 @@ .B \-w .I waittime ] [ +.B \-A +.I as_server +] [ .B \-z .I pausemsecs ] @@ -98,6 +101,13 @@ .PP Other options are: .TP +.B \-a +Turn on AS# lookups for each hop encountered. +.TP +.B -A +Turn on AS# lookups and use the given server instead of the +default. +.TP .B \-e Firewall evasion mode. Use fixed destination ports for UDP and TCP probes. @@ -443,3 +453,7 @@ router that's filtering packets), but this is not implemented yet. .PP Please send bug reports to traceroute@ee.lbl.gov. +.PP +The AS number capability reports information that may sometimes be +inaccurate due to discrepancies between the contents of the +routing database server and the current state of the Internet. ==== //depot/projects/xen31/contrib/traceroute/traceroute.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34 2007/07/01 12:08:05 gnn Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $"; #endif /* @@ -263,6 +263,7 @@ #include "findsaddr.h" #include "ifaddrlist.h" +#include "as.h" #include "traceroute.h" /* Maximum number of gateways (include room for one noop) */ @@ -350,6 +351,9 @@ int verbose; int waittime = 5; /* time to wait for response (in seconds) */ int nflag; /* print addresses numerically */ +int as_path; /* print as numbers for each hop */ +char *as_server = NULL; +void *asn; #ifdef CANT_HACK_IPCKSUM int doipcksum = 0; /* don't calculate ip checksums by default */ #else @@ -535,9 +539,17 @@ prog = argv[0]; opterr = 0; - while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) + while ((op = getopt(argc, argv, "aA:edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF) switch (op) { - + case 'a': + as_path = 1; + break; + + case 'A': + as_path = 1; + as_server = optarg; + break; + case 'd': options |= SO_DEBUG; break; @@ -913,6 +925,16 @@ exit (1); } + if (as_path) { + asn = as_setup(as_server); + if (asn == NULL) { + Fprintf(stderr, "%s: as_setup failed, AS# lookups" + " disabled\n", prog); + (void)fflush(stderr); + as_path = 0; + } + } + #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) if (setpolicy(sndsock, "in bypass") < 0) errx(1, "%s", ipsec_strerror()); @@ -1118,6 +1140,8 @@ (unreachable > 0 && unreachable >= nprobes - 1)) break; } + if (as_path) + as_shutdown(asn); exit(0); } @@ -1458,6 +1482,9 @@ hlen = ip->ip_hl << 2; cc -= hlen; + if (as_path) + Printf(" [AS%d]", as_lookup(asn, &from->sin_addr)); + if (nflag) Printf(" %s", inet_ntoa(from->sin_addr)); else @@ -1764,8 +1791,8 @@ Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" + "Usage: %s [-adDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" - "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog); + "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog); exit(1); } ==== //depot/projects/xen31/games/fortune/datfiles/fortunes#8 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $ % ======================================================================= || || @@ -15979,6 +15979,9 @@ % Don't mind him; politicians always sound like that. % +Don't patch bad code -- rewrite it. + -- "The Elements of Programming Style", Kernighan and Plauger +% Don't plan any hasty moves. You'll be evicted soon anyway. % @@ -31243,7 +31246,7 @@ -- Charles Dickens % Let the machine do the dirty work. - -- "Elements of Programming Style", Kernighan and Ritchie + -- "The Elements of Programming Style", Kernighan and Plauger % Let the meek inherit the earth -- they have it coming to them. -- James Thurber ==== //depot/projects/xen31/games/fortune/strfile/strfile.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.28 2005/02/17 18:06:37 ru Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.29 2008/02/19 07:09:17 ru Exp $"); # include # include @@ -270,7 +270,7 @@ { int ch; - while ((ch = getopt(argc, argv, "Cc:iorsx")) != EOF) + while ((ch = getopt(argc, argv, "Cc:iorsx")) != -1) switch(ch) { case 'C': /* embedded comments */ Cflag++; ==== //depot/projects/xen31/gnu/lib/libgcc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -122,7 +122,7 @@ .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c +LIB2FUNCS_EXTRA = tramp.asm LIB2FUNCS_STATIC_EXTRA = eabi.asm .endif ==== //depot/projects/xen31/gnu/usr.bin/binutils/ar/Makefile#2 (text+ko) ==== @@ -1,9 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc +.if !defined(_WITH_GNUAR) +PROGNAME= gnu-ar +MAN= gnu-ar.1 +gnu-ar.1: ar.1 + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= gnu-ar.1 +.endif + PROG= ar SRCS= ar.c not-ranlib.c CFLAGS+= -D_GNU_SOURCE ==== //depot/projects/xen31/gnu/usr.bin/binutils/ranlib/Makefile#2 (text+ko) ==== @@ -1,9 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 232F81065C1E; Fri, 29 Feb 2008 19:48:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C346510658D5 for ; Fri, 29 Feb 2008 19:48:17 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 387B88FC1A for ; Fri, 29 Feb 2008 19:48:17 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmHG0092571 for ; Fri, 29 Feb 2008 19:48:17 GMT (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmHX0092569 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:17 GMT (envelope-from obrien@freebsd.org) Date: Fri, 29 Feb 2008 19:48:17 GMT Message-Id: <200802291948.m1TJmHX0092569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=136469 Change 136469 by obrien@obrien_trang on 2008/02/29 00:22:37 Zero out the new tcb. Obtained from: Juniper Networks Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ tcb = malloc(sizeof(struct tcb)); if (tcb) + bzero(tcb, sizeof(struct tcb)); tcb->tcb_thread = thread; return (tcb); } From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 347C51065BFD; Fri, 29 Feb 2008 19:48:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D07E1065A38 for ; Fri, 29 Feb 2008 19:48:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74C2A8FC26 for ; Fri, 29 Feb 2008 19:48:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmIbj092596 for ; Fri, 29 Feb 2008 19:48:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmI5I092594 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:18 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:18 GMT Message-Id: <200802291948.m1TJmI5I092594@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=136474 Change 136474 by kmacy@kmacy:entropy:iwarp on 2008/02/29 04:24:55 IFC 136473 Affected files ... .. //depot/projects/iwarp/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/iwarp/include/unistd.h#4 integrate .. //depot/projects/iwarp/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/iwarp/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/iwarp/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/iwarp/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/iwarp/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/iwarp/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/iwarp/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/iwarp/lib/msun/src/e_rem_pio2.c#3 integrate .. //depot/projects/iwarp/lib/msun/src/e_rem_pio2f.c#3 integrate .. //depot/projects/iwarp/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/iwarp/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/iwarp/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/iwarp/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/iwarp/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/iwarp/share/man/man4/uscanner.4#2 integrate .. //depot/projects/iwarp/share/man/man9/Makefile#8 integrate .. //depot/projects/iwarp/share/man/man9/insmntque.9#1 branch .. //depot/projects/iwarp/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/iwarp/share/man/man9/vgone.9#2 integrate .. //depot/projects/iwarp/share/man/man9/vhold.9#2 integrate .. //depot/projects/iwarp/share/man/man9/vput.9#2 integrate .. //depot/projects/iwarp/share/man/man9/vref.9#2 integrate .. //depot/projects/iwarp/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/iwarp/share/man/man9/vrele.9#2 integrate .. //depot/projects/iwarp/share/misc/bsd-family-tree#5 integrate .. //depot/projects/iwarp/share/misc/committers-doc.dot#3 integrate .. //depot/projects/iwarp/share/misc/committers-ports.dot#4 integrate .. //depot/projects/iwarp/sys/arm/include/_bus.h#2 integrate .. //depot/projects/iwarp/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/iwarp/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/iwarp/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/iwarp/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/iwarp/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/iwarp/sys/conf/NOTES#8 integrate .. //depot/projects/iwarp/sys/conf/files#11 integrate .. //depot/projects/iwarp/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#21 integrate .. //depot/projects/iwarp/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/iwarp/sys/dev/md/md.c#5 integrate .. //depot/projects/iwarp/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/iwarp/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/iwarp/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/iwarp/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/iwarp/sys/fs/coda/TODO#3 integrate .. //depot/projects/iwarp/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/iwarp/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/iwarp/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/iwarp/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/iwarp/sys/kern/vnode_if.src#4 integrate .. //depot/projects/iwarp/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/iwarp/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/iwarp/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/iwarp/sys/vm/vm_object.c#6 integrate .. //depot/projects/iwarp/usr.bin/awk/Makefile#3 integrate .. //depot/projects/iwarp/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/iwarp/usr.sbin/pkg_install/add/main.c#3 integrate Differences ... ==== //depot/projects/iwarp/games/fortune/datfiles/fortunes#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $ % ======================================================================= || || @@ -15979,6 +15979,9 @@ % Don't mind him; politicians always sound like that. % +Don't patch bad code -- rewrite it. + -- "The Elements of Programming Style", Kernighan and Plauger +% Don't plan any hasty moves. You'll be evicted soon anyway. % @@ -31243,7 +31246,7 @@ -- Charles Dickens % Let the machine do the dirty work. - -- "Elements of Programming Style", Kernighan and Ritchie + -- "The Elements of Programming Style", Kernighan and Plauger % Let the meek inherit the earth -- they have it coming to them. -- James Thurber ==== //depot/projects/iwarp/include/unistd.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.83 2008/02/12 20:09:03 ru Exp $ + * $FreeBSD: src/include/unistd.h,v 1.84 2008/02/26 20:33:52 ru Exp $ */ #ifndef _UNISTD_H_ @@ -405,7 +405,7 @@ /* 1003.1-2001 */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE int fchown(int, uid_t, gid_t); -ssize_t readlink(const char *, char *, size_t); +ssize_t readlink(const char * __restrict, char * __restrict, size_t); #endif #if __POSIX_VISIBLE >= 200112 int gethostname(char *, size_t); ==== //depot/projects/iwarp/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.1 2008/01/03 18:30:37 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.2 2008/02/26 07:17:47 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -34,7 +34,7 @@ /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ static inline uint16_t -be16dec(const void *pp) +archive_be16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -42,7 +42,7 @@ } static inline uint32_t -be32dec(const void *pp) +archive_be32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -50,15 +50,15 @@ } static inline uint64_t -be64dec(const void *pp) +archive_be64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); + return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4)); } static inline uint16_t -le16dec(const void *pp) +archive_le16dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -66,7 +66,7 @@ } static inline uint32_t -le32dec(const void *pp) +archive_le32dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; @@ -74,15 +74,15 @@ } static inline uint64_t -le64dec(const void *pp) +archive_le64dec(const void *pp) { unsigned char const *p = (unsigned char const *)pp; - return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p)); + return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p)); } static inline void -be16enc(void *pp, uint16_t u) +archive_be16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -91,7 +91,7 @@ } static inline void -be32enc(void *pp, uint32_t u) +archive_be32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -102,16 +102,16 @@ } static inline void -be64enc(void *pp, uint64_t u) +archive_be64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - be32enc(p, u >> 32); - be32enc(p + 4, u & 0xffffffff); + archive_be32enc(p, u >> 32); + archive_be32enc(p + 4, u & 0xffffffff); } static inline void -le16enc(void *pp, uint16_t u) +archive_le16enc(void *pp, uint16_t u) { unsigned char *p = (unsigned char *)pp; @@ -120,7 +120,7 @@ } static inline void -le32enc(void *pp, uint32_t u) +archive_le32enc(void *pp, uint32_t u) { unsigned char *p = (unsigned char *)pp; @@ -131,12 +131,12 @@ } static inline void -le64enc(void *pp, uint64_t u) +archive_le64enc(void *pp, uint64_t u) { unsigned char *p = (unsigned char *)pp; - le32enc(p, u & 0xffffffff); - le32enc(p + 4, u >> 32); + archive_le32enc(p, u & 0xffffffff); + archive_le32enc(p + 4, u >> 32); } #endif ==== //depot/projects/iwarp/lib/libarchive/archive_read_support_format_zip.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.20 2008/01/15 16:27:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.22 2008/02/27 06:05:59 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -278,8 +278,8 @@ zip->version = p->version[0]; zip->system = p->version[1]; - zip->flags = le16dec(p->flags); - zip->compression = le16dec(p->compression); + zip->flags = archive_le16dec(p->flags); + zip->compression = archive_le16dec(p->compression); if (zip->compression < sizeof(compression_names)/sizeof(compression_names[0])) zip->compression_name = compression_names[zip->compression]; @@ -291,11 +291,11 @@ zip->mode = 0; zip->uid = 0; zip->gid = 0; - zip->crc32 = le32dec(p->crc32); - zip->filename_length = le16dec(p->filename_length); - zip->extra_length = le16dec(p->extra_length); - zip->uncompressed_size = le32dec(p->uncompressed_size); - zip->compressed_size = le32dec(p->compressed_size); + zip->crc32 = archive_le32dec(p->crc32); + zip->filename_length = archive_le16dec(p->filename_length); + zip->extra_length = archive_le16dec(p->extra_length); + zip->uncompressed_size = archive_le32dec(p->uncompressed_size); + zip->compressed_size = archive_le32dec(p->compressed_size); (a->decompressor->consume)(a, sizeof(struct zip_file_header)); @@ -397,9 +397,9 @@ "Truncated ZIP end-of-file record"); return (ARCHIVE_FATAL); } - zip->crc32 = le32dec(p + 4); - zip->compressed_size = le32dec(p + 8); - zip->uncompressed_size = le32dec(p + 12); + zip->crc32 = archive_le32dec(p + 4); + zip->compressed_size = archive_le32dec(p + 8); + zip->uncompressed_size = archive_le32dec(p + 12); (a->decompressor->consume)(a, 16); } @@ -636,7 +636,7 @@ { struct zip *zip; const void *buff = NULL; - ssize_t bytes_avail; + off_t bytes_skipped; zip = (struct zip *)(a->format->data); @@ -659,19 +659,10 @@ * If the length is at the beginning, we can skip the * compressed data much more quickly. */ - while (zip->entry_bytes_remaining > 0) { - bytes_avail = (a->decompressor->read_ahead)(a, &buff, 1); - if (bytes_avail <= 0) { - archive_set_error(&a->archive, - ARCHIVE_ERRNO_FILE_FORMAT, - "Truncated ZIP file body"); - return (ARCHIVE_FATAL); - } - if (bytes_avail > zip->entry_bytes_remaining) - bytes_avail = zip->entry_bytes_remaining; - (a->decompressor->consume)(a, bytes_avail); - zip->entry_bytes_remaining -= bytes_avail; - } + bytes_skipped = (a->decompressor->skip)(a, zip->entry_bytes_remaining); + if (bytes_skipped < 0) + return (ARCHIVE_FATAL); + /* This entry is finished and done. */ zip->end_of_entry_cleanup = zip->end_of_entry = 1; return (ARCHIVE_OK); @@ -707,8 +698,8 @@ const char *p = (const char *)extra; while (offset < zip->extra_length - 4) { - unsigned short headerid = le16dec(p + offset); - unsigned short datasize = le16dec(p + offset + 2); + unsigned short headerid = archive_le16dec(p + offset); + unsigned short datasize = archive_le16dec(p + offset + 2); offset += 4; if (offset + datasize > zip->extra_length) break; @@ -720,9 +711,9 @@ case 0x0001: /* Zip64 extended information extra field. */ if (datasize >= 8) - zip->uncompressed_size = le64dec(p + offset); + zip->uncompressed_size = archive_le64dec(p + offset); if (datasize >= 16) - zip->compressed_size = le64dec(p + offset + 8); + zip->compressed_size = archive_le64dec(p + offset + 8); break; case 0x5455: { @@ -735,11 +726,12 @@ { #ifdef DEBUG fprintf(stderr, "mtime: %lld -> %d\n", - (long long)zip->mtime, le32dec(p + offset)); + (long long)zip->mtime, + archive_le32dec(p + offset)); #endif if (datasize < 4) break; - zip->mtime = le32dec(p + offset); + zip->mtime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -747,7 +739,7 @@ { if (datasize < 4) break; - zip->atime = le32dec(p + offset); + zip->atime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -755,7 +747,7 @@ { if (datasize < 4) break; - zip->ctime = le32dec(p + offset); + zip->ctime = archive_le32dec(p + offset); offset += 4; datasize -= 4; } @@ -765,12 +757,13 @@ /* Info-ZIP Unix Extra Field (type 2) "Ux". */ #ifdef DEBUG fprintf(stderr, "uid %d gid %d\n", - le16dec(p + offset), le16dec(p + offset + 2)); + archive_le16dec(p + offset), + archive_le16dec(p + offset + 2)); #endif if (datasize >= 2) - zip->uid = le16dec(p + offset); + zip->uid = archive_le16dec(p + offset); if (datasize >= 4) - zip->gid = le16dec(p + offset + 2); + zip->gid = archive_le16dec(p + offset + 2); break; default: break; ==== //depot/projects/iwarp/lib/libarchive/archive_write_disk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.22 2008/02/19 05:39:35 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.23 2008/02/27 06:16:41 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -1167,7 +1167,7 @@ struct stat st; /* - * Gaurd against symlink tricks. Reject any archive entry whose + * Guard against symlink tricks. Reject any archive entry whose * destination would be altered by a symlink. */ /* Whatever we checked last time doesn't need to be re-checked. */ ==== //depot/projects/iwarp/lib/libc/gen/sysconf.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.25 2007/04/14 13:06:57 pjd Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.26 2008/02/27 05:56:57 wollman Exp $"); #include #include @@ -100,7 +100,16 @@ mib[1] = KERN_NGROUPS; break; case _SC_OPEN_MAX: - case _SC_STREAM_MAX: /* assume fds run out before memory does */ + if (getrlimit(RLIMIT_NOFILE, &rl) != 0) + return (-1); + if (rl.rlim_cur == RLIM_INFINITY) + return (-1); + if (rl.rlim_cur > LONG_MAX) { + errno = EOVERFLOW; + return (-1); + } + return ((long)rl.rlim_cur); + case _SC_STREAM_MAX: if (getrlimit(RLIMIT_NOFILE, &rl) != 0) return (-1); if (rl.rlim_cur == RLIM_INFINITY) @@ -109,6 +118,15 @@ errno = EOVERFLOW; return (-1); } + /* + * struct __sFILE currently has a limitation that + * file descriptors must fit in a signed short. + * This doesn't precisely capture the letter of POSIX + * but approximates the spirit. + */ + if (rl.rlim_cur > SHRT_MAX) + return (SHRT_MAX); + return ((long)rl.rlim_cur); case _SC_JOB_CONTROL: return (_POSIX_JOB_CONTROL); ==== //depot/projects/iwarp/lib/libc/stdio/fdopen.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)fdopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.8 2007/01/09 00:28:06 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.10 2008/02/27 21:25:19 jhb Exp $"); #include "namespace.h" #include @@ -42,6 +42,7 @@ #include #include #include +#include #include "un-namespace.h" #include "local.h" @@ -57,6 +58,18 @@ if (nofile == 0) nofile = getdtablesize(); + /* + * File descriptors are a full int, but _file is only a short. + * If we get a valid file descriptor that is greater than + * SHRT_MAX, then the fd will get sign-extended into an + * invalid file descriptor. Handle this case by failing the + * open. + */ + if (fd > SHRT_MAX) { + errno = EMFILE; + return (NULL); + } + if ((flags = __sflags(mode, &oflags)) == 0) return (NULL); ==== //depot/projects/iwarp/lib/libc/stdio/fopen.c#2 (text+ko) ==== @@ -34,14 +34,16 @@ static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.11 2007/01/09 00:28:06 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.13 2008/02/27 21:25:19 jhb Exp $"); #include "namespace.h" #include #include #include +#include #include #include +#include #include "un-namespace.h" #include "local.h" @@ -63,6 +65,18 @@ fp->_flags = 0; /* release */ return (NULL); } + /* + * File descriptors are a full int, but _file is only a short. + * If we get a valid file descriptor that is greater than + * SHRT_MAX, then the fd will get sign-extended into an + * invalid file descriptor. Handle this case by failing the + * open. + */ + if (f > SHRT_MAX) { + _close(f); + errno = EMFILE; + return (NULL); + } fp->_file = f; fp->_flags = flags; fp->_cookie = fp; ==== //depot/projects/iwarp/lib/libc/stdio/freopen.c#2 (text+ko) ==== @@ -34,13 +34,14 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.18 2007/01/09 00:28:06 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.20 2008/02/27 21:25:19 jhb Exp $"); #include "namespace.h" #include #include #include #include +#include #include #include #include @@ -203,6 +204,20 @@ } } + /* + * File descriptors are a full int, but _file is only a short. + * If we get a valid file descriptor that is greater than + * SHRT_MAX, then the fd will get sign-extended into an + * invalid file descriptor. Handle this case by failing the + * open. + */ + if (f > SHRT_MAX) { + fp->_flags = 0; /* set it free */ + FUNLOCKFILE(fp); + errno = EMFILE; + return (NULL); + } + fp->_flags = flags; fp->_file = f; fp->_cookie = fp; ==== //depot/projects/iwarp/lib/libc/stdlib/getenv.c#2 (text+ko) ==== @@ -23,23 +23,25 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.13 2008/02/28 04:09:08 scf Exp $"); + + +#include "namespace.h" #include -#include #include #include #include #include #include +#include +#include "un-namespace.h" -#include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.12 2007/09/22 02:30:44 scf Exp $"); - - -static const char CorruptEnvFindMsg[] = - "environment corrupt; unable to find %.*s"; +static const char CorruptEnvFindMsg[] = "environment corrupt; unable to find "; static const char CorruptEnvValueMsg[] = - "environment corrupt; missing value for %s"; + "environment corrupt; missing value for "; /* @@ -97,6 +99,26 @@ /* + * A simple version of warnx() to avoid the bloat of including stdio in static + * binaries. + */ +static void +__env_warnx(const char *msg, const char *name, size_t nameLen) +{ + static const char nl[] = "\n"; + static const char progSep[] = ": "; + + _write(STDERR_FILENO, _getprogname(), strlen(_getprogname())); + _write(STDERR_FILENO, progSep, sizeof(progSep) - 1); + _write(STDERR_FILENO, msg, strlen(msg)); + _write(STDERR_FILENO, name, nameLen); + _write(STDERR_FILENO, nl, sizeof(nl) - 1); + + return; +} + + +/* * Inline strlen() for performance. Also, perform check for an equals sign. * Cheaper here than peforming a strchr() later. */ @@ -341,7 +363,8 @@ envVars[envNdx].valueSize = strlen(envVars[envNdx].value); } else { - warnx(CorruptEnvValueMsg, envVars[envNdx].name); + __env_warnx(CorruptEnvValueMsg, envVars[envNdx].name, + strlen(envVars[envNdx].name)); errno = EFAULT; goto Failure; } @@ -356,8 +379,8 @@ activeNdx = envVarsTotal - 1; if (__findenv(envVars[envNdx].name, nameLen, &activeNdx, false) == NULL) { - warnx(CorruptEnvFindMsg, (int)nameLen, - envVars[envNdx].name); + __env_warnx(CorruptEnvFindMsg, envVars[envNdx].name, + nameLen); errno = EFAULT; goto Failure; } @@ -527,7 +550,8 @@ if (origEnviron != NULL) for (env = origEnviron; *env != NULL; env++) { if ((equals = strchr(*env, '=')) == NULL) { - warnx(CorruptEnvValueMsg, *env); + __env_warnx(CorruptEnvValueMsg, *env, + strlen(*env)); errno = EFAULT; return (-1); } ==== //depot/projects/iwarp/lib/libc/sys/readlink.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)readlink.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.15 2008/02/12 20:09:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/readlink.2,v 1.16 2008/02/26 20:33:52 ru Exp $ .\" -.Dd February 12, 2008 +.Dd February 26, 2008 .Dt READLINK 2 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .In unistd.h .Ft ssize_t -.Fn readlink "const char *path" "char *buf" "size_t bufsiz" +.Fn readlink "const char *restrict path" "char *restrict buf" "size_t bufsiz" .Sh DESCRIPTION The .Fn readlink ==== //depot/projects/iwarp/lib/msun/src/e_rem_pio2.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.18 2008/02/28 16:22:36 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -126,7 +126,7 @@ } } } - if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ + if(ix<0x413921fb) { /* |x| ~< 2^20*(pi/2), medium size */ medium: /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); ==== //depot/projects/iwarp/lib/msun/src/e_rem_pio2f.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.29 2008/02/28 16:22:36 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * @@ -38,8 +38,8 @@ static const double half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ -pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ -pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +pio2_1 = 1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */ +pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */ #ifdef INLINE_REM_PIO2F extern inline @@ -55,7 +55,7 @@ GET_FLOAT_WORD(hx,x); ix = hx&0x7fffffff; /* 33+53 bit pi is good enough for medium size */ - if(ix<=0x49490f80) { /* |x| ~<= 2^19*(pi/2), medium size */ + if(ix<0x4dc90fdb) { /* |x| ~< 2^28*(pi/2), medium size */ /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); fn = fn-0x1.8p52; ==== //depot/projects/iwarp/sbin/fsck_ffs/pass1.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.43 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.44 2008/02/26 03:08:22 delphij Exp $"); #include #include @@ -93,9 +93,11 @@ inumber = c * sblock.fs_ipg; setinodebuf(inumber); getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); - if (sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) { inosused = cgrp.cg_initediblk; - else + if (inosused > sblock.fs_ipg) + inosused = sblock.fs_ipg; + } else inosused = sblock.fs_ipg; if (got_siginfo) { printf("%s: phase 1: cyl group %d of %d (%d%%)\n", ==== //depot/projects/iwarp/sbin/fsck_ffs/pass2.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.26 2004/10/08 20:44:47 truckman Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.27 2008/02/26 03:05:48 delphij Exp $"); #include @@ -242,6 +242,8 @@ /* * check for "." */ + if (dirp->d_ino > maxino) + goto chk2; if (idesc->id_entryno != 0) goto chk1; if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) { ==== //depot/projects/iwarp/sbin/fsck_ffs/setup.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.51 2008/02/26 03:03:17 delphij Exp $"); #include #include @@ -349,7 +349,7 @@ sblock.fs_sblockloc == sblock_try[i])) && sblock.fs_ncg >= 1 && sblock.fs_bsize >= MINBSIZE && - sblock.fs_bsize >= sizeof(struct fs)) + sblock.fs_sbsize >= roundup(sizeof(struct fs), dev_bsize)) break; } if (sblock_try[i] == -1) { ==== //depot/projects/iwarp/sbin/ipfw/ipfw.8#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.210 2008/02/24 15:37:45 piso Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.211 2008/02/27 13:52:33 dwmalone Exp $ .\" .Dd November 26, 2007 .Dt IPFW 8 @@ -1971,6 +1971,13 @@ Even worse effects can result if you get packets from an interface with a much larger MTU, e.g.\& the loopback interface with its 16KB packets. +The +.Xr sysctl 8 +variables +.Em net.inet.ip.dummynet.pipe_byte_limit +and +.Em net.inet.ip.dummynet.pipe_slot_limit +control the maximum lengths that can be specified. .Pp .It Cm red | gred Ar w_q Ns / Ns Ar min_th Ns / Ns Ar max_th Ns / Ns Ar max_p Make use of the RED (Random Early Detection) queue management algorithm. @@ -2190,6 +2197,13 @@ .It Va net.inet.ip.dummynet.red_max_pkt_size : No 1500 Parameters used in the computations of the drop probability for the RED algorithm. +.It Va net.inet.ip.dummynet.pipe_byte_limit : No 1048576 +.It Va net.inet.ip.dummynet.pipe_slot_limit : No 100 +The maximum queue size that can be specified in bytes or packets. +These limits prevent accidental exhaustion of resources such as mbufs. +If you raise these limits, +you should make sure the system is configured so that sufficient resources +are available. .It Va net.inet.ip.fw.autoinc_step : No 100 Delta between rule numbers when auto-generating them. The value must be in the range 1..1000. ==== //depot/projects/iwarp/sbin/ipfw/ipfw2.c#6 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.117 2008/02/24 15:37:45 piso Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.118 2008/02/27 13:52:33 dwmalone Exp $ */ #include @@ -4341,11 +4341,25 @@ errx(EX_DATAERR, "weight must be <= 100"); } if (p.fs.flags_fs & DN_QSIZE_IS_BYTES) { - if (p.fs.qsize > 1024*1024) - errx(EX_DATAERR, "queue size must be < 1MB"); + size_t len; + long limit; + + len = sizeof(limit); + if (sysctlbyname("net.inet.ip.dummynet.pipe_byte_limit", + &limit, &len, NULL, 0) == -1) + limit = 1024*1024; + if (p.fs.qsize > limit) + errx(EX_DATAERR, "queue size must be < %ldB", limit); } else { - if (p.fs.qsize > 100) - errx(EX_DATAERR, "2 <= queue size <= 100"); + size_t len; + long limit; + + len = sizeof(limit); + if (sysctlbyname("net.inet.ip.dummynet.pipe_slot_limit", + &limit, &len, NULL, 0) == -1) + limit = 100; + if (p.fs.qsize > limit) + errx(EX_DATAERR, "2 <= queue size <= %ld", limit); } if (p.fs.flags_fs & DN_IS_RED) { size_t len; @@ -4363,7 +4377,6 @@ len = sizeof(int); if (sysctlbyname("net.inet.ip.dummynet.red_lookup_depth", &lookup_depth, &len, NULL, 0) == -1) - errx(1, "sysctlbyname(\"%s\")", "net.inet.ip.dummynet.red_lookup_depth"); if (lookup_depth == 0) ==== //depot/projects/iwarp/share/man/man4/uscanner.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.31 2007/10/05 15:17:14 luigi Exp $ +.\" $FreeBSD: src/share/man/man4/uscanner.4,v 1.32 2008/02/27 10:57:51 remko Exp $ .\" -.Dd October 5, 2007 +.Dd February 27, 2008 .Dt USCANNER 4 .Os .Sh NAME @@ -103,8 +103,8 @@ .It Epson: GT-8400UF, GT-9300UF, GT-9700F; .It -Epson Stylus: Photo RX425, CX3650, DX-5000, DX-5050, DX-6000, DX-6050 -(and possibly more in the CX-5000 and DX-3800..DX-7000 family); +Epson Stylus: Photo RX425, CX3650, DX-5000, DX-5050, CX5400, DX-6000, +DX-6050 (and possibly more in the CX-5000 and DX-3800..DX-7000 family); .It Hewlett Packard: Photosmart S20 .It ==== //depot/projects/iwarp/share/man/man9/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.326 2008/02/13 21:54:16 attilio Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.330 2008/02/26 21:40:30 davidc Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -124,6 +124,7 @@ ieee80211_radiotap.9 \ ifnet.9 \ inittodr.9 \ + insmntque.9 \ intro.9 \ ithread.9 \ KASSERT.9 \ @@ -253,6 +254,7 @@ VFS_LOCK_GIANT.9 \ VFS_MOUNT.9 \ vfs_mount.9 \ + vfs_mountedfrom.9 \ vfs_mountedon.9 \ VFS_QUOTACTL.9 \ VFS_ROOT.9 \ @@ -349,6 +351,7 @@ VOP_VPTOFH.9 \ vput.9 \ vref.9 \ + vrefcnt.9 \ vrele.9 \ vslock.9 \ watchdog.9 \ @@ -1228,6 +1231,7 @@ MLINKS+=VFS_LOCK_GIANT.9 VFS_UNLOCK_GIANT.9 MLINKS+=vgone.9 vgonel.9 MLINKS+=vhold.9 vdrop.9 \ + vhold.9 vholdl.9 \ vhold.9 vdropl.9 MLINKS+=vm_map_lock.9 vm_map_lock_downgrade.9 \ vm_map_lock.9 vm_map_lock_read.9 \ ==== //depot/projects/iwarp/share/man/man9/vgone.9#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71F2B1065CD6; Fri, 29 Feb 2008 19:48:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4710C1065986 for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D8628FC31 for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmI2t092616 for ; Fri, 29 Feb 2008 19:48:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmI4a092614 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:18 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:18 GMT Message-Id: <200802291948.m1TJmI4a092614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=136478 Change 136478 by kmacy@pandemonium:kmacy:xen31 on 2008/02/29 05:39:38 clean up logging remove vestigial wrpt reference in pmap_clear_modify Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#41 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#41 (text+ko) ==== @@ -1038,8 +1038,8 @@ newpf = *pde & PG_FRAME; if ((*PMAP1 & PG_FRAME) != newpf) { PT_SET_MA(PADDR1, newpf | PG_V | PG_A | PG_M); - CTR3(KTR_PMAP, "pmap_pte_quick: pmap=%p va=0x%x newpte=0x%jx", - pmap, va, *PMAP1); + CTR3(KTR_PMAP, "pmap_pte_quick: pmap=%p va=0x%x newpte=0x%08x", + pmap, va, (u_long)*PMAP1); #ifdef SMP PMAP1cpu = PCPU_GET(cpuid); @@ -2194,8 +2194,8 @@ pt_entry_t oldpte; vm_page_t m; - CTR3(KTR_PMAP, "pmap_remove_pte: pmap=%p *ptq=0x%jx va=0x%x", - pmap, *ptq, va); + CTR3(KTR_PMAP, "pmap_remove_pte: pmap=%p *ptq=0x%x va=0x%x", + pmap, (u_long)*ptq, va); mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -2594,8 +2594,8 @@ vm_page_t mpte, om; boolean_t invlva; - CTR6(KTR_PMAP, "pmap_enter: pmap=%08p va=0x%08x access=0x%x m=%p prot=0x%x wired=%d", - pmap, va, access, m, prot, wired); + CTR6(KTR_PMAP, "pmap_enter: pmap=%08p va=0x%08x access=0x%x ma=0x%08x prot=0x%x wired=%d", + pmap, va, access, xpmap_ptom(VM_PAGE_TO_PHYS(m)), prot, wired); va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC if (va > VM_MAX_KERNEL_ADDRESS) @@ -3158,8 +3158,6 @@ vm_offset_t end_addr = src_addr + len; vm_offset_t pdnxt; - return; - if (dst_addr != src_addr) return; @@ -3235,11 +3233,15 @@ * accessed (referenced) bits * during the copy. */ - PT_SET_VA_MA(dst_pte, ptetemp & ~(PG_W | PG_M | PG_A), FALSE); + KASSERT(ptetemp != 0, ("src_pte not set")); + PT_SET_VA_MA(dst_pte, ptetemp & ~(PG_W | PG_M | PG_A), TRUE /* XXX debug */); + KASSERT(*dst_pte == (ptetemp & ~(PG_W | PG_M | PG_A)), + ("no pmap copy expected: 0x%jx saw: 0x%jx", + ptetemp & ~(PG_W | PG_M | PG_A), *dst_pte)); dst_pmap->pm_stats.resident_count++; } else { free = NULL; - if (pmap_unwire_pte_hold( dst_pmap, + if (pmap_unwire_pte_hold(dst_pmap, dstmpte, &free)) { pmap_invalidate_page(dst_pmap, addr); @@ -3254,8 +3256,6 @@ } } PT_UPDATES_FLUSH(); - if (*PMAP1) - PT_SET_VA_MA(PMAP1, 0, TRUE); sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(src_pmap); @@ -3742,7 +3742,7 @@ * in size, PG_M is among the least significant * 32 bits. */ - atomic_clear_int((u_int *)pte, PG_M); + PT_SET_VA_MA(pte, *pte & ~PG_M, FALSE); pmap_invalidate_page(pmap, pv->pv_va); } PMAP_UNLOCK(pmap); From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A81C1065CDA; Fri, 29 Feb 2008 19:48:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A91491065AC7 for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 314B18FC34 for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmJtS092621 for ; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmJNE092619 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:19 GMT Message-Id: <200802291948.m1TJmJNE092619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=136479 Change 136479 by kmacy@pandemonium:kmacy:xen31 on 2008/02/29 05:46:16 remove some more wrpt vestiges Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#42 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#42 (text+ko) ==== @@ -3701,7 +3701,7 @@ PMAP_LOCK(pmap); pte = pmap_pte_quick(pmap, pv->pv_va); if ((*pte & PG_A) != 0) { - atomic_clear_int((u_int *)pte, PG_A); + PT_SET_VA_MA(pte, *pte & ~PG_A, FALSE); pmap_invalidate_page(pmap, pv->pv_va); rtval++; if (rtval > 4) @@ -3776,7 +3776,7 @@ * in size, PG_A is among the least significant * 32 bits. */ - atomic_clear_int((u_int *)pte, PG_A); + PT_SET_VA_MA(pte, *pte & ~PG_A, FALSE); pmap_invalidate_page(pmap, pv->pv_va); } PMAP_UNLOCK(pmap); @@ -3899,8 +3899,8 @@ opte = *(u_int *)pte; npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); npte |= pmap_cache_bits(mode, 0); - } while (npte != opte && - !atomic_cmpset_int((u_int *)pte, opte, npte)); + PT_SET_VA_MA(pte, npte, TRUE); + } while (npte != opte && (*pte != npte)); tmpva += PAGE_SIZE; size -= PAGE_SIZE; } From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB8D510661DC; Fri, 29 Feb 2008 19:48:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9C111065ADF for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4FC198FC37 for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmJmL092626 for ; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmJ1f092624 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:19 GMT Message-Id: <200802291948.m1TJmJ1f092624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=136480 Change 136480 by kmacy@kmacy:entropy:iwarp on 2008/02/29 06:02:16 move l2t support to the TOM move most of cxgb_offload in to the TOM Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.c#11 delete .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.h#8 delete .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#21 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.h#6 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#19 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#15 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c#7 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#11 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#6 edit .. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#11 edit .. //depot/projects/iwarp/sys/modules/cxgb/tom/Makefile#7 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#21 (text+ko) ==== @@ -63,7 +63,6 @@ #include #endif -#include #include #define VALIDATE_TID 0 @@ -71,14 +70,11 @@ TAILQ_HEAD(, cxgb_client) client_list; TAILQ_HEAD(, t3cdev) ofld_dev_list; -TAILQ_HEAD(, adapter) adapter_list; + static struct mtx cxgb_db_lock; -static struct rwlock adapter_list_lock; -static const unsigned int MAX_ATIDS = 64 * 1024; -static const unsigned int ATID_BASE = 0x100000; static int inited = 0; static inline int @@ -89,6 +85,25 @@ return (isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT)); } +static inline void +register_tdev(struct t3cdev *tdev) +{ + static int unit; + + mtx_lock(&cxgb_db_lock); + snprintf(tdev->name, sizeof(tdev->name), "ofld_dev%d", unit++); + TAILQ_INSERT_TAIL(&ofld_dev_list, tdev, entry); + mtx_unlock(&cxgb_db_lock); +} + +static inline void +unregister_tdev(struct t3cdev *tdev) +{ + mtx_lock(&cxgb_db_lock); + TAILQ_REMOVE(&ofld_dev_list, tdev, entry); + mtx_unlock(&cxgb_db_lock); +} + /** * cxgb_register_client - register an offload client * @client: the client @@ -179,291 +194,6 @@ mtx_unlock(&cxgb_db_lock); } -static int -is_offloading(struct ifnet *ifp) -{ - struct adapter *adapter; - int port; - - rw_rlock(&adapter_list_lock); - TAILQ_FOREACH(adapter, &adapter_list, adapter_entry) { - for_each_port(adapter, port) { - if (ifp == adapter->port[port].ifp) { - rw_runlock(&adapter_list_lock); - return 1; - } - } - } - rw_runlock(&adapter_list_lock); - return 0; -} - -static struct ifnet * -get_iff_from_mac(adapter_t *adapter, const uint8_t *mac, unsigned int vlan) -{ - int i; - - for_each_port(adapter, i) { -#ifdef notyet - const struct vlan_group *grp; -#endif - const struct port_info *p = &adapter->port[i]; - struct ifnet *ifp = p->ifp; - - if (!memcmp(p->hw_addr, mac, ETHER_ADDR_LEN)) { -#ifdef notyet - - if (vlan && vlan != EVL_VLID_MASK) { - grp = p->vlan_grp; - dev = grp ? grp->vlan_devices[vlan] : NULL; - } else - while (dev->master) - dev = dev->master; -#endif - return (ifp); - } - } - return (NULL); -} - -static inline void -failover_fixup(adapter_t *adapter, int port) -{ - if (adapter->params.rev == 0) { - struct ifnet *ifp = adapter->port[port].ifp; - struct cmac *mac = &adapter->port[port].mac; - if (!(ifp->if_flags & IFF_UP)) { - /* Failover triggered by the interface ifdown */ - t3_write_reg(adapter, A_XGM_TX_CTRL + mac->offset, - F_TXEN); - t3_read_reg(adapter, A_XGM_TX_CTRL + mac->offset); - } else { - /* Failover triggered by the interface link down */ - t3_write_reg(adapter, A_XGM_RX_CTRL + mac->offset, 0); - t3_read_reg(adapter, A_XGM_RX_CTRL + mac->offset); - t3_write_reg(adapter, A_XGM_RX_CTRL + mac->offset, - F_RXEN); - } - } -} - -static int -cxgb_ulp_iscsi_ctl(adapter_t *adapter, unsigned int req, void *data) -{ - int ret = 0; - struct ulp_iscsi_info *uiip = data; - - switch (req) { - case ULP_ISCSI_GET_PARAMS: - uiip->llimit = t3_read_reg(adapter, A_ULPRX_ISCSI_LLIMIT); - uiip->ulimit = t3_read_reg(adapter, A_ULPRX_ISCSI_ULIMIT); - uiip->tagmask = t3_read_reg(adapter, A_ULPRX_ISCSI_TAGMASK); - /* - * On tx, the iscsi pdu has to be <= tx page size and has to - * fit into the Tx PM FIFO. - */ - uiip->max_txsz = min(adapter->params.tp.tx_pg_size, - t3_read_reg(adapter, A_PM1_TX_CFG) >> 17); - /* on rx, the iscsi pdu has to be < rx page size and the - whole pdu + cpl headers has to fit into one sge buffer */ - /* also check the max rx data length programmed in TP */ - uiip->max_rxsz = min(uiip->max_rxsz, - ((t3_read_reg(adapter, A_TP_PARA_REG2)) - >> S_MAXRXDATA) & M_MAXRXDATA); - break; - case ULP_ISCSI_SET_PARAMS: - t3_write_reg(adapter, A_ULPRX_ISCSI_TAGMASK, uiip->tagmask); - break; - default: - ret = (EOPNOTSUPP); - } - return ret; -} - -/* Response queue used for RDMA events. */ -#define ASYNC_NOTIF_RSPQ 0 - -static int -cxgb_rdma_ctl(adapter_t *adapter, unsigned int req, void *data) -{ - int ret = 0; - - switch (req) { - case RDMA_GET_PARAMS: { - struct rdma_info *req = data; - - req->udbell_physbase = rman_get_start(adapter->udbs_res); - req->udbell_len = rman_get_size(adapter->udbs_res); - req->tpt_base = t3_read_reg(adapter, A_ULPTX_TPT_LLIMIT); - req->tpt_top = t3_read_reg(adapter, A_ULPTX_TPT_ULIMIT); - req->pbl_base = t3_read_reg(adapter, A_ULPTX_PBL_LLIMIT); - req->pbl_top = t3_read_reg(adapter, A_ULPTX_PBL_ULIMIT); - req->rqt_base = t3_read_reg(adapter, A_ULPRX_RQ_LLIMIT); - req->rqt_top = t3_read_reg(adapter, A_ULPRX_RQ_ULIMIT); - req->kdb_addr = (void *)((unsigned long)rman_get_virtual(adapter->regs_res) + A_SG_KDOORBELL); break; - } - case RDMA_CQ_OP: { - struct rdma_cq_op *req = data; - - /* may be called in any context */ - mtx_lock_spin(&adapter->sge.reg_lock); - ret = t3_sge_cqcntxt_op(adapter, req->id, req->op, - req->credits); - mtx_unlock_spin(&adapter->sge.reg_lock); - break; - } - case RDMA_GET_MEM: { - struct ch_mem_range *t = data; - struct mc7 *mem; - - if ((t->addr & 7) || (t->len & 7)) - return (EINVAL); - if (t->mem_id == MEM_CM) - mem = &adapter->cm; - else if (t->mem_id == MEM_PMRX) - mem = &adapter->pmrx; - else if (t->mem_id == MEM_PMTX) - mem = &adapter->pmtx; - else - return (EINVAL); - - ret = t3_mc7_bd_read(mem, t->addr/8, t->len/8, (u64 *)t->buf); - if (ret) - return (ret); - break; - } - case RDMA_CQ_SETUP: { - struct rdma_cq_setup *req = data; - - mtx_lock_spin(&adapter->sge.reg_lock); - ret = t3_sge_init_cqcntxt(adapter, req->id, req->base_addr, - req->size, ASYNC_NOTIF_RSPQ, - req->ovfl_mode, req->credits, - req->credit_thres); - mtx_unlock_spin(&adapter->sge.reg_lock); - break; - } - case RDMA_CQ_DISABLE: - mtx_lock_spin(&adapter->sge.reg_lock); - ret = t3_sge_disable_cqcntxt(adapter, *(unsigned int *)data); - mtx_unlock_spin(&adapter->sge.reg_lock); - break; - case RDMA_CTRL_QP_SETUP: { - struct rdma_ctrlqp_setup *req = data; - - mtx_lock_spin(&adapter->sge.reg_lock); - ret = t3_sge_init_ecntxt(adapter, FW_RI_SGEEC_START, 0, - SGE_CNTXT_RDMA, ASYNC_NOTIF_RSPQ, - req->base_addr, req->size, - FW_RI_TID_START, 1, 0); - mtx_unlock_spin(&adapter->sge.reg_lock); - break; - } - default: - ret = EOPNOTSUPP; - } - return (ret); -} - -static int -cxgb_offload_ctl(struct t3cdev *tdev, unsigned int req, void *data) -{ - struct adapter *adapter = tdev2adap(tdev); - struct tid_range *tid; - struct mtutab *mtup; - struct iff_mac *iffmacp; - struct ddp_params *ddpp; - struct adap_ports *ports; - struct ofld_page_info *rx_page_info; - struct tp_params *tp = &adapter->params.tp; - int port; - - switch (req) { - case GET_MAX_OUTSTANDING_WR: - *(unsigned int *)data = FW_WR_NUM; - break; - case GET_WR_LEN: - *(unsigned int *)data = WR_FLITS; - break; - case GET_TX_MAX_CHUNK: - *(unsigned int *)data = 1 << 20; /* 1MB */ - break; - case GET_TID_RANGE: - tid = data; - tid->num = t3_mc5_size(&adapter->mc5) - - adapter->params.mc5.nroutes - - adapter->params.mc5.nfilters - - adapter->params.mc5.nservers; - tid->base = 0; - break; - case GET_STID_RANGE: - tid = data; - tid->num = adapter->params.mc5.nservers; - tid->base = t3_mc5_size(&adapter->mc5) - tid->num - - adapter->params.mc5.nfilters - - adapter->params.mc5.nroutes; - break; - case GET_L2T_CAPACITY: - *(unsigned int *)data = 2048; - break; - case GET_MTUS: - mtup = data; - mtup->size = NMTUS; - mtup->mtus = adapter->params.mtus; - break; - case GET_IFF_FROM_MAC: - iffmacp = data; - iffmacp->dev = get_iff_from_mac(adapter, iffmacp->mac_addr, - iffmacp->vlan_tag & EVL_VLID_MASK); - break; - case GET_DDP_PARAMS: - ddpp = data; - ddpp->llimit = t3_read_reg(adapter, A_ULPRX_TDDP_LLIMIT); - ddpp->ulimit = t3_read_reg(adapter, A_ULPRX_TDDP_ULIMIT); - ddpp->tag_mask = t3_read_reg(adapter, A_ULPRX_TDDP_TAGMASK); - break; - case GET_PORTS: - ports = data; - ports->nports = adapter->params.nports; - for_each_port(adapter, port) - ports->lldevs[port] = adapter->port[port].ifp; - break; - case FAILOVER: - port = *(int *)data; - t3_port_failover(adapter, port); - failover_fixup(adapter, port); - break; - case FAILOVER_DONE: - port = *(int *)data; - t3_failover_done(adapter, port); - break; - case FAILOVER_CLEAR: - t3_failover_clear(adapter); - break; - case GET_RX_PAGE_INFO: - rx_page_info = data; - rx_page_info->page_size = tp->rx_pg_size; - rx_page_info->num = tp->rx_num_pgs; - break; - case ULP_ISCSI_GET_PARAMS: - case ULP_ISCSI_SET_PARAMS: - if (!offload_running(adapter)) - return (EAGAIN); - return cxgb_ulp_iscsi_ctl(adapter, req, data); - case RDMA_GET_PARAMS: - case RDMA_CQ_OP: - case RDMA_CQ_SETUP: - case RDMA_CQ_DISABLE: - case RDMA_CTRL_QP_SETUP: - case RDMA_GET_MEM: - if (!offload_running(adapter)) - return (EAGAIN); - return cxgb_rdma_ctl(adapter, req, data); - default: - return (EOPNOTSUPP); - } - return 0; -} /* * Dummy handler for Rx offload packets in case we get an offload packet before @@ -491,195 +221,6 @@ dev->arp_update = dummy_neigh_update; } -/* - * Free an active-open TID. - */ -void * -cxgb_free_atid(struct t3cdev *tdev, int atid) -{ - struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; - union active_open_entry *p = atid2entry(t, atid); - void *ctx = p->toe_tid.ctx; - - mtx_lock(&t->atid_lock); - p->next = t->afree; - t->afree = p; - t->atids_in_use--; - mtx_unlock(&t->atid_lock); - - return ctx; -} - -/* - * Free a server TID and return it to the free pool. - */ -void -cxgb_free_stid(struct t3cdev *tdev, int stid) -{ - struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; - union listen_entry *p = stid2entry(t, stid); - - mtx_lock(&t->stid_lock); - p->next = t->sfree; - t->sfree = p; - t->stids_in_use--; - mtx_unlock(&t->stid_lock); -} - -/* - * Free a server TID and return it to the free pool. - */ -void * -cxgb_get_lctx(struct t3cdev *tdev, int stid) -{ - struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; - union listen_entry *p = stid2entry(t, stid); - - return (p->toe_tid.ctx); -} - -void -cxgb_insert_tid(struct t3cdev *tdev, struct cxgb_client *client, - void *ctx, unsigned int tid) -{ - struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; - - t->tid_tab[tid].client = client; - t->tid_tab[tid].ctx = ctx; - atomic_add_int(&t->tids_in_use, 1); -} - -/* - * Populate a TID_RELEASE WR. The mbuf must be already propely sized. - */ -static inline void -mk_tid_release(struct mbuf *m, unsigned int tid) -{ - struct cpl_tid_release *req; - - m_set_priority(m, CPL_PRIORITY_SETUP); - req = mtod(m, struct cpl_tid_release *); - m->m_pkthdr.len = m->m_len = sizeof(*req); - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, tid)); -} - -static void -t3_process_tid_release_list(void *data, int pending) -{ - struct mbuf *m; - struct t3cdev *tdev = data; - struct t3c_data *td = T3C_DATA (tdev); - - mtx_lock(&td->tid_release_lock); - while (td->tid_release_list) { - struct toe_tid_entry *p = td->tid_release_list; - - td->tid_release_list = (struct toe_tid_entry *)p->ctx; - mtx_unlock(&td->tid_release_lock); - m = m_get(M_WAIT, MT_DATA); - mk_tid_release(m, p - td->tid_maps.tid_tab); - cxgb_ofld_send(tdev, m); - p->ctx = NULL; - mtx_lock(&td->tid_release_lock); - } - mtx_unlock(&td->tid_release_lock); -} - -/* use ctx as a next pointer in the tid release list */ -void -cxgb_queue_tid_release(struct t3cdev *tdev, unsigned int tid) -{ - struct t3c_data *td = T3C_DATA (tdev); - struct toe_tid_entry *p = &td->tid_maps.tid_tab[tid]; - - printf("queuing tid release\n"); - - mtx_lock(&td->tid_release_lock); - p->ctx = td->tid_release_list; - td->tid_release_list = p; - - if (!p->ctx) - taskqueue_enqueue(tdev->adapter->tq, &td->tid_release_task); - - mtx_unlock(&td->tid_release_lock); -} - -/* - * Remove a tid from the TID table. A client may defer processing its last - * CPL message if it is locked at the time it arrives, and while the message - * sits in the client's backlog the TID may be reused for another connection. - * To handle this we atomically switch the TID association if it still points - * to the original client context. - */ -void -cxgb_remove_tid(struct t3cdev *tdev, void *ctx, unsigned int tid) -{ - struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; - - if (tid >= t->ntids) - panic("tid=%d >= t->ntids=%d", tid, t->ntids); - - if (tdev->type == T3A) - atomic_cmpset_ptr((uintptr_t *)&t->tid_tab[tid].ctx, (long)NULL, (long)ctx); - else { - struct mbuf *m; - - m = m_get(M_NOWAIT, MT_DATA); - if (__predict_true(m != NULL)) { - mk_tid_release(m, tid); - CTR1(KTR_CXGB, "releasing tid=%u", tid); - - cxgb_ofld_send(tdev, m); - t->tid_tab[tid].ctx = NULL; - } else - cxgb_queue_tid_release(tdev, tid); - } - atomic_add_int(&t->tids_in_use, -1); -} - -int -cxgb_alloc_atid(struct t3cdev *tdev, struct cxgb_client *client, - void *ctx) -{ - int atid = -1; - struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; - - mtx_lock(&t->atid_lock); - if (t->afree) { - union active_open_entry *p = t->afree; - - atid = (p - t->atid_tab) + t->atid_base; - t->afree = p->next; - p->toe_tid.ctx = ctx; - p->toe_tid.client = client; - t->atids_in_use++; - } - mtx_unlock(&t->atid_lock); - return atid; -} - -int -cxgb_alloc_stid(struct t3cdev *tdev, struct cxgb_client *client, - void *ctx) -{ - int stid = -1; - struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; - - mtx_lock(&t->stid_lock); - if (t->sfree) { - union listen_entry *p = t->sfree; - - stid = (p - t->stid_tab) + t->stid_base; - t->sfree = p->next; - p->toe_tid.ctx = ctx; - p->toe_tid.client = client; - t->stids_in_use++; - } - mtx_unlock(&t->stid_lock); - return stid; -} - static int do_smt_write_rpl(struct t3cdev *dev, struct mbuf *m) { @@ -720,150 +261,6 @@ } static int -do_act_open_rpl(struct t3cdev *dev, struct mbuf *m) -{ - struct cpl_act_open_rpl *rpl = cplhdr(m); - unsigned int atid = G_TID(ntohl(rpl->atid)); - struct toe_tid_entry *toe_tid; - - toe_tid = lookup_atid(&(T3C_DATA (dev))->tid_maps, atid); - if (toe_tid->ctx && toe_tid->client && toe_tid->client->handlers && - toe_tid->client->handlers[CPL_ACT_OPEN_RPL]) { - return toe_tid->client->handlers[CPL_ACT_OPEN_RPL] (dev, m, - toe_tid->ctx); - } else { - log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", - dev->name, CPL_ACT_OPEN_RPL); - return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; - } -} - -static int -do_stid_rpl(struct t3cdev *dev, struct mbuf *m) -{ - union opcode_tid *p = cplhdr(m); - unsigned int stid = G_TID(ntohl(p->opcode_tid)); - struct toe_tid_entry *toe_tid; - - toe_tid = lookup_stid(&(T3C_DATA (dev))->tid_maps, stid); - if (toe_tid->ctx && toe_tid->client->handlers && - toe_tid->client->handlers[p->opcode]) { - return toe_tid->client->handlers[p->opcode] (dev, m, toe_tid->ctx); - } else { - log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", - dev->name, p->opcode); - return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; - } -} - -static int -do_hwtid_rpl(struct t3cdev *dev, struct mbuf *m) -{ - union opcode_tid *p = cplhdr(m); - unsigned int hwtid; - struct toe_tid_entry *toe_tid; - - DPRINTF("do_hwtid_rpl opcode=0x%x\n", p->opcode); - hwtid = G_TID(ntohl(p->opcode_tid)); - - toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); - if (toe_tid->ctx && toe_tid->client->handlers && - toe_tid->client->handlers[p->opcode]) { - return toe_tid->client->handlers[p->opcode] - (dev, m, toe_tid->ctx); - } else { - log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", - dev->name, p->opcode); - return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; - } -} - -static int -do_cr(struct t3cdev *dev, struct mbuf *m) -{ - struct cpl_pass_accept_req *req = cplhdr(m); - unsigned int stid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); - struct toe_tid_entry *toe_tid; - - toe_tid = lookup_stid(&(T3C_DATA (dev))->tid_maps, stid); - if (toe_tid->ctx && toe_tid->client->handlers && - toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ]) { - return toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ] - (dev, m, toe_tid->ctx); - } else { - log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", - dev->name, CPL_PASS_ACCEPT_REQ); - return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; - } -} - -static int -do_abort_req_rss(struct t3cdev *dev, struct mbuf *m) -{ - union opcode_tid *p = cplhdr(m); - unsigned int hwtid = G_TID(ntohl(p->opcode_tid)); - struct toe_tid_entry *toe_tid; - - toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); - if (toe_tid->ctx && toe_tid->client->handlers && - toe_tid->client->handlers[p->opcode]) { - return toe_tid->client->handlers[p->opcode] - (dev, m, toe_tid->ctx); - } else { - struct cpl_abort_req_rss *req = cplhdr(m); - struct cpl_abort_rpl *rpl; - - struct mbuf *m = m_get(M_NOWAIT, MT_DATA); - if (!m) { - log(LOG_NOTICE, "do_abort_req_rss: couldn't get mbuf!\n"); - goto out; - } - - m_set_priority(m, CPL_PRIORITY_DATA); -#if 0 - __skb_put(skb, sizeof(struct cpl_abort_rpl)); -#endif - rpl = cplhdr(m); - rpl->wr.wr_hi = - htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_RPL)); - rpl->wr.wr_lo = htonl(V_WR_TID(GET_TID(req))); - OPCODE_TID(rpl) = - htonl(MK_OPCODE_TID(CPL_ABORT_RPL, GET_TID(req))); - rpl->cmd = req->status; - cxgb_ofld_send(dev, m); - out: - return CPL_RET_BUF_DONE; - } -} - -static int -do_act_establish(struct t3cdev *dev, struct mbuf *m) -{ - struct cpl_act_establish *req; - unsigned int atid; - struct toe_tid_entry *toe_tid; - - req = cplhdr(m); - atid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); - toe_tid = lookup_atid(&(T3C_DATA (dev))->tid_maps, atid); - if (toe_tid && toe_tid->ctx && toe_tid->client->handlers && - toe_tid->client->handlers[CPL_ACT_ESTABLISH]) { - printf("active establish callback\n"); - - return toe_tid->client->handlers[CPL_ACT_ESTABLISH] - (dev, m, toe_tid->ctx); - } else { - printf("toe_tid=%p\n", toe_tid); - - log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", - dev->name, CPL_PASS_ACCEPT_REQ); - return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; - } -} - - - -static int do_set_tcb_rpl(struct t3cdev *dev, struct mbuf *m) { struct cpl_set_tcb_rpl *rpl = cplhdr(m); @@ -891,78 +288,6 @@ return 0; } -static int -do_term(struct t3cdev *dev, struct mbuf *m) -{ - unsigned int hwtid = ntohl(m_get_priority(m)) >> 8 & 0xfffff; - unsigned int opcode = G_OPCODE(ntohl(m->m_pkthdr.csum_data)); - struct toe_tid_entry *toe_tid; - - toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); - if (toe_tid->ctx && toe_tid->client->handlers && - toe_tid->client->handlers[opcode]) { - return toe_tid->client->handlers[opcode](dev, m, toe_tid->ctx); - } else { - log(LOG_ERR, "%s: received clientless CPL command 0x%x\n", - dev->name, opcode); - return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG; - } - return (0); -} - -static void -cxgb_arp_update_event(void *unused, struct rtentry *rt0, - uint8_t *enaddr, struct sockaddr *sa) -{ - - if (!is_offloading(rt0->rt_ifp)) - return; - - RT_ADDREF(rt0); - RT_UNLOCK(rt0); - cxgb_neigh_update(rt0, enaddr, sa); - RT_LOCK(rt0); - RT_REMREF(rt0); -} - - -static void -cxgb_redirect_event(void *unused, int event, struct rtentry *rt0, - struct rtentry *rt1, struct sockaddr *sa) -{ - /* - * ignore events on non-offloaded interfaces - */ - if (!is_offloading(rt0->rt_ifp)) - return; - - /* - * Cannot redirect to non-offload device. - */ - if (!is_offloading(rt1->rt_ifp)) { - log(LOG_WARNING, "%s: Redirect to non-offload" - "device ignored.\n", __FUNCTION__); - return; - } - - /* - * avoid LORs by dropping the route lock but keeping a reference - * - */ - RT_ADDREF(rt0); - RT_UNLOCK(rt0); - RT_ADDREF(rt1); - RT_UNLOCK(rt1); - - cxgb_redirect(rt0, rt1, sa); - cxgb_neigh_update(rt1, NULL, sa); - - RT_LOCK(rt0); - RT_REMREF(rt0); - RT_LOCK(rt1); - RT_REMREF(rt1); -} - /* * Process a received packet with an unknown/unexpected CPL opcode. */ @@ -981,20 +306,6 @@ static cpl_handler_func cpl_handlers[256]; /* - * Add a new handler to the CPL dispatch table. A NULL handler may be supplied - * to unregister an existing handler. - */ -void -t3_register_cpl_handler(unsigned int opcode, cpl_handler_func h) -{ - if (opcode < NUM_CPL_CMDS) - cpl_handlers[opcode] = h ? h : do_bad_cpl; - else - log(LOG_ERR, "T3C: handler registration for " - "opcode %x failed\n", opcode); -} - -/* * T3CDEV's receive method. */ int @@ -1025,139 +336,19 @@ } /* - * Sends an sk_buff to a T3C driver after dealing with any active network taps. - */ -int -cxgb_ofld_send(struct t3cdev *dev, struct mbuf *m) -{ - int r; - - r = dev->send(dev, m); - return r; -} - -/** - * cxgb_ofld_recv - process n received offload packets - * @dev: the offload device - * @m: an array of offload packets - * @n: the number of offload packets - * - * Process an array of ingress offload packets. Each packet is forwarded - * to any active network taps and then passed to the offload device's receive - * method. We optimize passing packets to the receive method by passing - * it the whole array at once except when there are active taps. + * Add a new handler to the CPL dispatch table. A NULL handler may be supplied + * to unregister an existing handler. */ -int -cxgb_ofld_recv(struct t3cdev *dev, struct mbuf **m, int n) -{ - -#if defined(CONFIG_CHELSIO_T3) - if (likely(!netdev_nit)) - return dev->recv(dev, skb, n); - - for ( ; n; n--, skb++) { - skb[0]->dev = dev->lldev; - dev_queue_xmit_nit(skb[0], dev->lldev); - skb[0]->dev = NULL; - dev->recv(dev, skb, 1); - } - return 0; -#else - return dev->recv(dev, m, n); -#endif -} - void -cxgb_neigh_update(struct rtentry *rt, uint8_t *enaddr, struct sockaddr *sa) +t3_register_cpl_handler(unsigned int opcode, cpl_handler_func h) { - - if (rt->rt_ifp && is_offloading(rt->rt_ifp) && (rt->rt_ifp->if_flags & IFCAP_TOE)) { - struct t3cdev *tdev = T3CDEV(rt->rt_ifp); - - PANIC_IF(!tdev); - t3_l2t_update(tdev, rt, enaddr, sa); - } + if (opcode < NUM_CPL_CMDS) + cpl_handlers[opcode] = h ? h : do_bad_cpl; + else + log(LOG_ERR, "T3C: handler registration for " + "opcode %x failed\n", opcode); } -static void -set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e) -{ - struct mbuf *m; - struct cpl_set_tcb_field *req; - - m = m_gethdr(M_NOWAIT, MT_DATA); - if (!m) { - log(LOG_ERR, "%s: cannot allocate mbuf!\n", __FUNCTION__); - return; - } - - m_set_priority(m, CPL_PRIORITY_CONTROL); - req = mtod(m, struct cpl_set_tcb_field *); - m->m_pkthdr.len = m->m_len = sizeof(*req); - - req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); - OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, tid)); - req->reply = 0; - req->cpu_idx = 0; - req->word = htons(W_TCB_L2T_IX); - req->mask = htobe64(V_TCB_L2T_IX(M_TCB_L2T_IX)); - req->val = htobe64(V_TCB_L2T_IX(e->idx)); - tdev->send(tdev, m); -} - -void -cxgb_redirect(struct rtentry *old, struct rtentry *new, struct sockaddr *sa) -{ - struct ifnet *olddev, *newdev; - struct tid_info *ti; - struct t3cdev *tdev; - u32 tid; - int update_tcb; - struct l2t_entry *e; - struct toe_tid_entry *te; - - olddev = old->rt_ifp; - newdev = new->rt_ifp; - if (!is_offloading(olddev)) - return; - if (!is_offloading(newdev)) { - log(LOG_WARNING, "%s: Redirect to non-offload" - "device ignored.\n", __FUNCTION__); - return; - } - tdev = T3CDEV(olddev); - PANIC_IF(!tdev); - if (tdev != T3CDEV(newdev)) { - log(LOG_WARNING, "%s: Redirect to different " - "offload device ignored.\n", __FUNCTION__); - return; - } - - /* Add new L2T entry */ - e = t3_l2t_get(tdev, new, new->rt_ifp, sa); - if (!e) { - log(LOG_ERR, "%s: couldn't allocate new l2t entry!\n", - __FUNCTION__); - return; - } - - /* Walk tid table and notify clients of dst change. */ - ti = &(T3C_DATA (tdev))->tid_maps; - for (tid=0; tid < ti->ntids; tid++) { - te = lookup_tid(ti, tid); - PANIC_IF(!te); - if (te->ctx && te->client && te->client->redirect) { - update_tcb = te->client->redirect(te->ctx, old, new, - e); - if (update_tcb) { - l2t_hold(L2DATA(tdev), e); - set_l2t_ix(tdev, tid, e); - } - } - } - l2t_release(L2DATA(tdev), e); -} - /* * Allocate a chunk of memory using kmalloc or, if that fails, vmalloc. * The allocated memory is cleared. @@ -1178,196 +369,6 @@ free(addr, M_CXGB); } -/* - * Allocate and initialize the TID tables. Returns 0 on success. - */ -static int -init_tid_tabs(struct tid_info *t, unsigned int ntids, - unsigned int natids, unsigned int nstids, - unsigned int atid_base, unsigned int stid_base) -{ - unsigned long size = ntids * sizeof(*t->tid_tab) + - natids * sizeof(*t->atid_tab) + nstids * sizeof(*t->stid_tab); - - t->tid_tab = cxgb_alloc_mem(size); - if (!t->tid_tab) - return (ENOMEM); - - t->stid_tab = (union listen_entry *)&t->tid_tab[ntids]; - t->atid_tab = (union active_open_entry *)&t->stid_tab[nstids]; - t->ntids = ntids; - t->nstids = nstids; - t->stid_base = stid_base; - t->sfree = NULL; - t->natids = natids; - t->atid_base = atid_base; - t->afree = NULL; - t->stids_in_use = t->atids_in_use = 0; - atomic_set_int(&t->tids_in_use, 0); - mtx_init(&t->stid_lock, "stid", NULL, MTX_DUPOK|MTX_DEF); - mtx_init(&t->atid_lock, "atid", NULL, MTX_DUPOK|MTX_DEF); - - /* - * Setup the free lists for stid_tab and atid_tab. - */ - if (nstids) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B4131066272; Fri, 29 Feb 2008 19:48:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22AB310658DE for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95D878FC19 for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmJTo092636 for ; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmJoL092634 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:19 GMT Message-Id: <200802291948.m1TJmJoL092634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=136482 Change 136482 by kmacy@pandemonium:kmacy:xen31 on 2008/02/29 07:28:43 drivers pass in machine address - don't need to translate from physical Affected files ... .. //depot/projects/xen31/sys/i386/xen/pmap.c#43 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/pmap.c#43 (text+ko) ==== @@ -1190,10 +1190,7 @@ PMAP_INLINE void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) { - pt_entry_t *pte; - - pte = vtopte(va); - pte_store(pte, pa | PG_RW | PG_V | pgeflag | pmap_cache_bits(mode, 0)); + PT_SET_MA(va, pa | PG_RW | PG_V | pgeflag | pmap_cache_bits(mode, 0)); } /* From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5B38106627A; Fri, 29 Feb 2008 19:48:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 336F51065B59 for ; Fri, 29 Feb 2008 19:48:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B8B638FC1B for ; Fri, 29 Feb 2008 19:48:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmJU6092641 for ; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmJSn092639 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:19 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:19 GMT Message-Id: <200802291948.m1TJmJSn092639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=136483 Change 136483 by kmacy@pandemonium:kmacy:xen31 on 2008/02/29 07:43:08 make sure that busdma uses machine addresses on xen Affected files ... .. //depot/projects/xen31/sys/i386/i386/busdma_machdep.c#4 edit Differences ... ==== //depot/projects/xen31/sys/i386/i386/busdma_machdep.c#4 (text+ko) ==== @@ -144,6 +144,11 @@ int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, int flags); +#ifdef XEN +#undef pmap_kextract +#define pmap_kextract pmap_kextract_ma +#endif + /* * Return true if a match is made. * From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A1A710663F0; Fri, 29 Feb 2008 19:48:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AB3C1065C1A for ; Fri, 29 Feb 2008 19:48:20 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A33708FC15 for ; Fri, 29 Feb 2008 19:48:20 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmKmW092666 for ; Fri, 29 Feb 2008 19:48:20 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmKb0092664 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:20 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 19:48:20 GMT Message-Id: <200802291948.m1TJmKb0092664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=136488 Change 136488 by rrs@rrs-mips2-jnpr on 2008/02/29 09:39:51 More notes. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#17 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#17 (text+ko) ==== @@ -15,15 +15,16 @@ into locore.S, and some code in sigreturn in pm_machdep.c. Not sure where things are in libc. o Don't forget John Baldwin's comments on the user switch stuff. XXX add more - here XXX This is mostly down to AST things. + here XXX This is mostly down to AST things. - Done RRS. o What's defined in assym.s and param.h varies somewhat between the two code strains. Figure out why and how to resolve. o machdep getmemsize() really is OBE. Except for the mips_wired_tlb variable setting, which is related to something that was omitted from the juniper-mips dump. -o cpu init ??? DONE ???? +o cpu init ??? DONE ???? - Now it is - RRS o we have a lot of memory from 0x80001000-0x81000000 that's currently - wasted. We should feed it to the vm system so as not to waste it. + wasted. We should feed it to the vm system so as not to waste it. - Fixed + for Cavium RRS. o Double check last merge from mips2 -> cavium code. Something seems wrong in one of the edits. Gonzo suggests looking at DO_AST macro. o Look at what the macro to set the per cpu data pointer will be like, and also @@ -39,9 +40,9 @@ o inb and readb are the same damn thing. Really. We should shoot them both and all their ilk. This would allow us to have only one bus_tag, which we need anyway to do the indirection bit right. -o We're not parsing the BIOS info quite right. +o We're not parsing the BIOS info quite right. - Fixed RRS for Cavium o We're not getting memory size at all from the BIOS, but rather are getting - it from the constant of 96... + it from the constant of 96... - Fixed RRS o RAMDISK support o Network driver works only on the 36XX sim. It dies in various ways on the different models. Do we wait for a better code drop from Cavium or fix @@ -52,8 +53,16 @@ ************ RRS (below) ********* o obio.c is probably not a good name for the IQ80321 driver -- obio is On Board I/O. The IQ80321 is a StrongARM eval board... -o the locations of the octeon uart stuff is probably not - good (in mips/octeon32) o Still need to update some of the file locations and s9indent it. -o Still need to figure out where the packet units and enet driver - should go. +o Still need to go in to the rgmii driver and fix some of its + issues. It seems to have its own spin_locks() which I think + should be fixed. It works.. but it needs some closer attention. +o The PG_G bit is being set on user processe pages. I have hacked + it so that we basically avoid this.. put a else remove the + PG_G opposite the if where we did the add PG_G for kernel + mode. Need to trace down the root cause of the pte's having + this bit set. +o Serial int's are not quite right. We stop getting them + in m-user. + + From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C37D106660E; Fri, 29 Feb 2008 19:48:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88B291066270 for ; Fri, 29 Feb 2008 19:48:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 934FB8FC3C for ; Fri, 29 Feb 2008 19:48:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmN1C092776 for ; Fri, 29 Feb 2008 19:48:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmNVM092774 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 Feb 2008 19:48:23 GMT Message-Id: <200802291948.m1TJmNVM092774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 136511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=136511 Change 136511 by hselasky@hselasky_laptop001 on 2008/02/29 19:20:10 Remove useless "+ 0" statements. Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#34 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#72 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#45 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#47 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#43 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#43 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#53 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#59 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#60 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#44 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#117 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#38 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#27 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#22 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#34 (text) ==== @@ -491,7 +491,7 @@ req.wIndex[1] = 0; USETW(req.wLength, 0); - usbd_copy_in(xfer->frbuffers + 0, 0, &req, sizeof(req)); + usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); xfer->nframes = 1; @@ -583,7 +583,7 @@ bzero(sc->cbw.cdb, 16); bcopy(request->u.atapi.ccb, sc->cbw.cdb, 12); /* XXX SOS */ - usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->cbw), sizeof(sc->cbw)); + usbd_copy_in(xfer->frbuffers, 0, &(sc->cbw), sizeof(sc->cbw)); xfer->frlengths[0] = sizeof(sc->cbw); usbd_start_hardware(xfer); @@ -606,7 +606,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - usbd_copy_out(xfer->frbuffers + 0, 0, + usbd_copy_out(xfer->frbuffers, 0, sc->ata_data, xfer->actlen); sc->ata_bytecount -= xfer->actlen; @@ -684,7 +684,7 @@ xfer->timeout = sc->timeout; xfer->frlengths[0] = max_bulk; - usbd_copy_in(xfer->frbuffers + 0, 0, + usbd_copy_in(xfer->frbuffers, 0, sc->ata_data, max_bulk); usbd_start_hardware(xfer); @@ -722,7 +722,7 @@ if (xfer->actlen < sizeof(sc->csw)) { bzero(&(sc->csw), sizeof(sc->csw)); } - usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->csw), xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, &(sc->csw), xfer->actlen); if (request->flags & (ATA_R_READ | ATA_R_WRITE)) { request->donecount = sc->ata_donecount; ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#33 (text+ko) ==== @@ -1249,7 +1249,7 @@ if (n > total) { n = total; } - usbd_copy_in(xfer->frbuffers + 0, offset, ch->cur, n); + usbd_copy_in(xfer->frbuffers, offset, ch->cur, n); total -= n; ch->cur += n; @@ -1305,7 +1305,7 @@ if (m > p_len[n]) { m = p_len[n]; } - usbd_copy_out(xfer->frbuffers + 0, offset1, ch->cur, m); + usbd_copy_out(xfer->frbuffers, offset1, ch->cur, m); p_len[n] -= m; offset1 += m; @@ -3032,7 +3032,7 @@ if (len > 1) { buf[1] = (mc->wData[chan] >> 8) & 0xFF; } - usbd_copy_in(xfer->frbuffers + 0, 0, &req, sizeof(req)); + usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); usbd_copy_in(xfer->frbuffers + 1, 0, buf, len); xfer->frlengths[0] = sizeof(req); @@ -3279,14 +3279,14 @@ while (xfer->actlen >= 4) { - usbd_copy_out(xfer->frbuffers + 0, pos, buf, 1); + usbd_copy_out(xfer->frbuffers, pos, buf, 1); cmd_len = umidi_cmd_to_len[buf[0] & 0xF]; /* command length */ cn = buf[0] >> 4; /* cable number */ sub = &(chan->sub[cn]); if (cmd_len && (cn < chan->max_cable) && sub->read_open) { - usb_cdev_put_data(&(sub->cdev), xfer->frbuffers + 0, + usb_cdev_put_data(&(sub->cdev), xfer->frbuffers, pos + 1, cmd_len, 1); } else { /* ignore the command */ @@ -3505,14 +3505,14 @@ sub = &(chan->sub[chan->curr_cable]); if (sub->write_open) { - usb_cdev_get_data(&(sub->cdev), xfer->frbuffers + 0, + usb_cdev_get_data(&(sub->cdev), xfer->frbuffers, total_length, 1, &actlen, 0); } else { actlen = 0; } if (actlen) { - usbd_copy_out(xfer->frbuffers + 0, total_length, &buf, 1); + usbd_copy_out(xfer->frbuffers, total_length, &buf, 1); tr_any = 1; @@ -3524,7 +3524,7 @@ sub->temp_cmd[0], sub->temp_cmd[1], sub->temp_cmd[2], sub->temp_cmd[3]); - usbd_copy_in(xfer->frbuffers + 0, total_length, + usbd_copy_in(xfer->frbuffers, total_length, sub->temp_cmd, 4); total_length += 4; ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#72 (text+ko) ==== @@ -2528,14 +2528,14 @@ * only call "usbd_get_page()" when we have a * non-zero length */ - usbd_get_page(xfer->frbuffers + 0, buf_offset, &buf_res); + usbd_get_page(xfer->frbuffers, buf_offset, &buf_res); td->sitd_bp[0] = htole32(buf_res.physaddr); buf_offset += *plen; /* * NOTE: We need to subtract one from the offset so * that we are on a valid page! */ - usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); + usbd_get_page(xfer->frbuffers, buf_offset - 1, &buf_res); temp = buf_res.physaddr & ~0xFFF; } else { td->sitd_bp[0] = 0; @@ -2824,7 +2824,7 @@ itd_offset[td_no] = buf_offset; /* get first page offset */ - usbd_get_page(xfer->frbuffers + 0, itd_offset[0], &buf_res); + usbd_get_page(xfer->frbuffers, itd_offset[0], &buf_res); /* get page address */ page_addr = buf_res.physaddr & ~0xFFF; @@ -2841,9 +2841,9 @@ * we don't go off the last * page! */ - usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); + usbd_get_page(xfer->frbuffers, buf_offset - 1, &buf_res); } else { - usbd_get_page(xfer->frbuffers + 0, itd_offset[x + 1], &buf_res); + usbd_get_page(xfer->frbuffers, itd_offset[x + 1], &buf_res); } /* check if we need a new page */ ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#45 (text+ko) ==== @@ -1005,7 +1005,7 @@ if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) && (xfer->actlen >= sizeof(pkt))) { - usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, sizeof(pkt)); + usbd_copy_out(xfer->frbuffers, 0, &pkt, sizeof(pkt)); if (pkt.aue_txstat0) { ifp->if_oerrors++; @@ -1071,7 +1071,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - 4, &(sc->sc_rxpkt), + usbd_copy_out(xfer->frbuffers, xfer->actlen - 4, &(sc->sc_rxpkt), sizeof(sc->sc_rxpkt)); /* @@ -1096,7 +1096,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1189,7 +1189,7 @@ xfer->frlengths[0] = m->m_pkthdr.len; - usbd_m_copy_in(xfer->frbuffers + 0, 0, + usbd_m_copy_in(xfer->frbuffers, 0, m, 0, m->m_pkthdr.len); } else { @@ -1205,9 +1205,9 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_in(xfer->frbuffers, 0, buf, 2); - usbd_m_copy_in(xfer->frbuffers + 0, 2, + usbd_m_copy_in(xfer->frbuffers, 2, m, 0, m->m_pkthdr.len); } ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#47 (text+ko) ==== @@ -1040,7 +1040,7 @@ /* too little data */ break; } - usbd_copy_out(xfer->frbuffers + 0, pos, &hdr, sizeof(hdr)); + usbd_copy_out(xfer->frbuffers, pos, &hdr, sizeof(hdr)); if ((hdr.len ^ hdr.ilen) != 0xFFFF) { /* we lost sync */ @@ -1073,7 +1073,7 @@ if (m->m_len > len) { m->m_len = len; } - usbd_copy_out(xfer->frbuffers + 0, pos, m->m_data, m->m_len); + usbd_copy_out(xfer->frbuffers, pos, m->m_data, m->m_len); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1209,7 +1209,7 @@ hdr.len = htole16(m->m_pkthdr.len); hdr.ilen = ~hdr.len; - usbd_copy_in(xfer->frbuffers + 0, pos, &hdr, sizeof(hdr)); + usbd_copy_in(xfer->frbuffers, pos, &hdr, sizeof(hdr)); pos += sizeof(hdr); @@ -1221,7 +1221,7 @@ * USBD_FORCE_SHORT_XFER flag instead. */ } - usbd_m_copy_in(xfer->frbuffers + 0, pos, + usbd_m_copy_in(xfer->frbuffers, pos, m, 0, m->m_pkthdr.len); pos += m->m_pkthdr.len; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#41 (text+ko) ==== @@ -652,7 +652,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_out(xfer->frbuffers, 0, buf, 2); len = buf[0] | (buf[1] << 8); @@ -667,7 +667,7 @@ xfer->actlen = min(xfer->actlen, m->m_len); xfer->actlen = min(xfer->actlen, len); - usbd_copy_out(xfer->frbuffers + 0, 2, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 2, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -810,9 +810,9 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_in(xfer->frbuffers, 0, buf, 2); - usbd_m_copy_in(xfer->frbuffers + 0, 2, + usbd_m_copy_in(xfer->frbuffers, 2, m, 0, m->m_pkthdr.len); /* ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#43 (text+ko) ==== @@ -690,7 +690,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_out(xfer->frbuffers, 0, buf, 2); len = buf[0] | (buf[1] << 8); @@ -705,7 +705,7 @@ xfer->actlen = min(xfer->actlen, m->m_len); xfer->actlen = min(xfer->actlen, len); - usbd_copy_out(xfer->frbuffers + 0, 2, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 2, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -798,12 +798,12 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_in(xfer->frbuffers, 0, buf, 2); - usbd_m_copy_in(xfer->frbuffers + 0, 2, + usbd_m_copy_in(xfer->frbuffers, 2, m, 0, m->m_pkthdr.len); - usbd_bzero(xfer->frbuffers + 0, temp_len, + usbd_bzero(xfer->frbuffers, temp_len, total_len - temp_len); xfer->frlengths[0] = total_len; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#41 (text+ko) ==== @@ -901,7 +901,7 @@ if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) && (xfer->actlen >= sizeof(pkt))) { - usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, sizeof(pkt)); + usbd_copy_out(xfer->frbuffers, 0, &pkt, sizeof(pkt)); ifp->if_ierrors += pkt.rue_rxlost_cnt; ifp->if_ierrors += pkt.rue_crcerr_cnt; @@ -955,7 +955,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - 4, + usbd_copy_out(xfer->frbuffers, xfer->actlen - 4, &status, sizeof(status)); status = le16toh(status); @@ -980,7 +980,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1071,7 +1071,7 @@ } temp_len = m->m_pkthdr.len; - usbd_m_copy_in(xfer->frbuffers + 0, 0, + usbd_m_copy_in(xfer->frbuffers, 0, m, 0, m->m_pkthdr.len); /* @@ -1080,7 +1080,7 @@ * RUE_MIN_FRAMELEN (60) byte packet. */ if (temp_len < RUE_MIN_FRAMELEN) { - usbd_bzero(xfer->frbuffers + 0, temp_len, + usbd_bzero(xfer->frbuffers, temp_len, RUE_MIN_FRAMELEN - temp_len); temp_len = RUE_MIN_FRAMELEN; } ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#28 (text+ko) ==== @@ -1048,7 +1048,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, + usbd_copy_out(xfer->frbuffers, 0, &(sc->sc_rx_desc), RT2573_RX_DESC_SIZE); flags = le32toh(sc->sc_rx_desc.flags); @@ -1072,7 +1072,7 @@ } max_len = (xfer->actlen - RT2573_RX_DESC_SIZE); - usbd_copy_out(xfer->frbuffers + 0, RT2573_RX_DESC_SIZE, + usbd_copy_out(xfer->frbuffers, RT2573_RX_DESC_SIZE, m->m_data, max_len); /* finalize mbuf */ @@ -1407,10 +1407,10 @@ } rum_setup_tx_desc(sc, flags, 0, m->m_pkthdr.len, rate); - usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_tx_desc), + usbd_copy_in(xfer->frbuffers, 0, &(sc->sc_tx_desc), RT2573_TX_DESC_SIZE); - usbd_m_copy_in(xfer->frbuffers + 0, RT2573_TX_DESC_SIZE, + usbd_m_copy_in(xfer->frbuffers, RT2573_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); /* compute transfer length */ @@ -1420,13 +1420,13 @@ if (temp_len & 3) { align = (-(temp_len)) & 3; /* zero the extra byte(s) */ - usbd_bzero(xfer->frbuffers + 0, temp_len, align); + usbd_bzero(xfer->frbuffers, temp_len, align); temp_len += align; } /* check if we need to add four extra bytes */ if ((temp_len % 64) == 0) { /* zero the extra bytes */ - usbd_bzero(xfer->frbuffers + 0, temp_len, 4); + usbd_bzero(xfer->frbuffers, temp_len, 4); temp_len += 4; } DPRINTF(sc, 10, "sending frame len=%u rate=%u xferlen=%u\n", ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#43 (text+ko) ==== @@ -925,13 +925,13 @@ temp_len += 2; - usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_in(xfer->frbuffers, 0, buf, 2); - usbd_m_copy_in(xfer->frbuffers + 0, 2, + usbd_m_copy_in(xfer->frbuffers, 2, m, 0, m->m_pkthdr.len); if (extra_len) { - usbd_bzero(xfer->frbuffers + 0, temp_len - extra_len, + usbd_bzero(xfer->frbuffers, temp_len - extra_len, extra_len); } /* @@ -995,7 +995,7 @@ } xfer->actlen -= 1; - usbd_copy_out(xfer->frbuffers + 0, 0, &status, 1); + usbd_copy_out(xfer->frbuffers, 0, &status, 1); if (status & UDAV_RSR_LCS) { ifp->if_collisions++; @@ -1005,7 +1005,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 1, &total_len, 2); + usbd_copy_out(xfer->frbuffers, 1, &total_len, 2); total_len = le16toh(total_len); @@ -1027,7 +1027,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(xfer->frbuffers + 0, 3, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 3, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#53 (text+ko) ==== @@ -1052,7 +1052,7 @@ } max_len = (xfer->actlen - RAL_RX_DESC_SIZE); - usbd_copy_out(xfer->frbuffers + 0, max_len, + usbd_copy_out(xfer->frbuffers, max_len, &(sc->sc_rx_desc), RAL_RX_DESC_SIZE); flags = le32toh(sc->sc_rx_desc.flags); @@ -1088,7 +1088,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, max_len); + usbd_copy_out(xfer->frbuffers, 0, m->m_data, max_len); /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; @@ -1422,10 +1422,10 @@ } ural_setup_tx_desc(sc, flags, m->m_pkthdr.len, rate); - usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_tx_desc), + usbd_copy_in(xfer->frbuffers, 0, &(sc->sc_tx_desc), RAL_TX_DESC_SIZE); - usbd_m_copy_in(xfer->frbuffers + 0, RAL_TX_DESC_SIZE, + usbd_m_copy_in(xfer->frbuffers, RAL_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); /* compute transfer length */ @@ -1434,13 +1434,13 @@ /* make transfer length 16-bit aligned */ if (temp_len & 1) { /* zero the extra byte */ - usbd_bzero(xfer->frbuffers + 0, temp_len, 1); + usbd_bzero(xfer->frbuffers, temp_len, 1); temp_len++; } /* check if we need to add two extra bytes */ if ((temp_len % 64) == 0) { /* zero the extra bytes */ - usbd_bzero(xfer->frbuffers + 0, temp_len, 2); + usbd_bzero(xfer->frbuffers, temp_len, 2); temp_len += 2; } DPRINTF(sc, 10, "sending frame len=%u rate=%u xferlen=%u\n", @@ -1492,7 +1492,7 @@ if (sc->sc_flags & URAL_FLAG_SEND_BYTE_FRAME) { sc->sc_flags &= ~URAL_FLAG_SEND_BYTE_FRAME; - usbd_bzero(xfer->frbuffers + 0, 0, 1); + usbd_bzero(xfer->frbuffers, 0, 1); xfer->frlengths[0] = 1; /* bytes */ ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#37 (text+ko) ==== @@ -420,7 +420,7 @@ if (actlen > sizeof(sc->sc_intr_ibuf)) { actlen = sizeof(sc->sc_intr_ibuf); } - usbd_copy_out(xfer->frbuffers + 0, 0, + usbd_copy_out(xfer->frbuffers, 0, &(sc->sc_intr_ibuf), actlen); switch (cmd->code) { @@ -626,7 +626,7 @@ goto wakeup; } if (sc->sc_intr_owakeup) { - usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_intr_obuf), + usbd_copy_in(xfer->frbuffers, 0, &(sc->sc_intr_obuf), sc->sc_intr_olen); xfer->frlengths[0] = sc->sc_intr_olen; @@ -818,8 +818,8 @@ ifp->if_ierrors++; return; } - usbd_copy_out(xfer->frbuffers + 0, offset, &plcp, sizeof(plcp)); - usbd_copy_out(xfer->frbuffers + 0, offset + len - sizeof(stat), + usbd_copy_out(xfer->frbuffers, offset, &plcp, sizeof(plcp)); + usbd_copy_out(xfer->frbuffers, offset + len - sizeof(stat), &stat, sizeof(stat)); if (stat.flags & ZYD_RX_ERROR) { @@ -850,7 +850,7 @@ m->m_pkthdr.len = len; m->m_len = len; - usbd_copy_out(xfer->frbuffers + 0, offset + + usbd_copy_out(xfer->frbuffers, offset + sizeof(plcp), m->m_data, len); if (bpf_peers_present(sc->sc_drvbpf)) { @@ -900,7 +900,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - sizeof(rx_desc), + usbd_copy_out(xfer->frbuffers, xfer->actlen - sizeof(rx_desc), &rx_desc, sizeof(rx_desc)); if (UGETW(rx_desc.tag) == ZYD_TAG_MULTIFRAME) { @@ -2706,9 +2706,9 @@ bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m); } - usbd_copy_in(xfer->frbuffers + 0, 0, &(tx_desc), sizeof(tx_desc)); + usbd_copy_in(xfer->frbuffers, 0, &(tx_desc), sizeof(tx_desc)); - usbd_m_copy_in(xfer->frbuffers + 0, sizeof(tx_desc), + usbd_m_copy_in(xfer->frbuffers, sizeof(tx_desc), m, 0, m->m_pkthdr.len); /* compute transfer length */ ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#59 (text+ko) ==== @@ -2005,12 +2005,12 @@ htole16(OHCI_ITD_MK_OFFS(0)); } } else { - usbd_get_page(xfer->frbuffers + 0, buf_offset - length, &buf_res); + usbd_get_page(xfer->frbuffers, buf_offset - length, &buf_res); length = OHCI_PAGE_MASK(buf_res.physaddr); buf_res.physaddr = OHCI_PAGE(buf_res.physaddr); td->itd_bp0 = htole32(buf_res.physaddr); - usbd_get_page(xfer->frbuffers + 0, buf_offset - 1, &buf_res); + usbd_get_page(xfer->frbuffers, buf_offset - 1, &buf_res); td->itd_be = htole32(buf_res.physaddr); while (ncur--) { ==== //depot/projects/usb/src/sys/dev/usb/uark.c#21 (text+ko) ==== @@ -269,7 +269,7 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers, 0, UARK_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -307,7 +307,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#38 (text+ko) ==== @@ -644,7 +644,7 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers, 0, UBSA_BSIZE, &actlen)) { xfer->frlengths[0] = actlen; @@ -683,7 +683,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers, 0, xfer->actlen); case USBD_ST_SETUP: if (sc->sc_flag & UBSA_FLAG_READ_STALL) { @@ -729,7 +729,7 @@ if (xfer->actlen >= sizeof(buf)) { - usbd_copy_out(xfer->frbuffers + 0, 0, buf, sizeof(buf)); + usbd_copy_out(xfer->frbuffers, 0, buf, sizeof(buf)); /* * incidentally, Belkin adapter status bits match ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#30 (text+ko) ==== @@ -454,12 +454,12 @@ } do { if (ucom_get_data(sc->sc_ucom + sc->sc_curr_tx_unit, - xfer->frbuffers + 0, 1, sc->sc_tx_size - 1, + xfer->frbuffers, 1, sc->sc_tx_size - 1, &actlen)) { buf[0] = sc->sc_curr_tx_unit; - usbd_copy_in(xfer->frbuffers + 0, 0, buf, 1); + usbd_copy_in(xfer->frbuffers, 0, buf, 1); xfer->frlengths[0] = actlen + 1; usbd_start_hardware(xfer); @@ -510,14 +510,14 @@ DPRINTF(sc, 0, "invalid actlen=0!\n"); goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, buf, 1); + usbd_copy_out(xfer->frbuffers, 0, buf, 1); if (buf[0] >= sc->sc_numser) { DPRINTF(sc, 0, "invalid serial number!\n"); goto tr_setup; } ucom_put_data(sc->sc_ucom + buf[0], - xfer->frbuffers + 0, 1, xfer->actlen - 1); + xfer->frbuffers, 1, xfer->actlen - 1); case USBD_ST_SETUP: tr_setup: ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#23 (text+ko) ==== @@ -894,7 +894,7 @@ DPRINTFN(0, "actlen = %u\n", xfer->actlen); if (xfer->actlen >= UCHCOM_INTR_LEAST) { - usbd_copy_out(xfer->frbuffers + 0, 0, buf, + usbd_copy_out(xfer->frbuffers, 0, buf, UCHCOM_INTR_LEAST); DPRINTFN(0, "data = 0x%02X 0x%02X 0x%02X 0x%02X\n", @@ -950,7 +950,7 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers, 0, UCHCOM_BULK_BUF_SIZE, &actlen)) { DPRINTFN(0, "actlen = %d\n", actlen); @@ -991,7 +991,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers, 0, xfer->actlen); case USBD_ST_SETUP: if (sc->sc_flag & UCHCOM_FLAG_READ_STALL) { ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#33 (text+ko) ==== @@ -433,7 +433,7 @@ break; } - usbd_copy_in(xfer->frbuffers + 0, 0, &(req), sizeof(req)); + usbd_copy_in(xfer->frbuffers, 0, &(req), sizeof(req)); usbd_copy_in(xfer->frbuffers + 1, 0, data, offset); xfer->frlengths[0] = sizeof(req); @@ -585,7 +585,7 @@ if (xfer->actlen < 1) { goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, buf, 1); + usbd_copy_out(xfer->frbuffers, 0, buf, 1); sc->sc_ist = buf[0] & ~0x07; len = buf[0] & 0x07; @@ -600,7 +600,7 @@ if (xfer->actlen < 2) { goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_out(xfer->frbuffers, 0, buf, 2); sc->sc_ist = buf[0] & ~0x07; len = buf[1]; @@ -620,7 +620,7 @@ len = xfer->actlen; } if (len) { - ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers, offset, len); } case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/udbp.c#26 (text+ko) ==== @@ -432,7 +432,7 @@ } m->m_pkthdr.len = m->m_len = xfer->actlen; - usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen); sc->sc_bulk_in_buffer = m; @@ -552,7 +552,7 @@ MCLBYTES); m->m_pkthdr.len = MCLBYTES; } - usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); + usbd_m_copy_in(xfer->frbuffers, 0, m, 0, m->m_pkthdr.len); xfer->frlengths[0] = m->m_pkthdr.len; ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#40 (text+ko) ==== @@ -595,7 +595,7 @@ USETW(req.wValue, 0); USETW(req.wLength, UFOMA_CMD_BUF_SIZE); - usbd_copy_in(xfer->frbuffers + 0, 0, &req, sizeof(req)); + usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = UFOMA_CMD_BUF_SIZE; @@ -639,7 +639,7 @@ USETW(req.wValue, 0); USETW(req.wLength, 1); - usbd_copy_in(xfer->frbuffers + 0, 0, &req, sizeof(req)); + usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = 1; @@ -696,7 +696,7 @@ DPRINTF(sc, 0, "truncating message\n"); xfer->actlen = sizeof(pkt); } - usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, &pkt, xfer->actlen); xfer->actlen -= 8; @@ -801,7 +801,7 @@ usbd_transfer_start(sc->sc_bulk_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers, 0, UFOMA_BULK_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -839,7 +839,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#35 (text+ko) ==== @@ -545,14 +545,14 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers, sc->sc_hdrlen, UFTDI_OBUFSIZE - sc->sc_hdrlen, &actlen)) { if (sc->sc_hdrlen > 0) { buf[0] = FTDI_OUT_TAG(actlen, sc->sc_ucom.sc_portno); - usbd_copy_in(xfer->frbuffers + 0, 0, buf, 1); + usbd_copy_in(xfer->frbuffers, 0, buf, 1); } xfer->frlengths[0] = actlen + sc->sc_hdrlen; usbd_start_hardware(xfer); @@ -597,7 +597,7 @@ if (xfer->actlen < 2) { goto tr_setup; } - usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); + usbd_copy_out(xfer->frbuffers, 0, buf, 2); msr = FTDI_GET_MSR(buf); lsr = FTDI_GET_LSR(buf); @@ -616,7 +616,7 @@ xfer->actlen -= 2; if (xfer->actlen > 0) { - ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 2, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers, 2, xfer->actlen); } case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#39 (text+ko) ==== @@ -1029,7 +1029,7 @@ PRINTFN(1, ("got %d of %d bytes\n", xfer->actlen, n)); error = ugen_usb_uiomove - (sc, sce, xfer->frbuffers + 0, uio, 0, + (sc, sce, xfer->frbuffers, uio, 0, xfer->actlen, UGEN_RD_UIO); if (error || (xfer->actlen < n)) { @@ -1092,7 +1092,7 @@ xfer = sce->xfer_out[0]; error = ugen_usb_uiomove - (sc, sce, xfer->frbuffers + 0, uio, + (sc, sce, xfer->frbuffers, uio, 0, n, UGEN_WR_UIO); if (error) { @@ -1302,7 +1302,7 @@ if (ptr == NULL) { PRINTFN(5, ("dropping one packet, sce=%p\n", sce)); } else { - usbd_copy_out(xfer->frbuffers + 0, 0, ptr, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, ptr, xfer->actlen); if (xfer->actlen > *plen) { xfer->actlen = *plen; @@ -1406,7 +1406,7 @@ if (*plen1 > *plen2) { *plen1 = *plen2; } - usbd_copy_out(xfer->frbuffers + 0, offset, + usbd_copy_out(xfer->frbuffers, offset, ptr2, *plen1); *plen2 = *plen1; @@ -1469,7 +1469,7 @@ if (len2 > xfer->max_frame_size) { len2 = xfer->max_frame_size; } - usbd_copy_in(xfer->frbuffers + 0, offset, ptr2, len2); + usbd_copy_in(xfer->frbuffers, offset, ptr2, len2); *plen1 = len2; ==== //depot/projects/usb/src/sys/dev/usb/ugensa.c#22 (text+ko) ==== @@ -299,7 +299,7 @@ usbd_transfer_start(ssc->sc_xfer[2]); return; } - if (ucom_get_data(ssc->sc_ucom_ptr, xfer->frbuffers + 0, 0, + if (ucom_get_data(ssc->sc_ucom_ptr, xfer->frbuffers, 0, UGENSA_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -337,7 +337,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(ssc->sc_ucom_ptr, xfer->frbuffers + 0, 0, + ucom_put_data(ssc->sc_ucom_ptr, xfer->frbuffers, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#60 (text+ko) ==== @@ -1069,7 +1069,7 @@ usbd_pc_cpu_invalidate(td->fix_pc); - usbd_copy_in(xfer->frbuffers + 0, offset, + usbd_copy_in(xfer->frbuffers, offset, res.buffer, len); } offset += *plen; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0702B10666A1; Fri, 29 Feb 2008 19:48:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92D311066274 for ; Fri, 29 Feb 2008 19:48:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D93E48FC15 for ; Fri, 29 Feb 2008 19:48:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmNpD092786 for ; Fri, 29 Feb 2008 19:48:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmN2q092784 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 Feb 2008 19:48:23 GMT Message-Id: <200802291948.m1TJmN2q092784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 136513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=136513 Change 136513 by hselasky@hselasky_laptop001 on 2008/02/29 19:25:15 Update documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#36 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#36 (text+ko) ==== @@ -1,8 +1,8 @@ DESCRIPTION OF THE NEW USB API -The new USB 2.0 API consists of 4 functions. All transfer types are managed -using these functions. There is no longer need for separate functions to setup -INTERRUPT- and ISOCHRONOUS- transfers. +The new USB 2.0 API consists of 5 functions. All transfer types are +managed using these functions. There is no longer need for separate +functions to setup INTERRUPT- and ISOCHRONOUS- transfers. +--------------------------------------------------------------+ | | From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8BB81066737; Fri, 29 Feb 2008 19:48:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9960C1066278 for ; Fri, 29 Feb 2008 19:48:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B2E68FC17 for ; Fri, 29 Feb 2008 19:48:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TJmOUk092796 for ; Fri, 29 Feb 2008 19:48:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmO6b092794 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 Feb 2008 19:48:24 GMT Message-Id: <200802291948.m1TJmO6b092794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 136515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=136515 Change 136515 by hselasky@hselasky_laptop001 on 2008/02/29 19:39:22 USB device side bugfix. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#118 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#118 (text+ko) ==== @@ -3113,7 +3113,13 @@ if (pipe == NULL) { /* nothing to do */ PRINTFN(0, ("Cannot find endpoint\n")); - return (USBD_ERR_INVAL); + /* + * Pretend that the clear or set stall request is + * successful else some USB host stacks can do + * strange things, especially when a control endpoint + * stalls. + */ + return (0); } et = (pipe->edesc->bmAttributes & UE_XFERTYPE); From owner-p4-projects@FreeBSD.ORG Fri Feb 29 21:04:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9A5B1065671; Fri, 29 Feb 2008 21:04:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88722106566C for ; Fri, 29 Feb 2008 21:04:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77BFD8FC2A for ; Fri, 29 Feb 2008 21:04:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TL4hH3008038 for ; Fri, 29 Feb 2008 21:04:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TL4h6H008036 for perforce@freebsd.org; Fri, 29 Feb 2008 21:04:43 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Feb 2008 21:04:43 GMT Message-Id: <200802292104.m1TL4h6H008036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 21:04:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=136517 Change 136517 by sam@sam_ebb on 2008/02/29 21:04:21 IFC @ 136516 Affected files ... .. //depot/projects/vap/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/vap/lib/libc/stdio/fdopen.c#4 integrate .. //depot/projects/vap/lib/libc/stdio/fopen.c#4 integrate .. //depot/projects/vap/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/vap/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/vap/lib/libc/sys/mq_close.2#4 integrate .. //depot/projects/vap/lib/libc/sys/mq_getattr.2#4 integrate .. //depot/projects/vap/lib/libc/sys/mq_notify.2#4 integrate .. //depot/projects/vap/lib/libc/sys/mq_open.2#4 integrate .. //depot/projects/vap/lib/libc/sys/mq_receive.2#4 integrate .. //depot/projects/vap/lib/libc/sys/mq_send.2#4 integrate .. //depot/projects/vap/lib/libc/sys/mq_setattr.2#4 integrate .. //depot/projects/vap/lib/msun/src/e_rem_pio2.c#5 integrate .. //depot/projects/vap/lib/msun/src/e_rem_pio2f.c#5 integrate .. //depot/projects/vap/share/misc/bsd-family-tree#5 integrate .. //depot/projects/vap/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/vap/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/vap/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/vap/sys/boot/i386/btx/btx/btx.S#5 integrate .. //depot/projects/vap/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/vap/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/vap/sys/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/vap/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/vap/sys/boot/pc98/libpc98/Makefile#5 integrate .. //depot/projects/vap/sys/boot/pc98/libpc98/biosdisk.c#5 integrate .. //depot/projects/vap/sys/dev/md/md.c#7 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/vap/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/vap/sys/gdb/gdb_main.c#6 integrate .. //depot/projects/vap/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/vap/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/vap/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/vap/usr.bin/awk/Makefile#3 integrate .. //depot/projects/vap/usr.bin/unifdef/unifdef.c#3 integrate Differences ... ==== //depot/projects/vap/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.255 2008/01/10 14:51:24 des Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $ % ======================================================================= || || @@ -15979,6 +15979,9 @@ % Don't mind him; politicians always sound like that. % +Don't patch bad code -- rewrite it. + -- "The Elements of Programming Style", Kernighan and Plauger +% Don't plan any hasty moves. You'll be evicted soon anyway. % @@ -31243,7 +31246,7 @@ -- Charles Dickens % Let the machine do the dirty work. - -- "Elements of Programming Style", Kernighan and Ritchie + -- "The Elements of Programming Style", Kernighan and Plauger % Let the meek inherit the earth -- they have it coming to them. -- James Thurber ==== //depot/projects/vap/lib/libc/stdio/fdopen.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)fdopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.9 2008/02/27 19:02:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.10 2008/02/27 21:25:19 jhb Exp $"); #include "namespace.h" #include @@ -42,6 +42,7 @@ #include #include #include +#include #include "un-namespace.h" #include "local.h" ==== //depot/projects/vap/lib/libc/stdio/fopen.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.12 2008/02/27 19:02:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.13 2008/02/27 21:25:19 jhb Exp $"); #include "namespace.h" #include @@ -43,6 +43,7 @@ #include #include #include +#include #include "un-namespace.h" #include "local.h" ==== //depot/projects/vap/lib/libc/stdio/freopen.c#4 (text+ko) ==== @@ -34,13 +34,14 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.19 2008/02/27 19:02:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.20 2008/02/27 21:25:19 jhb Exp $"); #include "namespace.h" #include #include #include #include +#include #include #include #include ==== //depot/projects/vap/lib/libc/stdlib/getenv.c#3 (text+ko) ==== @@ -23,23 +23,25 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.13 2008/02/28 04:09:08 scf Exp $"); + + +#include "namespace.h" #include -#include #include #include #include #include #include +#include +#include "un-namespace.h" -#include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.12 2007/09/22 02:30:44 scf Exp $"); - - -static const char CorruptEnvFindMsg[] = - "environment corrupt; unable to find %.*s"; +static const char CorruptEnvFindMsg[] = "environment corrupt; unable to find "; static const char CorruptEnvValueMsg[] = - "environment corrupt; missing value for %s"; + "environment corrupt; missing value for "; /* @@ -97,6 +99,26 @@ /* + * A simple version of warnx() to avoid the bloat of including stdio in static + * binaries. + */ +static void +__env_warnx(const char *msg, const char *name, size_t nameLen) +{ + static const char nl[] = "\n"; + static const char progSep[] = ": "; + + _write(STDERR_FILENO, _getprogname(), strlen(_getprogname())); + _write(STDERR_FILENO, progSep, sizeof(progSep) - 1); + _write(STDERR_FILENO, msg, strlen(msg)); + _write(STDERR_FILENO, name, nameLen); + _write(STDERR_FILENO, nl, sizeof(nl) - 1); + + return; +} + + +/* * Inline strlen() for performance. Also, perform check for an equals sign. * Cheaper here than peforming a strchr() later. */ @@ -341,7 +363,8 @@ envVars[envNdx].valueSize = strlen(envVars[envNdx].value); } else { - warnx(CorruptEnvValueMsg, envVars[envNdx].name); + __env_warnx(CorruptEnvValueMsg, envVars[envNdx].name, + strlen(envVars[envNdx].name)); errno = EFAULT; goto Failure; } @@ -356,8 +379,8 @@ activeNdx = envVarsTotal - 1; if (__findenv(envVars[envNdx].name, nameLen, &activeNdx, false) == NULL) { - warnx(CorruptEnvFindMsg, (int)nameLen, - envVars[envNdx].name); + __env_warnx(CorruptEnvFindMsg, envVars[envNdx].name, + nameLen); errno = EFAULT; goto Failure; } @@ -527,7 +550,8 @@ if (origEnviron != NULL) for (env = origEnviron; *env != NULL; env++) { if ((equals = strchr(*env, '=')) == NULL) { - warnx(CorruptEnvValueMsg, *env); + __env_warnx(CorruptEnvValueMsg, *env, + strlen(*env)); errno = EFAULT; return (-1); } ==== //depot/projects/vap/lib/libc/sys/mq_close.2#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.5 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.6 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_CLOSE 2 @@ -95,11 +95,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/vap/lib/libc/sys/mq_getattr.2#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.5 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.6 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_GETATTR 2 @@ -117,11 +117,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/vap/lib/libc/sys/mq_notify.2#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.9 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.10 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_NOTIFY 2 @@ -141,11 +141,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/vap/lib/libc/sys/mq_open.2#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.9 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.10 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_OPEN 2 @@ -313,11 +313,11 @@ and contain no other slash characters. .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/vap/lib/libc/sys/mq_receive.2#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.6 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.7 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_RECEIVE 2 @@ -207,11 +207,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/vap/lib/libc/sys/mq_send.2#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.5 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.6 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_SEND 2 @@ -226,11 +226,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/vap/lib/libc/sys/mq_setattr.2#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.6 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.7 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_SETATTR 2 @@ -113,11 +113,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/vap/lib/msun/src/e_rem_pio2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.17 2008/02/25 18:28:58 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.18 2008/02/28 16:22:36 bde Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -126,7 +126,7 @@ } } } - if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ + if(ix<0x413921fb) { /* |x| ~< 2^20*(pi/2), medium size */ medium: /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); ==== //depot/projects/vap/lib/msun/src/e_rem_pio2f.c#5 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.28 2008/02/25 22:19:17 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.29 2008/02/28 16:22:36 bde Exp $"); /* __ieee754_rem_pio2f(x,y) * @@ -38,8 +38,8 @@ static const double half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ -pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ -pio2_1t = 6.07710050650619224932e-11; /* 0x3DD0B461, 0x1A626331 */ +pio2_1 = 1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */ +pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */ #ifdef INLINE_REM_PIO2F extern inline @@ -55,7 +55,7 @@ GET_FLOAT_WORD(hx,x); ix = hx&0x7fffffff; /* 33+53 bit pi is good enough for medium size */ - if(ix<=0x49490f80) { /* |x| ~<= 2^19*(pi/2), medium size */ + if(ix<0x4dc90fdb) { /* |x| ~< 2^28*(pi/2), medium size */ /* Use a specialized rint() to get fn. Assume round-to-nearest. */ STRICT_ASSIGN(double,fn,x*invpio2+0x1.8p52); fn = fn-0x1.8p52; ==== //depot/projects/vap/share/misc/bsd-family-tree#5 (text+ko) ==== @@ -169,8 +169,8 @@ | FreeBSD 4.10 | | | | | | | | | | | FreeBSD 4.11 | | | | - | | | | | | - | v `-|------|-----------------|---------------------. + | | | | | + | `-|------|-----------------|---------------------. | | | | \ FreeBSD 5.0 | | | | | | | | | @@ -212,12 +212,18 @@ | | | | | DragonFly 1.8.0 | | | | OpenBSD 4.1 | | | | | | DragonFly 1.10.0 + | | Mac OS X | | | + | | 10.5 | | | | | | | OpenBSD 4.2 | | | | NetBSD 4.0 | | | FreeBSD 6.3 | | | | | | | | | + *--FreeBSD | | | DragonFly 1.12.0 + | 7.0 | | | | + | | | | | | + | V | | | | | | | | | -FreeBSD 7 -current | NetBSD -current OpenBSD -current | +FreeBSD 8 -current | NetBSD -current OpenBSD -current | | | | | | v v v v v @@ -472,9 +478,12 @@ DragonFly 1.8.0 2007-01-30 [DFB] OpenBSD 4.1 2007-05-01 [OBD] DragonFly 1.10.0 2007-08-06 [DFB] +Mac OS X 10.5 2007-10-26 [APL] OpenBSD 4.2 2007-11-01 [OBD] NetBSD 4.0 2007-12-19 [NBD] FreeBSD 6.3 2008-01-18 [FBD] +DragonFly 1.12.0 2008-02-26 [DFB] +FreeBSD 7.0 2008-02-27 [FBD] Bibliography ------------------------ @@ -535,4 +544,4 @@ Copyright (c) 1997-2007 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.118 2008/01/18 19:25:15 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.119 2008/02/28 06:54:24 maxim Exp $ ==== //depot/projects/vap/share/mk/bsd.cpu.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.63 2007/10/16 18:32:37 cognet Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.64 2008/02/29 19:20:05 jhb 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 @@ -133,6 +133,8 @@ MACHINE_CPU = 3dnow mmx i586 i486 i386 . elif ${CPUTYPE} == "c3-2" MACHINE_CPU = sse mmx i586 i486 i386 +. elif ${CPUTYPE} == "c7" +MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 . elif ${CPUTYPE} == "prescott" MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 . elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m" ==== //depot/projects/vap/sys/boot/i386/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.85 2007/10/26 21:02:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.86 2008/02/28 17:08:05 jhb Exp $"); #include #include @@ -129,7 +129,7 @@ unsigned start; int init; } dsk; -static char cmd[512]; +static char cmd[512], cmddup[512]; static char kname[1024]; static uint32_t opts; static int comspeed = SIOSPD; @@ -255,10 +255,11 @@ fsread(ino, cmd, sizeof(cmd)); if (*cmd) { + memcpy(cmddup, cmd, sizeof(cmd)); if (parse()) autoboot = 0; if (!OPT_CHECK(RBX_QUIET)) - printf("%s: %s", PATH_CONFIG, cmd); + printf("%s: %s", PATH_CONFIG, cmddup); /* Do not process this command twice */ *cmd = 0; } ==== //depot/projects/vap/sys/boot/i386/btx/btx/Makefile#3 (text+ko) ==== @@ -1,14 +1,10 @@ -# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.19 2004/12/21 08:47:13 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.20 2008/02/27 23:35:39 jhb Exp $ PROG= btx INTERNALPROG= NO_MAN= SRCS= btx.S -.if defined(PAGING) -CFLAGS+=-DPAGING -.endif - .if defined(BOOT_BTX_NOHANG) BOOT_BTX_FLAGS=0x1 .else ==== //depot/projects/vap/sys/boot/i386/btx/btx/btx.S#5 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.45 2008/02/27 23:35:39 jhb Exp $ */ /* @@ -25,8 +25,7 @@ .set MEM_IDT,0x1e00 # IDT .set MEM_TSS,0x1f98 # TSS .set MEM_MAP,0x2000 # I/O bit map - .set MEM_DIR,0x4000 # Page directory - .set MEM_TBL,0x5000 # Page tables + .set MEM_TSS_END,0x3fff # Page directory .set MEM_ORG,0x9000 # BTX code .set MEM_USR,0xa000 # Start of user memory /* @@ -88,7 +87,7 @@ .set _ESP0H,MEM_ESP0>>0x8 # Byte 1 of ESP0 .set _ESP1H,MEM_ESP1>>0x8 # Byte 1 of ESP1 .set _TSSIO,MEM_MAP-MEM_TSS # TSS I/O base - .set _TSSLM,MEM_DIR-MEM_TSS-1 # TSS limit + .set _TSSLM,MEM_TSS_END-MEM_TSS # TSS limit .set _IDTLM,MEM_TSS-MEM_IDT-1 # IDT limit /* * Code segment. @@ -158,58 +157,15 @@ movb $SEL_SDATA,TSS_SS0(%di) # Set SS0 movb $_ESP1H,TSS_ESP1+1(%di) # Set ESP1 movb $_TSSIO,TSS_MAP(%di) # Set I/O bit map base -#ifdef PAGING /* - * Create page directory. - */ - xor %edx,%edx # Page - mov $PAG_SIZ>>0x8,%dh # size - xor %eax,%eax # Zero - mov $MEM_DIR,%di # Page directory - mov $PAG_CNT>>0xa,%cl # Entries - mov $MEM_TBL|0x7,%ax # First entry -init.5: stosl # Write entry - add %dx,%ax # To next - loop init.5 # Till done -/* - * Create page tables. - */ - mov $MEM_TBL,%di # Page table - mov $PAG_CNT>>0x8,%ch # Entries - xor %ax,%ax # Start address -init.6: mov $0x7,%al # Set U:W:P flags - cmp btx_hdr+0x8,%cx # Standard user page? - jb init.7 # Yes - cmp $PAG_CNT-MEM_BTX>>0xc,%cx # BTX memory? - jae init.7 # No or first page - and $~0x2,%al # Clear W flag - cmp $PAG_CNT-MEM_USR>>0xc,%cx # User page zero? - jne init.7 # No - testb $0x80,btx_hdr+0x7 # Unmap it? - jz init.7 # No - and $~0x1,%al # Clear P flag -init.7: stosl # Set entry - add %edx,%eax # Next address - loop init.6 # Till done -#endif -/* * Bring up the system. */ mov $0x2820,%bx # Set protected mode callw setpic # IRQ offsets lidt idtdesc # Set IDT -#ifdef PAGING - xor %eax,%eax # Set base - mov $MEM_DIR>>0x8,%ah # of page - mov %eax,%cr3 # directory -#endif lgdt gdtdesc # Set GDT mov %cr0,%eax # Switch to protected -#ifdef PAGING - or $0x80000001,%eax # mode and enable paging -#else inc %ax # mode -#endif mov %eax,%cr0 # ljmp $SEL_SCODE,$init.8 # To 32-bit code .code32 @@ -854,13 +810,6 @@ movl $MEM_USR,%eax # User base address addl 0xc(%esp,1),%eax # Change to user leal 0x4(%eax),%esp # stack -#ifdef PAGING - movl %cr0,%eax # Turn - andl $~0x80000000,%eax # off - movl %eax,%cr0 # paging - xorl %eax,%eax # Flush - movl %eax,%cr3 # TLB -#endif popl %eax # Call call *%eax # program intx30.1: orb $0x1,%ss:btx_hdr+0x7 # Flag reboot ==== //depot/projects/vap/sys/boot/i386/gptboot/gptboot.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.86 2007/10/26 21:02:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/gptboot/gptboot.c,v 1.87 2008/02/28 17:08:05 jhb Exp $"); #include #include @@ -127,7 +127,7 @@ daddr_t start; int init; } dsk; -static char cmd[512]; +static char cmd[512], cmddup[512]; static char kname[1024]; static uint32_t opts; static int comspeed = SIOSPD; @@ -253,10 +253,11 @@ fsread(ino, cmd, sizeof(cmd)); if (*cmd) { + memcpy(cmddup, cmd, sizeof(cmd)); if (parse()) autoboot = 0; if (!OPT_CHECK(RBX_QUIET)) - printf("%s: %s", PATH_CONFIG, cmd); + printf("%s: %s", PATH_CONFIG, cmddup); /* Do not process this command twice */ *cmd = 0; } ==== //depot/projects/vap/sys/boot/i386/libi386/biosdisk.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.54 2007/11/12 23:53:43 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.55 2008/02/28 17:49:23 jhb Exp $"); /* * BIOS disk device handling. @@ -316,6 +316,29 @@ } } +/* Given a size in 512 byte sectors, convert it to a human-readable number. */ +static char * +display_size(uint64_t size) +{ + static char buf[80]; + char unit; + + size /= 2; + unit = 'K'; + if (size >= 10485760000LL) { + size /= 1073741824; + unit = 'T'; + } else if (size >= 10240000) { + size /= 1048576; + unit = 'G'; + } else if (size >= 10000) { + size /= 1024; + unit = 'M'; + } + sprintf(buf, "%.6ld%cB", (long)size, unit); + return (buf); +} + static uuid_t efi = GPT_ENT_TYPE_EFI; static uuid_t freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT; static uuid_t freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS; @@ -329,33 +352,22 @@ { char stats[80]; char line[96]; - uint64_t size; - char unit; - if (verbose) { - size = (gp->gp_end + 1 - gp->gp_start) / 2048; - unit = 'M'; - if (size >= 10240000) { - size /= 1048576; - unit = 'T'; - } else if (size >= 10000) { - size /= 1024; - unit = 'G'; - } - sprintf(stats, " %.6ld%cB", (long)size, unit); - } else + if (verbose) + sprintf(stats, " %s", display_size(gp->gp_end + 1 - gp->gp_start)); + else stats[0] = '\0'; if (uuid_equal(&gp->gp_type, &efi, NULL)) - sprintf(line, "%s: EFI%s\n", prefix, stats); + sprintf(line, "%s: EFI %s\n", prefix, stats); else if (uuid_equal(&gp->gp_type, &ms_basic_data, NULL)) - sprintf(line, "%s: FAT/NTFS%s\n", prefix, stats); + sprintf(line, "%s: FAT/NTFS %s\n", prefix, stats); else if (uuid_equal(&gp->gp_type, &freebsd_boot, NULL)) sprintf(line, "%s: FreeBSD boot%s\n", prefix, stats); else if (uuid_equal(&gp->gp_type, &freebsd_ufs, NULL)) - sprintf(line, "%s: FreeBSD UFS%s\n", prefix, stats); + sprintf(line, "%s: FreeBSD UFS %s\n", prefix, stats); else if (uuid_equal(&gp->gp_type, &freebsd_zfs, NULL)) - sprintf(line, "%s: FreeBSD ZFS%s\n", prefix, stats); + sprintf(line, "%s: FreeBSD ZFS %s\n", prefix, stats); else if (uuid_equal(&gp->gp_type, &freebsd_swap, NULL)) sprintf(line, "%s: FreeBSD swap%s\n", prefix, stats); else @@ -377,70 +389,50 @@ bd_printslice(struct open_disk *od, struct dos_partition *dp, char *prefix, int verbose) { + char stats[80]; char line[80]; + if (verbose) + sprintf(stats, " %s (%d - %d)", display_size(dp->dp_size), + dp->dp_start, dp->dp_start + dp->dp_size); + else + stats[0] = '\0'; + switch (dp->dp_typ) { case DOSPTYP_386BSD: bd_printbsdslice(od, (daddr_t)dp->dp_start, prefix, verbose); return; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 21:33:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 170D91065672; Fri, 29 Feb 2008 21:33:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA92D1065678 for ; Fri, 29 Feb 2008 21:33:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BC36A8FC2C for ; Fri, 29 Feb 2008 21:33:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TLXDOJ009247 for ; Fri, 29 Feb 2008 21:33:13 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TLXDsl009245 for perforce@freebsd.org; Fri, 29 Feb 2008 21:33:13 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 21:33:13 GMT Message-Id: <200802292133.m1TLXDsl009245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 21:33:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=136519 Change 136519 by rrs@rrs-mips2-jnpr on 2008/02/29 21:32:25 Adds a ddb show command to dump out things about the ttys. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/kern/tty.c#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/kern/tty.c#3 (text+ko) ==== @@ -75,6 +75,7 @@ #include "opt_compat.h" #include "opt_tty.h" +#include "opt_ddb.h" #include #include @@ -3469,6 +3470,54 @@ ttsetwater(tp); } +#ifdef DDB +void db_dump_all_ttys(void); + + +void +db_dump_all_ttys(void) +{ + struct tty *tp; + + TAILQ_FOREACH(tp, &tty_list, t_list) { + printf("********************************************************\n"); + printf("tp:%p dev:%p t_mdev:%p unit:%d state:%x flags:%x mutex:%p\n", + tp, tp->t_dev, tp->t_mdev, (int)tp->t_devunit, (uint32_t) tp->t_state, + (uint32_t) tp->t_flags, &tp->t_mtx); + printf("driver sc:%p linedisc sc:%p hi_input:%d low_input:%d hi_output:%d low_output:%d\n", + tp->t_sc, tp->t_lsc, + tp->t_ihiwat, tp->t_ilowat, + tp->t_ohiwat, tp->t_olowat); + printf("output state c_cc:%d n_cb:%d max_cb:%d t_outcc:%ld\n", + tp->t_outq.c_cc, tp->t_outq.c_cbcount, tp->t_outq.c_cbmax, + tp->t_outcc + ); + printf("input state (raw) c_cc:%d n_cb:%d max_cb:%d t_rawcc:%ld\n", + tp->t_rawq.c_cc, tp->t_rawq.c_cbcount, tp->t_rawq.c_cbmax, + tp->t_rawcc + ); + printf("input state (can) c_cc:%d n_cb:%d max_cb:%d t_cancc:%ld\n", + tp->t_canq.c_cc, tp->t_canq.c_cbcount, tp->t_canq.c_cbmax, + tp->t_cancc + ); + printf("tp->t_line:%d l_rint:%p l_start:%p\n", tp->t_line, + linesw[tp->t_line]->l_rint, + linesw[tp->t_line]->l_start + ); + + } +} + +#include +#include + +DB_SHOW_COMMAND(ttys, ddb_dump_all_ttys) +{ + db_dump_all_ttys(); +} + +#endif + /* * Record the relationship between the serial ports notion of modem control * signals and the one used in certain ioctls in a way the compiler can enforce From owner-p4-projects@FreeBSD.ORG Fri Feb 29 21:34:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5762C1065672; Fri, 29 Feb 2008 21:34:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F42081065682 for ; Fri, 29 Feb 2008 21:34:14 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E56248FC1F for ; Fri, 29 Feb 2008 21:34:14 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TLYEhY009300 for ; Fri, 29 Feb 2008 21:34:14 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TLYEeo009298 for perforce@freebsd.org; Fri, 29 Feb 2008 21:34:14 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 21:34:14 GMT Message-Id: <200802292134.m1TLYEeo009298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 21:34:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=136520 Change 136520 by rrs@rrs-mips2-jnpr on 2008/02/29 21:33:45 Assure when we go to user mode the SX/UX and KX bits are off. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#17 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#17 (text+ko) ==== @@ -512,8 +512,6 @@ mtlo t0 mthi t1 RESTORE_U_PCB_REG(a0, PC, k1) - .set noat - RESTORE_U_PCB_REG(AT, AST, k1) RESTORE_U_PCB_REG(v0, V0, k1) _MTC0 a0, COP_0_EXC_PC # set return address RESTORE_U_PCB_REG(v1, V1, k1) @@ -544,6 +542,13 @@ RESTORE_U_PCB_REG(k0, SR, k1) RESTORE_U_PCB_REG(s8, S8, k1) RESTORE_U_PCB_REG(ra, RA, k1) +#ifdef TARGET_OCTEON + and k0, k0, ~(MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX) + or k0, k0, MIPS_SR_INT_IE +#endif + .set noat + RESTORE_U_PCB_REG(AT, AST, k1) + /* * The restoration of the user SR must be done only after * k1 is no longer needed. Otherwise, k1 will get clobbered after @@ -630,6 +635,7 @@ GET_CPU_PCPU(k1) lw k1, PC_CURPCB(k1) SAVE_U_PCB_REG(AT, AST, k1) + .set at SAVE_U_PCB_REG(v0, V0, k1) SAVE_U_PCB_REG(v1, V1, k1) SAVE_U_PCB_REG(a0, A0, k1) @@ -676,7 +682,6 @@ la gp, _C_LABEL(_gp) # switch to kernel GP # Turn off fpu, disable interrupts, set kernel mode kernel mode, clear exception level. - .set at and t0, a0, ~(SR_COP_1_BIT | SR_EXL | SR_INT_ENAB | SR_KSU_MASK) mtc0 t0, COP_0_STATUS_REG ITLBNOPFIX @@ -738,9 +743,6 @@ */ move k1, a1 - .set noat - - RESTORE_U_PCB_REG(AT, AST, k1) RESTORE_U_PCB_REG(v0, V0, k1) RESTORE_U_PCB_REG(v1, V1, k1) RESTORE_U_PCB_REG(a0, A0, k1) @@ -761,6 +763,12 @@ RESTORE_U_PCB_REG(k0, SR, k1) RESTORE_U_PCB_REG(sp, SP, k1) RESTORE_U_PCB_REG(ra, RA, k1) +#ifdef TARGET_OCTEON + and k0, k0, ~(MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX) + or k0, k0, MIPS_SR_INT_IE +#endif + .set noat + RESTORE_U_PCB_REG(AT, AST, k1) /* * The restoration of the user SR must be done only after From owner-p4-projects@FreeBSD.ORG Fri Feb 29 21:37:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBB2F106567B; Fri, 29 Feb 2008 21:37:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 877CF1065673 for ; Fri, 29 Feb 2008 21:37:18 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78F7B8FC24 for ; Fri, 29 Feb 2008 21:37:18 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TLbIp2009418 for ; Fri, 29 Feb 2008 21:37:18 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TLbIaM009416 for perforce@freebsd.org; Fri, 29 Feb 2008 21:37:18 GMT (envelope-from rrs@cisco.com) Date: Fri, 29 Feb 2008 21:37:18 GMT Message-Id: <200802292137.m1TLbIaM009416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 21:37:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136521 Change 136521 by rrs@rrs-mips2-jnpr on 2008/02/29 21:36:57 Fixes strange UART reply of IIR_BUSY, if treated like a read and write int it all works. Also adds a ddb command to show oct_state (int reg etc). Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#12 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#12 (text+ko) ==== @@ -57,7 +57,7 @@ #include __FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_oct16550.c,v 1.23 2006/05/23 06:04:45 dev-id:0 Exp $"); - +#include "opt_ddb.h" #include #include #include @@ -86,6 +86,8 @@ bus_space_write_8((bas)->bst, (bas)->bsh, uart_regofs(bas, reg), value) #define uart_getreg(bas, reg) \ bus_space_read_8((bas)->bst, (bas)->bsh, uart_regofs(bas, reg)) + + /* * Clear pending interrupts. THRE is cleared by reading IIR. Data * that may have been received gets lost here. @@ -535,6 +537,7 @@ return (sig); } + static int oct16550_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) { @@ -622,7 +625,7 @@ bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); - + iir = uart_getreg(bas, OCT_REG_IIR) & IIR_IMASK; if (iir != IIR_NOPEND) { @@ -648,7 +651,9 @@ ipend |= SER_INT_SIGCHG; } else if (iir == IIR_BUSY) { - (void)uart_getreg(bas, OCT_REG_USR); + ipend |= SER_INT_TXIDLE; + ipend |= SER_INT_RXREADY; + iir = uart_getreg(bas, OCT_REG_IIR) & IIR_IMASK; } } uart_unlock(sc->sc_hwmtx); @@ -812,12 +817,6 @@ bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); -#ifdef NO_UART_INTERRUPTS - for (i = 0; i < sc->sc_txdatasz; i++) { - oct16550_putc(bas, sc->sc_txbuf[i]); - } -#else - oct16550_wait_txhr_empty(bas, 100, oct16550_delay(bas)); uart_setreg(bas, OCT_REG_IER, oct16550->ier | IER_ETXRDY); uart_barrier(bas); @@ -827,7 +826,64 @@ uart_barrier(bas); } sc->sc_txbusy = 1; -#endif uart_unlock(sc->sc_hwmtx); return (0); } + +#ifdef DDB + +void db_dump_intr_state(void); + +void +db_dump_intr_state(void) +{ + uint32_t status_bits; + uint64_t ciu_intr_reg_addr; + uint64_t regstate1, regstate2; + int i; + status_bits = mips_rd_status(); + printf("Mips SR is currently %x\n", status_bits); + + + printf("Core Interrupt summary's IP2/IP3\n"); + ciu_intr_reg_addr = OCTEON_CIU_SUMMARY_BASE_ADDR; + for(i=0; i<16; i++) { + regstate1 = oct_read64(ciu_intr_reg_addr); + regstate2 = oct_read64(ciu_intr_reg_addr + 0x8); + printf("Core:%d Reg:%llx IP2:%llx IP3:%llx\n", + i, ciu_intr_reg_addr, regstate1, regstate2); + /* next register set please */ + ciu_intr_reg_addr += 0x10; + } + printf("Core Interrupt enable 0 IP2/IP3\n"); + ciu_intr_reg_addr = OCTEON_CIU_ENABLE_BASE_ADDR; + for(i=0; i<16; i++) { + regstate1 = oct_read64(ciu_intr_reg_addr); + regstate2 = oct_read64(ciu_intr_reg_addr + 0x10); + printf("Core:%d Reg:%llx IP2:%llx IP3:%llx\n", + i, ciu_intr_reg_addr, regstate1, regstate2); + /* next register set please */ + ciu_intr_reg_addr += 0x10; + } + printf("Core Interrupt enable 1 IP2/IP3\n"); + ciu_intr_reg_addr = OCTEON_CIU_ENABLE_BASE_ADDR + 0x8; + for(i=0; i<16; i++) { + regstate1 = oct_read64(ciu_intr_reg_addr); + regstate2 = oct_read64(ciu_intr_reg_addr + 0x10); + printf("Core:%d Reg:%llx IP2:%llx IP3:%llx\n", + i, ciu_intr_reg_addr, regstate1, regstate2); + /* next register set please */ + ciu_intr_reg_addr += 0x10; + } + +} + +#include +#include + +DB_SHOW_COMMAND(oct_state, ddb_dump_intr_state) +{ + db_dump_intr_state(); +} + +#endif From owner-p4-projects@FreeBSD.ORG Fri Feb 29 23:00:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B79B1065675; Fri, 29 Feb 2008 23:00:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBA47106566B for ; Fri, 29 Feb 2008 23:00:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB3828FC21 for ; Fri, 29 Feb 2008 23:00:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TN0t7X015147 for ; Fri, 29 Feb 2008 23:00:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TN0j8P015145 for perforce@freebsd.org; Fri, 29 Feb 2008 23:00:45 GMT (envelope-from marcel@freebsd.org) Date: Fri, 29 Feb 2008 23:00:45 GMT Message-Id: <200802292300.m1TN0j8P015145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 23:00:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=136528 Change 136528 by marcel@marcel_xcllnt on 2008/02/29 22:59:51 IFC @136526 (time to upgrade my Netra :-) Affected files ... .. //depot/projects/usiii/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/usiii/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/usiii/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/usiii/amd64/conf/GENERIC#5 integrate .. //depot/projects/usiii/amd64/conf/NOTES#4 integrate .. //depot/projects/usiii/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/usiii/arm/arm/genassym.c#2 integrate .. //depot/projects/usiii/arm/arm/locore.S#3 integrate .. //depot/projects/usiii/arm/arm/swtch.S#3 integrate .. //depot/projects/usiii/arm/include/_bus.h#2 integrate .. //depot/projects/usiii/arm/include/asmacros.h#4 integrate .. //depot/projects/usiii/arm/include/atomic.h#3 integrate .. //depot/projects/usiii/arm/include/sysarch.h#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/usiii/boot/Makefile#2 integrate .. //depot/projects/usiii/boot/common/bootstrap.h#2 integrate .. //depot/projects/usiii/boot/common/load_elf.c#2 integrate .. //depot/projects/usiii/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/usiii/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/usiii/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/usiii/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/usiii/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/usiii/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/usiii/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/usiii/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/usiii/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/usiii/boot/powerpc/Makefile#3 integrate .. //depot/projects/usiii/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/usiii/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/usiii/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/usiii/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/usiii/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/usiii/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/usiii/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/usiii/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/usiii/boot/powerpc/uboot/version#1 branch .. //depot/projects/usiii/boot/uboot/Makefile#1 branch .. //depot/projects/usiii/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/usiii/boot/uboot/common/main.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/Makefile#1 branch .. //depot/projects/usiii/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/usiii/boot/uboot/lib/console.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/copy.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/disk.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/glue.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/glue.h#1 branch .. //depot/projects/usiii/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/usiii/boot/uboot/lib/module.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/net.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/usiii/boot/uboot/lib/time.c#1 branch .. //depot/projects/usiii/cam/cam_periph.c#2 integrate .. //depot/projects/usiii/cam/cam_xpt.c#4 integrate .. //depot/projects/usiii/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/usiii/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/usiii/compat/linux/linux_misc.c#4 integrate .. //depot/projects/usiii/compat/linux/linux_misc.h#2 integrate .. //depot/projects/usiii/conf/Makefile.arm#2 integrate .. //depot/projects/usiii/conf/NOTES#6 integrate .. //depot/projects/usiii/conf/files#5 integrate .. //depot/projects/usiii/conf/files.amd64#4 integrate .. //depot/projects/usiii/conf/files.i386#4 integrate .. //depot/projects/usiii/conf/files.powerpc#4 integrate .. //depot/projects/usiii/conf/files.sparc64#4 integrate .. //depot/projects/usiii/conf/kern.post.mk#2 integrate .. //depot/projects/usiii/conf/ldscript.powerpc#2 integrate .. //depot/projects/usiii/conf/options#5 integrate .. //depot/projects/usiii/conf/options.powerpc#3 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/usiii/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/usiii/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/usiii/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/usiii/dev/amr/amrreg.h#3 integrate .. //depot/projects/usiii/dev/atkbdc/psm.c#2 integrate .. //depot/projects/usiii/dev/bce/if_bce.c#3 integrate .. //depot/projects/usiii/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/usiii/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/usiii/dev/ciss/ciss.c#4 integrate .. //depot/projects/usiii/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/usiii/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/usiii/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/usiii/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/usiii/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/usiii/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/usiii/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/usiii/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/usiii/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/usiii/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/usiii/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/usiii/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/usiii/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/usiii/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/usiii/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/usiii/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/usiii/dev/em/LICENSE#2 integrate .. //depot/projects/usiii/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_82540.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_82541.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_82541.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_82542.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_82543.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_82543.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_82571.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_82571.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_82575.c#3 delete .. //depot/projects/usiii/dev/em/e1000_82575.h#3 delete .. //depot/projects/usiii/dev/em/e1000_api.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_api.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_defines.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_hw.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_mac.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_mac.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_manage.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_manage.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_phy.c#3 integrate .. //depot/projects/usiii/dev/em/e1000_phy.h#3 integrate .. //depot/projects/usiii/dev/em/e1000_regs.h#3 integrate .. //depot/projects/usiii/dev/em/if_em.c#4 integrate .. //depot/projects/usiii/dev/em/if_em.h#4 integrate .. //depot/projects/usiii/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/usiii/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/usiii/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/usiii/dev/hptrr/array.h#2 integrate .. //depot/projects/usiii/dev/hptrr/him.h#2 integrate .. //depot/projects/usiii/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/usiii/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/usiii/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/usiii/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/usiii/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/usiii/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/usiii/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/usiii/dev/hptrr/ldm.h#2 integrate .. //depot/projects/usiii/dev/hptrr/list.h#2 integrate .. //depot/projects/usiii/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/usiii/dev/hptrr/osm.h#2 integrate .. //depot/projects/usiii/dev/igb/e1000_82575.c#1 branch .. //depot/projects/usiii/dev/igb/e1000_82575.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_api.c#1 branch .. //depot/projects/usiii/dev/igb/e1000_api.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_defines.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_hw.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_mac.c#1 branch .. //depot/projects/usiii/dev/igb/e1000_mac.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_manage.c#1 branch .. //depot/projects/usiii/dev/igb/e1000_manage.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/usiii/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_phy.c#1 branch .. //depot/projects/usiii/dev/igb/e1000_phy.h#1 branch .. //depot/projects/usiii/dev/igb/e1000_regs.h#1 branch .. //depot/projects/usiii/dev/igb/if_igb.c#1 branch .. //depot/projects/usiii/dev/igb/if_igb.h#1 branch .. //depot/projects/usiii/dev/md/md.c#4 integrate .. //depot/projects/usiii/dev/msk/if_msk.c#4 integrate .. //depot/projects/usiii/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/usiii/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/usiii/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/usiii/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/usiii/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/usiii/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/usiii/dev/ral/rt2560.c#5 integrate .. //depot/projects/usiii/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/usiii/dev/ral/rt2560var.h#2 integrate .. //depot/projects/usiii/dev/rr232x/LICENSE#2 delete .. //depot/projects/usiii/dev/rr232x/README#2 delete .. //depot/projects/usiii/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/usiii/dev/rr232x/array.h#2 delete .. //depot/projects/usiii/dev/rr232x/him.h#2 delete .. //depot/projects/usiii/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/usiii/dev/rr232x/hptintf.h#2 delete .. //depot/projects/usiii/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/usiii/dev/rr232x/ldm.h#2 delete .. //depot/projects/usiii/dev/rr232x/list.h#2 delete .. //depot/projects/usiii/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/usiii/dev/rr232x/os_bsd.h#2 delete .. //depot/projects/usiii/dev/rr232x/osm.h#2 delete .. //depot/projects/usiii/dev/rr232x/osm_bsd.c#2 delete .. //depot/projects/usiii/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/usiii/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/usiii/dev/sk/if_sk.c#4 integrate .. //depot/projects/usiii/dev/sk/if_skreg.h#2 integrate .. //depot/projects/usiii/dev/syscons/syscons.h#4 integrate .. //depot/projects/usiii/dev/ti/if_ti.c#4 integrate .. //depot/projects/usiii/dev/twe/twe.c#2 integrate .. //depot/projects/usiii/dev/usb/ehci.c#3 integrate .. //depot/projects/usiii/dev/usb/ubsa.c#2 integrate .. //depot/projects/usiii/dev/usb/ucom.c#2 integrate .. //depot/projects/usiii/dev/usb/umass.c#3 integrate .. //depot/projects/usiii/dev/usb/usbdevs#5 integrate .. //depot/projects/usiii/dev/usb/usbdi.c#2 integrate .. //depot/projects/usiii/dev/usb/uscanner.c#3 integrate .. //depot/projects/usiii/fs/coda/TODO#2 integrate .. //depot/projects/usiii/fs/coda/cnode.h#3 integrate .. //depot/projects/usiii/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/usiii/fs/coda/coda_io.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_kernel.h#2 delete .. //depot/projects/usiii/fs/coda/coda_namecache.c#2 delete .. //depot/projects/usiii/fs/coda/coda_namecache.h#3 delete .. //depot/projects/usiii/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_psdev.c#3 integrate .. //depot/projects/usiii/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_subr.c#2 integrate .. //depot/projects/usiii/fs/coda/coda_subr.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_venus.c#2 integrate .. //depot/projects/usiii/fs/coda/coda_venus.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/usiii/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/usiii/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/usiii/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/usiii/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/usiii/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/usiii/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/usiii/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/usiii/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/usiii/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/usiii/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/usiii/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/usiii/gdb/gdb_main.c#2 integrate .. //depot/projects/usiii/geom/geom_disk.c#2 integrate .. //depot/projects/usiii/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/usiii/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/usiii/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/usiii/i386/conf/GENERIC#5 integrate .. //depot/projects/usiii/i386/conf/NOTES#4 integrate .. //depot/projects/usiii/i386/cpufreq/est.c#2 integrate .. //depot/projects/usiii/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/usiii/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/usiii/i386/i386/geode.c#3 integrate .. //depot/projects/usiii/i386/i386/identcpu.c#2 integrate .. //depot/projects/usiii/i386/i386/initcpu.c#2 integrate .. //depot/projects/usiii/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/usiii/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/usiii/ia64/conf/GENERIC#5 integrate .. //depot/projects/usiii/ia64/ia64/locore.S#2 integrate .. //depot/projects/usiii/ia64/ia64/machdep.c#4 integrate .. //depot/projects/usiii/ia64/ia64/pmap.c#4 integrate .. //depot/projects/usiii/ia64/include/md_var.h#2 integrate .. //depot/projects/usiii/kern/init_sysent.c#3 integrate .. //depot/projects/usiii/kern/kern_descrip.c#4 integrate .. //depot/projects/usiii/kern/kern_exit.c#4 integrate .. //depot/projects/usiii/kern/kern_ktrace.c#5 integrate .. //depot/projects/usiii/kern/kern_lock.c#4 integrate .. //depot/projects/usiii/kern/kern_mib.c#4 integrate .. //depot/projects/usiii/kern/kern_module.c#3 integrate .. //depot/projects/usiii/kern/kern_mutex.c#4 integrate .. //depot/projects/usiii/kern/kern_rwlock.c#4 integrate .. //depot/projects/usiii/kern/kern_tc.c#3 integrate .. //depot/projects/usiii/kern/kern_timeout.c#5 integrate .. //depot/projects/usiii/kern/subr_autoconf.c#2 integrate .. //depot/projects/usiii/kern/subr_lock.c#5 integrate .. //depot/projects/usiii/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/usiii/kern/subr_turnstile.c#3 integrate .. //depot/projects/usiii/kern/syscalls.c#3 integrate .. //depot/projects/usiii/kern/syscalls.master#4 integrate .. //depot/projects/usiii/kern/systrace_args.c#3 integrate .. //depot/projects/usiii/kern/sysv_shm.c#3 integrate .. //depot/projects/usiii/kern/uipc_shm.c#2 integrate .. //depot/projects/usiii/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/usiii/kern/uipc_socket.c#4 integrate .. //depot/projects/usiii/kern/uipc_syscalls.c#4 integrate .. //depot/projects/usiii/kern/vfs_bio.c#5 integrate .. //depot/projects/usiii/kern/vfs_cache.c#5 integrate .. //depot/projects/usiii/kern/vfs_default.c#3 integrate .. //depot/projects/usiii/kern/vfs_lookup.c#5 integrate .. //depot/projects/usiii/kern/vfs_mount.c#5 integrate .. //depot/projects/usiii/kern/vfs_subr.c#5 integrate .. //depot/projects/usiii/kern/vfs_syscalls.c#5 integrate .. //depot/projects/usiii/kern/vnode_if.src#3 integrate .. //depot/projects/usiii/libkern/cmpdi2.c#1 branch .. //depot/projects/usiii/libkern/quad.h#2 integrate .. //depot/projects/usiii/modules/Makefile#6 integrate .. //depot/projects/usiii/modules/coda/Makefile#2 integrate .. //depot/projects/usiii/modules/coda5/Makefile#2 integrate .. //depot/projects/usiii/modules/cxgb/Makefile#4 integrate .. //depot/projects/usiii/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/usiii/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/usiii/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/usiii/modules/em/Makefile#2 integrate .. //depot/projects/usiii/modules/geom/Makefile#3 integrate .. //depot/projects/usiii/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/usiii/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/usiii/modules/hwpmc/Makefile#2 integrate .. //depot/projects/usiii/modules/igb/Makefile#1 branch .. //depot/projects/usiii/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/usiii/modules/rr232x/Makefile#2 delete .. //depot/projects/usiii/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/usiii/modules/zfs/Makefile#3 integrate .. //depot/projects/usiii/net/route.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_input.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/usiii/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/usiii/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/usiii/netgraph/ng_base.c#4 integrate .. //depot/projects/usiii/netgraph/ng_bpf.c#3 integrate .. //depot/projects/usiii/netgraph/ng_ppp.c#4 integrate .. //depot/projects/usiii/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/usiii/netgraph/ng_tee.c#2 integrate .. //depot/projects/usiii/netinet/in_rmx.c#3 integrate .. //depot/projects/usiii/netinet/ip_carp.c#3 integrate .. //depot/projects/usiii/netinet/ip_dummynet.c#4 integrate .. //depot/projects/usiii/netinet/ip_fw.h#3 integrate .. //depot/projects/usiii/netinet/ip_fw2.c#6 integrate .. //depot/projects/usiii/netinet/ip_fw_nat.c#1 branch .. //depot/projects/usiii/netinet/ip_id.c#3 integrate .. //depot/projects/usiii/netinet/sctp_output.c#4 integrate .. //depot/projects/usiii/netinet/sctp_pcb.c#5 integrate .. //depot/projects/usiii/netinet/tcp_var.h#6 integrate .. //depot/projects/usiii/netncp/ncp_conn.c#3 integrate .. //depot/projects/usiii/netsmb/smb_conn.c#3 integrate .. //depot/projects/usiii/netsmb/smb_iod.c#3 integrate .. //depot/projects/usiii/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/usiii/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/usiii/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/usiii/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/usiii/nfsclient/nfs_node.c#3 integrate .. //depot/projects/usiii/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/usiii/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/usiii/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/usiii/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/usiii/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/usiii/nfsclient/nfsnode.h#2 integrate .. //depot/projects/usiii/pc98/cbus/sio.c#4 integrate .. //depot/projects/usiii/pc98/pc98/machdep.c#4 integrate .. //depot/projects/usiii/powerpc/aim/locore.S#2 integrate .. //depot/projects/usiii/powerpc/aim/machdep.c#2 integrate .. //depot/projects/usiii/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/usiii/powerpc/conf/GENERIC#5 integrate .. //depot/projects/usiii/powerpc/conf/NOTES#5 integrate .. //depot/projects/usiii/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/usiii/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/usiii/powerpc/include/bootinfo.h#2 integrate .. //depot/projects/usiii/powerpc/include/float.h#2 integrate .. //depot/projects/usiii/powerpc/include/hid.h#2 integrate .. //depot/projects/usiii/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/usiii/powerpc/include/metadata.h#2 integrate .. //depot/projects/usiii/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/usiii/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/usiii/powerpc/include/spr.h#2 integrate .. //depot/projects/usiii/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/usiii/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/usiii/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/usiii/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/usiii/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/usiii/security/audit/audit.c#4 integrate .. //depot/projects/usiii/security/audit/audit_arg.c#3 integrate .. //depot/projects/usiii/security/audit/audit_bsm.c#4 integrate .. //depot/projects/usiii/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/usiii/security/audit/audit_private.h#2 integrate .. //depot/projects/usiii/security/audit/audit_worker.c#4 integrate .. //depot/projects/usiii/sparc64/include/md_var.h#2 integrate .. //depot/projects/usiii/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/usiii/sys/buf.h#3 integrate .. //depot/projects/usiii/sys/conf.h#3 integrate .. //depot/projects/usiii/sys/ipc.h#2 integrate .. //depot/projects/usiii/sys/ktrace.h#2 integrate .. //depot/projects/usiii/sys/lock.h#3 integrate .. //depot/projects/usiii/sys/lockmgr.h#4 integrate .. //depot/projects/usiii/sys/module.h#2 integrate .. //depot/projects/usiii/sys/param.h#5 integrate .. //depot/projects/usiii/sys/priv.h#4 integrate .. //depot/projects/usiii/sys/proc.h#5 integrate .. //depot/projects/usiii/sys/rwlock.h#2 integrate .. //depot/projects/usiii/sys/shm.h#2 integrate .. //depot/projects/usiii/sys/socket.h#4 integrate .. //depot/projects/usiii/sys/socketvar.h#3 integrate .. //depot/projects/usiii/sys/syscall.h#3 integrate .. //depot/projects/usiii/sys/syscall.mk#3 integrate .. //depot/projects/usiii/sys/syscallsubr.h#3 integrate .. //depot/projects/usiii/sys/sysproto.h#3 integrate .. //depot/projects/usiii/sys/user.h#5 integrate .. //depot/projects/usiii/sys/vnode.h#4 integrate .. //depot/projects/usiii/tools/embed_mfs.sh#1 branch .. //depot/projects/usiii/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/usiii/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/usiii/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/usiii/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/usiii/vm/vm_object.c#6 integrate Differences ... ==== //depot/projects/usiii/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.84 2007/11/27 17:28:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.85 2008/02/12 16:24:30 scottl Exp $"); #include #include @@ -598,14 +598,14 @@ * Count the number of bounce pages * needed in order to complete this transfer */ - vaddr = trunc_page((vm_offset_t)buf); + vaddr = (vm_offset_t)buf; vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; - vaddr += PAGE_SIZE; + vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); } CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } ==== //depot/projects/usiii/amd64/amd64/dump_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.13 2008/01/28 19:04:06 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); #include #include @@ -177,6 +177,7 @@ uint64_t pgs; size_t counter, sz, chunk; int i, c, error, twiddle; + u_int maxdumppgs; error = 0; /* catch case in which chunk size is 0 */ counter = 0; /* Update twiddle every 16MB */ @@ -184,13 +185,16 @@ va = 0; pgs = mdp->md_size / PAGE_SIZE; pa = mdp->md_start; + maxdumppgs = di->maxiosize / PAGE_SIZE; + if (maxdumppgs == 0) /* seatbelt */ + maxdumppgs = 1; printf(" chunk %d: %ldMB (%ld pages)", seqnr, PG2MB(pgs), pgs); while (pgs) { chunk = pgs; - if (chunk > MAXDUMPPGS) - chunk = MAXDUMPPGS; + if (chunk > maxdumppgs) + chunk = maxdumppgs; sz = chunk << PAGE_SHIFT; counter += sz; if (counter >> 24) { ==== //depot/projects/usiii/amd64/amd64/minidump_machdep.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $"); #include #include @@ -122,7 +122,11 @@ { size_t len; int error, i, c; + u_int maxdumpsz; + maxdumpsz = di->maxiosize; + if (maxdumpsz == 0) /* seatbelt */ + maxdumpsz = PAGE_SIZE; error = 0; if ((sz % PAGE_SIZE) != 0) { printf("size not page aligned\n"); @@ -143,7 +147,7 @@ return (error); } while (sz) { - len = (MAXDUMPPGS * PAGE_SIZE) - fragsz; + len = maxdumpsz - fragsz; if (len > sz) len = sz; counter += len; @@ -165,7 +169,7 @@ fragsz += len; pa += len; sz -= len; - if (fragsz == (MAXDUMPPGS * PAGE_SIZE)) { + if (fragsz == maxdumpsz) { error = blk_flush(di); if (error) return (error); ==== //depot/projects/usiii/amd64/conf/GENERIC#5 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.491 2008/01/07 21:40:09 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.493 2008/02/19 06:30:49 ru Exp $ cpu HAMMER ident GENERIC @@ -30,7 +30,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols -options SCTP # Stream Control Transmission Protocol +options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -116,7 +116,6 @@ device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters - # SCSI peripherals device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers @@ -133,7 +132,6 @@ device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx -device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/usiii/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.74 2007/12/28 22:50:04 rpaulo Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.75 2008/02/03 07:07:30 scottl Exp $ # # @@ -381,11 +381,6 @@ device hptrr # -# Highpoint RocketRAID 232x. This is software RAID but with hardware -# acceleration assistance for RAID_5. -device rr232x - -# # Highpoint RocketRaid 3xxx series SATA RAID device hptiop ==== //depot/projects/usiii/amd64/linux32/linux32_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.45 2007/07/04 23:06:43 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.46 2008/02/11 19:35:03 jkim Exp $"); #include #include @@ -907,21 +907,22 @@ PROC_UNLOCK(p); } - /* This gives us our maximum stack size */ - if (linux_args->len > STACK_SIZE - GUARD_SIZE) - bsd_args.len = linux_args->len; - else - bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* - * This gives us a new BOS. If we're using VM_STACK, then - * mmap will just map the top SGROWSIZ bytes, and let - * the stack grow down to the limit at BOS. If we're - * not using VM_STACK we map the full stack, since we - * don't have a way to autogrow it. + * This gives us our maximum stack size and a new BOS. + * If we're using VM_STACK, then mmap will just map + * the top SGROWSIZ bytes, and let the stack grow down + * to the limit at BOS. If we're not using VM_STACK + * we map the full stack, since we don't have a way + * to autogrow it. */ - bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - - bsd_args.len; + if (linux_args->len > STACK_SIZE - GUARD_SIZE) { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); + bsd_args.len = linux_args->len; + } else { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - + (STACK_SIZE - GUARD_SIZE - linux_args->len); + bsd_args.len = STACK_SIZE - GUARD_SIZE; + } } else { bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; ==== //depot/projects/usiii/arm/arm/genassym.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.10 2007/08/08 09:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.11 2008/02/05 10:22:33 raj Exp $"); #include #include #include @@ -102,6 +102,8 @@ ASSYM(P_FLAG, offsetof(struct proc, p_flag)); ASSYM(ARM_TP_ADDRESS, ARM_TP_ADDRESS); +ASSYM(ARM_RAS_START, ARM_RAS_START); +ASSYM(ARM_RAS_END, ARM_RAS_END); ASSYM(PAGE_SIZE, PAGE_SIZE); ASSYM(PDESIZE, PDESIZE); ASSYM(PMAP_DOMAIN_KERNEL, PMAP_DOMAIN_KERNEL); ==== //depot/projects/usiii/arm/arm/locore.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.17 2007/09/27 20:52:17 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.18 2008/02/05 10:23:42 raj Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -69,7 +69,7 @@ #if defined (FLASHADDR) && defined(LOADERRAMADDR) /* Check if we're running from flash. */ ldr r7, =FLASHADDR - /* + /* * If we're running with MMU disabled, test against the * physical address instead. */ @@ -88,7 +88,7 @@ bls from_ram do_copy: ldr r9, =KERNBASE - adr r1, _start + adr r1, _start ldr r0, Lreal_start ldr r2, Lend sub r2, r2, r0 @@ -105,7 +105,7 @@ adr r7, Lunmapped bic r7, r7, #0xff000000 orr r7, r7, #PHYSADDR - + disable_mmu: /* Disable MMU for a while */ @@ -170,7 +170,7 @@ ldr pc, .Lvirt_done virt_done: - mov fp, #0 /* trace back starts here */ + mov fp, #0 /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ /* init arm will return the new stack pointer. */ @@ -180,7 +180,7 @@ adr r0, .Lmainreturned b _C_LABEL(panic) - /* NOTEACHED */ + /* NOTREACHED */ #ifdef STARTUP_PAGETABLE_ADDR #define MMU_INIT(va,pa,n_sec,attr) \ .word n_sec ; \ @@ -229,9 +229,6 @@ .text .align 0 -#ifndef OFW - /* OFW based systems will used OF_boot() */ - .Lcpufuncs: .word _C_LABEL(cpufuncs) @@ -260,7 +257,7 @@ mov r2, #0 /* - * MMU & IDC off, 32 bit program & data space + * MMU & IDC off, 32 bit program & data space * Hurl ourselves into the ROM */ mov r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE) @@ -285,7 +282,6 @@ .Lcpu_reset_needs_v4_MMU_disable: .word _C_LABEL(cpu_reset_needs_v4_MMU_disable) -#endif /* OFW */ #ifdef IPKDB /* ==== //depot/projects/usiii/arm/arm/swtch.S#3 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.21 2007/10/13 12:05:03 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.22 2008/02/05 10:22:33 raj Exp $"); /* @@ -205,7 +205,7 @@ /* Set the new tp */ ldr r6, [r5, #(TD_MD + MD_TP)] - mov r5, #ARM_TP_ADDRESS + ldr r5, =ARM_TP_ADDRESS strt r6, [r5] /* Hook in a new pcb */ @@ -263,7 +263,7 @@ * them for the new process. */ /* Store the old tp */ - mov r3, #ARM_TP_ADDRESS + ldr r3, =ARM_TP_ADDRESS ldrt r9, [r3] str r9, [r0, #(TD_MD + MD_TP)] ==== //depot/projects/usiii/arm/include/_bus.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- -% * Copyright (c) 2005 M. Warner Losh. + * Copyright (c) 2005 M. Warner Losh. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $ + * $FreeBSD: src/sys/arm/include/_bus.h,v 1.2 2008/02/26 11:45:32 rwatson Exp $ */ #ifndef ARM_INCLUDE__BUS_H ==== //depot/projects/usiii/arm/include/asmacros.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.7 2007/12/02 12:49:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.8 2008/02/05 10:22:33 raj Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -68,10 +68,10 @@ mov r0, r0; /* NOP for previous instruction */ \ mrs r0, spsr_all; /* Put the SPSR on the stack */ \ str r0, [sp, #-4]!; \ - mov r0, #0xe0000004; \ + ldr r0, =ARM_RAS_START; \ mov r1, #0; \ str r1, [r0]; \ - mov r0, #0xe0000008; \ + ldr r0, =ARM_RAS_END; \ mov r1, #0xffffffff; \ str r1, [r0]; @@ -119,11 +119,11 @@ add r0, sp, #(4*13); /* Adjust the stack pointer */ \ stmia r0, {r13-r14}^; /* Push the user mode registers */ \ mov r0, r0; /* NOP for previous instruction */ \ - ldr r5, =0xe0000004; /* Check if there's any RAS */ \ + ldr r5, =ARM_RAS_START; /* Check if there's any RAS */ \ ldr r3, [r5]; \ cmp r3, #0; /* Is the update needed ? */ \ ldrgt lr, [r0, #16]; \ - ldrgt r1, =0xe0000008; \ + ldrgt r1, =ARM_RAS_END; \ ldrgt r4, [r1]; /* Get the end of the RAS */ \ movgt r2, #0; /* Reset the magic addresses */ \ strgt r2, [r5]; \ ==== //depot/projects/usiii/arm/include/atomic.h#3 (text+ko) ==== @@ -33,18 +33,20 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.23 2007/12/02 12:49:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.24 2008/02/05 10:22:33 raj Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ - - #ifndef _LOCORE #include +#ifndef _KERNEL +#include +#endif + #ifndef I32_bit #define I32_bit (1 << 7) /* IRQ disable */ #endif @@ -71,9 +73,6 @@ : "cc" ); \ } while(0) -#define ARM_RAS_START 0xe0000004 -#define ARM_RAS_END 0xe0000008 - static __inline uint32_t __swp(uint32_t val, volatile uint32_t *ptr) { @@ -145,28 +144,24 @@ static __inline u_int32_t atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_int32_t newval) { - register int done, ras_start; + register int done, ras_start = ARM_RAS_START; __asm __volatile("1:\n" "adr %1, 1b\n" - "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "mov %0, #0xe0000008\n" "adr %1, 2f\n" - "str %1, [%0]\n" + "str %1, [%0, #4]\n" "ldr %1, [%2]\n" "cmp %1, %3\n" "streq %4, [%2]\n" "2:\n" "mov %1, #0\n" - "mov %0, #0xe0000004\n" "str %1, [%0]\n" "mov %1, #0xffffffff\n" - "mov %0, #0xe0000008\n" - "str %1, [%0]\n" + "str %1, [%0, #4]\n" "moveq %1, #1\n" "movne %1, #0\n" - : "=r" (ras_start), "=r" (done) + : "+r" (ras_start), "=r" (done) ,"+r" (p), "+r" (cmpval), "+r" (newval) : : "memory"); return (done); } @@ -174,106 +169,90 @@ static __inline void atomic_add_32(volatile u_int32_t *p, u_int32_t val) { - int ras_start, start; + int start, ras_start = ARM_RAS_START; __asm __volatile("1:\n" "adr %1, 1b\n" - "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "mov %0, #0xe0000008\n" "adr %1, 2f\n" - "str %1, [%0]\n" + "str %1, [%0, #4]\n" "ldr %1, [%2]\n" "add %1, %1, %3\n" "str %1, [%2]\n" "2:\n" - "mov %0, #0xe0000004\n" "mov %1, #0\n" "str %1, [%0]\n" "mov %1, #0xffffffff\n" - "mov %0, #0xe0000008\n" - "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val) + "str %1, [%0, #4]\n" + : "+r" (ras_start), "=r" (start), "+r" (p), "+r" (val) : : "memory"); } static __inline void atomic_subtract_32(volatile u_int32_t *p, u_int32_t val) { - int ras_start, start; + int start, ras_start = ARM_RAS_START; __asm __volatile("1:\n" "adr %1, 1b\n" - "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "mov %0, #0xe0000008\n" "adr %1, 2f\n" - "str %1, [%0]\n" + "str %1, [%0, #4]\n" "ldr %1, [%2]\n" "sub %1, %1, %3\n" "str %1, [%2]\n" "2:\n" - "mov %0, #0xe0000004\n" "mov %1, #0\n" "str %1, [%0]\n" "mov %1, #0xffffffff\n" - "mov %0, #0xe0000008\n" - "str %1, [%0]\n" + "str %1, [%0, #4]\n" - : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val) + : "+r" (ras_start), "=r" (start), "+r" (p), "+r" (val) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 29 23:34:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 764F51065689; Fri, 29 Feb 2008 23:34:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35FD01065682 for ; Fri, 29 Feb 2008 23:34:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E6C58FC1F for ; Fri, 29 Feb 2008 23:34:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TNYVOa017404 for ; Fri, 29 Feb 2008 23:34:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TNYVg1017402 for perforce@freebsd.org; Fri, 29 Feb 2008 23:34:31 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Feb 2008 23:34:31 GMT Message-Id: <200802292334.m1TNYVg1017402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 23:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=136530 Change 136530 by sam@sam_ebb on 2008/02/29 23:34:13 fix build w/o DEBUG but w/ WITNESS Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#10 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#10 (text+ko) ==== @@ -105,7 +105,7 @@ struct ieee80211_node *ni; enum ieee80211_state ostate; - IEEE80211_LOCK_ASSERT(ic); + IEEE80211_LOCK_ASSERT(vap->iv_ic); ostate = vap->iv_state; IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n", From owner-p4-projects@FreeBSD.ORG Fri Feb 29 23:35:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F28311065672; Fri, 29 Feb 2008 23:35:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0EBF1065675 for ; Fri, 29 Feb 2008 23:35:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A24C98FC1A for ; Fri, 29 Feb 2008 23:35:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1TNZXFk017489 for ; Fri, 29 Feb 2008 23:35:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TNZX3X017487 for perforce@freebsd.org; Fri, 29 Feb 2008 23:35:33 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Feb 2008 23:35:33 GMT Message-Id: <200802292335.m1TNZX3X017487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 23:35:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=136531 Change 136531 by sam@sam_ebb on 2008/02/29 23:35:12 merge adhoc mode scan changes from HEAD (done differently) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#19 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#19 (text+ko) ==== @@ -441,67 +441,12 @@ #undef N } -static const uint16_t rcl1[] = /* 8 FCC channel: 52, 56, 60, 64, 36, 40, 44, 48 */ -{ 5260, 5280, 5300, 5320, 5180, 5200, 5220, 5240 }; -static const uint16_t rcl2[] = /* 4 MKK channels: 34, 38, 42, 46 */ -{ 5170, 5190, 5210, 5230 }; -static const uint16_t rcl3[] = /* 2.4Ghz ch: 1,6,11,7,13 */ -{ 2412, 2437, 2462, 2442, 2472 }; -static const uint16_t rcl4[] = /* 5 FCC channel: 149, 153, 161, 165 */ -{ 5745, 5765, 5785, 5805, 5825 }; -static const uint16_t rcl7[] = /* 11 ETSI channel: 100,104,108,112,116,120,124,128,132,136,140 */ -{ 5500, 5520, 5540, 5560, 5580, 5600, 5620, 5640, 5660, 5680, 5700 }; -static const uint16_t rcl8[] = /* 2.4Ghz ch: 2,3,4,5,8,9,10,12 */ -{ 2417, 2422, 2427, 2432, 2447, 2452, 2457, 2467 }; -static const uint16_t rcl9[] = /* 2.4Ghz ch: 14 */ -{ 2484 }; -static const uint16_t rcl10[] = /* Added Korean channels 2312-2372 */ -{ 2312, 2317, 2322, 2327, 2332, 2337, 2342, 2347, 2352, 2357, 2362, 2367, 2372 }; -static const uint16_t rcl11[] = /* Added Japan channels in 4.9/5.0 spectrum */ -{ 5040, 5060, 5080, 4920, 4940, 4960, 4980 }; -#ifdef ATH_TURBO_SCAN -static const uint16_t rcl5[] = /* 3 static turbo channels */ -{ 5210, 5250, 5290 }; -static const uint16_t rcl6[] = /* 2 static turbo channels */ -{ 5760, 5800 }; -static const uint16_t rcl6x[] = /* 4 FCC3 turbo channels */ -{ 5540, 5580, 5620, 5660 }; -static const uint16_t rcl12[] = /* 2.4Ghz Turbo channel 6 */ -{ 2437 }; -static const uint16_t rcl13[] = /* dynamic Turbo channels */ -{ 5200, 5240, 5280, 5765, 5805 }; -#endif /* ATH_TURBO_SCAN */ - struct scanlist { uint16_t mode; uint16_t count; const uint16_t *list; }; -#define X(a) .count = sizeof(a)/sizeof(a[0]), .list = a - -static const struct scanlist staScanTable[] = { - { IEEE80211_MODE_11B, X(rcl3) }, - { IEEE80211_MODE_11A, X(rcl1) }, - { IEEE80211_MODE_11A, X(rcl2) }, - { IEEE80211_MODE_11B, X(rcl8) }, - { IEEE80211_MODE_11B, X(rcl9) }, - { IEEE80211_MODE_11A, X(rcl4) }, -#ifdef ATH_TURBO_SCAN - { IEEE80211_MODE_STURBO_A, X(rcl5) }, - { IEEE80211_MODE_STURBO_A, X(rcl6) }, - { IEEE80211_MODE_TURBO_A, X(rcl6x) }, - { IEEE80211_MODE_TURBO_A, X(rcl13) }, -#endif /* ATH_TURBO_SCAN */ - { IEEE80211_MODE_11A, X(rcl7) }, - { IEEE80211_MODE_11B, X(rcl10) }, - { IEEE80211_MODE_11A, X(rcl11) }, -#ifdef ATH_TURBO_SCAN - { IEEE80211_MODE_TURBO_G, X(rcl12) }, -#endif /* ATH_TURBO_SCAN */ - { .list = NULL } -}; - static int checktable(const struct scanlist *scan, const struct ieee80211_channel *c) { @@ -516,14 +461,61 @@ } static void -sta_makescanlist(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) +sweepchannels(struct ieee80211_scan_state *ss, struct ieee80211vap *vap, + const struct scanlist table[]) { -#define N(a) (sizeof(a)/sizeof(a[0])) struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_channel *c; + int i; + + for (i = 0; i < ic->ic_nchans; i++) { + if (ss->ss_last >= IEEE80211_SCAN_MAX) + break; + + c = &ic->ic_channels[i]; + /* + * Ignore dynamic turbo channels; we scan them + * in normal mode (i.e. not boosted). Likewise + * for HT channels, they get scanned using + * legacy rates. + */ + if (IEEE80211_IS_CHAN_DTURBO(c) || IEEE80211_IS_CHAN_HT(c)) + continue; + + /* + * If a desired mode was specified, scan only + * channels that satisfy that constraint. + */ + if (vap->iv_des_mode != IEEE80211_MODE_AUTO && + vap->iv_des_mode != ieee80211_chan2mode(c)) + continue; + + /* + * Skip channels excluded by user request. + */ + if (isexcluded(vap, c)) + continue; + + /* + * Add the channel unless it is listed in the + * fixed scan order tables. This insures we + * don't sweep back in channels we filtered out + * above. + */ + if (checktable(table, c)) + continue; + + /* Add channel to scanning list. */ + ss->ss_chans[ss->ss_last++] = c; + } +} + +static void +makescanlist(struct ieee80211_scan_state *ss, struct ieee80211vap *vap, + const struct scanlist table[]) +{ const struct scanlist *scan; enum ieee80211_phymode mode; - struct ieee80211_channel *c; - int i; ss->ss_last = 0; /* @@ -531,7 +523,7 @@ * of channels for scanning. Any channels in the ordered * list not in the master list will be discarded. */ - for (scan = staScanTable; scan->list != NULL; scan++) { + for (scan = table; scan->list != NULL; scan++) { mode = scan->mode; if (vap->iv_des_mode != IEEE80211_MODE_AUTO) { /* @@ -574,46 +566,65 @@ /* * Add the channels from the ic that are not present - * in the staScanTable. + * in the table. */ - for (i = 0; i < ic->ic_nchans; i++) { - if (ss->ss_last >= IEEE80211_SCAN_MAX) - break; - c = &ic->ic_channels[i]; - /* - * Ignore dynamic turbo channels; we scan them - * in normal mode (i.e. not boosted). Likewise - * for HT channels, they get scanned using - * legacy rates. - */ - if (IEEE80211_IS_CHAN_DTURBO(c) || IEEE80211_IS_CHAN_HT(c)) - continue; - /* - * If a desired mode was specified, scan only - * channels that satisfy that constraint. - */ - if (vap->iv_des_mode != IEEE80211_MODE_AUTO && - vap->iv_des_mode != ieee80211_chan2mode(c)) - continue; - /* - * Skip channels excluded by user request. - */ - if (isexcluded(vap, c)) - continue; - /* - * Add the channel unless it is listed in the - * fixed scan order tables. This insures we - * don't sweep back in channels we filtered out - * above. - */ - if (checktable(staScanTable, c)) - continue; + sweepchannels(ss, vap, table); +} + +static const uint16_t rcl1[] = /* 8 FCC channel: 52, 56, 60, 64, 36, 40, 44, 48 */ +{ 5260, 5280, 5300, 5320, 5180, 5200, 5220, 5240 }; +static const uint16_t rcl2[] = /* 4 MKK channels: 34, 38, 42, 46 */ +{ 5170, 5190, 5210, 5230 }; +static const uint16_t rcl3[] = /* 2.4Ghz ch: 1,6,11,7,13 */ +{ 2412, 2437, 2462, 2442, 2472 }; +static const uint16_t rcl4[] = /* 5 FCC channel: 149, 153, 161, 165 */ +{ 5745, 5765, 5785, 5805, 5825 }; +static const uint16_t rcl7[] = /* 11 ETSI channel: 100,104,108,112,116,120,124,128,132,136,140 */ +{ 5500, 5520, 5540, 5560, 5580, 5600, 5620, 5640, 5660, 5680, 5700 }; +static const uint16_t rcl8[] = /* 2.4Ghz ch: 2,3,4,5,8,9,10,12 */ +{ 2417, 2422, 2427, 2432, 2447, 2452, 2457, 2467 }; +static const uint16_t rcl9[] = /* 2.4Ghz ch: 14 */ +{ 2484 }; +static const uint16_t rcl10[] = /* Added Korean channels 2312-2372 */ +{ 2312, 2317, 2322, 2327, 2332, 2337, 2342, 2347, 2352, 2357, 2362, 2367, 2372 }; +static const uint16_t rcl11[] = /* Added Japan channels in 4.9/5.0 spectrum */ +{ 5040, 5060, 5080, 4920, 4940, 4960, 4980 }; +#ifdef ATH_TURBO_SCAN +static const uint16_t rcl5[] = /* 3 static turbo channels */ +{ 5210, 5250, 5290 }; +static const uint16_t rcl6[] = /* 2 static turbo channels */ +{ 5760, 5800 }; +static const uint16_t rcl6x[] = /* 4 FCC3 turbo channels */ +{ 5540, 5580, 5620, 5660 }; +static const uint16_t rcl12[] = /* 2.4Ghz Turbo channel 6 */ +{ 2437 }; +static const uint16_t rcl13[] = /* dynamic Turbo channels */ +{ 5200, 5240, 5280, 5765, 5805 }; +#endif /* ATH_TURBO_SCAN */ + +#define X(a) .count = sizeof(a)/sizeof(a[0]), .list = a - /* Add channel to scanning list. */ - ss->ss_chans[ss->ss_last++] = c; - } -#undef N -} +static const struct scanlist staScanTable[] = { + { IEEE80211_MODE_11B, X(rcl3) }, + { IEEE80211_MODE_11A, X(rcl1) }, + { IEEE80211_MODE_11A, X(rcl2) }, + { IEEE80211_MODE_11B, X(rcl8) }, + { IEEE80211_MODE_11B, X(rcl9) }, + { IEEE80211_MODE_11A, X(rcl4) }, +#ifdef ATH_TURBO_SCAN + { IEEE80211_MODE_STURBO_A, X(rcl5) }, + { IEEE80211_MODE_STURBO_A, X(rcl6) }, + { IEEE80211_MODE_TURBO_A, X(rcl6x) }, + { IEEE80211_MODE_TURBO_A, X(rcl13) }, +#endif /* ATH_TURBO_SCAN */ + { IEEE80211_MODE_11A, X(rcl7) }, + { IEEE80211_MODE_11B, X(rcl10) }, + { IEEE80211_MODE_11A, X(rcl11) }, +#ifdef ATH_TURBO_SCAN + { IEEE80211_MODE_TURBO_G, X(rcl12) }, +#endif /* ATH_TURBO_SCAN */ + { .list = NULL } +}; /* * Start a station-mode scan by populating the channel list. @@ -623,7 +634,7 @@ { struct sta_table *st = ss->ss_priv; - sta_makescanlist(ss, vap); + makescanlist(ss, vap, staScanTable); if (ss->ss_mindwell == 0) ss->ss_mindwell = msecs_to_ticks(20); /* 20ms */ @@ -1269,57 +1280,10 @@ static int adhoc_start(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) { -#define N(a) (sizeof(a)/sizeof(a[0])) struct sta_table *st = ss->ss_priv; - const struct scanlist *scan; - enum ieee80211_phymode mode; - ss->ss_last = 0; - /* - * Use the table of ordered channels to construct the list - * of channels for scanning. Any channels in the ordered - * list not in the master list will be discarded. - */ - for (scan = adhocScanTable; scan->list != NULL; scan++) { - mode = scan->mode; - if (vap->iv_des_mode != IEEE80211_MODE_AUTO) { - /* - * If a desired mode was specified, scan only - * channels that satisfy that constraint. - */ - if (vap->iv_des_mode != mode) { - /* - * The scan table marks 2.4Ghz channels as b - * so if the desired mode is 11g, then use - * the 11b channel list but upgrade the mode. - */ - /* XXX 11n upgrade */ - if (vap->iv_des_mode != IEEE80211_MODE_11G || - mode != IEEE80211_MODE_11B) - continue; - mode = IEEE80211_MODE_11G; /* upgrade */ - } - } else { - /* - * This lets add_channels upgrade an 11b channel - * to 11g if available. - */ - if (mode == IEEE80211_MODE_11B) - mode = IEEE80211_MODE_AUTO; - } -#ifdef IEEE80211_F_XR - /* XR does not operate on turbo channels */ - if ((vap->iv_flags & IEEE80211_F_XR) && - (mode == IEEE80211_MODE_TURBO_A || - mode == IEEE80211_MODE_TURBO_G)) - continue; -#endif - /* - * Add the list of the channels; any that are not - * in the master channel list will be discarded. - */ - add_channels(vap, ss, mode, scan->list, scan->count); - } + makescanlist(ss, vap, adhocScanTable); + if (ss->ss_mindwell == 0) ss->ss_mindwell = msecs_to_ticks(200); /* 200ms */ if (ss->ss_maxdwell == 0) @@ -1329,7 +1293,6 @@ st->st_newscan = 1; return 0; -#undef N } /* @@ -1513,7 +1476,7 @@ { struct sta_table *st = ss->ss_priv; - sta_makescanlist(ss, vap); + makescanlist(ss, vap, staScanTable); if (ss->ss_mindwell == 0) ss->ss_mindwell = msecs_to_ticks(200); /* 200ms */ From owner-p4-projects@FreeBSD.ORG Sat Mar 1 01:12:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A55C1065676; Sat, 1 Mar 2008 01:12:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19D2A106566B for ; Sat, 1 Mar 2008 01:12:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E33888FC1F for ; Sat, 1 Mar 2008 01:12:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m211CImN032987 for ; Sat, 1 Mar 2008 01:12:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m211CIRW032985 for perforce@freebsd.org; Sat, 1 Mar 2008 01:12:18 GMT (envelope-from sam@freebsd.org) Date: Sat, 1 Mar 2008 01:12:18 GMT Message-Id: <200803010112.m211CIRW032985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 01:12:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136541 Change 136541 by sam@sam_ebb on 2008/03/01 01:11:29 allocate space for sta info pre-zero'd MFP4 after: 3 days Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#33 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#33 (text+ko) ==== @@ -450,7 +450,7 @@ if (req.space > 0) { space = req.space; /* XXX M_WAITOK after driver lock released */ - MALLOC(p, void *, space, M_TEMP, M_NOWAIT); + MALLOC(p, void *, space, M_TEMP, M_NOWAIT | M_ZERO); if (p == NULL) { error = ENOMEM; goto bad; From owner-p4-projects@FreeBSD.ORG Sat Mar 1 01:17:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBF271065670; Sat, 1 Mar 2008 01:17:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B282106566B for ; Sat, 1 Mar 2008 01:17:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 708688FC23 for ; Sat, 1 Mar 2008 01:17:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m211HOq6033108 for ; Sat, 1 Mar 2008 01:17:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m211HOPh033106 for perforce@freebsd.org; Sat, 1 Mar 2008 01:17:24 GMT (envelope-from sam@freebsd.org) Date: Sat, 1 Mar 2008 01:17:24 GMT Message-Id: <200803010117.m211HOPh033106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 01:17:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=136542 Change 136542 by sam@sam_ebb on 2008/03/01 01:16:42 txrate passed out is no longer an index into the rate set; it's the ieee rate code Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#12 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#12 (text+ko) ==== @@ -3402,7 +3402,7 @@ return si->isi_flags & IEEE80211_CHAN_HT40 ? txrate : txrate / 2; } else - return (si->isi_rates[txrate] & IEEE80211_RATE_VAL) / 2; + return (txrate & IEEE80211_RATE_VAL) / 2; } static void From owner-p4-projects@FreeBSD.ORG Sat Mar 1 03:54:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 746E51065672; Sat, 1 Mar 2008 03:54:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34A3A106566B for ; Sat, 1 Mar 2008 03:54:01 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.226]) by mx1.freebsd.org (Postfix) with ESMTP id DB1E08FC17 for ; Sat, 1 Mar 2008 03:54:00 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: by wx-out-0506.google.com with SMTP id i29so4897550wxd.7 for ; Fri, 29 Feb 2008 19:53:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer:mime-version:content-type; bh=vaDW/yvZyI5eOMMQTUntgA8xCJLTHP0pyhZ9nPmczWQ=; b=a6KmHeGuI9K1RXovProXCpWbQYnNROUwUEUY2StzW3HfjylHlRzmdaPvXtm39jVmachIu1PfW0FFsHapQriqVuyla4CmFQJahFFNHxcrPf8B1lrZk7n+qjx2z7vTyqfO4E1tbUjX7qRGSXsO1CSYzDHNq+F/rZAUO3hVi0uCweY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer:mime-version:content-type; b=HADgkUhDSswtlFJuCKIKIUM47SAaSpeVbxk/O8bHoC6IHTUm3ZjB3AwZEk1OidLvT/gLJ9DuRx5lf7Yslt/+PflV4nzSpeRca6RthKujHyo4PMcFzzsho4JBuDym2q419R89bnQa0O736GZAG+n3N4NaZoSnjEQiN15kMDD8CYI= Received: by 10.70.32.10 with SMTP id f10mr8275297wxf.20.1204342186892; Fri, 29 Feb 2008 19:29:46 -0800 (PST) Received: from kan.dnsalias.net ( [24.218.183.247]) by mx.google.com with ESMTPS id h9sm9642334wxd.35.2008.02.29.19.29.45 (version=SSLv3 cipher=OTHER); Fri, 29 Feb 2008 19:29:45 -0800 (PST) Date: Fri, 29 Feb 2008 22:29:40 -0500 From: Alexander Kabaev To: "David E. O'Brien" Message-ID: <20080229222940.12b73ade@kan.dnsalias.net> In-Reply-To: <200802291948.m1TJmHX0092569@repoman.freebsd.org> References: <200802291948.m1TJmHX0092569@repoman.freebsd.org> X-Mailer: Claws Mail 3.3.0 (GTK+ 2.12.8; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ablZ_j75XPD0KfbrW_Q3+pP"; protocol="application/pgp-signature"; micalg=PGP-SHA1 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 136469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 03:54:02 -0000 --Sig_/ablZ_j75XPD0KfbrW_Q3+pP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Fri, 29 Feb 2008 19:48:17 GMT "David E. O'Brien" wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D136469 >=20 > Change 136469 by obrien@obrien_trang on 2008/02/29 00:22:37 >=20 > Zero out the new tcb. > Obtained from: Juniper Networks >=20 > Affected files ... >=20 > .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c= #3 > edit >=20 > Differences ... >=20 > =3D=3D=3D=3D //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pt= hread_md.c#3 > (text+ko) =3D=3D=3D=3D >=20 > @@ -42,6 +42,7 @@ > =20 > tcb =3D malloc(sizeof(struct tcb)); > if (tcb) > + bzero(tcb, sizeof(struct tcb)); > tcb->tcb_thread =3D thread; > return (tcb); > } Huh? The line below one you added is now redundant. --=20 Alexander Kabaev --Sig_/ablZ_j75XPD0KfbrW_Q3+pP Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (FreeBSD) iD8DBQFHyM2kQ6z1jMm+XZYRAqSMAJ4r28mRvB3B9F7NCV/AVCIBW3rCnwCgnTlu s0jYYSytBSEN1dKLl+Xvx6w= =one6 -----END PGP SIGNATURE----- --Sig_/ablZ_j75XPD0KfbrW_Q3+pP-- From owner-p4-projects@FreeBSD.ORG Sat Mar 1 04:02:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAFA61065671; Sat, 1 Mar 2008 04:02:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 809731065673; Sat, 1 Mar 2008 04:02:09 +0000 (UTC) (envelope-from haro@kgt.co.jp) Received: from mail02.kgt.co.jp (dmz02.kgt.co.jp [210.141.246.82]) by mx1.freebsd.org (Postfix) with ESMTP id 4E50A8FC17; Sat, 1 Mar 2008 04:02:09 +0000 (UTC) (envelope-from haro@kgt.co.jp) Received: from navgw.tt.kgt.co.jp (unknown [210.141.246.71]) by mail02.kgt.co.jp (Postfix) with ESMTP id 3763C3C3DD41; Sat, 1 Mar 2008 12:51:25 +0900 (JST) Received: from localhost (posh.tt.kgt.co.jp [192.168.15.51]) by navgw.tt.kgt.co.jp (Postfix) with ESMTP id 0099747711; Sat, 1 Mar 2008 12:51:24 +0900 (JST) Date: Sat, 01 Mar 2008 12:49:23 +0900 (JST) Message-Id: <20080301.124923.69822602.haro@kgt.co.jp> To: obrien@FreeBSD.org From: haro@kgt.co.jp In-Reply-To: <200802291948.m1TJmHX0092569@repoman.freebsd.org> References: <200802291948.m1TJmHX0092569@repoman.freebsd.org> X-Mailer: Mew version 4.2 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 136469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 04:02:10 -0000 From: "David E. O'Brien" Date: Fri, 29 Feb 2008 19:48:17 GMT ::http://perforce.freebsd.org/chv.cgi?CH=136469 :: ::Change 136469 by obrien@obrien_trang on 2008/02/29 00:22:37 :: :: Zero out the new tcb. :: Obtained from: Juniper Networks :: ::Affected files ... :: ::.. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#3 edit :: ::Differences ... :: ::==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#3 (text+ko) ==== :: ::@@ -42,6 +42,7 @@ :: :: tcb = malloc(sizeof(struct tcb)); :: if (tcb) ::+ bzero(tcb, sizeof(struct tcb)); :: tcb->tcb_thread = thread; :: return (tcb); :: } Hi Shouldn't we need '{', '}' around the 'if (tcb)' ? Thanks, Haro =----------------------------------------------------------------------- _ _ Munehiro (haro) Matsuda -|- /_\ |_|_| KGT Inc. /|\ |_| |_|_| 2-8-8 Shinjuku, Shinjuku-ku Tokyo 160-0022, Japan Tel: +81-3-3225-0767 Fax: +81-3-3225-0740 From owner-p4-projects@FreeBSD.ORG Sat Mar 1 07:18:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D64B7106566C; Sat, 1 Mar 2008 07:18:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 774901065671 for ; Sat, 1 Mar 2008 07:18:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F95C8FC15 for ; Sat, 1 Mar 2008 07:18:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m217ISuV074719 for ; Sat, 1 Mar 2008 07:18:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m217IRMM074710 for perforce@freebsd.org; Sat, 1 Mar 2008 07:18:27 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 1 Mar 2008 07:18:27 GMT Message-Id: <200803010718.m217IRMM074710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 07:18:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=136557 Change 136557 by kmacy@pandemonium:kmacy:xen31_7_0 on 2008/03/01 07:17:41 integrate Affected files ... .. //depot/projects/xen31_7_0/COPYRIGHT#1 branch .. //depot/projects/xen31_7_0/LOCKS#1 branch .. //depot/projects/xen31_7_0/MAINTAINERS#1 branch .. //depot/projects/xen31_7_0/Makefile#1 branch .. //depot/projects/xen31_7_0/Makefile.inc1#1 branch .. //depot/projects/xen31_7_0/ObsoleteFiles.inc#1 branch .. //depot/projects/xen31_7_0/README#1 branch .. //depot/projects/xen31_7_0/UPDATING#1 branch .. //depot/projects/xen31_7_0/bin/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/Makefile.inc#1 branch .. //depot/projects/xen31_7_0/bin/cat/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/cat/cat.1#1 branch .. //depot/projects/xen31_7_0/bin/cat/cat.c#1 branch .. //depot/projects/xen31_7_0/bin/chflags/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/chflags/chflags.1#1 branch .. //depot/projects/xen31_7_0/bin/chflags/chflags.c#1 branch .. //depot/projects/xen31_7_0/bin/chio/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/chio/chio.1#1 branch .. //depot/projects/xen31_7_0/bin/chio/chio.c#1 branch .. //depot/projects/xen31_7_0/bin/chio/defs.h#1 branch .. //depot/projects/xen31_7_0/bin/chio/pathnames.h#1 branch .. //depot/projects/xen31_7_0/bin/chmod/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/chmod/chmod.1#1 branch .. //depot/projects/xen31_7_0/bin/chmod/chmod.c#1 branch .. //depot/projects/xen31_7_0/bin/cp/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/cp/cp.1#1 branch .. //depot/projects/xen31_7_0/bin/cp/cp.c#1 branch .. //depot/projects/xen31_7_0/bin/cp/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/cp/utils.c#1 branch .. //depot/projects/xen31_7_0/bin/csh/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/xen31_7_0/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/xen31_7_0/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/xen31_7_0/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/xen31_7_0/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/xen31_7_0/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/xen31_7_0/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/xen31_7_0/bin/csh/config.h#1 branch .. //depot/projects/xen31_7_0/bin/csh/config_p.h#1 branch .. //depot/projects/xen31_7_0/bin/csh/host.defs#1 branch .. //depot/projects/xen31_7_0/bin/csh/iconv.h#1 branch .. //depot/projects/xen31_7_0/bin/csh/iconv_stub.c#1 branch .. //depot/projects/xen31_7_0/bin/date/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/date/date.1#1 branch .. //depot/projects/xen31_7_0/bin/date/date.c#1 branch .. //depot/projects/xen31_7_0/bin/date/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/date/netdate.c#1 branch .. //depot/projects/xen31_7_0/bin/date/vary.c#1 branch .. //depot/projects/xen31_7_0/bin/date/vary.h#1 branch .. //depot/projects/xen31_7_0/bin/dd/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/dd/args.c#1 branch .. //depot/projects/xen31_7_0/bin/dd/conv.c#1 branch .. //depot/projects/xen31_7_0/bin/dd/conv_tab.c#1 branch .. //depot/projects/xen31_7_0/bin/dd/dd.1#1 branch .. //depot/projects/xen31_7_0/bin/dd/dd.c#1 branch .. //depot/projects/xen31_7_0/bin/dd/dd.h#1 branch .. //depot/projects/xen31_7_0/bin/dd/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/dd/gen.c#1 branch .. //depot/projects/xen31_7_0/bin/dd/misc.c#1 branch .. //depot/projects/xen31_7_0/bin/dd/position.c#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.ascii#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.ebcdic#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.ibm#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.lcase#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.oldascii#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.oldibm#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.pareven#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.parnone#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.parodd#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.parset#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.swab#1 branch .. //depot/projects/xen31_7_0/bin/dd/ref.ucase#1 branch .. //depot/projects/xen31_7_0/bin/df/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/df/df.1#1 branch .. //depot/projects/xen31_7_0/bin/df/df.c#1 branch .. //depot/projects/xen31_7_0/bin/domainname/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/domainname/domainname.1#1 branch .. //depot/projects/xen31_7_0/bin/domainname/domainname.c#1 branch .. //depot/projects/xen31_7_0/bin/echo/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/echo/echo.1#1 branch .. //depot/projects/xen31_7_0/bin/echo/echo.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/ed/POSIX#1 branch .. //depot/projects/xen31_7_0/bin/ed/README#1 branch .. //depot/projects/xen31_7_0/bin/ed/buf.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/cbc.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/ed.1#1 branch .. //depot/projects/xen31_7_0/bin/ed/ed.h#1 branch .. //depot/projects/xen31_7_0/bin/ed/glbl.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/io.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/main.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/re.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/sub.c#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/=.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/README#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/TODO#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/a.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/a.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/a.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/a1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/a2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/addr.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/addr.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/addr.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/addr1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/addr2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/ascii.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/bang1.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/bang1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/bang1.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/bang1.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/bang2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/c.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/c.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/c.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/c1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/c2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/d.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/d.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/d.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/d.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e1.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e1.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e1.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e2.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e2.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e2.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e3.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e3.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e3.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e3.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e4.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e4.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/e4.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/f1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/f2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g1.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g1.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g1.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g2.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g2.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g2.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g3.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g3.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g3.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g3.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g4.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g4.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g4.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g5.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g5.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/g5.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/h.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/i.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/i.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/i.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/i1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/i2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/i3.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/j.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/j.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/j.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/k.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/k.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/k.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/k1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/k2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/k3.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/k4.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/l.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/l.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/l.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/m.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/m.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/m.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/m.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/n.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/n.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/n.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/nl.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/nl1.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/nl1.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/nl1.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/nl2.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/nl2.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/nl2.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/p.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/p.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/p.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/q.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/q.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/q.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/q1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r1.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r1.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r1.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r2.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r2.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r2.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r3.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r3.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/r3.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s1.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s1.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s1.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s10.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s2.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s2.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s2.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s3.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s3.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s3.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s3.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s4.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s5.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s6.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s7.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s8.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/s9.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t1.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t1.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t1.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t2.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t2.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/t2.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/u.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/u.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/u.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/u.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/v.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/v.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/v.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/w.d#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/w.r#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/w.t#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/w1.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/w2.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/w3.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/x.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/test/z.err#1 branch .. //depot/projects/xen31_7_0/bin/ed/undo.c#1 branch .. //depot/projects/xen31_7_0/bin/expr/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/expr/expr.1#1 branch .. //depot/projects/xen31_7_0/bin/expr/expr.y#1 branch .. //depot/projects/xen31_7_0/bin/getfacl/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/getfacl/getfacl.1#1 branch .. //depot/projects/xen31_7_0/bin/getfacl/getfacl.c#1 branch .. //depot/projects/xen31_7_0/bin/hostname/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/hostname/hostname.1#1 branch .. //depot/projects/xen31_7_0/bin/hostname/hostname.c#1 branch .. //depot/projects/xen31_7_0/bin/kenv/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/kenv/kenv.1#1 branch .. //depot/projects/xen31_7_0/bin/kenv/kenv.c#1 branch .. //depot/projects/xen31_7_0/bin/kill/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/kill/kill.1#1 branch .. //depot/projects/xen31_7_0/bin/kill/kill.c#1 branch .. //depot/projects/xen31_7_0/bin/ln/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/ln/ln.1#1 branch .. //depot/projects/xen31_7_0/bin/ln/ln.c#1 branch .. //depot/projects/xen31_7_0/bin/ln/symlink.7#1 branch .. //depot/projects/xen31_7_0/bin/ls/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/ls/cmp.c#1 branch .. //depot/projects/xen31_7_0/bin/ls/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/ls/ls.1#1 branch .. //depot/projects/xen31_7_0/bin/ls/ls.c#1 branch .. //depot/projects/xen31_7_0/bin/ls/ls.h#1 branch .. //depot/projects/xen31_7_0/bin/ls/print.c#1 branch .. //depot/projects/xen31_7_0/bin/ls/util.c#1 branch .. //depot/projects/xen31_7_0/bin/mkdir/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/mkdir/mkdir.1#1 branch .. //depot/projects/xen31_7_0/bin/mkdir/mkdir.c#1 branch .. //depot/projects/xen31_7_0/bin/mv/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/mv/mv.1#1 branch .. //depot/projects/xen31_7_0/bin/mv/mv.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/pax/ar_io.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/ar_subs.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/buf_subs.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/cache.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/cache.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/cpio.1#1 branch .. //depot/projects/xen31_7_0/bin/pax/cpio.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/cpio.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/file_subs.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/ftree.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/ftree.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/gen_subs.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/getoldopt.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/options.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/options.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/pat_rep.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/pat_rep.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/pax.1#1 branch .. //depot/projects/xen31_7_0/bin/pax/pax.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/pax.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/sel_subs.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/sel_subs.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/tables.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/tables.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/tar.1#1 branch .. //depot/projects/xen31_7_0/bin/pax/tar.c#1 branch .. //depot/projects/xen31_7_0/bin/pax/tar.h#1 branch .. //depot/projects/xen31_7_0/bin/pax/tty_subs.c#1 branch .. //depot/projects/xen31_7_0/bin/ps/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/ps/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/ps/fmt.c#1 branch .. //depot/projects/xen31_7_0/bin/ps/keyword.c#1 branch .. //depot/projects/xen31_7_0/bin/ps/nlist.c#1 branch .. //depot/projects/xen31_7_0/bin/ps/print.c#1 branch .. //depot/projects/xen31_7_0/bin/ps/ps.1#1 branch .. //depot/projects/xen31_7_0/bin/ps/ps.c#1 branch .. //depot/projects/xen31_7_0/bin/ps/ps.h#1 branch .. //depot/projects/xen31_7_0/bin/pwd/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/pwd/pwd.1#1 branch .. //depot/projects/xen31_7_0/bin/pwd/pwd.c#1 branch .. //depot/projects/xen31_7_0/bin/rcp/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/rcp/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/rcp/rcp.1#1 branch .. //depot/projects/xen31_7_0/bin/rcp/rcp.c#1 branch .. //depot/projects/xen31_7_0/bin/rcp/util.c#1 branch .. //depot/projects/xen31_7_0/bin/realpath/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/realpath/realpath.1#1 branch .. //depot/projects/xen31_7_0/bin/realpath/realpath.c#1 branch .. //depot/projects/xen31_7_0/bin/rm/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/rm/rm.1#1 branch .. //depot/projects/xen31_7_0/bin/rm/rm.c#1 branch .. //depot/projects/xen31_7_0/bin/rmail/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/rmdir/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/rmdir/rmdir.1#1 branch .. //depot/projects/xen31_7_0/bin/rmdir/rmdir.c#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/file.c#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/mask.c#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/merge.c#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/remove.c#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/setfacl.1#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/setfacl.c#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/setfacl.h#1 branch .. //depot/projects/xen31_7_0/bin/setfacl/util.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/sh/TOUR#1 branch .. //depot/projects/xen31_7_0/bin/sh/alias.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/alias.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/arith.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/arith.y#1 branch .. //depot/projects/xen31_7_0/bin/sh/arith_lex.l#1 branch .. //depot/projects/xen31_7_0/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/bltin/echo.1#1 branch .. //depot/projects/xen31_7_0/bin/sh/bltin/echo.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/builtins.def#1 branch .. //depot/projects/xen31_7_0/bin/sh/cd.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/cd.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/error.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/error.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/eval.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/eval.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/exec.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/exec.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/expand.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/expand.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/cmv#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/dirs#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/kill#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/login#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/newgrp#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/popd#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/pushd#1 branch .. //depot/projects/xen31_7_0/bin/sh/funcs/suspend#1 branch .. //depot/projects/xen31_7_0/bin/sh/histedit.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/init.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/input.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/input.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/jobs.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/jobs.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/mail.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/mail.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/main.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/main.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/memalloc.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/memalloc.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/miscbltin.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/mkbuiltins#1 branch .. //depot/projects/xen31_7_0/bin/sh/mkinit.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/mknodes.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/mksyntax.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/mktokens#1 branch .. //depot/projects/xen31_7_0/bin/sh/myhistedit.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/mystring.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/mystring.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/nodes.c.pat#1 branch .. //depot/projects/xen31_7_0/bin/sh/nodetypes#1 branch .. //depot/projects/xen31_7_0/bin/sh/options.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/options.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/output.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/output.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/parser.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/parser.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/redir.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/redir.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/sh.1#1 branch .. //depot/projects/xen31_7_0/bin/sh/shell.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/show.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/show.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/trap.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/trap.h#1 branch .. //depot/projects/xen31_7_0/bin/sh/var.c#1 branch .. //depot/projects/xen31_7_0/bin/sh/var.h#1 branch .. //depot/projects/xen31_7_0/bin/sleep/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/sleep/sleep.1#1 branch .. //depot/projects/xen31_7_0/bin/sleep/sleep.c#1 branch .. //depot/projects/xen31_7_0/bin/stty/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/stty/cchar.c#1 branch .. //depot/projects/xen31_7_0/bin/stty/extern.h#1 branch .. //depot/projects/xen31_7_0/bin/stty/gfmt.c#1 branch .. //depot/projects/xen31_7_0/bin/stty/key.c#1 branch .. //depot/projects/xen31_7_0/bin/stty/modes.c#1 branch .. //depot/projects/xen31_7_0/bin/stty/print.c#1 branch .. //depot/projects/xen31_7_0/bin/stty/stty.1#1 branch .. //depot/projects/xen31_7_0/bin/stty/stty.c#1 branch .. //depot/projects/xen31_7_0/bin/stty/stty.h#1 branch .. //depot/projects/xen31_7_0/bin/stty/util.c#1 branch .. //depot/projects/xen31_7_0/bin/sync/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/sync/sync.8#1 branch .. //depot/projects/xen31_7_0/bin/sync/sync.c#1 branch .. //depot/projects/xen31_7_0/bin/test/Makefile#1 branch .. //depot/projects/xen31_7_0/bin/test/TEST.README#1 branch .. //depot/projects/xen31_7_0/bin/test/TEST.csh#1 branch .. //depot/projects/xen31_7_0/bin/test/TEST.sh#1 branch .. //depot/projects/xen31_7_0/bin/test/test.1#1 branch .. //depot/projects/xen31_7_0/bin/test/test.c#1 branch .. //depot/projects/xen31_7_0/cddl/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/Makefile.inc#1 branch .. //depot/projects/xen31_7_0/cddl/lib/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/lib/Makefile.inc#1 branch .. //depot/projects/xen31_7_0/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/sbin/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/xen31_7_0/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/usr.bin/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/xen31_7_0/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/xen31_7_0/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/xen31_7_0/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/xen31_7_0/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/AUTHORS#1 branch .. //depot/projects/xen31_7_0/contrib/amd/BUGS#1 branch .. //depot/projects/xen31_7_0/contrib/amd/COPYING#1 branch .. //depot/projects/xen31_7_0/contrib/amd/ChangeLog#1 branch .. //depot/projects/xen31_7_0/contrib/amd/FAQ#1 branch .. //depot/projects/xen31_7_0/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/xen31_7_0/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/xen31_7_0/contrib/amd/INSTALL#1 branch .. //depot/projects/xen31_7_0/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/xen31_7_0/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/xen31_7_0/contrib/amd/NEWS#1 branch .. //depot/projects/xen31_7_0/contrib/amd/README#1 branch .. //depot/projects/xen31_7_0/contrib/amd/README.attrcache#1 branch .. //depot/projects/xen31_7_0/contrib/amd/README.ldap#1 branch .. //depot/projects/xen31_7_0/contrib/amd/README.y2k#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amd.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amd.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amd.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/autil.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/clock.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/conf.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/map.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/opts.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/restart.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/sched.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amq/amq.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amq/amq.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amq/amq.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/xen31_7_0/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/bootstrap#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/xen31_7_0/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/xen31_7_0/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/xen31_7_0/contrib/amd/doc/version.texi#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/xen31_7_0/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/xen31_7_0/contrib/amd/ldap.schema#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/xen31_7_0/contrib/amd/tasks#1 branch .. //depot/projects/xen31_7_0/contrib/amd/vers.m4#1 branch .. //depot/projects/xen31_7_0/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/xen31_7_0/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/AUTHORS#1 branch .. //depot/projects/xen31_7_0/contrib/bc/ChangeLog#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/FAQ#1 branch .. //depot/projects/xen31_7_0/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/xen31_7_0/contrib/bc/INSTALL#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Makefile.am#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bc/NEWS#1 branch .. //depot/projects/xen31_7_0/contrib/bc/README#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/array.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/atan.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/div.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/exp.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/fact.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/jn.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/ln.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/mul.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/raise.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/signum#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/sine.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/Test/timetest#1 branch .. //depot/projects/xen31_7_0/contrib/bc/acconfig.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/aclocal.m4#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/bc.y#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/const.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/execute.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/global.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/global.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/load.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/main.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/proto.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/scan.l#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/storage.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/bc/util.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/config.h.in#1 branch .. //depot/projects/xen31_7_0/contrib/bc/configure#1 branch .. //depot/projects/xen31_7_0/contrib/bc/configure.in#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/array.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/dc.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/dc.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/eval.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/misc.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/stack.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/dc/string.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/xen31_7_0/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bc/doc/bc.1#1 branch .. //depot/projects/xen31_7_0/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/xen31_7_0/contrib/bc/doc/dc.1#1 branch .. //depot/projects/xen31_7_0/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/xen31_7_0/contrib/bc/h/number.h#1 branch .. //depot/projects/xen31_7_0/contrib/bc/install-sh#1 branch .. //depot/projects/xen31_7_0/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/xen31_7_0/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bc/lib/number.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/xen31_7_0/contrib/bc/missing#1 branch .. //depot/projects/xen31_7_0/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/xen31_7_0/contrib/bc/stamp-h.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/CHANGES#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/FAQ#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/README#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/README.idnkit#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/acconfig.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/config.guess#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/config.sub#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/config.threads.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/configure.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/xen31_7_0/contrib/bind9/doc/rfc/rfc2163.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 1 08:29:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65FE81065674; Sat, 1 Mar 2008 08:29:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24ECE1065671 for ; Sat, 1 Mar 2008 08:29:44 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D00C8FC27 for ; Sat, 1 Mar 2008 08:29:44 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m218ThQe081204 for ; Sat, 1 Mar 2008 08:29:43 GMT (envelope-from cperciva@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m218Thfx081202 for perforce@freebsd.org; Sat, 1 Mar 2008 08:29:43 GMT (envelope-from cperciva@freebsd.org) Date: Sat, 1 Mar 2008 08:29:43 GMT Message-Id: <200803010829.m218Thfx081202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cperciva@freebsd.org using -f From: Colin Percival To: Perforce Change Reviews Cc: Subject: PERFORCE change 136559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 08:29:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=136559 Change 136559 by cperciva@cperciva_freefall on 2008/03/01 08:29:41 Backport Xen bits. Affected files ... .. //depot/projects/xen31_7_0/etc/Makefile#2 edit .. //depot/projects/xen31_7_0/etc/etc.xen/ttys#1 add .. //depot/projects/xen31_7_0/sys/conf/files#2 edit .. //depot/projects/xen31_7_0/sys/conf/files.i386#2 edit .. //depot/projects/xen31_7_0/sys/conf/options.i386#2 edit .. //depot/projects/xen31_7_0/sys/dev/sound/pcm/sound.h#2 edit .. //depot/projects/xen31_7_0/sys/dev/xen/balloon/balloon.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/blkback/blkback.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/blkfront/blkfront.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/blkfront/block.h#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/console/console.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/console/xencons_ring.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/console/xencons_ring.h#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/evtchn/evtchn_dev.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/netback/netback.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/netfront/mbufq.h#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/netfront/netfront.c#1 add .. //depot/projects/xen31_7_0/sys/dev/xen/pcifront/pcifront.c#1 add .. //depot/projects/xen31_7_0/sys/i386/conf/DEFAULTS#2 edit .. //depot/projects/xen31_7_0/sys/i386/conf/XEN#1 add .. //depot/projects/xen31_7_0/sys/i386/i386/genassym.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/i386/intr_machdep.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/i386/machdep.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/i386/support.s#2 edit .. //depot/projects/xen31_7_0/sys/i386/i386/swtch.s#2 edit .. //depot/projects/xen31_7_0/sys/i386/i386/sys_machdep.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/i386/trap.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/i386/vm_machdep.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/asmacros.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/cpufunc.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/pcpu.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/pmap.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/psl.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/segments.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/trap.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/vmparam.h#2 edit .. //depot/projects/xen31_7_0/sys/i386/include/xen/evtchn.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/features.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/hypercall.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/hypervisor.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/synch_bitops.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/xen-os.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/xen_intr.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/xenbus.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/xenfunc.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/xenpmap.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/xenstored.h#1 add .. //depot/projects/xen31_7_0/sys/i386/include/xen/xenvar.h#1 add .. //depot/projects/xen31_7_0/sys/i386/isa/npx.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/pci/pci_cfgreg.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/pci/pci_pir.c#2 edit .. //depot/projects/xen31_7_0/sys/i386/xen/clock.c#1 add .. //depot/projects/xen31_7_0/sys/i386/xen/exception.s#1 add .. //depot/projects/xen31_7_0/sys/i386/xen/locore.s#1 add .. //depot/projects/xen31_7_0/sys/i386/xen/machdep.c#1 add .. //depot/projects/xen31_7_0/sys/i386/xen/pmap.c#1 add .. //depot/projects/xen31_7_0/sys/i386/xen/xen_bus.c#1 add .. //depot/projects/xen31_7_0/sys/i386/xen/xen_machdep.c#1 add .. //depot/projects/xen31_7_0/sys/kern/init_main.c#2 edit .. //depot/projects/xen31_7_0/sys/kern/kern_fork.c#2 edit .. //depot/projects/xen31_7_0/sys/kern/kern_switch.c#2 edit .. //depot/projects/xen31_7_0/sys/kern/subr_kdb.c#2 edit .. //depot/projects/xen31_7_0/sys/kern/subr_trap.c#2 edit .. //depot/projects/xen31_7_0/sys/libkern/strcspn.c#1 add .. //depot/projects/xen31_7_0/sys/sys/cdefs.h#2 edit .. //depot/projects/xen31_7_0/sys/sys/libkern.h#2 edit .. //depot/projects/xen31_7_0/sys/vm/pmap.h#2 edit .. //depot/projects/xen31_7_0/sys/vm/vm_fault.c#2 edit .. //depot/projects/xen31_7_0/sys/vm/vm_page.c#2 edit .. //depot/projects/xen31_7_0/sys/xen/evtchn/evtchn.c#1 add .. //depot/projects/xen31_7_0/sys/xen/evtchn/evtchn_dev.c#1 add .. //depot/projects/xen31_7_0/sys/xen/features.c#1 add .. //depot/projects/xen31_7_0/sys/xen/gnttab.c#1 add .. //depot/projects/xen31_7_0/sys/xen/gnttab.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/COPYING#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/acm.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/acm_ops.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/arch-ia64.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/arch-powerpc.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/arch-x86/xen-x86_32.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/arch-x86/xen-x86_64.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/arch-x86/xen.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/arch-x86_32.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/arch-x86_64.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/callback.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/dom0_ops.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/domctl.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/elfnote.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/elfstructs.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/event_channel.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/features.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/foreign/Makefile#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/foreign/mkchecker.py#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/foreign/mkheader.py#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/foreign/reference.size#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/foreign/structs.py#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/grant_table.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/hvm/e820.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/hvm/hvm_info_table.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/hvm/hvm_op.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/hvm/ioreq.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/hvm/params.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/hvm/save.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/hvm/vmx_assist.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/blkif.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/console.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/fbif.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/kbdif.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/netif.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/pciif.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/protocols.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/ring.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/tpmif.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/xenbus.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/io/xs_wire.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/kexec.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/libelf.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/memory.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/nmi.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/physdev.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/platform.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/sched.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/sysctl.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/trace.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/vcpu.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/version.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/xen-compat.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/xen.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/xencomm.h#1 add .. //depot/projects/xen31_7_0/sys/xen/interface/xenoprof.h#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/init.txt#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/xenbus_client.c#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/xenbus_comms.c#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/xenbus_comms.h#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/xenbus_dev.c#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/xenbus_probe.c#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/xenbus_probe_backend.c#1 add .. //depot/projects/xen31_7_0/sys/xen/xenbus/xenbus_xs.c#1 add Differences ... ==== //depot/projects/xen31_7_0/etc/Makefile#2 (text+ko) ==== @@ -7,6 +7,8 @@ SUBDIR= sendmail .endif +TTY_ARCH?= ${MACHINE_ARCH} + BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ dhclient.conf disktab fbtab freebsd-update.conf \ @@ -19,7 +21,7 @@ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ snmpd.config sysctl.conf syslog.conf \ - etc.${MACHINE_ARCH}/ttys \ + etc.${TTY_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ${.CURDIR}/../usr.bin/locate/locate/locate.rc ==== //depot/projects/xen31_7_0/sys/conf/files#2 (text+ko) ==== @@ -1583,6 +1583,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2105,6 +2106,21 @@ vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard +xen/gnttab.c optional xen +xen/features.c optional xen +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen +xen/xenbus/xenbus_client.c optional xen +xen/xenbus/xenbus_comms.c optional xen +xen/xenbus/xenbus_dev.c optional xen +xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen +dev/xen/netfront/netfront.c optional xen + # gnu/fs/xfs/xfs_alloc.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \ ==== //depot/projects/xen31_7_0/sys/conf/files.i386#2 (text+ko) ==== @@ -259,8 +259,8 @@ i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -269,7 +269,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -282,9 +283,11 @@ i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -296,7 +299,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c optional native +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/support.s standard i386/i386/swtch.s standard @@ -306,6 +310,7 @@ i386/i386/uio_machdep.c standard i386/i386/vm86.c standard i386/i386/vm_machdep.c standard +i386/xen/xen_bus.c optional xen i386/ibcs2/ibcs2_errno.c optional ibcs2 i386/ibcs2/ibcs2_fcntl.c optional ibcs2 i386/ibcs2/ibcs2_ioctl.c optional ibcs2 @@ -325,9 +330,10 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard -i386/isa/clock.c standard +i386/isa/clock.c optional native +i386/xen/clock.c optional xen i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa ==== //depot/projects/xen31_7_0/sys/conf/options.i386#2 (text+ko) ==== @@ -36,6 +36,9 @@ # Physical address extensions and support for >4G ram. As above. PAE opt_global.h +XEN opt_global.h +NATIVE opt_global.h + CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h ==== //depot/projects/xen31_7_0/sys/dev/sound/pcm/sound.h#2 (text+ko) ==== @@ -31,12 +31,13 @@ * first, include kernel header files. */ -#ifndef _OS_H_ -#define _OS_H_ +#ifndef _SOUND_IS_A_PAIN_IN_MY_ASS_H_ +#define _SOUND_IS_A_PAIN_IN_MY_ASS_H_ #ifdef _KERNEL #include #include +#include #include #include #include @@ -545,17 +546,14 @@ int sndstat_unregister(device_t dev); int sndstat_unregisterfile(char *str); -#define SND_DECLARE_FILE(version) \ - _SND_DECLARE_FILE(__LINE__, version) - -#define _SND_DECLARE_FILE(uniq, version) \ - __SND_DECLARE_FILE(uniq, version) - #define __SND_DECLARE_FILE(uniq, version) \ - static char sndstat_vinfo[] = version; \ + static char sndstat_vinfo[] = version; \ SYSINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_registerfile, sndstat_vinfo); \ SYSUNINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_unregisterfile, sndstat_vinfo); +#define SND_DECLARE_FILE(version) \ + __SND_DECLARE_FILE(__LINE__, (version)) + /* usage of flags in device config entry (config file) */ #define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */ #define DV_F_DUAL_DMA 0x00000010 /* set to use secondary dma channel */ ==== //depot/projects/xen31_7_0/sys/i386/conf/DEFAULTS#2 (text+ko) ==== @@ -15,6 +15,7 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device +device atpic # UART chips on this platform device uart_ns8250 @@ -23,5 +24,4 @@ options GEOM_BSD options GEOM_MBR -# KSE support went from being default to a kernel option -options KSE +options NATIVE ==== //depot/projects/xen31_7_0/sys/i386/i386/genassym.c#2 (text+ko) ==== @@ -228,3 +228,9 @@ ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); #endif + +#ifdef XEN +#include +ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3)); +ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START); +#endif ==== //depot/projects/xen31_7_0/sys/i386/i386/intr_machdep.c#2 (text+ko) ==== @@ -395,7 +395,8 @@ /* Schedule the ithread if needed. */ if (thread) { error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("bad stray interrupt")); + if (error != 0) + log(LOG_CRIT, "bad stray interrupt %d", vector); } critical_exit(); td->td_intr_nesting_level--; ==== //depot/projects/xen31_7_0/sys/i386/i386/machdep.c#2 (text+ko) ==== @@ -54,6 +54,7 @@ #include "opt_npx.h" #include "opt_perfmon.h" #include "opt_xbox.h" +#include "opt_global.h" #include #include @@ -142,6 +143,25 @@ uint32_t arch_i386_xbox_memsize = 0; #endif +#ifdef XEN +/* XEN includes */ +#include +#include +#include +#include +#include + +void Xhypervisor_callback(void); +void failsafe_callback(void); + +int gdt_set; +extern trap_info_t trap_table[]; +struct proc_ldt default_proc_ldt; +extern int init_first; +int running_xen = 1; +extern unsigned long physfree; +#endif + /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -286,8 +306,9 @@ */ bufinit(); vm_pager_bufferinit(); - +#ifndef XEN cpu_setregs(); +#endif } /* @@ -1117,6 +1138,25 @@ return (0); } +static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); +SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, + &cpu_idle_hlt, 0, "Idle loop HLT enable"); + +#ifdef XEN +void +cpu_halt(void) +{ + HYPERVISOR_shutdown(SHUTDOWN_poweroff); +} + +static void +cpu_idle_default(void) +{ + idle_block(); +} + +#else /* * Shutdown the CPU as much as possible */ @@ -1142,10 +1182,6 @@ * XXX I'm turning it on for SMP as well by default for now. It seems to * help lock contention somewhat, and this is critical for HTT. -Peter */ -static int cpu_idle_hlt = 1; -TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); -SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, - &cpu_idle_hlt, 0, "Idle loop HLT enable"); static void cpu_idle_default(void) @@ -1157,7 +1193,7 @@ */ __asm __volatile("sti; hlt"); } - +#endif /* * Note that we have to be careful here to avoid a race between checking * sched_runnable() and actually halting. If we don't do this, we may waste @@ -1307,10 +1343,16 @@ */ int _default_ldt; +#ifdef XEN +union descriptor *gdt; +union descriptor *ldt; +#else union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ +union descriptor ldt[NLDT]; /* local descriptor table */ +#endif + static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -union descriptor ldt[NLDT]; /* local descriptor table */ struct region_descriptor r_gdt, r_idt; /* table descriptors */ struct mtx dt_lock; /* lock for GDT and LDT */ @@ -1344,7 +1386,7 @@ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1371,7 +1413,7 @@ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ SDT_MEMERA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1380,7 +1422,7 @@ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1407,17 +1449,18 @@ { 0x400, /* segment base address */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, +#ifndef XEN /* GPROC0_SEL 9 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ sizeof(struct i386tss)-1,/* length */ SDT_SYS386TSS, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ @@ -1430,12 +1473,12 @@ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, + 0 /* limit granularity (byte/page units)*/ }, /* GUSERLDT_SEL 11 User LDT Descriptor per process */ { (int) ldt, /* segment base address */ (512 * sizeof(union descriptor)-1), /* length */ SDT_SYSLDT, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ @@ -1444,7 +1487,7 @@ { (int) &dblfault_tss, /* segment base address */ sizeof(struct i386tss)-1,/* length - all address space */ SDT_SYS386TSS, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ @@ -1453,7 +1496,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1462,7 +1505,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1471,7 +1514,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1480,7 +1523,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1489,7 +1532,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1498,11 +1541,12 @@ { 0x0, /* segment base address */ 0x0, /* length */ 0, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 0, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +#endif /* !XEN */ }; static struct soft_segment_descriptor ldt_segs[] = { @@ -1687,7 +1731,16 @@ goto physmap_done; } #endif - +#if defined(XEN) + Maxmem = xen_start_info->nr_pages - init_first; + physmem = Maxmem; + basemem = 0; + physmap[0] = init_first << PAGE_SHIFT; + physmap[1] = ptoa(Maxmem) - round_page(MSGBUF_SIZE); + physmap_idx = 0; + goto physmap_done; +#endif + hasbrokenint12 = 0; TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); @@ -1864,7 +1917,7 @@ vmf.vmf_ah = 0x88; vm86_intcall(0x15, &vmf); extmem = vmf.vmf_ax; -#else +#elif !defined(XEN) /* * Prefer the RTC value for extended memory. */ @@ -1955,6 +2008,7 @@ getenv_quad("dcons.size", &dcons_size) == 0) dcons_addr = 0; +#ifndef XEN /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. @@ -2072,7 +2126,11 @@ } *pte = 0; invltlb(); - +#else + phys_avail[0] = physfree; + phys_avail[1] = xen_start_info->nr_pages*PAGE_SIZE; +#endif /* XEN */ + /* * XXX * The last chunk must contain at least one page plus the message @@ -2095,9 +2153,271 @@ for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + off); + + PT_UPDATES_FLUSH(); } +#ifdef XEN +extern vm_paddr_t *pdir_shadow; + + +#define MTOPSIZE (1<<(14 + PAGE_SHIFT)) void +init386(int first) +{ + int error, gsel_tss, metadata_missing, x; + unsigned long gdtmachpfn; + struct pcpu *pc; + struct callback_register event = { + .type = CALLBACKTYPE_event, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)Xhypervisor_callback }, + }; + struct callback_register failsafe = { + .type = CALLBACKTYPE_failsafe, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback }, + }; + + thread0.td_kstack = proc0kstack; + thread0.td_pcb = (struct pcb *) + (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + + /* + * This may be done better later if it gets more high level + * components in it. If so just link td->td_proc here. + */ + proc_linkup0(&proc0, &thread0); + + metadata_missing = 0; + if (xen_start_info->mod_start) { + preload_metadata = (caddr_t)xen_start_info->mod_start; + preload_bootstrap_relocate(KERNBASE); + } else { + metadata_missing = 1; + } + if (envmode == 1) + kern_envp = static_env; + else if ((caddr_t)xen_start_info->cmd_line) + kern_envp = xen_setbootenv((caddr_t)xen_start_info->cmd_line); + + boothowto |= xen_boothowto(kern_envp); + + /* Init basic tunables, hz etc */ + init_param1(); + + /* + * XEN occupies a portion of the upper virtual address space + * At its base it manages an array mapping machine page frames + * to physical page frames - hence we need to be able to + * access 4GB - (64MB - 4MB + 64k) + */ + gdt_segs[GPRIV_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUFS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUGS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GBIOSLOWMEM_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + +#ifdef SMP + pc = &SMP_prvspace[0].pcpu; +#else + pc = &__pcpu; +#endif + + gdt_segs[GPRIV_SEL].ssd_base = (int) pc; + gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; + + PT_SET_MA(gdt, xpmap_ptom(VTOP(gdt)) | PG_V | PG_RW); + bzero(gdt, PAGE_SIZE); + for (x = 0; x < NGDT; x++) + ssdtosd(&gdt_segs[x], &gdt[x].sd); + + + mtx_init(&dt_lock, "descriptor tables", NULL, MTX_SPIN); + + printk("gdt=%p\n", gdt); + printk("PTmap=%p\n", PTmap); + printk("addr=%p\n", *vtopte((unsigned long)gdt) & ~PG_RW); + + gdtmachpfn = vtomach(gdt) >> PAGE_SHIFT; + PT_SET_MA(gdt, *vtopte((unsigned long)gdt) & ~(PG_RW|PG_M|PG_A)); + PANIC_IF(HYPERVISOR_set_gdt(&gdtmachpfn, 512) != 0); + lgdt(&r_gdt /* unused */); + gdt_set = 1; + + if ((error = HYPERVISOR_set_trap_table(trap_table)) != 0) { + panic("set_trap_table failed - error %d\n", error); + } + + error = HYPERVISOR_callback_op(CALLBACKOP_register, &event); + if (error == 0) + error = HYPERVISOR_callback_op(CALLBACKOP_register, &failsafe); +#if CONFIG_XEN_COMPAT <= 0x030002 + if (error == -ENOXENSYS) + HYPERVISOR_set_callbacks(GSEL(GCODE_SEL, SEL_KPL), + (unsigned long)Xhypervisor_callback, + GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback); +#endif + pcpu_init(pc, 0, sizeof(struct pcpu)); + PCPU_SET(prvspace, pc); + PCPU_SET(curthread, &thread0); + PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(pdir, (unsigned long)IdlePTD); + PCPU_SET(pdir_shadow, pdir_shadow); + + /* + * Initialize mutexes. + * + * icu_lock: in order to allow an interrupt to occur in a critical + * section, to set pcpu->ipending (etc...) properly, we + * must be able to get the icu lock, so it can't be + * under witness. + */ + mutex_init(); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS | MTX_NOPROFILE); + + /* make ldt memory segments */ + PT_SET_MA(ldt, xpmap_ptom(VTOP(ldt)) | PG_V | PG_RW); + bzero(ldt, PAGE_SIZE); + ldt_segs[LUCODE_SEL].ssd_limit = atop(0 - 1); + ldt_segs[LUDATA_SEL].ssd_limit = atop(0 - 1); + for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++) + ssdtosd(&ldt_segs[x], &ldt[x].sd); + + default_proc_ldt.ldt_base = (caddr_t)ldt; + default_proc_ldt.ldt_len = 6; + _default_ldt = (int)&default_proc_ldt; + PCPU_SET(currentldt, _default_ldt) + PT_SET_MA(ldt, *vtopte((unsigned long)ldt) & ~PG_RW); + xen_set_ldt((unsigned long) ldt, (sizeof ldt_segs / sizeof ldt_segs[0])); + +#ifdef XBOX + /* + * The following code queries the PCI ID of 0:0:0. For the XBOX, + * This should be 0x10de / 0x02a5. + * + * This is exactly what Linux does. + */ + outl(0xcf8, 0x80000000); + if (inl(0xcfc) == 0x02a510de) { + arch_i386_is_xbox = 1; + pic16l_setled(XBOX_LED_GREEN); + + /* + * We are an XBOX, but we may have either 64MB or 128MB of + * memory. The PCI host bridge should be programmed for this, + * so we just query it. + */ + outl(0xcf8, 0x80000084); + arch_i386_xbox_memsize = (inl(0xcfc) == 0x7FFFFFF) ? 128 : 64; + } +#endif /* XBOX */ +#if defined (XEN_PRIVILEGED) + /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); +#endif + /* + * Initialize the console before we print anything out. + */ + cninit(); + + if (metadata_missing) + printf("WARNING: loader(8) metadata is missing!\n"); + +#ifdef DEV_ISA + if (xen_start_info->flags & SIF_PRIVILEGED) { + elcr_probe(); +#ifdef DEV_ATPIC + atpic_startup(); +#endif + } +#endif + +#ifdef DDB + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; +#endif + + kdb_init(); + +#ifdef KDB + if (boothowto & RB_KDB) + kdb_enter("Boot flags requested debugger"); +#endif + + finishidentcpu(); /* Final stage of CPU initialization */ + setidt(IDT_UD, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + setidt(IDT_GP, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + initializecpu(); /* Initialize CPU registers */ + + /* make an initial tss so cpu can get interrupt stack on syscall! */ + /* Note: -16 is so we can grow the trapframe if we came from vm86 */ + PCPU_SET(common_tss.tss_esp0, thread0.td_kstack + + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16); + PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL)); + gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); + HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), + PCPU_GET(common_tss.tss_esp0)); + + + /* pointer to selector slot for %fs/%gs */ + PCPU_SET(fsgs_gdt, &gdt[GUFS_SEL].sd); + + dblfault_tss.tss_esp = dblfault_tss.tss_esp0 = dblfault_tss.tss_esp1 = + dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; + dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = + dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL); +#ifdef PAE + dblfault_tss.tss_cr3 = (int)IdlePDPT; +#else + dblfault_tss.tss_cr3 = (int)IdlePTD; +#endif + dblfault_tss.tss_eip = (int)dblfault_handler; + dblfault_tss.tss_eflags = PSL_KERNEL; + dblfault_tss.tss_ds = dblfault_tss.tss_es = + dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL); + dblfault_tss.tss_fs = GSEL(GPRIV_SEL, SEL_KPL); + dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); + dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); + + vm86_initialize(); + PCPU_SET(pdir_shadow, pdir_shadow); + getmemsize(first); + init_param2(physmem); + + /* now running on new page tables, configured,and u/iom is accessible */ + + msgbufinit(msgbufp, MSGBUF_SIZE); + + /* transfer to user mode */ + + _ucodesel = GSEL(GUCODE_SEL, SEL_UPL); + _udatasel = GSEL(GUDATA_SEL, SEL_UPL); + + /* setup proc 0's pcb */ + thread0.td_pcb->pcb_flags = 0; +#ifdef PAE + thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; +#else + thread0.td_pcb->pcb_cr3 = (int)IdlePTD; +#endif + thread0.td_pcb->pcb_ext = 0; + thread0.td_frame = &proc0_tf; + thread0.td_pcb->pcb_fsd = PCPU_GET(fsgs_gdt)[0]; + thread0.td_pcb->pcb_gsd = PCPU_GET(fsgs_gdt)[1]; +} + + + +#else + +void init386(first) int first; { @@ -2363,6 +2683,7 @@ thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; } +#endif /* !XEN */ void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) ==== //depot/projects/xen31_7_0/sys/i386/i386/support.s#2 (text+ko) ==== @@ -1459,10 +1459,11 @@ */ /* void lgdt(struct region_descriptor *rdp); */ ENTRY(lgdt) +#ifndef XEN /* reload the descriptor table */ movl 4(%esp),%eax lgdt (%eax) - +#endif /* flush the prefetch q */ jmp 1f nop ==== //depot/projects/xen31_7_0/sys/i386/i386/swtch.s#2 (text+ko) ==== @@ -88,7 +88,7 @@ movl 8(%esp),%ecx /* New thread */ movl TD_PCB(%ecx),%edx movl PCB_CR3(%edx),%eax - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* set bit in new pm_active */ movl TD_PROC(%ecx),%eax movl P_VMSPACE(%eax), %ebx @@ -181,10 +181,10 @@ cmpl %eax,IdlePTD /* Kernel address space? */ #endif je sw0 - movl %cr3,%ebx /* The same address space? */ + READ_CR3(%ebx) /* The same address space? */ cmpl %ebx,%eax je sw0 - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* new address space */ movl %esi,%eax movl PCPU(CPUID),%esi SETOP %eax,TD_LOCK(%edi) /* Switchout td_lock */ @@ -211,6 +211,18 @@ SETOP %esi,TD_LOCK(%edi) /* Switchout td_lock */ sw1: BLOCK_SPIN(%ecx) +#ifdef XEN + pushl %eax + pushl %ecx + pushl %edx + call xen_handle_thread_switch + popl %edx + popl %ecx + popl %eax + /* + * XXX set IOPL + */ +#else /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. @@ -259,7 +271,7 @@ movl 12(%esi), %ebx movl %eax, 8(%edi) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 1 11:01:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E37D31065678; Sat, 1 Mar 2008 11:01:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FFCB1065677 for ; Sat, 1 Mar 2008 11:01:21 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C3938FC24 for ; Sat, 1 Mar 2008 11:01:21 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21B1L4n003727 for ; Sat, 1 Mar 2008 11:01:21 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21B1LR2003725 for perforce@freebsd.org; Sat, 1 Mar 2008 11:01:21 GMT (envelope-from rrs@cisco.com) Date: Sat, 1 Mar 2008 11:01:21 GMT Message-Id: <200803011101.m21B1LR2003725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 11:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=136562 Change 136562 by rrs@rrs-mips2-jnpr on 2008/03/01 11:00:30 This commit makes it so we can get to m-user. I shrink the fifo size to 32 (not 64). This gives us some room for the conflicting putc's and transmits (I think). I also have BUSY print.. at each 100,000 BUSY int's. We do seem to get this message out 2-3 times during startup. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#13 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#13 (text+ko) ==== @@ -616,6 +616,8 @@ return (error); } +uint64_t uart_got_busy=0; + static int oct16550_bus_ipend(struct uart_softc *sc) { @@ -651,9 +653,15 @@ ipend |= SER_INT_SIGCHG; } else if (iir == IIR_BUSY) { + uint8_t niir; + uart_got_busy++; ipend |= SER_INT_TXIDLE; - ipend |= SER_INT_RXREADY; - iir = uart_getreg(bas, OCT_REG_IIR) & IIR_IMASK; + niir = uart_getreg(bas, OCT_REG_IIR); + lsr = uart_getreg(bas, OCT_REG_LSR); + if(( uart_got_busy % 100000 ) == 0) { + printf("Now gotten %lld busy's lsr:%x iir:%x niir:%x\n", + uart_got_busy, iir, lsr, niir); + } } } uart_unlock(sc->sc_hwmtx); @@ -712,8 +720,8 @@ device_set_desc(sc->sc_dev, "Octeon-16550 channel 0"); } #ifdef ENABLE_OCTEON_FIFO - sc->sc_rxfifosz = 64; - sc->sc_txfifosz = 64; + sc->sc_rxfifosz = 32; + sc->sc_txfifosz = 32; #else sc->sc_rxfifosz = 1; sc->sc_txfifosz = 1; From owner-p4-projects@FreeBSD.ORG Sat Mar 1 11:32:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 589471065676; Sat, 1 Mar 2008 11:32:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1952A106566B for ; Sat, 1 Mar 2008 11:32:57 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 081D98FC1F for ; Sat, 1 Mar 2008 11:32:57 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21BWubc005950 for ; Sat, 1 Mar 2008 11:32:56 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21BWucS005948 for perforce@freebsd.org; Sat, 1 Mar 2008 11:32:56 GMT (envelope-from rrs@cisco.com) Date: Sat, 1 Mar 2008 11:32:56 GMT Message-Id: <200803011132.m21BWucS005948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 11:32:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=136565 Change 136565 by rrs@rrs-mips2-jnpr on 2008/03/01 11:32:49 A few more tweaks that get us down to only 2 BUSY's Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#14 (text+ko) ==== @@ -343,9 +343,10 @@ static inline void oct16550_wait_txhr_empty(struct uart_bas *bas, int limit, int delay) { - while (((uart_getreg(bas, OCT_REG_LSR) & LSR_THRE) == 0) && - ((uart_getreg(bas, OCT_REG_USR) & USR_TX_FIFO_NOTFULL) == 0) && --limit) + while (((uart_getreg(bas, OCT_REG_LSR) & LSR_THRE) == 0) && --limit) { + (void)uart_getreg(bas, OCT_REG_USR); DELAY(delay); + } } static void @@ -653,15 +654,17 @@ ipend |= SER_INT_SIGCHG; } else if (iir == IIR_BUSY) { - uint8_t niir; + uint8_t niir, usr; + int delay; + + /* 1/10th the time to transmit 1 character (estimate). */ + delay = oct16550_delay(bas); + oct16550_wait_txhr_empty(bas, 100, delay); uart_got_busy++; ipend |= SER_INT_TXIDLE; niir = uart_getreg(bas, OCT_REG_IIR); lsr = uart_getreg(bas, OCT_REG_LSR); - if(( uart_got_busy % 100000 ) == 0) { - printf("Now gotten %lld busy's lsr:%x iir:%x niir:%x\n", - uart_got_busy, iir, lsr, niir); - } + usr = uart_getreg(bas, OCT_REG_USR); } } uart_unlock(sc->sc_hwmtx); @@ -821,11 +824,13 @@ { struct oct16550_softc *oct16550 = (struct oct16550_softc *)sc; struct uart_bas *bas; + uint8_t ier; int i; bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); oct16550_wait_txhr_empty(bas, 100, oct16550_delay(bas)); + ier = uart_getreg(bas, OCT_REG_IER); uart_setreg(bas, OCT_REG_IER, oct16550->ier | IER_ETXRDY); uart_barrier(bas); From owner-p4-projects@FreeBSD.ORG Sat Mar 1 11:45:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F7011065679; Sat, 1 Mar 2008 11:45:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2A251065673 for ; Sat, 1 Mar 2008 11:45:10 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 944F38FC1E for ; Sat, 1 Mar 2008 11:45:10 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21BjALg006620 for ; Sat, 1 Mar 2008 11:45:10 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21BjAM8006618 for perforce@freebsd.org; Sat, 1 Mar 2008 11:45:10 GMT (envelope-from rrs@cisco.com) Date: Sat, 1 Mar 2008 11:45:10 GMT Message-Id: <200803011145.m21BjAM8006618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 11:45:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=136568 Change 136568 by rrs@rrs-mips2-jnpr on 2008/03/01 11:45:09 More todo. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#18 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#18 (text+ko) ==== @@ -62,7 +62,9 @@ PG_G opposite the if where we did the add PG_G for kernel mode. Need to trace down the root cause of the pte's having this bit set. -o Serial int's are not quite right. We stop getting them - in m-user. +o Need to fix whatever is causing the ssh-keygen to die. +o Printf of floating point is not working right. + + From owner-p4-projects@FreeBSD.ORG Sat Mar 1 16:32:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B3AB1065672; Sat, 1 Mar 2008 16:32:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39F2E1065670 for ; Sat, 1 Mar 2008 16:32:42 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2674E8FC20 for ; Sat, 1 Mar 2008 16:32:42 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21GWg9f044953 for ; Sat, 1 Mar 2008 16:32:42 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21GWZAi044951 for perforce@freebsd.org; Sat, 1 Mar 2008 16:32:35 GMT (envelope-from thioretic@FreeBSD.org) Date: Sat, 1 Mar 2008 16:32:35 GMT Message-Id: <200803011632.m21GWZAi044951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 136580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 16:32:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=136580 Change 136580 by thioretic@thioretic on 2008/03/01 16:31:37 Integrate form parent. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/alpha/include/md_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/cia.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/acpica/madt.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/NOTES#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/include/proc.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/clock.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/arm/support.S#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/include/asmacros.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/include/atomic.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_stats.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files#4 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.amd64#3 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.i386#3 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/newvers.sh#3 integrate .. //depot/projects/soc2007/thioretic_gidl/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/crypto/camellia/camellia.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/crypto/camellia/camellia.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_debug.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-all.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-dma.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/drm/drm_drv.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/array.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/him.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/hptintf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/ldm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/list.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/hptrr/osm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/am7990.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/am79900.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfi.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/e1000phy.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/gentbi.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/miidevs#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/nsphy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/nsphyter.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/msk/if_msk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/ofw/openpromio.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/pci/pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/re/if_re.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/twe/twe.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/geom/geom_bsd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/geom/geom_gpt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/acpica/madt.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/bios/apm.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/conf/NOTES#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/conf/PAE#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/include/proc.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/isa/clock.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_proto.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/syscalls.master#5 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/pci/pci_pir.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/init_main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_conf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_module.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/uipc_sem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/vfs_default.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/Makefile#4 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/crypto/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/hptrr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/modules/mii/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/mxge/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/net/bpf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/bpf.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_bridge.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_enc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_lagg.c#6 integrate .. //depot/projects/soc2007/thioretic_gidl/net/netisr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/pfkeyv2.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/route.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/route.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/netgraph.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_base.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_bpf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_iface.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_ppp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_tee.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/in.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/ip_carp.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/ip_input.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/tcp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet6/esp_camellia.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/netinet6/esp_camellia.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/netinet6/esp_core.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netipsec/xform_esp.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/opencrypto/cryptodev.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/opencrypto/cryptodev.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/opencrypto/xform.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/opencrypto/xform.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_rlreg.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_ti.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_bsm.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/copyright.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/gpt.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/mount.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/param.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/syscallsubr.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/vnode.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/fs.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/dinode.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/dir.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/quota.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_map.c#4 integrate Differences ... ==== //depot/projects/soc2007/thioretic_gidl/alpha/alpha/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.2 2007/11/27 17:43:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.3 2007/12/10 20:14:16 jhb Exp $"); #include #include @@ -77,7 +77,8 @@ STAILQ_ENTRY(bounce_page) links; }; -int busdma_swi_pending; +int busdma_pyxis_bug, busdma_swi_pending; +TUNABLE_INT("machdep.busdma_pyxis_bug", &busdma_pyxis_bug); static struct mtx bounce_lock; static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; @@ -514,8 +515,24 @@ vm_offset_t vaddr; bus_addr_t paddr; int seg; + bus_size_t boundary; + bus_size_t maxsegsz; /* + * Enforce a boundary of 8k for buffers that aren't allocated + * via bus_dmamem_alloc() on systems with the Pyxis pass 1 DMA + * bug. This is somewhat gross. + */ + boundary = dmat->boundary; + maxsegsz = dmat->maxsegsz; + if (busdma_pyxis_bug && map != &nobounce_dmamap) { + if (boundary == 0 || boundary > 8192) + boundary = 8192; + if (boundary < maxsegsz) + maxsegsz = boundary; + } + + /* * If we are being called during a callback, pagesneeded will * be non-zero, so we can avoid doing the work twice. */ @@ -566,7 +583,7 @@ vaddr = (vm_offset_t)buf; lastaddr = *lastaddrp; - bmask = ~(dmat->boundary - 1); + bmask = ~(boundary - 1); for (seg = *segp; buflen > 0 ; ) { /* @@ -587,8 +604,8 @@ /* * Make sure we don't cross any boundaries. */ - if (dmat->boundary > 0) { - baddr = (curaddr + dmat->boundary) & bmask; + if (boundary > 0) { + baddr = (curaddr + boundary) & bmask; if (sgsize > (baddr - curaddr)) sgsize = (baddr - curaddr); } @@ -611,8 +628,8 @@ first = 0; } else { if (curaddr == lastaddr && - (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && - (dmat->boundary == 0 || + (segs[seg].ds_len + sgsize) <= maxsegsz && + (boundary == 0 || (segs[seg].ds_addr & bmask) == (curaddr & bmask))) segs[seg].ds_len += sgsize; else { ==== //depot/projects/soc2007/thioretic_gidl/alpha/include/md_var.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.23 2003/08/17 06:42:07 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.23.10.1 2007/12/10 20:14:16 jhb Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -50,6 +50,7 @@ #endif extern long Maxmem; extern int busdma_swi_pending; +extern int busdma_pyxis_bug; extern struct rpb *hwrpb; extern volatile int mc_expected; extern volatile int mc_received; ==== //depot/projects/soc2007/thioretic_gidl/alpha/pci/cia.c#2 (text+ko) ==== @@ -87,7 +87,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.44 2005/01/05 20:05:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.44.2.1 2007/12/10 20:14:16 jhb Exp $"); #include "opt_cpu.h" @@ -490,6 +490,7 @@ ctrl &= ~(CTRL_RD_TYPE|CTRL_RL_TYPE|CTRL_RM_TYPE); REGVAL(CIA_CSR_CTRL) = ctrl; alpha_mb(); + busdma_pyxis_bug = 1; } #endif ==== //depot/projects/soc2007/thioretic_gidl/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.4 2007/10/05 15:22:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.5 2008/02/12 19:20:10 jhb Exp $"); #include #include @@ -106,9 +106,11 @@ /* * Code to abuse the crashdump map to map in the tables for the early * probe. We cheat and make the following assumptions about how we - * use this KVA: page 0 is used to map in the first page of each table - * found via the RSDT or XSDT and pages 1 to n are used to map in the - * RSDT or XSDT. The offset is in pages; the length is in bytes. + * use this KVA: pages 0 and 1 are used to map in the header of each + * table found via the RSDT or XSDT and pages 2 to n are used to map + * in the RSDT or XSDT. We have to use 2 pages for the table headers + * in case a header spans a page boundary. The offset is in pages; + * the length is in bytes. */ static void * madt_map(vm_paddr_t pa, int offset, vm_offset_t length) @@ -232,7 +234,7 @@ printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 2, XSDT_SIG); if (xsdt == NULL) { if (bootverbose) printf("MADT: Failed to map XSDT\n"); @@ -245,7 +247,7 @@ break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 2, RSDT_SIG); if (rsdt == NULL) { if (bootverbose) printf("MADT: Failed to map RSDT\n"); ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.15.2.5 2007/11/26 15:08:35 scottl Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.15.2.6 2008/01/19 15:38:13 jhb Exp $ */ /* @@ -43,13 +43,14 @@ #include #include #include -#include #include #include +#include #include #include #include #include +#include #include #include #ifdef DDB @@ -70,7 +71,8 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; -static struct mtx intr_table_lock; +static struct sx intr_table_lock; +static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; #ifdef SMP @@ -108,14 +110,14 @@ { int error; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (intr_pic_registered(pic)) error = EBUSY; else { STAILQ_INSERT_TAIL(&pics, pic, pics); error = 0; } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (error); } @@ -137,16 +139,16 @@ (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); if (error) return (error); - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); interrupt_sources[vector] = isrc; isrc->is_enabled = 0; - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (0); } @@ -170,19 +172,18 @@ error = intr_event_add_handler(isrc->is_event, name, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { + sx_xlock(&intr_table_lock); intrcnt_updatename(isrc); - mtx_lock_spin(&intr_table_lock); if (!isrc->is_enabled) { isrc->is_enabled = 1; #ifdef SMP if (assign_cpu) intr_assign_next_cpu(isrc); #endif - mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_intr(isrc); - } else - mtx_unlock_spin(&intr_table_lock); + } isrc->is_pic->pic_enable_source(isrc); + sx_xunlock(&intr_table_lock); } return (error); } @@ -306,12 +307,12 @@ #ifndef DEV_ATPIC atpic_reset(); #endif - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_resume != NULL) pic->pic_resume(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } void @@ -319,12 +320,12 @@ { struct pic *pic; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_suspend != NULL) pic->pic_suspend(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } static void @@ -347,8 +348,8 @@ { char straystr[MAXCOMLEN + 1]; - /* mtx_assert(&intr_table_lock, MA_OWNED); */ KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); + mtx_lock_spin(&intrcnt_lock); is->is_index = intrcnt_index; intrcnt_index += 2; snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", @@ -357,17 +358,18 @@ is->is_count = &intrcnt[is->is_index]; intrcnt_setname(straystr, is->is_index + 1); is->is_straycount = &intrcnt[is->is_index + 1]; + mtx_unlock_spin(&intrcnt_lock); } void intrcnt_add(const char *name, u_long **countp) { - mtx_lock_spin(&intr_table_lock); + mtx_lock_spin(&intrcnt_lock); *countp = &intrcnt[intrcnt_index]; intrcnt_setname(name, intrcnt_index); intrcnt_index++; - mtx_unlock_spin(&intr_table_lock); + mtx_unlock_spin(&intrcnt_lock); } static void @@ -377,7 +379,8 @@ intrcnt_setname("???", 0); intrcnt_index = 1; STAILQ_INIT(&pics); - mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + sx_init(&intr_table_lock, "intr sources"); + mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) @@ -482,14 +485,14 @@ return; /* Round-robin assign a CPU to each enabled source. */ - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; if (isrc != NULL && isrc->is_enabled) intr_assign_next_cpu(isrc); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) #endif ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.638.2.13 2007/11/21 16:41:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.638.2.14 2007/12/19 21:01:35 rpaulo Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -154,6 +154,10 @@ extern vm_offset_t ksym_start, ksym_end; #endif +/* Intel ICH registers */ +#define ICH_PMBASE 0x400 +#define ICH_SMI_EN ICH_PMBASE + 0x30 + int _udatasel, _ucodesel, _ucode32sel; int cold = 1; @@ -185,6 +189,27 @@ cpu_startup(dummy) void *dummy; { + char *sysenv; + + /* + * On MacBooks, we need to disallow the legacy USB circuit to + * generate an SMI# because this can cause several problems, + * namely: incorrect CPU frequency detection and failure to + * start the APs. + * We do this by disabling a bit in the SMI_EN (SMI Control and + * Enable register) of the Intel ICH LPC Interface Bridge. + */ + sysenv = getenv("smbios.system.product"); + if (sysenv != NULL) { + if (strncmp(sysenv, "MacBook", 7) == 0) { + if (bootverbose) + printf("Disabling LEGACY_USB_EN bit on " + "Intel ICH.\n"); + outl(ICH_SMI_EN, inl(ICH_SMI_EN) & ~0x8); + } + freeenv(sysenv); + } + /* * Good {morning,afternoon,evening,night}. */ ==== //depot/projects/soc2007/thioretic_gidl/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18 2007/03/27 02:33:00 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.19 2007/12/15 06:03:43 scottl Exp $ machine amd64 cpu HAMMER @@ -117,6 +117,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID ==== //depot/projects/soc2007/thioretic_gidl/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.13 2007/10/02 15:59:52 gallatin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.14 2007/12/15 06:03:43 scottl Exp $ # # @@ -289,6 +289,11 @@ # Marvell SATA chip. device hptmv +# +# Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340, +# RR2210, RR174x, RR2522, RR231x, RR230x. +device hptrr + # # Highpoint RocketRAID 232x. This is software RAID but with hardware # acceleration assistance for RAID_5. ==== //depot/projects/soc2007/thioretic_gidl/amd64/include/proc.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24 2005/04/04 21:53:52 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24.2.1 2008/02/06 21:02:55 mav Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -44,4 +44,17 @@ struct mdproc { }; +#ifdef _KERNEL + +/* Get the current kernel thread stack usage. */ +#define GET_STACK_USAGE(total, used) do { \ + struct thread *td = curthread; \ + (total) = td->td_kstack_pages * PAGE_SIZE; \ + (used) = (char *)td->td_kstack + \ + td->td_kstack_pages * PAGE_SIZE - \ + (char *)&td; \ +} while (0) + +#endif /* _KERNEL */ + #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/soc2007/thioretic_gidl/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.221.2.2 2007/06/29 21:05:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.221.2.4 2008/02/13 15:46:10 jhb Exp $"); /* * Routines to handle clock hardware. @@ -67,6 +67,7 @@ #include #include +#include #include #include #include @@ -279,6 +280,7 @@ start = rdtsc(); end = start + (tsc_freq * n) / 1000000; do { + cpu_spinwait(); now = rdtsc(); } while (now < end || (now > start && end < start)); sched_unpin(); ==== //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.1.8.3 2007/07/08 12:20:35 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.1.8.4 2007/12/08 08:48:07 dwmalone Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -242,6 +242,19 @@ l_ulonglong st_ino; } __packed; +struct l_statfs64 { + l_int f_type; + l_int f_bsize; + uint64_t f_blocks; + uint64_t f_bfree; + uint64_t f_bavail; + uint64_t f_files; + uint64_t f_ffree; + l_fsid_t f_fsid; + l_int f_namelen; + l_int f_spare[6]; +} __packed; + struct l_new_utsname { char sysname[LINUX_MAX_UTSNAME]; char nodename[LINUX_MAX_UTSNAME]; ==== //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10.2.3 2007/08/29 15:04:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10.2.4 2008/02/14 18:41:00 jkim Exp $"); #include #include @@ -720,21 +720,22 @@ PROC_UNLOCK(p); } - /* This gives us our maximum stack size */ - if (linux_args->len > STACK_SIZE - GUARD_SIZE) - bsd_args.len = linux_args->len; - else - bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* - * This gives us a new BOS. If we're using VM_STACK, then - * mmap will just map the top SGROWSIZ bytes, and let - * the stack grow down to the limit at BOS. If we're - * not using VM_STACK we map the full stack, since we - * don't have a way to autogrow it. + * This gives us our maximum stack size and a new BOS. + * If we're using VM_STACK, then mmap will just map + * the top SGROWSIZ bytes, and let the stack grow down + * to the limit at BOS. If we're not using VM_STACK + * we map the full stack, since we don't have a way + * to autogrow it. */ - bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - - bsd_args.len; + if (linux_args->len > STACK_SIZE - GUARD_SIZE) { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); + bsd_args.len = linux_args->len; + } else { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - + (STACK_SIZE - GUARD_SIZE - linux_args->len); + bsd_args.len = STACK_SIZE - GUARD_SIZE; + } } else { bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; ==== //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.5.2.4 2007/12/03 21:54:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.5.2.6 2007/12/08 08:50:36 dwmalone Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -729,6 +729,7 @@ }; struct linux_statfs64_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)]; char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)]; }; struct linux_fstatfs64_args { ==== //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.5.2.4 2007/12/03 21:54:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.5.2.6 2007/12/08 08:50:36 dwmalone Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.5.2.4 2007/12/03 21:54:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.5.2.6 2007/12/08 08:50:36 dwmalone Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp */ #include ==== //depot/projects/soc2007/thioretic_gidl/amd64/linux32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -439,6 +439,7 @@ int flags, struct l_timespec *rqtp, \ struct l_timespec *rmtp); } 268 AUE_NULL MSTD { int linux_statfs64(char *path, \ + size_t bufsize, \ struct l_statfs64_buf *buf); } 269 AUE_NULL MSTD { int linux_fstatfs64(void); } 270 AUE_NULL MSTD { int linux_tgkill(int tgid, int pid, int sig); } ==== //depot/projects/soc2007/thioretic_gidl/arm/arm/support.S#2 (text+ko) ==== @@ -23,10 +23,79 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * Copyright 2003 Wasabi Systems, Inc. + * All rights reserved. + * + * Written by Steve C. Woodford for Wasabi Systems, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Wasabi Systems, Inc. + * 4. The name of Wasabi Systems, Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC + * 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. + */ +/* + * Copyright (c) 1997 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Neil A. Carson and Mark Brinicombe + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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. + */ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.9 2005/04/12 22:46:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.9.2.1 2008/01/16 22:45:03 cognet Exp $"); #include "assym.s" ==== //depot/projects/soc2007/thioretic_gidl/arm/include/asmacros.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.4 2005/04/07 22:03:04 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.4.2.1 2007/12/07 22:07:44 cognet Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -67,7 +67,13 @@ stmia r0, {r13-r14}^; /* Push the user mode registers */ \ mov r0, r0; /* NOP for previous instruction */ \ mrs r0, spsr_all; /* Put the SPSR on the stack */ \ - str r0, [sp, #-4]!; + str r0, [sp, #-4]!; \ + mov r0, #0xe0000004; \ + mov r1, #0; \ + str r1, [r0]; \ + mov r0, #0xe0000008; \ + mov r1, #0xffffffff; \ + str r1, [r0]; /* * PULLFRAME - macro to pull a trap frame from the stack in the current mode @@ -116,18 +122,16 @@ ldr r5, =0xe0000004; /* Check if there's any RAS */ \ ldr r3, [r5]; \ cmp r3, #0; /* Is the update needed ? */ \ - beq 1f; \ - ldr lr, [r0, #16]; \ - ldr r1, =0xe0000008; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 1 16:50:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC91B1065675; Sat, 1 Mar 2008 16:50:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C7111065672 for ; Sat, 1 Mar 2008 16:50:01 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8930C8FC26 for ; Sat, 1 Mar 2008 16:50:01 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21Go1Ym054453 for ; Sat, 1 Mar 2008 16:50:01 GMT (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21Go1Sg054451 for perforce@freebsd.org; Sat, 1 Mar 2008 16:50:01 GMT (envelope-from obrien@freebsd.org) Date: Sat, 1 Mar 2008 16:50:01 GMT Message-Id: <200803011650.m21Go1Sg054451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 16:50:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=136581 Change 136581 by obrien@obrien_trang on 2008/03/01 16:49:20 grrr. I hate that style(9) (or really C) doesn't require {} for if's. fix logic to match intention (as shown thru indention). Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/mips/pthread_md.c#4 (text+ko) ==== @@ -41,9 +41,10 @@ struct tcb *tcb; tcb = malloc(sizeof(struct tcb)); - if (tcb) + if (tcb) { bzero(tcb, sizeof(struct tcb)); tcb->tcb_thread = thread; + } return (tcb); } From owner-p4-projects@FreeBSD.ORG Sat Mar 1 17:02:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFA9B1065671; Sat, 1 Mar 2008 17:02:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E10D106566B for ; Sat, 1 Mar 2008 17:02:22 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 683BE8FC12 for ; Sat, 1 Mar 2008 17:02:22 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21H2Mj4054884 for ; Sat, 1 Mar 2008 17:02:22 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21H2EOb054870 for perforce@freebsd.org; Sat, 1 Mar 2008 17:02:14 GMT (envelope-from thioretic@FreeBSD.org) Date: Sat, 1 Mar 2008 17:02:14 GMT Message-Id: <200803011702.m21H2EOb054870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 136582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 17:02:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=136582 Change 136582 by thioretic@thioretic on 2008/03/01 17:01:45 Integrate from parents. Affected files ... .. //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/alpha/include/md_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/alpha/pci/cia.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/acpica/madt.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/conf/NOTES#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/include/proc.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/isa/clock.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/arm/support.S#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/include/asmacros.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/include/atomic.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_stats.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.amd64#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.i386#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/newvers.sh#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/crypto/camellia/camellia.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/crypto/camellia/camellia.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_debug.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-all.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-dma.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/drm/drm_drv.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/array.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/him.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/hptintf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/ldm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/list.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/hptrr/osm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/am7990.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/am79900.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfi.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/e1000phy.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/gentbi.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/miidevs#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/nsphy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/nsphyter.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/msk/if_msk.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/ofw/openpromio.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/pci/pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/re/if_re.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/twe/twe.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/geom/geom_bsd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/geom/geom_gpt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/acpica/madt.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/bios/apm.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/conf/NOTES#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/conf/PAE#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/include/proc.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/isa/clock.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_proto.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/syscalls.master#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/pci/pci_pir.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/init_main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_conf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_module.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/uipc_sem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/vfs_default.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/Makefile#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/crypto/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/hptrr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/modules/mii/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/mxge/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/net/bpf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/bpf.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_bridge.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_enc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_lagg.c#6 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/netisr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/pfkeyv2.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/route.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/route.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/netgraph.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_base.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_bpf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_iface.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_ppp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_tee.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/in.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/ip_carp.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/ip_input.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/tcp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet6/esp_camellia.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/netinet6/esp_camellia.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/netinet6/esp_core.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netipsec/xform_esp.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/opencrypto/cryptodev.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/opencrypto/cryptodev.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/opencrypto/xform.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/opencrypto/xform.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_rlreg.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_ti.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_bsm.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/copyright.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/gpt.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/mount.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/param.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/syscallsubr.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/vnode.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/fs.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/dinode.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/dir.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/quota.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_map.c#4 integrate Differences ... ==== //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.2 2007/11/27 17:43:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.3 2007/12/10 20:14:16 jhb Exp $"); #include #include @@ -77,7 +77,8 @@ STAILQ_ENTRY(bounce_page) links; }; -int busdma_swi_pending; +int busdma_pyxis_bug, busdma_swi_pending; +TUNABLE_INT("machdep.busdma_pyxis_bug", &busdma_pyxis_bug); static struct mtx bounce_lock; static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; @@ -514,8 +515,24 @@ vm_offset_t vaddr; bus_addr_t paddr; int seg; + bus_size_t boundary; + bus_size_t maxsegsz; /* + * Enforce a boundary of 8k for buffers that aren't allocated + * via bus_dmamem_alloc() on systems with the Pyxis pass 1 DMA + * bug. This is somewhat gross. + */ + boundary = dmat->boundary; + maxsegsz = dmat->maxsegsz; + if (busdma_pyxis_bug && map != &nobounce_dmamap) { + if (boundary == 0 || boundary > 8192) + boundary = 8192; + if (boundary < maxsegsz) + maxsegsz = boundary; + } + + /* * If we are being called during a callback, pagesneeded will * be non-zero, so we can avoid doing the work twice. */ @@ -566,7 +583,7 @@ vaddr = (vm_offset_t)buf; lastaddr = *lastaddrp; - bmask = ~(dmat->boundary - 1); + bmask = ~(boundary - 1); for (seg = *segp; buflen > 0 ; ) { /* @@ -587,8 +604,8 @@ /* * Make sure we don't cross any boundaries. */ - if (dmat->boundary > 0) { - baddr = (curaddr + dmat->boundary) & bmask; + if (boundary > 0) { + baddr = (curaddr + boundary) & bmask; if (sgsize > (baddr - curaddr)) sgsize = (baddr - curaddr); } @@ -611,8 +628,8 @@ first = 0; } else { if (curaddr == lastaddr && - (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && - (dmat->boundary == 0 || + (segs[seg].ds_len + sgsize) <= maxsegsz && + (boundary == 0 || (segs[seg].ds_addr & bmask) == (curaddr & bmask))) segs[seg].ds_len += sgsize; else { ==== //depot/projects/soc2007/thioretic_gidl2/alpha/include/md_var.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.23 2003/08/17 06:42:07 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.23.10.1 2007/12/10 20:14:16 jhb Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -50,6 +50,7 @@ #endif extern long Maxmem; extern int busdma_swi_pending; +extern int busdma_pyxis_bug; extern struct rpb *hwrpb; extern volatile int mc_expected; extern volatile int mc_received; ==== //depot/projects/soc2007/thioretic_gidl2/alpha/pci/cia.c#2 (text+ko) ==== @@ -87,7 +87,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.44 2005/01/05 20:05:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.44.2.1 2007/12/10 20:14:16 jhb Exp $"); #include "opt_cpu.h" @@ -490,6 +490,7 @@ ctrl &= ~(CTRL_RD_TYPE|CTRL_RL_TYPE|CTRL_RM_TYPE); REGVAL(CIA_CSR_CTRL) = ctrl; alpha_mb(); + busdma_pyxis_bug = 1; } #endif ==== //depot/projects/soc2007/thioretic_gidl2/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.4 2007/10/05 15:22:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.5 2008/02/12 19:20:10 jhb Exp $"); #include #include @@ -106,9 +106,11 @@ /* * Code to abuse the crashdump map to map in the tables for the early * probe. We cheat and make the following assumptions about how we - * use this KVA: page 0 is used to map in the first page of each table - * found via the RSDT or XSDT and pages 1 to n are used to map in the - * RSDT or XSDT. The offset is in pages; the length is in bytes. + * use this KVA: pages 0 and 1 are used to map in the header of each + * table found via the RSDT or XSDT and pages 2 to n are used to map + * in the RSDT or XSDT. We have to use 2 pages for the table headers + * in case a header spans a page boundary. The offset is in pages; + * the length is in bytes. */ static void * madt_map(vm_paddr_t pa, int offset, vm_offset_t length) @@ -232,7 +234,7 @@ printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 2, XSDT_SIG); if (xsdt == NULL) { if (bootverbose) printf("MADT: Failed to map XSDT\n"); @@ -245,7 +247,7 @@ break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 2, RSDT_SIG); if (rsdt == NULL) { if (bootverbose) printf("MADT: Failed to map RSDT\n"); ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.15.2.5 2007/11/26 15:08:35 scottl Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.15.2.6 2008/01/19 15:38:13 jhb Exp $ */ /* @@ -43,13 +43,14 @@ #include #include #include -#include #include #include +#include #include #include #include #include +#include #include #include #ifdef DDB @@ -70,7 +71,8 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; -static struct mtx intr_table_lock; +static struct sx intr_table_lock; +static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; #ifdef SMP @@ -108,14 +110,14 @@ { int error; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (intr_pic_registered(pic)) error = EBUSY; else { STAILQ_INSERT_TAIL(&pics, pic, pics); error = 0; } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (error); } @@ -137,16 +139,16 @@ (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); if (error) return (error); - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); interrupt_sources[vector] = isrc; isrc->is_enabled = 0; - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (0); } @@ -170,19 +172,18 @@ error = intr_event_add_handler(isrc->is_event, name, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { + sx_xlock(&intr_table_lock); intrcnt_updatename(isrc); - mtx_lock_spin(&intr_table_lock); if (!isrc->is_enabled) { isrc->is_enabled = 1; #ifdef SMP if (assign_cpu) intr_assign_next_cpu(isrc); #endif - mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_intr(isrc); - } else - mtx_unlock_spin(&intr_table_lock); + } isrc->is_pic->pic_enable_source(isrc); + sx_xunlock(&intr_table_lock); } return (error); } @@ -306,12 +307,12 @@ #ifndef DEV_ATPIC atpic_reset(); #endif - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_resume != NULL) pic->pic_resume(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } void @@ -319,12 +320,12 @@ { struct pic *pic; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_suspend != NULL) pic->pic_suspend(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } static void @@ -347,8 +348,8 @@ { char straystr[MAXCOMLEN + 1]; - /* mtx_assert(&intr_table_lock, MA_OWNED); */ KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); + mtx_lock_spin(&intrcnt_lock); is->is_index = intrcnt_index; intrcnt_index += 2; snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", @@ -357,17 +358,18 @@ is->is_count = &intrcnt[is->is_index]; intrcnt_setname(straystr, is->is_index + 1); is->is_straycount = &intrcnt[is->is_index + 1]; + mtx_unlock_spin(&intrcnt_lock); } void intrcnt_add(const char *name, u_long **countp) { - mtx_lock_spin(&intr_table_lock); + mtx_lock_spin(&intrcnt_lock); *countp = &intrcnt[intrcnt_index]; intrcnt_setname(name, intrcnt_index); intrcnt_index++; - mtx_unlock_spin(&intr_table_lock); + mtx_unlock_spin(&intrcnt_lock); } static void @@ -377,7 +379,8 @@ intrcnt_setname("???", 0); intrcnt_index = 1; STAILQ_INIT(&pics); - mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + sx_init(&intr_table_lock, "intr sources"); + mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) @@ -482,14 +485,14 @@ return; /* Round-robin assign a CPU to each enabled source. */ - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; if (isrc != NULL && isrc->is_enabled) intr_assign_next_cpu(isrc); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) #endif ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.638.2.13 2007/11/21 16:41:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.638.2.14 2007/12/19 21:01:35 rpaulo Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -154,6 +154,10 @@ extern vm_offset_t ksym_start, ksym_end; #endif +/* Intel ICH registers */ +#define ICH_PMBASE 0x400 +#define ICH_SMI_EN ICH_PMBASE + 0x30 + int _udatasel, _ucodesel, _ucode32sel; int cold = 1; @@ -185,6 +189,27 @@ cpu_startup(dummy) void *dummy; { + char *sysenv; + + /* + * On MacBooks, we need to disallow the legacy USB circuit to + * generate an SMI# because this can cause several problems, + * namely: incorrect CPU frequency detection and failure to + * start the APs. + * We do this by disabling a bit in the SMI_EN (SMI Control and + * Enable register) of the Intel ICH LPC Interface Bridge. + */ + sysenv = getenv("smbios.system.product"); + if (sysenv != NULL) { + if (strncmp(sysenv, "MacBook", 7) == 0) { + if (bootverbose) + printf("Disabling LEGACY_USB_EN bit on " + "Intel ICH.\n"); + outl(ICH_SMI_EN, inl(ICH_SMI_EN) & ~0x8); + } + freeenv(sysenv); + } + /* * Good {morning,afternoon,evening,night}. */ ==== //depot/projects/soc2007/thioretic_gidl2/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18 2007/03/27 02:33:00 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.19 2007/12/15 06:03:43 scottl Exp $ machine amd64 cpu HAMMER @@ -117,6 +117,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID ==== //depot/projects/soc2007/thioretic_gidl2/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.13 2007/10/02 15:59:52 gallatin Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.14 2007/12/15 06:03:43 scottl Exp $ # # @@ -289,6 +289,11 @@ # Marvell SATA chip. device hptmv +# +# Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340, +# RR2210, RR174x, RR2522, RR231x, RR230x. +device hptrr + # # Highpoint RocketRAID 232x. This is software RAID but with hardware # acceleration assistance for RAID_5. ==== //depot/projects/soc2007/thioretic_gidl2/amd64/include/proc.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24 2005/04/04 21:53:52 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/proc.h,v 1.24.2.1 2008/02/06 21:02:55 mav Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -44,4 +44,17 @@ struct mdproc { }; +#ifdef _KERNEL + +/* Get the current kernel thread stack usage. */ +#define GET_STACK_USAGE(total, used) do { \ + struct thread *td = curthread; \ + (total) = td->td_kstack_pages * PAGE_SIZE; \ + (used) = (char *)td->td_kstack + \ + td->td_kstack_pages * PAGE_SIZE - \ + (char *)&td; \ +} while (0) + +#endif /* _KERNEL */ + #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/soc2007/thioretic_gidl2/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.221.2.2 2007/06/29 21:05:27 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.221.2.4 2008/02/13 15:46:10 jhb Exp $"); /* * Routines to handle clock hardware. @@ -67,6 +67,7 @@ #include #include +#include #include #include #include @@ -279,6 +280,7 @@ start = rdtsc(); end = start + (tsc_freq * n) / 1000000; do { + cpu_spinwait(); now = rdtsc(); } while (now < end || (now > start && end < start)); sched_unpin(); ==== //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.1.8.3 2007/07/08 12:20:35 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.1.8.4 2007/12/08 08:48:07 dwmalone Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -242,6 +242,19 @@ l_ulonglong st_ino; } __packed; +struct l_statfs64 { + l_int f_type; + l_int f_bsize; + uint64_t f_blocks; + uint64_t f_bfree; + uint64_t f_bavail; + uint64_t f_files; + uint64_t f_ffree; + l_fsid_t f_fsid; + l_int f_namelen; + l_int f_spare[6]; +} __packed; + struct l_new_utsname { char sysname[LINUX_MAX_UTSNAME]; char nodename[LINUX_MAX_UTSNAME]; ==== //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10.2.3 2007/08/29 15:04:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.10.2.4 2008/02/14 18:41:00 jkim Exp $"); #include #include @@ -720,21 +720,22 @@ PROC_UNLOCK(p); } - /* This gives us our maximum stack size */ - if (linux_args->len > STACK_SIZE - GUARD_SIZE) - bsd_args.len = linux_args->len; - else - bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* - * This gives us a new BOS. If we're using VM_STACK, then - * mmap will just map the top SGROWSIZ bytes, and let - * the stack grow down to the limit at BOS. If we're - * not using VM_STACK we map the full stack, since we - * don't have a way to autogrow it. + * This gives us our maximum stack size and a new BOS. + * If we're using VM_STACK, then mmap will just map + * the top SGROWSIZ bytes, and let the stack grow down + * to the limit at BOS. If we're not using VM_STACK + * we map the full stack, since we don't have a way + * to autogrow it. */ - bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - - bsd_args.len; + if (linux_args->len > STACK_SIZE - GUARD_SIZE) { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); + bsd_args.len = linux_args->len; + } else { + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - + (STACK_SIZE - GUARD_SIZE - linux_args->len); + bsd_args.len = STACK_SIZE - GUARD_SIZE; + } } else { bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; ==== //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.5.2.4 2007/12/03 21:54:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.5.2.6 2007/12/08 08:50:36 dwmalone Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -729,6 +729,7 @@ }; struct linux_statfs64_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)]; char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)]; }; struct linux_fstatfs64_args { ==== //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.5.2.4 2007/12/03 21:54:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.5.2.6 2007/12/08 08:50:36 dwmalone Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.5.2.4 2007/12/03 21:54:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.5.2.6 2007/12/08 08:50:36 dwmalone Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp */ #include ==== //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.4 2007/12/03 21:53:22 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.4.2.5 2007/12/08 08:48:07 dwmalone Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -439,6 +439,7 @@ int flags, struct l_timespec *rqtp, \ struct l_timespec *rmtp); } 268 AUE_NULL MSTD { int linux_statfs64(char *path, \ + size_t bufsize, \ struct l_statfs64_buf *buf); } 269 AUE_NULL MSTD { int linux_fstatfs64(void); } 270 AUE_NULL MSTD { int linux_tgkill(int tgid, int pid, int sig); } ==== //depot/projects/soc2007/thioretic_gidl2/arm/arm/support.S#2 (text+ko) ==== @@ -23,10 +23,79 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * Copyright 2003 Wasabi Systems, Inc. + * All rights reserved. + * + * Written by Steve C. Woodford for Wasabi Systems, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Wasabi Systems, Inc. + * 4. The name of Wasabi Systems, Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC + * 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. + */ +/* + * Copyright (c) 1997 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Neil A. Carson and Mark Brinicombe + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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. + */ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.9 2005/04/12 22:46:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.9.2.1 2008/01/16 22:45:03 cognet Exp $"); #include "assym.s" ==== //depot/projects/soc2007/thioretic_gidl2/arm/include/asmacros.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.4 2005/04/07 22:03:04 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.4.2.1 2007/12/07 22:07:44 cognet Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -67,7 +67,13 @@ stmia r0, {r13-r14}^; /* Push the user mode registers */ \ mov r0, r0; /* NOP for previous instruction */ \ mrs r0, spsr_all; /* Put the SPSR on the stack */ \ - str r0, [sp, #-4]!; + str r0, [sp, #-4]!; \ + mov r0, #0xe0000004; \ + mov r1, #0; \ + str r1, [r0]; \ + mov r0, #0xe0000008; \ + mov r1, #0xffffffff; \ + str r1, [r0]; /* * PULLFRAME - macro to pull a trap frame from the stack in the current mode @@ -116,18 +122,16 @@ ldr r5, =0xe0000004; /* Check if there's any RAS */ \ ldr r3, [r5]; \ cmp r3, #0; /* Is the update needed ? */ \ - beq 1f; \ - ldr lr, [r0, #16]; \ - ldr r1, =0xe0000008; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 1 17:55:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 025301065671; Sat, 1 Mar 2008 17:55:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B40151065676 for ; Sat, 1 Mar 2008 17:55:17 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A01548FC1D for ; Sat, 1 Mar 2008 17:55:17 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21HtHD3058102 for ; Sat, 1 Mar 2008 17:55:17 GMT (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21HtH2q058100 for perforce@freebsd.org; Sat, 1 Mar 2008 17:55:17 GMT (envelope-from obrien@freebsd.org) Date: Sat, 1 Mar 2008 17:55:17 GMT Message-Id: <200803011755.m21HtH2q058100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 17:55:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=136586 Change 136586 by obrien@obrien_trang on 2008/03/01 17:54:32 Have _tcb_get() use a function named mips_tcb_get(). Submitted by: Juniper Networks Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/include/pthread_md.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/include/pthread_md.h#3 (text+ko) ==== @@ -69,8 +69,8 @@ static __inline struct tcb * _tcb_get(void) { - /* XXXMIPS: return (*((struct tcb **)ARM_TP_ADDRESS)); */ - return NULL; + /* define in sys/mips/include/sysarch.h */ + return /*(mips_tcb_get())*/ NULL; } extern struct pthread *_thr_initial; From owner-p4-projects@FreeBSD.ORG Sat Mar 1 18:09:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCB6F1065673; Sat, 1 Mar 2008 18:09:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BDE3106566B for ; Sat, 1 Mar 2008 18:09:34 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67C8C8FC30 for ; Sat, 1 Mar 2008 18:09:34 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21I9YZQ059666 for ; Sat, 1 Mar 2008 18:09:34 GMT (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21I9YMN059664 for perforce@freebsd.org; Sat, 1 Mar 2008 18:09:34 GMT (envelope-from obrien@freebsd.org) Date: Sat, 1 Mar 2008 18:09:34 GMT Message-Id: <200803011809.m21I9YMN059664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136588 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 18:09:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=136588 Change 136588 by obrien@obrien_trang on 2008/03/01 18:09:13 More additions to libthr to hopefully set direction to match Juniper's code (if its not found too upsetting to go in this direction). Obtained from: Juniper Networks Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/include/pthread_md.h#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/sysarch.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/include/pthread_md.h#4 (text+ko) ==== @@ -60,7 +60,7 @@ static __inline void _tcb_set(struct tcb *tcb) { - /* XXXMIPS: *((struct tcb **)ARM_TP_ADDRESS) = tcb; */ + mips_tcb_set(tcb); } /* @@ -69,8 +69,7 @@ static __inline struct tcb * _tcb_get(void) { - /* define in sys/mips/include/sysarch.h */ - return /*(mips_tcb_get())*/ NULL; + return (mips_tcb_get()); } extern struct pthread *_thr_initial; ==== //depot/projects/mips2-jnpr/src/sys/mips/include/sysarch.h#3 (text+ko) ==== @@ -38,6 +38,13 @@ #ifndef _KERNEL #include +#if 0 +/* Something useful for each MIPS platform. */ +#else$ +#define mips_tcb_set(tcb) NULL$ +#define mips_tcb_get() NULL$ +#endif /* _MIPS_ARCH_XLR */$ + __BEGIN_DECLS int sysarch(int, void *); __END_DECLS From owner-p4-projects@FreeBSD.ORG Sat Mar 1 18:26:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5A8910656C2; Sat, 1 Mar 2008 18:26:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94F5A106570E for ; Sat, 1 Mar 2008 18:26:54 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 811C68FC17 for ; Sat, 1 Mar 2008 18:26:54 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21IQsmv060319 for ; Sat, 1 Mar 2008 18:26:54 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21IQsFB060317 for perforce@freebsd.org; Sat, 1 Mar 2008 18:26:54 GMT (envelope-from csjp@freebsd.org) Date: Sat, 1 Mar 2008 18:26:54 GMT Message-Id: <200803011826.m21IQsFB060317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 18:26:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=136590 Change 136590 by csjp@ibm01 on 2008/03/01 18:26:01 Some cosmetic nits Affected files ... .. //depot/projects/trustedbsd/netauditd/netauditd.c#12 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/netauditd.c#12 (text+ko) ==== @@ -160,7 +160,7 @@ } void -netaudit_run() +netaudit_run(void) { fd_set rfds; struct timeval tv; @@ -229,7 +229,7 @@ } void -netaudit_establish() +netaudit_establish(void) { struct au_cmpnt *au; @@ -268,7 +268,7 @@ } void -netaudit_oq() +netaudit_oq(void) { struct au_cmpnt *au; struct au_queue_ent *q, *tmpr; @@ -378,7 +378,7 @@ exit(2); new->sb_fd = accept(au->ac_fd, new->sb_sockaddr, &new->sb_socklen); if (new->sb_fd == -1) { - if ((errno == EWOULDBLOCK) || (errno == ECONNABORTED)) { + if (errno == EWOULDBLOCK || errno == ECONNABORTED) { free(new->sb_sockaddr); free(new); return; @@ -486,8 +486,9 @@ } void -usage() +usage(void) { + (void) fputs("usage: netauditd [-Ddh] [-f path]\n", stderr); exit(1); } From owner-p4-projects@FreeBSD.ORG Sat Mar 1 18:54:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C68B1065670; Sat, 1 Mar 2008 18:54:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BF52106566B for ; Sat, 1 Mar 2008 18:54:24 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2DC398FC18 for ; Sat, 1 Mar 2008 18:54:24 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21IsO0A063540 for ; Sat, 1 Mar 2008 18:54:24 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21IsOEH063538 for perforce@freebsd.org; Sat, 1 Mar 2008 18:54:24 GMT (envelope-from csjp@freebsd.org) Date: Sat, 1 Mar 2008 18:54:24 GMT Message-Id: <200803011854.m21IsOEH063538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 18:54:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=136593 Change 136593 by csjp@ibm01 on 2008/03/01 18:54:03 Add file which which will process the encryption for netauditd Affected files ... .. //depot/projects/trustedbsd/netauditd/crypto.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Mar 1 19:02:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8F461065672; Sat, 1 Mar 2008 19:02:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9835B106566C for ; Sat, 1 Mar 2008 19:02:32 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8411C8FC2B for ; Sat, 1 Mar 2008 19:02:32 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21J2WA1063862 for ; Sat, 1 Mar 2008 19:02:32 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21J2Wor063860 for perforce@freebsd.org; Sat, 1 Mar 2008 19:02:32 GMT (envelope-from csjp@freebsd.org) Date: Sat, 1 Mar 2008 19:02:32 GMT Message-Id: <200803011902.m21J2Wor063860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 19:02:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=136594 Change 136594 by csjp@ibm01 on 2008/03/01 19:01:37 We dont process Diffie Hellman parameters when we are running in client mode. Introduce context flags "server" and "client" and pass them to the crypto context initialization function. Affected files ... .. //depot/projects/trustedbsd/netauditd/crypto.c#2 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/crypto.c#2 (text+ko) ==== @@ -31,6 +31,9 @@ BIO *c_bioerror; }; +#define CRTYPO_CTX_CLIENT 1 +#define CRYPTO_CTX_SERVER 2 + static char *crypto_pass; static int @@ -46,7 +49,7 @@ } int -crypto_init_context(struct crypto_context *ct) +crypto_init_context(struct crypto_context *ct, int ctx_type) { SSL_METHOD *meth; DH *ret; @@ -79,12 +82,15 @@ if ((bio = BIO_new_file("DHFILE", "r")) == NULL) berr_exit("Couldn't open DH file"); /* - * Process DH parameters + * If we are initializing this crypto context for serving SSL clients, + * make sure we initialize our Diffie Hellman parameters. */ - ret = PEM_read_bio_DHparams(bio, NULL, NULL, NULL); - BIO_free(bio); - if(SSL_CTX_set_tmp_dh(ct->c_ctx,ret) < 0) - berr_exit("Couldn't set DH parameters"); + if (ctx_type == CRYPTO_CTX_SERVER) { + ret = PEM_read_bio_DHparams(bio, NULL, NULL, NULL); + BIO_free(bio); + if (SSL_CTX_set_tmp_dh(ct->c_ctx, ret) < 0) + berr_exit("Couldn't set DH parameters"); + } return (0); } From owner-p4-projects@FreeBSD.ORG Sat Mar 1 19:06:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AF021065672; Sat, 1 Mar 2008 19:06:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18C8A106566C for ; Sat, 1 Mar 2008 19:06:37 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 049778FC12 for ; Sat, 1 Mar 2008 19:06:37 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21J6anM065202 for ; Sat, 1 Mar 2008 19:06:36 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21J6anu065200 for perforce@freebsd.org; Sat, 1 Mar 2008 19:06:36 GMT (envelope-from csjp@freebsd.org) Date: Sat, 1 Mar 2008 19:06:36 GMT Message-Id: <200803011906.m21J6anu065200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 19:06:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=136595 Change 136595 by csjp@ibm01 on 2008/03/01 19:05:40 Re-organize the crypto code a bit, introduce a header file and move structure definitions, prototyes etc into there. Affected files ... .. //depot/projects/trustedbsd/netauditd/crypto.c#3 edit .. //depot/projects/trustedbsd/netauditd/crypto.h#1 add Differences ... ==== //depot/projects/trustedbsd/netauditd/crypto.c#3 (text+ko) ==== @@ -24,15 +24,10 @@ * SUCH DAMAGE. */ #include + #include -struct crypto_context { - SSL_CTX *c_ctx; - BIO *c_bioerror; -}; - -#define CRTYPO_CTX_CLIENT 1 -#define CRYPTO_CTX_SERVER 2 +#include "crypto.h" static char *crypto_pass; From owner-p4-projects@FreeBSD.ORG Sat Mar 1 19:30:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9F691065675; Sat, 1 Mar 2008 19:30:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6810C1065672 for ; Sat, 1 Mar 2008 19:30:03 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 537BF8FC15 for ; Sat, 1 Mar 2008 19:30:03 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21JU3CO066160 for ; Sat, 1 Mar 2008 19:30:03 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21JU3us066152 for perforce@freebsd.org; Sat, 1 Mar 2008 19:30:03 GMT (envelope-from csjp@freebsd.org) Date: Sat, 1 Mar 2008 19:30:03 GMT Message-Id: <200803011930.m21JU3us066152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 136599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 19:30:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=136599 Change 136599 by csjp@ibm01 on 2008/03/01 19:29:27 Introduce crypto_fatal and use that. Include a "main" for now until things are a bit more stable. Affected files ... .. //depot/projects/trustedbsd/netauditd/crypto.c#4 edit Differences ... ==== //depot/projects/trustedbsd/netauditd/crypto.c#4 (text+ko) ==== @@ -24,6 +24,7 @@ * SUCH DAMAGE. */ #include +#include #include @@ -32,6 +33,16 @@ static char *crypto_pass; static int +crypto_fatal(struct crypto_context *ct, const char *string) +{ + + assert(ct != NULL); + BIO_printf(ct->c_bioerror, "%s\n", string); + ERR_print_errors(ct->c_bioerror); + exit(1); +} + +static int crypto_password_cb(char *buf, int num, int rwflag, void *userdata) { int slen; @@ -60,22 +71,22 @@ } meth = SSLv23_method(); ct->c_ctx = SSL_CTX_new(meth); - if (!SSL_CTX_use_certificate_chain_file(ct->c_ctx, "KEYFILE")) - berr_exit("Can't read certificate file"); + if (!SSL_CTX_use_certificate_chain_file(ct->c_ctx, "server.pem")) + crypto_fatal(ct, "Can't read certificate file"); /* * XXX we will revisit this. Just want to get things working. */ crypto_pass = "SeCrET KeY"; SSL_CTX_set_default_passwd_cb(ct->c_ctx, crypto_password_cb); - if (!SSL_CTX_use_PrivateKey_file(ct->c_ctx, "KEYFILE", SSL_FILETYPE_PEM)) - berr_exit("Can't read key file"); + if (!SSL_CTX_use_PrivateKey_file(ct->c_ctx, "server.pem", SSL_FILETYPE_PEM)) + crypto_fatal(ct, "Can't read key file"); /* - * Load trusted certificate authorities from root.pem + * Load trusted certificate authorities from key.pem */ - if (!SSL_CTX_load_verify_locations(ct->c_ctx, "root.pem", 0)) - berr_exit("Can't read CA list"); + if (!SSL_CTX_load_verify_locations(ct->c_ctx, "key.pem", 0)) + crypto_fatal(ct, "Can't read CA list"); if ((bio = BIO_new_file("DHFILE", "r")) == NULL) - berr_exit("Couldn't open DH file"); + crypto_fatal(ct, "Couldn't open DH file"); /* * If we are initializing this crypto context for serving SSL clients, * make sure we initialize our Diffie Hellman parameters. @@ -84,7 +95,7 @@ ret = PEM_read_bio_DHparams(bio, NULL, NULL, NULL); BIO_free(bio); if (SSL_CTX_set_tmp_dh(ct->c_ctx, ret) < 0) - berr_exit("Couldn't set DH parameters"); + crypto_fatal(ct, "Couldn't set DH parameters"); } return (0); } @@ -95,3 +106,15 @@ SSL_CTX_free(ct->c_ctx); } + +int +main(int argc, char *argv[]) +{ + struct crypto_context ct; + int error; + + error = crypto_init_context(&ct, CRYPTO_CTX_SERVER); + if (error) + err(1, "crypto_init_context failed"); + return (0); +} From owner-p4-projects@FreeBSD.ORG Sat Mar 1 22:21:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 383781065673; Sat, 1 Mar 2008 22:21:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF27D106566C for ; Sat, 1 Mar 2008 22:21:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B8DB08FC12 for ; Sat, 1 Mar 2008 22:21:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21ML1G2086887 for ; Sat, 1 Mar 2008 22:21:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21ML1m7086885 for perforce@freebsd.org; Sat, 1 Mar 2008 22:21:01 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 1 Mar 2008 22:21:01 GMT Message-Id: <200803012221.m21ML1m7086885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 22:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=136609 Change 136609 by kmacy@kmacy:entropy:iwarp on 2008/03/01 22:21:00 IFC 136608 Affected files ... .. //depot/projects/iwarp/UPDATING#7 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/iwarp/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/iwarp/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/iwarp/share/man/man4/Makefile#9 integrate .. //depot/projects/iwarp/share/man/man4/ng_nat.4#2 integrate .. //depot/projects/iwarp/share/man/man4/uchcom.4#1 branch .. //depot/projects/iwarp/share/man/man4/ucom.4#2 integrate .. //depot/projects/iwarp/share/man/man4/ucycom.4#2 integrate .. //depot/projects/iwarp/share/man/man9/Makefile#9 integrate .. //depot/projects/iwarp/share/man/man9/lock.9#5 integrate .. //depot/projects/iwarp/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/iwarp/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/iwarp/sys/conf/NOTES#9 integrate .. //depot/projects/iwarp/sys/conf/files#12 integrate .. //depot/projects/iwarp/sys/dev/em/LICENSE#2 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_82575.c#3 delete .. //depot/projects/iwarp/sys/dev/em/e1000_82575.h#3 delete .. //depot/projects/iwarp/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/iwarp/sys/dev/em/if_em.c#3 integrate .. //depot/projects/iwarp/sys/dev/em/if_em.h#3 integrate .. //depot/projects/iwarp/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/iwarp/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/iwarp/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/iwarp/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/iwarp/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/iwarp/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/iwarp/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/iwarp/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_lock.c#7 integrate .. //depot/projects/iwarp/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/iwarp/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/iwarp/sys/modules/Makefile#7 integrate .. //depot/projects/iwarp/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#12 integrate .. //depot/projects/iwarp/sys/modules/em/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/igb/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/iwarp/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/iwarp/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/iwarp/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/iwarp/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/iwarp/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/iwarp/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/iwarp/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/iwarp/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/iwarp/sys/security/audit/audit.c#7 integrate .. //depot/projects/iwarp/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/iwarp/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/iwarp/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/iwarp/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/iwarp/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/iwarp/sys/sys/buf.h#4 integrate .. //depot/projects/iwarp/sys/sys/bufobj.h#2 integrate .. //depot/projects/iwarp/sys/sys/lockmgr.h#6 integrate .. //depot/projects/iwarp/sys/sys/mount.h#2 integrate .. //depot/projects/iwarp/sys/sys/param.h#10 integrate .. //depot/projects/iwarp/sys/sys/vnode.h#5 integrate .. //depot/projects/iwarp/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/iwarp/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/iwarp/usr.bin/unifdef/unifdef.c#2 integrate Differences ... ==== //depot/projects/iwarp/UPDATING#7 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +989,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.521 2008/02/29 22:08:49 jfv Exp $ ==== //depot/projects/iwarp/lib/libc/sys/mq_close.2#3 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.5 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_close.2,v 1.6 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_CLOSE 2 @@ -95,11 +95,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/iwarp/lib/libc/sys/mq_getattr.2#3 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.5 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_getattr.2,v 1.6 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_GETATTR 2 @@ -117,11 +117,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/iwarp/lib/libc/sys/mq_notify.2#3 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.9 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.10 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_NOTIFY 2 @@ -141,11 +141,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/iwarp/lib/libc/sys/mq_open.2#3 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.9 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_open.2,v 1.10 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_OPEN 2 @@ -313,11 +313,11 @@ and contain no other slash characters. .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/iwarp/lib/libc/sys/mq_receive.2#3 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.6 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_receive.2,v 1.7 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_RECEIVE 2 @@ -207,11 +207,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/iwarp/lib/libc/sys/mq_send.2#3 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.5 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_send.2,v 1.6 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_SEND 2 @@ -226,11 +226,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/iwarp/lib/libc/sys/mq_setattr.2#3 (text+ko) ==== @@ -25,17 +25,17 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" Portions of this text are reprinted and reproduced in electronic form -.\" from IEEE Std 1003.1, 2003 Edition, Standard for Information -.\" Technology -- Portable Operating System Interface (POSIX), The Open -.\" Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -.\" Institute of Electrical and Electronics Engineers, Inc and The Open -.\" Group. In the event of any discrepancy between this version and the -.\" original IEEE and The Open Group Standard, the original IEEE and The -.\" Open Group Standard is the referee document. The original Standard can -.\" be obtained online at http://www.opengroup.org/unix/online.html . +.\" Portions of this text are reprinted and reproduced in electronic form +.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +.\" Portable Operating System Interface (POSIX), The Open Group Base +.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +.\" Electrical and Electronics Engineers, Inc and The Open Group. In the +.\" event of any discrepancy between this version and the original IEEE and +.\" The Open Group Standard, the original IEEE and The Open Group Standard is +.\" the referee document. The original Standard can be obtained online at +.\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.6 2008/02/21 19:16:57 philip Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_setattr.2,v 1.7 2008/02/29 17:48:25 philip Exp $ .\" .Dd November 29, 2005 .Dt MQ_SETATTR 2 @@ -113,11 +113,11 @@ .Fx 7.0 . .Sh COPYRIGHT Portions of this text are reprinted and reproduced in electronic form -from IEEE Std 1003.1, 2003 Edition, Standard for Information -Technology -- Portable Operating System Interface (POSIX), The Open -Group Base Specifications Issue 6, Copyright (C) 2001-2003 by the -Institute of Electrical and Electronics Engineers, Inc and The Open -Group. In the event of any discrepancy between this version and the -original IEEE and The Open Group Standard, the original IEEE and The -Open Group Standard is the referee document. The original Standard can -be obtained online at http://www.opengroup.org/unix/online.html . +from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology -- +Portable Operating System Interface (POSIX), The Open Group Base +Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of +Electrical and Electronics Engineers, Inc and The Open Group. In the +event of any discrepancy between this version and the original IEEE and +The Open Group Standard, the original IEEE and The Open Group Standard is +the referee document. The original Standard can be obtained online at + http://www.opengroup.org/unix/online.html. ==== //depot/projects/iwarp/sbin/ifconfig/ifconfig.8#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.145 2007/12/10 02:31:00 sam Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.146 2008/02/29 20:42:17 sam Exp $ .\" -.Dd December 8, 2007 +.Dd February 29, 2008 .Dt IFCONFIG 8 .Os .Sh NAME @@ -779,6 +779,8 @@ .It Cm deftxkey Ar index Set the default key to use for transmission. Typically this is only set when using WEP encryption. +Note that you must set a default transmit key +for the system to know which key to use in encrypting outbound traffic. The .Cm weptxkey is an alias for this request; it is provided for backwards compatibility. @@ -1263,6 +1265,10 @@ If that is the case, then the first four keys (1-4) will be the standard temporary keys and any others will be adaptor specific keys such as permanent keys stored in NVRAM. +.Pp +Note that you must set a default transmit key with +.Cm deftxkey +for the system to know which key to use in encrypting outbound traffic. .It Cm wme Enable Wireless Multimedia Extensions (WME) support, if available, for the specified interface. ==== //depot/projects/iwarp/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.409 2008/02/20 07:50:12 thompsa Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.410 2008/03/01 13:05:03 brueffer Exp $ MAN= aac.4 \ acpi.4 \ @@ -372,6 +372,7 @@ ubsec.4 \ ubser.4 \ ubtbcmfw.4 \ + uchcom.4 \ ucom.4 \ ucycom.4 \ udav.4 \ ==== //depot/projects/iwarp/share/man/man4/ng_nat.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_nat.4,v 1.3 2007/05/22 12:23:39 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ng_nat.4,v 1.4 2008/03/01 17:14:02 mav Exp $ .\" -.Dd May 6, 2005 +.Dd March 1, 2008 .Dt NG_NAT 4 .Os .Sh NAME @@ -42,7 +42,6 @@ node uses .Xr libalias 3 engine for packet aliasing. -At this moment it supports only the basic functionality of the library. .Sh HOOKS This node type has two hooks: .Bl -tag -width indent @@ -81,7 +80,194 @@ Configure target address for a node. When an incoming packet not associated with any pre-existing aliasing link arrives at the host machine, it will be sent to the specified address. +.It Dv NGM_NAT_REDIRECT_PORT Pq Li redirectport +Redirect incoming connections arriving to given port(s) to +another host and port(s). +The following +.Vt "struct ng_nat_redirect_port" +must be supplied as argument. +.Bd -literal +#define NG_NAT_DESC_LENGTH 64 +struct ng_nat_redirect_port { + struct in_addr local_addr; + struct in_addr alias_addr; + struct in_addr remote_addr; + uint16_t local_port; + uint16_t alias_port; + uint16_t remote_port; + uint8_t proto; + char description[NG_NAT_DESC_LENGTH]; +}; +.Ed +.Pp +Redirection is assigned an unique ID which is returned as +response to this message, and +information about redirection added to +list of static redirects which later can be retrieved by +.Dv NGM_NAT_LIST_REDIRECTS +message. +.It Dv NGM_NAT_REDIRECT_ADDR Pq Li redirectaddr +Redirect traffic for public IP address to a machine on the +local network. +This function is known as +.Em static NAT . +The following +.Vt "struct ng_nat_redirect_addr" +must be supplied as argument. +.Bd -literal +struct ng_nat_redirect_addr { + struct in_addr local_addr; + struct in_addr alias_addr; + char description[NG_NAT_DESC_LENGTH]; +}; +.Ed +.Pp +Unique ID for this redirection is returned as response to this message. +.It Dv NGM_NAT_REDIRECT_PROTO Pq Li redirectproto +Redirect incoming IP packets of protocol +.Va proto +(see +.Xr protocols 5 ) +to a machine on the local network. +The following +.Vt "struct ng_nat_redirect_proto" +must be supplied as argument. +.Bd -literal +struct ng_nat_redirect_proto { + struct in_addr local_addr; + struct in_addr alias_addr; + struct in_addr remote_addr; + uint8_t proto; + char description[NG_NAT_DESC_LENGTH]; +}; +.Ed +.Pp +Unique ID for this redirection is returned as response to this message. +.It Dv NGM_NAT_REDIRECT_DYNAMIC Pq Li redirectdynamic +Mark redirection with specified ID as dynamic, i.e., it will serve +for exactly one next connection and then will be automatically +deleted from internal links table. +Only fully specified links can be made dynamic. +The redirection with this ID is also immediately deleted from +user-visible list of static redirects (available through +.Dv NGM_NAT_LIST_REDIRECTS +message). +.It Dv NGM_NAT_REDIRECT_DELETE Pq Li redirectdelete +Delete redirection with specified ID (currently active +connections are not affected). +.It Dv NGM_NAT_ADD_SERVER Pq Li addserver +Add another server to a pool. +This is used to transparently offload network load on a single server +and distribute the load across a pool of servers, also known as +.Em LSNAT +(RFC 2391). +The following +.Vt "struct ng_nat_add_server" +must be supplied as argument. +.Bd -literal +struct ng_nat_add_server { + uint32_t id; + struct in_addr addr; + uint16_t port; +}; +.Ed +.Pp +First, the redirection is set up by +.Dv NGM_NAT_REDIRECT_PORT +or +.Dv NGM_NAT_REDIRECT_ADDR . +Then, ID of that redirection is used in multiple +.Dv NGM_NAT_ADD_SERVER +messages to add necessary number of servers. +For redirections created by +.Dv NGM_NAT_REDIRECT_ADDR , +the +.Va port +is ignored and could have any value. +Original redirection's parameters +.Va local_addr +and +.Va local_port +are also ignored after +.Dv NGM_NAT_ADD_SERVER +was used (they are effectively replaced by server pool). +.It Dv NGM_NAT_LIST_REDIRECTS Pq Li listredirects +Return list of configured static redirects as +.Vt "struct ng_nat_list_redirects". +.Bd -literal +struct ng_nat_listrdrs_entry { + uint32_t id; /* Anything except zero */ + struct in_addr local_addr; + struct in_addr alias_addr; + struct in_addr remote_addr; + uint16_t local_port; + uint16_t alias_port; + uint16_t remote_port; + uint16_t proto; /* Valid proto or NG_NAT_REDIRPROTO_ADDR */ + uint16_t lsnat; /* LSNAT servers count */ + char description[NG_NAT_DESC_LENGTH]; +}; +struct ng_nat_list_redirects { + uint32_t total_count; + struct ng_nat_listrdrs_entry redirects[]; +}; +#define NG_NAT_REDIRPROTO_ADDR (IPPROTO_MAX + 3) +.Ed +.Pp +Entries of the +.Va redirects +array returned in the unified format for all redirect types. +Ports are meaningful only if protocol is either TCP or UDP +and +.Em static NAT +redirection (created by +.Dv NGM_NAT_REDIRECT_ADDR ) +is indicated by +.Va proto +set to +.Dv NG_NAT_REDIRPROTO_ADDR . +If +.Va lsnat +servers counter is greater than zero, then +.Va local_addr +and +.Va local_port +are also meaningless. +.It Dv NGM_NAT_PROXY_RULE Pq Li proxyrule +Specify a transparent proxying rule (string must be +supplied as argument). +See +.Xr libalias 3 +for details. .El +.Pp +In all redirection messages +.Va local_addr +and +.Va local_port +mean address and port of target machine in the internal network, +respectively. +If +.Va alias_addr +is zero, then default aliasing address (set by +.Dv NGM_NAT_SET_IPADDR ) +is used. +Connections can also be restricted to be accepted only +from specific external machines by using non-zero +.Va remote_addr +and/or +.Va remote_port . +Each redirection assigned an ID which can be later used for +redirection manipulation on individual basis (e.g., removal). +This ID guaranteed to be unique until the node shuts down +(it will not be reused after deletion), and is returned to +user after making each new redirection or can be found in +the stored list of all redirections. +The +.Va description +passed to and from node unchanged, together with ID providing +a way for several entities to concurrently manipulate +redirections in automated way. .Sh SHUTDOWN This node shuts down upon receipt of a .Dv NGM_SHUTDOWN ==== //depot/projects/iwarp/share/man/man4/ucom.4#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.8 2007/06/30 14:36:37 imp Exp $ +.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.9 2008/03/01 13:28:27 brueffer Exp $ .\" -.Dd November 18, 2006 +.Dd March 1, 2008 .Dt UCOM 4 .Os .Sh NAME @@ -91,6 +91,7 @@ .Sh SEE ALSO .Xr tty 4 , .Xr uark 4 , +.Xr uchcom 4 , .Xr uftdi 4 , .Xr umct 4 , .Xr umodem 4 , ==== //depot/projects/iwarp/share/man/man4/ucycom.4#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/share/man/man4/ucycom.4,v 1.4 2006/11/22 21:30:02 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ucycom.4,v 1.5 2008/03/01 11:35:30 brueffer Exp $ .\" .Dd November 22, 2006 .Dt UCYCOM 4 @@ -47,16 +47,6 @@ .Bd -literal -offset indent ucycom_load="YES" .Ed -.Sh HARDWARE -The -.Nm -driver currently supports the following devices which incorporate -Cypress USB to RS232 bridge chips: -.Pp -.Bl -bullet -compact -.It -DeLorme Earthmate USB GPS receiver -.El .Sh DESCRIPTION The .Nm @@ -69,6 +59,16 @@ .Nm driver behaves like a .Xr tty 4 . +.Sh HARDWARE +The +.Nm +driver currently supports the following devices which incorporate +Cypress USB to RS232 bridge chips: +.Pp +.Bl -bullet -compact +.It +DeLorme Earthmate USB GPS receiver +.El .Sh SEE ALSO .Xr tty 4 , .Xr usb 4 ==== //depot/projects/iwarp/share/man/man9/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.330 2008/02/26 21:40:30 davidc Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.331 2008/03/01 20:39:56 attilio Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -718,6 +718,7 @@ MLINKS+=lock.9 lockdestroy.9 \ lock.9 lockinit.9 \ lock.9 lockmgr.9 \ + lock.9 lockmgr_args.9 \ lock.9 lockmgr_assert.9 \ lock.9 lockmgr_disown.9 \ lock.9 lockmgr_printinfo.9 \ ==== //depot/projects/iwarp/share/man/man9/lock.9#5 (text+ko) ==== @@ -24,23 +24,25 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.26 2008/02/25 19:12:01 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.29 2008/03/01 21:24:07 attilio Exp $ .\" -.Dd February 25, 2008 +.Dd March 1, 2008 .Dt LOCK 9 .Os .Sh NAME .Nm lockinit , .Nm lockdestroy , .Nm lockmgr , -.Nm lockstatus , +.Nm lockmgr_args , .Nm lockmgr_disown , .Nm lockmgr_printinfo , .Nm lockmgr_recursed , +.Nm lockstatus , .Nm lockmgr_assert .Nd "lockmgr family of functions" .Sh SYNOPSIS .In sys/types.h +.In sys/lock.h .In sys/lockmgr.h .Ft void .Fn lockinit "struct lock *lkp" "int prio" "const char *wmesg" "int timo" "int flags" @@ -49,13 +51,15 @@ .Ft int .Fn lockmgr "struct lock *lkp" "u_int flags" "struct mtx *interlkp" .Ft int -.Fn lockstatus "struct lock *lkp" +.Fn lockmgr_args "struct lock *lkp" "u_int flags" "struct mtx *interlkp" "const char *wmesg" "int prio" "int timo" .Ft void .Fn lockmgr_disown "struct lock *lkp" .Ft void .Fn lockmgr_printinfo "struct lock *lkp" .Ft int .Fn lockmgr_recursed "struct lock *lkp" +.Ft int +.Fn lockstatus "struct lock *lkp" .Pp .Cd "options INVARIANTS" .Cd "options INVARIANT_SUPPORT" @@ -81,14 +85,12 @@ The timeout value passed to .Xr sleep 9 . .It Fa flags -The flags the lock is to be initialized with. +The flags the lock is to be initialized with: .Bl -tag -width ".Dv LK_CANRECURSE" -.It Dv LK_NOWAIT -Do not sleep while acquiring the lock. -.It Dv LK_SLEEPFAIL -Fail after a sleep. .It Dv LK_CANRECURSE Allow recursive exclusive locks. +.It Dv LK_NOPROFILE +Disable lock profiling for this lock. .It Dv LK_NOSHARE Allow exclusive locks only. .It Dv LK_NOWITNESS @@ -98,6 +100,10 @@ .It Dv LK_NODUP .Xr witness 4 should log messages about duplicate locks being acquired. +.It Dv LK_QUIET +Disable +.Xr ktr 4 +logging for this lock. .It Dv LK_TIMELOCK Use .Fa timo @@ -179,8 +185,20 @@ .El .Pp The -.Fn lockstatus -function returns the status of the lock in relation to the current thread. +.Fn lockmgr_args +function works like +.Fn lockmgr +but accepting a +.Fa wmesg , +.Fa timo +and +.Fa prio +on a per-instance basis. The specified values will override the default +ones, but this can still be used passing, respectively, +.Dv LK_WMESG_DEFAULT , +.Dv LK_PRIO_DEFAULT +and +.Dv LK_TIMO_DEFAULT . .Pp The .Fn lockmgr_disown @@ -200,6 +218,10 @@ function returns true if the lock is recursed, 0 otherwise. .Pp +The +.Fn lockstatus +function returns the status of the lock in relation to the current thread. +.Pp When compiled with .Cd "options INVARIANTS" and ==== //depot/projects/iwarp/share/mk/bsd.cpu.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.63 2007/10/16 18:32:37 cognet Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.64 2008/02/29 19:20:05 jhb 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 @@ -133,6 +133,8 @@ MACHINE_CPU = 3dnow mmx i586 i486 i386 . elif ${CPUTYPE} == "c3-2" MACHINE_CPU = sse mmx i586 i486 i386 +. elif ${CPUTYPE} == "c7" +MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 . elif ${CPUTYPE} == "prescott" MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 . elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m" ==== //depot/projects/iwarp/sys/boot/pc98/libpc98/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.24 2006/04/11 20:11:30 jhb Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.25 2008/02/29 05:06:06 nyan Exp $ # LIB= pc98 INTERNALLIB= @@ -10,6 +10,13 @@ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c +# Enable PXE TFTP or NFS support, not both. +.if defined(LOADER_TFTP_SUPPORT) +CFLAGS+= -DLOADER_TFTP_SUPPORT >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 1 23:51:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACE6A1065675; Sat, 1 Mar 2008 23:51:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CA01106566C for ; Sat, 1 Mar 2008 23:51:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5896F8FC22 for ; Sat, 1 Mar 2008 23:51:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21NpeRk091565 for ; Sat, 1 Mar 2008 23:51:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21Npedv091563 for perforce@freebsd.org; Sat, 1 Mar 2008 23:51:40 GMT (envelope-from sam@freebsd.org) Date: Sat, 1 Mar 2008 23:51:40 GMT Message-Id: <200803012351.m21Npedv091563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 136616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2008 23:51:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=136616 Change 136616 by sam@sam_ebb on 2008/03/01 23:50:43 o the channel field in the RXON cmd block (aka IWN_CMD_CONFIGURE) is 16 bits, not 8; don't try to be cute just to be different o document and fillin more of the RXON cmd block Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#5 edit .. //depot/projects/vap/sys/dev/iwn/if_iwnreg.h#3 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#5 (text+kox) ==== @@ -3424,7 +3424,7 @@ /* update adapter's configuration */ sc->config.associd = 0; IEEE80211_ADDR_COPY(sc->config.bssid, ni->ni_bssid); - sc->config.chan = ieee80211_chan2ieee(ic, ni->ni_chan); + sc->config.chan = htole16(ieee80211_chan2ieee(ic, ni->ni_chan)); sc->config.flags = htole32(IWN_CONFIG_TSF); if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) sc->config.flags |= htole32(IWN_CONFIG_AUTO | IWN_CONFIG_24GHZ); @@ -3450,7 +3450,7 @@ "ht_single 0x%x ht_dual 0x%x rxchain 0x%x " "myaddr %6D wlap %6D bssid %6D associd %d filter 0x%x\n", __func__, - sc->config.chan, sc->config.mode, le32toh(sc->config.flags), + le16toh(sc->config.chan), sc->config.mode, le32toh(sc->config.flags), sc->config.cck_mask, sc->config.ofdm_mask, sc->config.ht_single_mask, sc->config.ht_dual_mask, le16toh(sc->config.rxchain), @@ -3549,7 +3549,7 @@ "ht_single 0x%x ht_dual 0x%x rxchain 0x%x " "myaddr %6D wlap %6D bssid %6D associd %d filter 0x%x\n", __func__, - sc->config.chan, sc->config.mode, le32toh(sc->config.flags), + le16toh(sc->config.chan), sc->config.mode, le32toh(sc->config.flags), sc->config.cck_mask, sc->config.ofdm_mask, sc->config.ht_single_mask, sc->config.ht_dual_mask, le16toh(sc->config.rxchain), @@ -3854,7 +3854,7 @@ IEEE80211_ADDR_COPY(sc->config.myaddr, ic->ic_myaddr); IEEE80211_ADDR_COPY(sc->config.wlap, ic->ic_myaddr); /* set default channel */ - sc->config.chan = ieee80211_chan2ieee(ic, ic->ic_curchan); + sc->config.chan = htole16(ieee80211_chan2ieee(ic, ic->ic_curchan)); sc->config.flags = htole32(IWN_CONFIG_TSF); if (IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) sc->config.flags |= htole32(IWN_CONFIG_AUTO | IWN_CONFIG_24GHZ); @@ -3890,7 +3890,7 @@ "ht_single 0x%x ht_dual 0x%x rxchain 0x%x " "myaddr %6D wlap %6D bssid %6D associd %d filter 0x%x\n", __func__, - sc->config.chan, sc->config.mode, le32toh(sc->config.flags), + le16toh(sc->config.chan), sc->config.mode, le32toh(sc->config.flags), sc->config.cck_mask, sc->config.ofdm_mask, sc->config.ht_single_mask, sc->config.ht_dual_mask, le16toh(sc->config.rxchain), ==== //depot/projects/vap/sys/dev/iwn/if_iwnreg.h#3 (text+kox) ==== @@ -274,7 +274,7 @@ uint8_t data[136]; } __packed; -/* structure for command IWN_CMD_CONFIGURE */ +/* structure for command IWN_CMD_CONFIGURE (NB: RXON) */ struct iwn_config { uint8_t myaddr[IEEE80211_ADDR_LEN]; uint16_t reserved1; @@ -287,38 +287,39 @@ #define IWN_MODE_STA 3 #define IWN_MODE_IBSS 4 #define IWN_MODE_MONITOR 6 - - uint8_t reserved4; + uint8_t unused4; /* air propagation */ uint16_t rxchain; #define IWN_RXCHAIN_ANTMSK_SHIFT 1 #define IWN_RXCHAIN_FORCE_MIMO (1 << 14) - uint8_t ofdm_mask; /* basic rates */ uint8_t cck_mask; /* basic rates */ uint16_t associd; uint32_t flags; -#define IWN_CONFIG_24GHZ 0x00000001 -#define IWN_CONFIG_CCK 0x00000002 -#define IWN_CONFIG_AUTO 0x00000004 -#define IWN_CONFIG_SHSLOT 0x00000010 -#define IWN_CONFIG_SHPREAMBLE 0x00000020 -#define IWN_CONFIG_NODIVERSITY 0x00000080 +#define IWN_CONFIG_24GHZ 0x00000001 /* band */ +#define IWN_CONFIG_CCK 0x00000002 /* modulation */ +#define IWN_CONFIG_AUTO 0x00000004 /* 2.4-only auto-detect */ +#define IWN_CONFIG_HTPROT 0x00000008 /* xmit with HT protection */ +#define IWN_CONFIG_SHSLOT 0x00000010 /* short slot time */ +#define IWN_CONFIG_SHPREAMBLE 0x00000020 /* short premable */ +#define IWN_CONFIG_NODIVERSITY 0x00000080 /* disable antenna diversity */ #define IWN_CONFIG_ANTENNA_A 0x00000100 #define IWN_CONFIG_ANTENNA_B 0x00000200 +#define IWN_CONFIG_RADAR 0x00001000 /* enable radar detect */ +#define IWN_CONFIG_NARROW 0x00002000 /* MKK narrow band select */ #define IWN_CONFIG_TSF 0x00008000 #define IWN_CONFIG_HT 0x06400000 #define IWN_CONFIG_HT20 0x02000000 #define IWN_CONFIG_HT40U 0x04000000 #define IWN_CONFIG_HT40D 0x04400000 uint32_t filter; -#define IWN_FILTER_PROMISC (1 << 0) -#define IWN_FILTER_CTL (1 << 1) -#define IWN_FILTER_MULTICAST (1 << 2) -#define IWN_FILTER_NODECRYPT (1 << 3) -#define IWN_FILTER_BSS (1 << 5) - - uint8_t chan; - uint8_t reserved5; +#define IWN_FILTER_PROMISC (1 << 0) /* pass all data frames */ +#define IWN_FILTER_CTL (1 << 1) /* pass ctl+mgt frames */ +#define IWN_FILTER_MULTICAST (1 << 2) /* pass multi-cast frames */ +#define IWN_FILTER_NODECRYPT (1 << 3) /* pass unicast undecrypted */ +#define IWN_FILTER_BSS (1 << 5) /* station is associated */ +#define IWN_FILTER_ALLBEACONS (1 << 6) /* pass overlapping bss beacons + (must be associated) */ + uint16_t chan; /* IEEE channel # of control/primary */ uint8_t ht_single_mask; /* single-stream basic rates */ uint8_t ht_dual_mask; /* dual-stream basic rates */ } __packed;