From owner-p4-projects@FreeBSD.ORG Sun Oct 8 00:06:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5521216A412; Sun, 8 Oct 2006 00:06:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F61816A407 for ; Sun, 8 Oct 2006 00:06:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C139F43D55 for ; Sun, 8 Oct 2006 00:06:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9806App054821 for ; Sun, 8 Oct 2006 00:06:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k98069WJ054809 for perforce@freebsd.org; Sun, 8 Oct 2006 00:06:09 GMT (envelope-from jb@freebsd.org) Date: Sun, 8 Oct 2006 00:06:09 GMT Message-Id: <200610080006.k98069WJ054809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 00:06:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=107467 Change 107467 by jb@jb_freebsd7 on 2006/10/08 00:05:34 More updates to match current since perforce missed the integration. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/include/_bus.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/_inttypes.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/_limits.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/_stdint.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/_types.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/asi.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/asm.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/asmacros.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/bus.h#4 edit .. //depot/projects/dtrace/src/sys/sun4v/include/bus_common.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/bus_dma.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/bus_private.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/cache.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ccr.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/clock.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/cpu.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/cpufunc.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/db_machdep.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/elf.h#4 edit .. //depot/projects/dtrace/src/sys/sun4v/include/endian.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/errata.h#2 delete .. //depot/projects/dtrace/src/sys/sun4v/include/exec.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/float.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/floatingpoint.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/fp.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/frame.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/fsr.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/gdb_machdep.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/hv_pcivar.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/hviommu.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#5 edit .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#4 edit .. //depot/projects/dtrace/src/sys/sun4v/include/idprom.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ieee.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ieeefp.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/in_cksum.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/instr.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/intr_machdep.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/iommureg.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/iommuvar.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/kdb.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/kerneldump.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ktr.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/limits.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/lsu.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/md_var.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/memdev.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/metadata.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/mmu.h#4 edit .. //depot/projects/dtrace/src/sys/sun4v/include/mutex.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/nexusvar.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_bus.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_machdep.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_mem.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_nexus.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_upa.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/param.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/pcb.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#6 edit .. //depot/projects/dtrace/src/sys/sun4v/include/pmap.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/pmc_mdep.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/proc.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/profile.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/pstate.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ptrace.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/reg.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/reloc.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/resource.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/runq.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/sc_machdep.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/setjmp.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/sf_buf.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/sigframe.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/signal.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/smp.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/stdarg.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/sun4v_cpufunc.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/sysarch.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/tick.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/tlb.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/trap.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/tsb.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/tstate.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/tte.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/tte_hash.h#4 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ucontext.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/upa.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/utrap.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/varargs.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/ver.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/vmparam.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/watch.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/wstate.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/include/_bus.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/_bus.h,v 1.1 2005/04/18 21:45:34 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/_bus.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef SPARC64_INCLUDE__BUS_H @@ -38,5 +38,6 @@ typedef int bus_type_t; typedef u_long bus_addr_t; typedef u_long bus_size_t; +typedef struct bus_space_tag *bus_space_tag_t; #endif /* SPARC64_INCLUDE__BUS_H */ ==== //depot/projects/dtrace/src/sys/sun4v/include/_inttypes.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $ - * $FreeBSD: src/sys/sparc64/include/_inttypes.h,v 1.2 2002/06/30 05:48:03 mike Exp $ + * $FreeBSD: src/sys/sun4v/include/_inttypes.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_INTTYPES_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/_limits.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/sparc64/include/_limits.h,v 1.14 2005/08/20 16:44:41 stefanf Exp $ + * $FreeBSD: src/sys/sun4v/include/_limits.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE__LIMITS_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/_stdint.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $ + * $FreeBSD: src/sys/sun4v/include/_stdint.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE__STDINT_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/_types.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/sparc64/include/_types.h,v 1.8 2005/03/02 21:33:28 joerg Exp $ + * $FreeBSD: src/sys/sun4v/include/_types.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE__TYPES_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/asi.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * from: BSDI: asi.h,v 1.3 1997/08/08 14:31:42 torek - * $FreeBSD: src/sys/sparc64/include/asi.h,v 1.9 2002/07/16 16:22:25 tmm Exp $ + * $FreeBSD: src/sys/sun4v/include/asi.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_ASI_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/asm.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 * from: FreeBSD: src/sys/i386/include/asm.h,v 1.7 2000/01/25 - * $FreeBSD: src/sys/sparc64/include/asm.h,v 1.7 2004/04/07 05:00:00 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/asm.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_ASM_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/asmacros.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/asmacros.h,v 1.19 2004/06/06 21:26:48 phk Exp $ + * $FreeBSD: src/sys/sun4v/include/asmacros.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_ASMACROS_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/atomic.h,v 1.20 2001/02/11 - * $FreeBSD: src/sys/sparc64/include/atomic.h,v 1.10 2005/09/27 17:39:11 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/atomic.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_ATOMIC_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/bus.h#4 (text+ko) ==== @@ -69,7 +69,7 @@ * and * from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09 * - * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.37 2005/04/18 21:45:34 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/bus.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_BUS_H_ @@ -113,8 +113,6 @@ /* * Access methods for bus resources and address space. */ -typedef struct bus_space_tag *bus_space_tag_t; - struct bus_space_tag { void *bst_cookie; bus_space_tag_t bst_parent; ==== //depot/projects/dtrace/src/sys/sun4v/include/bus_common.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * form: @(#)sbusreg.h 8.1 (Berkeley) 6/11/93 * from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp * - * $FreeBSD: src/sys/sparc64/include/bus_common.h,v 1.5 2005/01/07 02:29:21 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/bus_common.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_BUS_COMMON_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/bus_dma.h#3 (text+ko) ==== @@ -69,7 +69,7 @@ * and * from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09 * - * $FreeBSD: src/sys/sparc64/include/bus_dma.h,v 1.1 2005/03/14 16:46:28 scottl Exp $ + * $FreeBSD: src/sys/sun4v/include/bus_dma.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _SPARC64_BUS_DMA_H ==== //depot/projects/dtrace/src/sys/sun4v/include/bus_private.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.25 2002/01/05 * - * $FreeBSD: src/sys/sparc64/include/bus_private.h,v 1.7 2004/06/28 04:04:43 scottl Exp $ + * $FreeBSD: src/sys/sun4v/include/bus_private.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_BUS_PRIVATE_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/cache.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * from: @(#)cache.h 8.1 (Berkeley) 6/11/93 * from: NetBSD: cache.h,v 1.3 2000/08/01 00:28:02 eeh Exp * - * $FreeBSD: src/sys/sparc64/include/cache.h,v 1.12 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/cache.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_CACHE_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ccr.h#3 (text+ko) ==== @@ -21,7 +21,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/ccr.h,v 1.2 2001/12/29 06:50:25 jake Exp $ + * $FreeBSD: src/sys/sun4v/include/ccr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_CCR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/clock.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/clock.h,v 1.6 2002/10/05 20:14:49 mux Exp $ + * $FreeBSD: src/sys/sun4v/include/clock.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_CLOCK_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/cpu.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 * from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29 - * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.16 2005/12/22 22:16:09 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/cpu.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_CPU_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/cpufunc.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.21 2005/07/27 20:01:45 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/cpufunc.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/db_machdep.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04 - * $FreeBSD: src/sys/sparc64/include/db_machdep.h,v 1.9 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/db_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.14 2005/12/07 03:41:12 obrien Exp $ + * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/endian.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)endian.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.15 2005/03/02 21:33:28 joerg Exp $ + * $FreeBSD: src/sys/sun4v/include/endian.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_ENDIAN_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/exec.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/exec.h,v 1.3 2001/08/09 02:09:34 obrien Exp $ + * $FreeBSD: src/sys/sun4v/include/exec.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_EXEC_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/float.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)float.h 8.1 (Berkeley) 6/11/93 * from: NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp - * $FreeBSD: src/sys/sparc64/include/float.h,v 1.6 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/float.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_FLOAT_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/floatingpoint.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/floatingpoint.h,v 1.2 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/floatingpoint.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _FLOATINGPOINT_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/fp.h#3 (text+ko) ==== @@ -21,7 +21,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/fp.h,v 1.9 2003/04/01 04:02:44 jake Exp $ + * $FreeBSD: src/sys/sun4v/include/fp.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_FP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/frame.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/frame.h,v 1.16 2005/12/22 22:16:09 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/frame.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_FRAME_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/fsr.h#3 (text+ko) ==== @@ -21,7 +21,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/fsr.h,v 1.3 2002/09/14 17:58:54 tmm Exp $ + * $FreeBSD: src/sys/sun4v/include/fsr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_FSR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/gdb_machdep.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/sys/sparc64/include/gdb_machdep.h,v 1.3 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/gdb_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/hv_pcivar.h#3 (text+ko) ==== @@ -23,31 +23,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ * + * $FreeBSD: src/sys/sun4v/include/hv_pcivar.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _HV_PCIVAR_H_ #define _HV_PCIVAR_H_ struct hvpci_softc { - devhandle_t hs_devhandle; - phandle_t hs_node; - uint8_t hs_busnum; + devhandle_t hs_devhandle; + phandle_t hs_node; + uint8_t hs_busnum; + + struct ofw_bus_iinfo hs_pci_iinfo; struct bus_dma_tag hs_dmatag; - struct resource *hs_intr[4]; - int hs_intrrefcnt[4]; - - struct rman hs_pci_intr_rman; - - struct rman hs_pci_mem_rman; - bus_space_tag_t hs_pci_memt; + struct rman hs_pci_mem_rman; + bus_space_tag_t hs_pci_memt; bus_space_handle_t hs_pci_memh; - struct rman hs_pci_io_rman; - bus_space_tag_t hs_pci_iot; + struct rman hs_pci_io_rman; + bus_space_tag_t hs_pci_iot; bus_space_handle_t hs_pci_ioh; }; ==== //depot/projects/dtrace/src/sys/sun4v/include/hviommu.h#3 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright 2006 John-Mark Gurney. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * + * $FreeBSD: src/sys/sun4v/include/hviommu.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ + */ + #ifndef _HVIOMMU_H_ #define _HVIOMMU_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#5 (text+ko) ==== @@ -17,6 +17,7 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END + * $FreeBSD: src/sys/sun4v/include/hypervisor_api.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ /* ==== //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#4 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2006 Kip Macy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sun4v/include/hypervisorvar.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ + */ #ifndef _MACHINE_HYPERVISORVAR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/idprom.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: NetBSD: idprom.h,v 1.2 1998/09/05 23:57:26 eeh Exp * - * $FreeBSD: src/sys/sparc64/include/idprom.h,v 1.2 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/idprom.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_IDPROM_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ieee.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ieee.h 8.1 (Berkeley) 6/11/93 * from: NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp - * $FreeBSD: src/sys/sparc64/include/ieee.h,v 1.3 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/ieee.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_IEEE_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ieeefp.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Written by J.T. Conklin, Apr 6, 1995 * Public domain. - * $FreeBSD: src/sys/sparc64/include/ieeefp.h,v 1.4 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/ieeefp.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_IEEEFP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/in_cksum.h#3 (text+ko) ==== @@ -55,7 +55,7 @@ * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp * from: FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.5 2000/05/06 * - * $FreeBSD: src/sys/sparc64/include/in_cksum.h,v 1.3 2006/01/12 11:40:39 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/in_cksum.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/instr.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * from: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp * - * $FreeBSD: src/sys/sparc64/include/instr.h,v 1.7 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/instr.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_INSTR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/intr_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/intr_machdep.h,v 1.14 2005/10/25 19:48:48 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/intr_machdep.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_INTR_MACHDEP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/iommureg.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * from: @(#)sbusreg.h 8.1 (Berkeley) 6/11/93 * from: NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp * - * $FreeBSD: src/sys/sparc64/include/iommureg.h,v 1.6 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/iommureg.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_IOMMUREG_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/iommuvar.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * * from: NetBSD: iommuvar.h,v 1.9 2001/07/20 00:07:13 eeh Exp * - * $FreeBSD: src/sys/sparc64/include/iommuvar.h,v 1.15 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/iommuvar.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_IOMMUVAR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/kdb.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/sys/sparc64/include/kdb.h,v 1.2 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/kdb.h,v 1.1 2006/10/05 06:14:25 kmacy Exp $ */ #ifndef _MACHINE_KDB_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/kerneldump.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/kerneldump.h,v 1.2 2003/04/08 06:35:08 jake Exp $ + * $FreeBSD: src/sys/sun4v/include/kerneldump.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_KERNELDUMP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ktr.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $ - * $FreeBSD: src/sys/sparc64/include/ktr.h,v 1.6 2005/12/06 16:38:08 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/ktr.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_KTR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/limits.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/sparc64/include/limits.h,v 1.12 2005/03/04 21:26:07 joerg Exp $ + * $FreeBSD: src/sys/sun4v/include/limits.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_LIMITS_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/lsu.h#3 (text+ko) ==== @@ -21,7 +21,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/lsu.h,v 1.2 2002/07/16 16:24:03 tmm Exp $ + * $FreeBSD: src/sys/sun4v/include/lsu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_LSU_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/md_var.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12 - * $FreeBSD: src/sys/sparc64/include/md_var.h,v 1.16 2005/01/19 18:24:07 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/md_var.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/memdev.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/sys/sparc64/include/memdev.h,v 1.1 2004/08/01 11:40:54 markm Exp $ + * $FreeBSD: src/sys/sun4v/include/memdev.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #define CDEV_MAJOR 2 ==== //depot/projects/dtrace/src/sys/sun4v/include/metadata.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/metadata.h,v 1.5 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/metadata.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_METADATA_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/mmu.h#4 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2006 Kip Macy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sun4v/include/mmu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ + */ #ifndef _MACHINE_MMU_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/mutex.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/mutex.h,v 1.5 2001/12/18 00:27:18 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/mutex.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_MUTEX_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/nexusvar.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/nexusvar.h,v 1.3 2004/04/30 19:50:50 tmm Exp $ + * $FreeBSD: src/sys/sun4v/include/nexusvar.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_NEXUSVAR_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_bus.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/ofw_bus.h,v 1.7 2004/08/16 15:45:27 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/ofw_bus.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_OFW_BUS_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_machdep.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/ofw_machdep.h,v 1.6 2005/02/12 19:13:51 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/ofw_machdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_OFW_MACHDEP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_mem.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/ofw_mem.h,v 1.3 2003/06/07 18:29:29 jake Exp $ + * $FreeBSD: src/sys/sun4v/include/ofw_mem.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_OFW_MEM_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_nexus.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp * - * $FreeBSD: src/sys/sparc64/include/ofw_upa.h,v 1.5 2005/12/03 19:52:20 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/ofw_nexus.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_OFW_NEXUS_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/ofw_upa.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: NetBSD: psychoreg.h,v 1.8 2001/09/10 16:17:06 eeh Exp * - * $FreeBSD: src/sys/sparc64/include/ofw_upa.h,v 1.5 2005/12/03 19:52:20 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/ofw_upa.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_OFW_UPA_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/param.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/sparc64/include/param.h,v 1.21 2005/12/06 13:27:21 ru Exp $ + * $FreeBSD: src/sys/sun4v/include/param.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ /* ==== //depot/projects/dtrace/src/sys/sun4v/include/pcb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/pcb.h,v 1.17 2004/07/10 19:56:00 marcel Exp $ + * $FreeBSD: src/sys/sun4v/include/pcb.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_PCB_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/sparc64/include/pcpu.h,v 1.20 2005/04/16 14:57:38 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -77,8 +77,10 @@ u_int pc_kwbuf_full; \ struct rwindow pc_tsbwbuf[2]; \ uint64_t pc_caller; \ + uint32_t pc_tl; \ + uint32_t pc_trapid; \ uint16_t pc_cpulist[MAXCPU]; \ - uint64_t pad[10]; + uint64_t pad[5]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned ==== //depot/projects/dtrace/src/sys/sun4v/include/pmap.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 - * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.45 2005/12/06 21:09:01 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/pmap.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -59,6 +59,7 @@ TAILQ_HEAD(, pv_entry) pv_list; }; + struct pmap { uint64_t pm_context; uint64_t pm_hashscratch; @@ -116,7 +117,6 @@ extern vm_offset_t virtual_end; extern vm_paddr_t msgbuf_phys; - static __inline int pmap_track_modified(pmap_t pm, vm_offset_t va) { ==== //depot/projects/dtrace/src/sys/sun4v/include/pmc_mdep.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * This file is in the public domain. * - * $FreeBSD: src/sys/sparc64/include/pmc_mdep.h,v 1.2 2005/06/09 19:45:08 jkoshy Exp $ + * $FreeBSD: src/sys/sun4v/include/pmc_mdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_PMC_MDEP_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/proc.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 * from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29 - * $FreeBSD: src/sys/sparc64/include/proc.h,v 1.14 2005/04/04 21:53:55 jhb Exp $ + * $FreeBSD: src/sys/sun4v/include/proc.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ #ifndef _MACHINE_PROC_H_ ==== //depot/projects/dtrace/src/sys/sun4v/include/profile.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp * from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29 - * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.8 2005/01/07 02:29:22 imp Exp $ + * $FreeBSD: src/sys/sun4v/include/profile.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 8 00:36:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9524616A417; Sun, 8 Oct 2006 00:36:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A25216A416 for ; Sun, 8 Oct 2006 00:36:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 217AB43D53 for ; Sun, 8 Oct 2006 00:36:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k980anNo061225 for ; Sun, 8 Oct 2006 00:36:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k980amLO061222 for perforce@freebsd.org; Sun, 8 Oct 2006 00:36:48 GMT (envelope-from jb@freebsd.org) Date: Sun, 8 Oct 2006 00:36:48 GMT Message-Id: <200610080036.k980amLO061222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 00:36:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=107468 Change 107468 by jb@jb_freebsd7 on 2006/10/08 00:36:05 Remove some code that crept in via a sun4v_stable integration. This resets this file to match current. Affected files ... .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#4 (text+ko) ==== @@ -365,7 +365,7 @@ request, ata_cmd2str(request)); \ } #else -#define ATA_DEBUG_RQ(request, string) do { } while(0) +#define ATA_DEBUG_RQ(request, string) #endif From owner-p4-projects@FreeBSD.ORG Sun Oct 8 00:52:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F10C16A416; Sun, 8 Oct 2006 00:52:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49CCE16A407 for ; Sun, 8 Oct 2006 00:52:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AD2043D46 for ; Sun, 8 Oct 2006 00:52:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k980q9V1071627 for ; Sun, 8 Oct 2006 00:52:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k980q95E071624 for perforce@freebsd.org; Sun, 8 Oct 2006 00:52:09 GMT (envelope-from jb@freebsd.org) Date: Sun, 8 Oct 2006 00:52:09 GMT Message-Id: <200610080052.k980q95E071624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 00:52:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107471 Change 107471 by jb@jb_freebsd7 on 2006/10/08 00:51:19 Add KSE option support. Affected files ... .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/ddb/db_ps.c#8 (text+ko) ==== @@ -292,7 +292,12 @@ td = kdb_thread; db_printf("Thread %d at %p:\n", td->td_tid, td); +#ifdef KSE + db_printf(" proc (pid %d): %p ", td->td_proc->p_pid, td->td_proc); + db_printf(" ksegrp: %p\n", td->td_ksegrp); +#else db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); +#endif if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); db_printf(" flags: %#x ", td->td_flags); From owner-p4-projects@FreeBSD.ORG Sun Oct 8 01:28:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B250416A407; Sun, 8 Oct 2006 01:28:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E49716A416 for ; Sun, 8 Oct 2006 01:28:02 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A50143D45 for ; Sun, 8 Oct 2006 01:28:02 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k981S2VS078946 for ; Sun, 8 Oct 2006 01:28:02 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k981QPf3078276 for perforce@freebsd.org; Sun, 8 Oct 2006 01:26:25 GMT (envelope-from marcel@freebsd.org) Date: Sun, 8 Oct 2006 01:26:25 GMT Message-Id: <200610080126.k981QPf3078276@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 107474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 01:28:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=107474 Change 107474 by marcel@marcel_nfs on 2006/10/08 01:25:24 IFC @107454 Affected files ... .. //depot/projects/ia64/MAINTAINERS#55 integrate .. //depot/projects/ia64/Makefile#51 integrate .. //depot/projects/ia64/Makefile.inc1#111 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#8 integrate .. //depot/projects/ia64/UPDATING#89 integrate .. //depot/projects/ia64/bin/cp/cp.1#11 integrate .. //depot/projects/ia64/bin/cp/cp.c#19 integrate .. //depot/projects/ia64/bin/cp/extern.h#8 integrate .. //depot/projects/ia64/bin/cp/utils.c#15 integrate .. //depot/projects/ia64/bin/date/netdate.c#7 integrate .. //depot/projects/ia64/bin/dd/Makefile#8 integrate .. //depot/projects/ia64/bin/df/df.c#24 integrate .. //depot/projects/ia64/bin/ed/main.c#9 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.1#9 integrate .. //depot/projects/ia64/bin/ls/ls.1#30 integrate .. //depot/projects/ia64/bin/pax/pax.1#11 integrate .. //depot/projects/ia64/bin/ps/ps.1#29 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.1#10 integrate .. //depot/projects/ia64/bin/sh/histedit.c#10 integrate .. //depot/projects/ia64/bin/sh/jobs.c#25 integrate .. //depot/projects/ia64/bin/sh/jobs.h#6 integrate .. //depot/projects/ia64/bin/sh/main.c#8 integrate .. //depot/projects/ia64/bin/sh/parser.c#16 integrate .. //depot/projects/ia64/bin/sh/sh.1#37 integrate .. //depot/projects/ia64/bin/test/test.1#6 integrate .. //depot/projects/ia64/contrib/bind9/CHANGES#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/ia64/contrib/bind9/version#5 integrate .. //depot/projects/ia64/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/ia64/contrib/gcc/ChangeLog#15 integrate .. //depot/projects/ia64/contrib/gcc/ansidecl.h#6 integrate .. //depot/projects/ia64/contrib/gcc/builtins.c#11 integrate .. //depot/projects/ia64/contrib/gcc/c-common.c#13 integrate .. //depot/projects/ia64/contrib/gcc/c-common.h#10 integrate .. //depot/projects/ia64/contrib/gcc/c-decl.c#17 integrate .. //depot/projects/ia64/contrib/gcc/c-objc-common.c#8 integrate .. //depot/projects/ia64/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/ia64/contrib/gcc/c-typeck.c#14 integrate .. //depot/projects/ia64/contrib/gcc/cccp.1#2 delete .. //depot/projects/ia64/contrib/gcc/cfgcleanup.c#9 integrate .. //depot/projects/ia64/contrib/gcc/combine.c#11 integrate .. //depot/projects/ia64/contrib/gcc/config.gcc#10 integrate .. //depot/projects/ia64/contrib/gcc/config.host#2 integrate .. //depot/projects/ia64/contrib/gcc/config.in#9 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.c#11 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.md#9 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.c#8 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.md#8 integrate .. //depot/projects/ia64/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/i386.c#14 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.md#11 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/hpux.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix51.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux64.h#9 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000-protos.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.c#12 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.md#11 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#12 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/gmon-sol2.c#6 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-gas-bi.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.c#12 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/x-linux#4 branch .. //depot/projects/ia64/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/ia64/contrib/gcc/configure#13 integrate .. //depot/projects/ia64/contrib/gcc/configure.ac#3 integrate .. //depot/projects/ia64/contrib/gcc/coverage.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog#15 integrate .. //depot/projects/ia64/contrib/gcc/cp/call.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/class.c#11 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-tree.def#6 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-tree.h#13 integrate .. //depot/projects/ia64/contrib/gcc/cp/cvt.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl.c#15 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl2.c#15 integrate .. //depot/projects/ia64/contrib/gcc/cp/error.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cp/init.c#14 integrate .. //depot/projects/ia64/contrib/gcc/cp/lex.c#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/method.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/name-lookup.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/parser.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cp/pt.c#13 integrate .. //depot/projects/ia64/contrib/gcc/cp/search.c#11 integrate .. //depot/projects/ia64/contrib/gcc/cp/semantics.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cp/typeck.c#11 integrate .. //depot/projects/ia64/contrib/gcc/cpp.1#2 delete .. //depot/projects/ia64/contrib/gcc/cppfiles.c#7 integrate .. //depot/projects/ia64/contrib/gcc/cpphash.h#6 integrate .. //depot/projects/ia64/contrib/gcc/cppinit.c#12 integrate .. //depot/projects/ia64/contrib/gcc/cse.c#10 integrate .. //depot/projects/ia64/contrib/gcc/doc/contrib.texi#8 integrate .. //depot/projects/ia64/contrib/gcc/doc/cpp.1#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/gcc.1#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/gcov.1#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/hostconfig.texi#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/include/gcc-common.texi#8 integrate .. //depot/projects/ia64/contrib/gcc/doc/invoke.texi#13 integrate .. //depot/projects/ia64/contrib/gcc/expmed.c#10 integrate .. //depot/projects/ia64/contrib/gcc/f/ChangeLog#14 integrate .. //depot/projects/ia64/contrib/gcc/f/g77.texi#6 integrate .. //depot/projects/ia64/contrib/gcc/f/g77spec.c#6 integrate .. //depot/projects/ia64/contrib/gcc/flow.c#11 integrate .. //depot/projects/ia64/contrib/gcc/fold-const.c#11 integrate .. //depot/projects/ia64/contrib/gcc/gcc.1#7 delete .. //depot/projects/ia64/contrib/gcc/gcc.c#18 integrate .. //depot/projects/ia64/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/ia64/contrib/gcc/gcov.c#5 integrate .. //depot/projects/ia64/contrib/gcc/gcse.c#8 integrate .. //depot/projects/ia64/contrib/gcc/ggc-common.c#5 integrate .. //depot/projects/ia64/contrib/gcc/global.c#6 integrate .. //depot/projects/ia64/contrib/gcc/hooks.c#7 integrate .. //depot/projects/ia64/contrib/gcc/hooks.h#7 integrate .. //depot/projects/ia64/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/ia64/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/ia64/contrib/gcc/local-alloc.c#7 integrate .. //depot/projects/ia64/contrib/gcc/longlong.h#6 integrate .. //depot/projects/ia64/contrib/gcc/loop.c#15 integrate .. //depot/projects/ia64/contrib/gcc/md5.c#3 integrate .. //depot/projects/ia64/contrib/gcc/md5.h#2 integrate .. //depot/projects/ia64/contrib/gcc/mips-tdump.c#4 integrate .. //depot/projects/ia64/contrib/gcc/mips-tfile.c#4 integrate .. //depot/projects/ia64/contrib/gcc/mklibgcc.in#9 integrate .. //depot/projects/ia64/contrib/gcc/optabs.c#11 integrate .. //depot/projects/ia64/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/ia64/contrib/gcc/reg-stack.c#9 integrate .. //depot/projects/ia64/contrib/gcc/regrename.c#6 integrate .. //depot/projects/ia64/contrib/gcc/regs.h#6 integrate .. //depot/projects/ia64/contrib/gcc/rtl.h#11 integrate .. //depot/projects/ia64/contrib/gcc/sched-rgn.c#6 integrate .. //depot/projects/ia64/contrib/gcc/simplify-rtx.c#6 integrate .. //depot/projects/ia64/contrib/gcc/stmt.c#10 integrate .. //depot/projects/ia64/contrib/gcc/toplev.c#15 integrate .. //depot/projects/ia64/contrib/gcc/tree.c#11 integrate .. //depot/projects/ia64/contrib/gcc/unroll.c#12 integrate .. //depot/projects/ia64/contrib/gcc/version.c#16 integrate .. //depot/projects/ia64/contrib/gdb/FREEBSD-Xlist#5 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#9 integrate .. //depot/projects/ia64/contrib/ipfilter/HISTORY#10 integrate .. //depot/projects/ia64/contrib/ipfilter/Makefile#8 integrate .. //depot/projects/ia64/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/ipf.h#6 integrate .. //depot/projects/ia64/contrib/ipfilter/iplang/iplang_y.y#6 integrate .. //depot/projects/ia64/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/ipsend.c#8 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/iptests.c#7 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/lsock.c#6 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/resend.c#6 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/sbpf.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/sock.c#8 integrate .. //depot/projects/ia64/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/ia64/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/ia64/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipmon.8#10 integrate .. //depot/projects/ia64/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/samples/proxy.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/test/Makefile#10 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/ia64/contrib/ipfilter/todo#4 branch .. //depot/projects/ia64/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipmon.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/ia64/contrib/less/LICENSE#3 integrate .. //depot/projects/ia64/contrib/less/Makefile.aut#4 integrate .. //depot/projects/ia64/contrib/less/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/ia64/contrib/less/NEWS#4 integrate .. //depot/projects/ia64/contrib/less/README#4 integrate .. //depot/projects/ia64/contrib/less/brac.c#3 integrate .. //depot/projects/ia64/contrib/less/ch.c#4 integrate .. //depot/projects/ia64/contrib/less/charset.c#4 integrate .. //depot/projects/ia64/contrib/less/charset.h#1 branch .. //depot/projects/ia64/contrib/less/cmd.h#4 integrate .. //depot/projects/ia64/contrib/less/cmdbuf.c#4 integrate .. //depot/projects/ia64/contrib/less/command.c#4 integrate .. //depot/projects/ia64/contrib/less/configure#4 integrate .. //depot/projects/ia64/contrib/less/configure.ac#2 integrate .. //depot/projects/ia64/contrib/less/decode.c#4 integrate .. //depot/projects/ia64/contrib/less/defines.ds#4 integrate .. //depot/projects/ia64/contrib/less/defines.h.in#4 integrate .. //depot/projects/ia64/contrib/less/defines.o2#4 integrate .. //depot/projects/ia64/contrib/less/defines.o9#3 integrate .. //depot/projects/ia64/contrib/less/defines.wn#4 integrate .. //depot/projects/ia64/contrib/less/edit.c#3 integrate .. //depot/projects/ia64/contrib/less/filename.c#4 integrate .. //depot/projects/ia64/contrib/less/forwback.c#3 integrate .. //depot/projects/ia64/contrib/less/funcs.h#4 integrate .. //depot/projects/ia64/contrib/less/ifile.c#3 integrate .. //depot/projects/ia64/contrib/less/input.c#3 integrate .. //depot/projects/ia64/contrib/less/jump.c#3 integrate .. //depot/projects/ia64/contrib/less/less.h#4 integrate .. //depot/projects/ia64/contrib/less/less.man#4 integrate .. //depot/projects/ia64/contrib/less/less.nro#4 integrate .. //depot/projects/ia64/contrib/less/lessecho.c#3 integrate .. //depot/projects/ia64/contrib/less/lessecho.man#1 branch .. //depot/projects/ia64/contrib/less/lessecho.nro#1 branch .. //depot/projects/ia64/contrib/less/lesskey.c#4 integrate .. //depot/projects/ia64/contrib/less/lesskey.h#3 integrate .. //depot/projects/ia64/contrib/less/lesskey.man#4 integrate .. //depot/projects/ia64/contrib/less/lesskey.nro#4 integrate .. //depot/projects/ia64/contrib/less/lglob.h#3 integrate .. //depot/projects/ia64/contrib/less/line.c#5 integrate .. //depot/projects/ia64/contrib/less/linenum.c#4 integrate .. //depot/projects/ia64/contrib/less/lsystem.c#4 integrate .. //depot/projects/ia64/contrib/less/main.c#4 integrate .. //depot/projects/ia64/contrib/less/mark.c#3 integrate .. //depot/projects/ia64/contrib/less/mkhelp.c#3 integrate .. //depot/projects/ia64/contrib/less/optfunc.c#4 integrate .. //depot/projects/ia64/contrib/less/option.c#4 integrate .. //depot/projects/ia64/contrib/less/option.h#3 integrate .. //depot/projects/ia64/contrib/less/opttbl.c#4 integrate .. //depot/projects/ia64/contrib/less/os.c#4 integrate .. //depot/projects/ia64/contrib/less/output.c#4 integrate .. //depot/projects/ia64/contrib/less/pckeys.h#3 integrate .. //depot/projects/ia64/contrib/less/position.c#3 integrate .. //depot/projects/ia64/contrib/less/position.h#3 integrate .. //depot/projects/ia64/contrib/less/prompt.c#4 integrate .. //depot/projects/ia64/contrib/less/screen.c#4 integrate .. //depot/projects/ia64/contrib/less/scrsize.c#3 integrate .. //depot/projects/ia64/contrib/less/search.c#4 integrate .. //depot/projects/ia64/contrib/less/signal.c#3 integrate .. //depot/projects/ia64/contrib/less/tags.c#4 integrate .. //depot/projects/ia64/contrib/less/ttyin.c#4 integrate .. //depot/projects/ia64/contrib/less/version.c#4 integrate .. //depot/projects/ia64/contrib/libf2c/ChangeLog#13 integrate .. //depot/projects/ia64/contrib/libobjc/ChangeLog#14 integrate .. //depot/projects/ia64/contrib/libobjc/README#2 integrate .. //depot/projects/ia64/contrib/libpcap/CHANGES#6 integrate .. //depot/projects/ia64/contrib/libpcap/CREDITS#6 integrate .. //depot/projects/ia64/contrib/libpcap/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/libpcap/README.dag#2 integrate .. //depot/projects/ia64/contrib/libpcap/VERSION#7 integrate .. //depot/projects/ia64/contrib/libpcap/config.h.in#6 integrate .. //depot/projects/ia64/contrib/libpcap/configure#6 integrate .. //depot/projects/ia64/contrib/libpcap/configure.in#6 integrate .. //depot/projects/ia64/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/ia64/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/ia64/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/ia64/contrib/libpcap/ethertype.h#4 integrate .. //depot/projects/ia64/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/gencode.c#8 integrate .. //depot/projects/ia64/contrib/libpcap/gencode.h#6 integrate .. //depot/projects/ia64/contrib/libpcap/grammar.y#6 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.c#10 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dlpi.c#6 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-int.h#7 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-linux.c#6 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.3#8 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.c#7 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.h#7 integrate .. //depot/projects/ia64/contrib/libpcap/savefile.c#6 integrate .. //depot/projects/ia64/contrib/libpcap/scanner.l#7 integrate .. //depot/projects/ia64/contrib/libstdc++/ChangeLog#15 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/c++config#12 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/fstream.tcc#8 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cmath.h#5 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/Makefile#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/cmds.c#6 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/conf.c#5 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/extern.h#7 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpcmd.y#6 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.8#5 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.c#7 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.conf.5#6 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/logutmp.c#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/logwtmp.c#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/pathnames.h#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/popen.c#6 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/version.h#6 integrate .. //depot/projects/ia64/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/ia64/contrib/ntp/include/ntpd.h#4 integrate .. //depot/projects/ia64/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/openbsm/HISTORY#4 integrate .. //depot/projects/ia64/contrib/openbsm/README#3 integrate .. //depot/projects/ia64/contrib/openbsm/TODO#3 integrate .. //depot/projects/ia64/contrib/openbsm/VERSION#4 integrate .. //depot/projects/ia64/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/ia64/contrib/openbsm/bsm/audit.h#3 delete .. //depot/projects/ia64/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/ia64/contrib/openbsm/bsm/audit_internal.h#2 delete .. //depot/projects/ia64/contrib/openbsm/bsm/audit_kevents.h#3 delete .. //depot/projects/ia64/contrib/openbsm/bsm/audit_record.h#4 delete .. //depot/projects/ia64/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/ia64/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/ia64/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/ia64/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/ia64/contrib/openbsm/configure#4 integrate .. //depot/projects/ia64/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/ia64/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/ia64/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/ia64/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/ia64/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/ia64/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/ia64/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/ia64/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/ia64/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/ia64/contrib/pnpinfo/pnpinfo.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#24 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#18 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#17 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#18 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/cidrexpand#4 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#18 integrate .. //depot/projects/ia64/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/ia64/contrib/smbfs/smbutil/view.c#5 integrate .. //depot/projects/ia64/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/ia64/contrib/tar/AUTHORS#2 delete .. //depot/projects/ia64/contrib/tar/COPYING#2 delete .. //depot/projects/ia64/contrib/tar/ChangeLog#2 delete .. //depot/projects/ia64/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/ia64/contrib/tar/FREEBSD-Xlist#3 delete .. //depot/projects/ia64/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/ia64/contrib/tar/INSTALL#2 delete .. //depot/projects/ia64/contrib/tar/NEWS#2 delete .. //depot/projects/ia64/contrib/tar/PORTS#2 delete .. //depot/projects/ia64/contrib/tar/README#2 delete .. //depot/projects/ia64/contrib/tar/README-alpha#2 delete .. //depot/projects/ia64/contrib/tar/THANKS#2 delete .. //depot/projects/ia64/contrib/tar/TODO#2 delete .. //depot/projects/ia64/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/ia64/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/ia64/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/ia64/contrib/tar/doc/header.texi#2 delete .. //depot/projects/ia64/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/ia64/contrib/tar/doc/version.texi#2 delete .. //depot/projects/ia64/contrib/tar/lib/addext.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/basename.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/error.c#3 delete .. //depot/projects/ia64/contrib/tar/lib/error.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/ia64/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/getline.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/getline.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/hash.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/hash.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/human.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/human.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/memset.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/quote.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/quote.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/rename.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/utime.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/ia64/contrib/tar/src/arith.h#2 delete .. //depot/projects/ia64/contrib/tar/src/buffer.c#6 delete .. //depot/projects/ia64/contrib/tar/src/common.h#2 delete .. //depot/projects/ia64/contrib/tar/src/compare.c#3 delete .. //depot/projects/ia64/contrib/tar/src/create.c#2 delete .. //depot/projects/ia64/contrib/tar/src/delete.c#2 delete .. //depot/projects/ia64/contrib/tar/src/extract.c#5 delete .. //depot/projects/ia64/contrib/tar/src/incremen.c#2 delete .. //depot/projects/ia64/contrib/tar/src/list.c#2 delete .. //depot/projects/ia64/contrib/tar/src/mangle.c#2 delete .. //depot/projects/ia64/contrib/tar/src/misc.c#3 delete .. //depot/projects/ia64/contrib/tar/src/names.c#2 delete .. //depot/projects/ia64/contrib/tar/src/rmt.c#2 delete .. //depot/projects/ia64/contrib/tar/src/rmt.h#2 delete .. //depot/projects/ia64/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/ia64/contrib/tar/src/system.h#2 delete .. //depot/projects/ia64/contrib/tar/src/tar.c#3 delete .. //depot/projects/ia64/contrib/tar/src/tar.h#2 delete .. //depot/projects/ia64/contrib/tar/src/update.c#2 delete .. //depot/projects/ia64/contrib/tcpdump/CHANGES#7 integrate .. //depot/projects/ia64/contrib/tcpdump/CREDITS#7 integrate .. //depot/projects/ia64/contrib/tcpdump/FILES#7 integrate .. //depot/projects/ia64/contrib/tcpdump/INSTALL#6 integrate .. //depot/projects/ia64/contrib/tcpdump/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/tcpdump/VERSION#8 integrate .. //depot/projects/ia64/contrib/tcpdump/addrtoname.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/configure#7 integrate .. //depot/projects/ia64/contrib/tcpdump/configure.in#7 integrate .. //depot/projects/ia64/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ethertype.h#5 integrate .. //depot/projects/ia64/contrib/tcpdump/icmp6.h#5 integrate .. //depot/projects/ia64/contrib/tcpdump/interface.h#8 integrate .. //depot/projects/ia64/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/ipproto.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/llc.h#6 integrate .. //depot/projects/ia64/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ospf.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/ppp.h#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-802_11.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ascii.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-atm.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-chdlc.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-cip.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-ether.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fddi.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fr.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp6.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip6.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipx.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isoclns.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lane.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ldp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-llc.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-null.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ospf.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pim.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-radius.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rsvp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sctp.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sll.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-tcp.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-token.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump-stdinc.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump.1#8 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/ia64/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/ia64/contrib/telnet/telnet/telnet.1#4 integrate .. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.c#6 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-upgrade#7 integrate .. //depot/projects/ia64/crypto/openssh/CREDITS#7 integrate .. //depot/projects/ia64/crypto/openssh/ChangeLog#12 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#10 integrate .. //depot/projects/ia64/crypto/openssh/INSTALL#8 integrate .. //depot/projects/ia64/crypto/openssh/LICENCE#9 integrate .. //depot/projects/ia64/crypto/openssh/Makefile.in#11 integrate .. //depot/projects/ia64/crypto/openssh/OVERVIEW#5 integrate .. //depot/projects/ia64/crypto/openssh/README#11 integrate .. //depot/projects/ia64/crypto/openssh/README.platform#5 integrate .. //depot/projects/ia64/crypto/openssh/README.tun#2 integrate .. //depot/projects/ia64/crypto/openssh/acss.c#3 integrate .. //depot/projects/ia64/crypto/openssh/atomicio.c#6 integrate .. //depot/projects/ia64/crypto/openssh/atomicio.h#5 integrate .. //depot/projects/ia64/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/ia64/crypto/openssh/audit.c#3 integrate .. //depot/projects/ia64/crypto/openssh/audit.h#2 integrate .. //depot/projects/ia64/crypto/openssh/auth-bsdauth.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth-chall.c#10 integrate .. //depot/projects/ia64/crypto/openssh/auth-krb5.c#14 integrate .. //depot/projects/ia64/crypto/openssh/auth-options.c#8 integrate .. //depot/projects/ia64/crypto/openssh/auth-options.h#5 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.c#15 integrate .. //depot/projects/ia64/crypto/openssh/auth-passwd.c#13 integrate .. //depot/projects/ia64/crypto/openssh/auth-rh-rsa.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth-rhosts.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth-rsa.c#9 integrate .. //depot/projects/ia64/crypto/openssh/auth-shadow.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth-sia.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth-skey.c#8 integrate .. //depot/projects/ia64/crypto/openssh/auth.c#12 integrate .. //depot/projects/ia64/crypto/openssh/auth.h#13 integrate .. //depot/projects/ia64/crypto/openssh/auth1.c#15 integrate .. //depot/projects/ia64/crypto/openssh/auth2-chall.c#11 integrate .. //depot/projects/ia64/crypto/openssh/auth2-gss.c#6 integrate .. //depot/projects/ia64/crypto/openssh/auth2-hostbased.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth2-kbdint.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth2-none.c#6 integrate .. //depot/projects/ia64/crypto/openssh/auth2-passwd.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pubkey.c#6 integrate .. //depot/projects/ia64/crypto/openssh/auth2.c#16 integrate .. //depot/projects/ia64/crypto/openssh/authfd.c#12 integrate .. //depot/projects/ia64/crypto/openssh/authfd.h#8 integrate .. //depot/projects/ia64/crypto/openssh/authfile.c#13 integrate .. //depot/projects/ia64/crypto/openssh/authfile.h#4 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.c#11 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.h#7 integrate .. //depot/projects/ia64/crypto/openssh/bufbn.c#1 branch .. //depot/projects/ia64/crypto/openssh/buffer.c#8 integrate .. //depot/projects/ia64/crypto/openssh/buffer.h#4 integrate .. //depot/projects/ia64/crypto/openssh/buildpkg.sh.in#4 integrate .. //depot/projects/ia64/crypto/openssh/canohost.c#14 integrate .. //depot/projects/ia64/crypto/openssh/canohost.h#4 integrate .. //depot/projects/ia64/crypto/openssh/channels.c#16 integrate .. //depot/projects/ia64/crypto/openssh/channels.h#12 integrate .. //depot/projects/ia64/crypto/openssh/cipher-3des1.c#3 integrate .. //depot/projects/ia64/crypto/openssh/cipher-acss.c#3 integrate .. //depot/projects/ia64/crypto/openssh/cipher-aes.c#4 integrate .. //depot/projects/ia64/crypto/openssh/cipher-bf1.c#2 integrate .. //depot/projects/ia64/crypto/openssh/cipher-ctr.c#6 integrate .. //depot/projects/ia64/crypto/openssh/cipher.c#14 integrate .. //depot/projects/ia64/crypto/openssh/cipher.h#6 integrate .. //depot/projects/ia64/crypto/openssh/cleanup.c#2 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.c#13 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.h#8 integrate .. //depot/projects/ia64/crypto/openssh/compat.c#10 integrate .. //depot/projects/ia64/crypto/openssh/compat.h#11 integrate .. //depot/projects/ia64/crypto/openssh/compress.c#5 integrate .. //depot/projects/ia64/crypto/openssh/compress.h#3 integrate .. //depot/projects/ia64/crypto/openssh/config.h#12 integrate .. //depot/projects/ia64/crypto/openssh/configure.ac#12 integrate .. //depot/projects/ia64/crypto/openssh/crc32.c#3 integrate .. //depot/projects/ia64/crypto/openssh/crc32.h#4 integrate .. //depot/projects/ia64/crypto/openssh/deattack.c#5 integrate .. //depot/projects/ia64/crypto/openssh/deattack.h#3 integrate .. //depot/projects/ia64/crypto/openssh/defines.h#12 integrate .. //depot/projects/ia64/crypto/openssh/dh.c#9 integrate .. //depot/projects/ia64/crypto/openssh/dh.h#4 integrate .. //depot/projects/ia64/crypto/openssh/dispatch.c#4 integrate .. //depot/projects/ia64/crypto/openssh/dispatch.h#3 integrate .. //depot/projects/ia64/crypto/openssh/dns.c#6 integrate .. //depot/projects/ia64/crypto/openssh/dns.h#4 integrate .. //depot/projects/ia64/crypto/openssh/entropy.c#6 integrate .. //depot/projects/ia64/crypto/openssh/fatal.c#3 integrate .. //depot/projects/ia64/crypto/openssh/getput.h#3 delete .. //depot/projects/ia64/crypto/openssh/groupaccess.c#5 integrate .. //depot/projects/ia64/crypto/openssh/groupaccess.h#3 integrate .. //depot/projects/ia64/crypto/openssh/gss-genr.c#5 integrate .. //depot/projects/ia64/crypto/openssh/gss-serv-krb5.c#7 integrate .. //depot/projects/ia64/crypto/openssh/gss-serv.c#5 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.c#11 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.h#7 integrate .. //depot/projects/ia64/crypto/openssh/includes.h#13 integrate .. //depot/projects/ia64/crypto/openssh/kex.c#10 integrate .. //depot/projects/ia64/crypto/openssh/kex.h#9 integrate .. //depot/projects/ia64/crypto/openssh/kexdh.c#6 integrate .. //depot/projects/ia64/crypto/openssh/kexdhc.c#4 integrate .. //depot/projects/ia64/crypto/openssh/kexdhs.c#4 integrate .. //depot/projects/ia64/crypto/openssh/kexgex.c#6 integrate .. //depot/projects/ia64/crypto/openssh/kexgexc.c#4 integrate .. //depot/projects/ia64/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/ia64/crypto/openssh/key.c#13 integrate .. //depot/projects/ia64/crypto/openssh/key.h#7 integrate .. //depot/projects/ia64/crypto/openssh/log.c#10 integrate .. //depot/projects/ia64/crypto/openssh/log.h#11 integrate .. //depot/projects/ia64/crypto/openssh/loginrec.c#13 integrate .. //depot/projects/ia64/crypto/openssh/loginrec.h#5 integrate .. //depot/projects/ia64/crypto/openssh/logintest.c#4 integrate .. //depot/projects/ia64/crypto/openssh/mac.c#6 integrate .. //depot/projects/ia64/crypto/openssh/mac.h#3 integrate .. //depot/projects/ia64/crypto/openssh/match.c#4 integrate .. //depot/projects/ia64/crypto/openssh/match.h#3 integrate .. //depot/projects/ia64/crypto/openssh/md-sha256.c#1 branch .. //depot/projects/ia64/crypto/openssh/md5crypt.c#4 integrate .. //depot/projects/ia64/crypto/openssh/misc.c#12 integrate .. //depot/projects/ia64/crypto/openssh/misc.h#9 integrate .. //depot/projects/ia64/crypto/openssh/moduli.c#6 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#14 integrate .. //depot/projects/ia64/crypto/openssh/monitor.h#8 integrate .. //depot/projects/ia64/crypto/openssh/monitor_fdpass.c#5 integrate .. //depot/projects/ia64/crypto/openssh/monitor_fdpass.h#3 integrate .. //depot/projects/ia64/crypto/openssh/monitor_mm.c#7 integrate .. //depot/projects/ia64/crypto/openssh/monitor_mm.h#4 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.c#12 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.h#10 integrate .. //depot/projects/ia64/crypto/openssh/msg.c#8 integrate .. //depot/projects/ia64/crypto/openssh/msg.h#5 integrate .. //depot/projects/ia64/crypto/openssh/myproposal.h#9 integrate .. //depot/projects/ia64/crypto/openssh/nchan.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/Makefile.in#9 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/basename.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bindresvport.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-arc4random.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-asprintf.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-closefrom.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cray.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-getpeereid.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.c#10 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-nextstep.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-openpty.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-snprintf.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-waitpid.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/daemon.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-rfc2553.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-rfc2553.h#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getrrsetbyname.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.h#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/mktemp.c#8 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/openbsd-compat.h#9 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.c#8 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.h#9 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-irix.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-linux.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-linux.h#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-solaris.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-solaris.h#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-tun.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-tun.h#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-uw.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/readpassphrase.c#7 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/regress/Makefile.in#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/regress/closefromtest.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/regress/snprintftest.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/regress/strduptest.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/regress/strtonumtest.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/rresvport.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/setproctitle.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sha2.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sha2.h#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strtonum.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/xcrypt.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/xmmap.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openssh.xml.in#1 branch .. //depot/projects/ia64/crypto/openssh/packet.c#14 integrate .. //depot/projects/ia64/crypto/openssh/packet.h#8 integrate .. //depot/projects/ia64/crypto/openssh/pathnames.h#7 integrate .. //depot/projects/ia64/crypto/openssh/platform.c#1 branch .. //depot/projects/ia64/crypto/openssh/platform.h#1 branch .. //depot/projects/ia64/crypto/openssh/progressmeter.c#7 integrate .. //depot/projects/ia64/crypto/openssh/progressmeter.h#2 integrate .. //depot/projects/ia64/crypto/openssh/readconf.c#15 integrate .. //depot/projects/ia64/crypto/openssh/readconf.h#12 integrate .. //depot/projects/ia64/crypto/openssh/readpass.c#8 integrate .. //depot/projects/ia64/crypto/openssh/regress/Makefile#8 integrate .. //depot/projects/ia64/crypto/openssh/regress/agent-getpeereid.sh#4 integrate .. //depot/projects/ia64/crypto/openssh/regress/cfgmatch.sh#1 branch .. //depot/projects/ia64/crypto/openssh/regress/cipher-speed.sh#1 branch .. //depot/projects/ia64/crypto/openssh/regress/forcecommand.sh#1 branch .. //depot/projects/ia64/crypto/openssh/regress/forwarding.sh#4 integrate .. //depot/projects/ia64/crypto/openssh/rsa.c#4 integrate .. //depot/projects/ia64/crypto/openssh/rsa.h#4 integrate .. //depot/projects/ia64/crypto/openssh/scard-opensc.c#5 integrate .. //depot/projects/ia64/crypto/openssh/scard.c#6 integrate .. //depot/projects/ia64/crypto/openssh/scard.h#5 integrate .. //depot/projects/ia64/crypto/openssh/scp.1#12 integrate .. //depot/projects/ia64/crypto/openssh/scp.c#13 integrate .. //depot/projects/ia64/crypto/openssh/servconf.c#17 integrate .. //depot/projects/ia64/crypto/openssh/servconf.h#11 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.c#13 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.h#3 integrate .. //depot/projects/ia64/crypto/openssh/session.c#25 integrate .. //depot/projects/ia64/crypto/openssh/session.h#11 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.c#14 integrate .. //depot/projects/ia64/crypto/openssh/sftp-common.c#8 integrate .. //depot/projects/ia64/crypto/openssh/sftp-common.h#6 integrate .. //depot/projects/ia64/crypto/openssh/sftp-glob.c#6 integrate .. //depot/projects/ia64/crypto/openssh/sftp-server.8#6 integrate .. //depot/projects/ia64/crypto/openssh/sftp-server.c#12 integrate .. //depot/projects/ia64/crypto/openssh/sftp.c#14 integrate .. //depot/projects/ia64/crypto/openssh/sftp.h#3 integrate .. //depot/projects/ia64/crypto/openssh/ssh-add.c#13 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.1#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#16 integrate .. //depot/projects/ia64/crypto/openssh/ssh-dss.c#7 integrate .. //depot/projects/ia64/crypto/openssh/ssh-gss.h#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#13 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#14 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keysign.8#5 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keysign.c#9 integrate .. //depot/projects/ia64/crypto/openssh/ssh-rand-helper.c#9 integrate .. //depot/projects/ia64/crypto/openssh/ssh-rsa.c#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh.1#14 integrate .. //depot/projects/ia64/crypto/openssh/ssh.c#15 integrate .. //depot/projects/ia64/crypto/openssh/ssh.h#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh1.h#5 integrate .. //depot/projects/ia64/crypto/openssh/ssh2.h#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#20 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#16 integrate .. //depot/projects/ia64/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#14 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.h#5 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect1.c#10 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect2.c#15 integrate .. //depot/projects/ia64/crypto/openssh/sshd.8#16 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#18 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#22 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#18 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.c#11 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.h#7 integrate .. //depot/projects/ia64/crypto/openssh/sshpty.c#12 integrate .. //depot/projects/ia64/crypto/openssh/sshpty.h#4 integrate .. //depot/projects/ia64/crypto/openssh/sshtty.c#6 integrate .. //depot/projects/ia64/crypto/openssh/ttymodes.c#6 integrate .. //depot/projects/ia64/crypto/openssh/ttymodes.h#5 integrate .. //depot/projects/ia64/crypto/openssh/uidswap.c#8 integrate .. //depot/projects/ia64/crypto/openssh/uidswap.h#3 integrate .. //depot/projects/ia64/crypto/openssh/uuencode.c#6 integrate .. //depot/projects/ia64/crypto/openssh/uuencode.h#4 integrate .. //depot/projects/ia64/crypto/openssh/version.h#21 integrate .. //depot/projects/ia64/crypto/openssh/xmalloc.c#3 integrate .. //depot/projects/ia64/crypto/openssh/xmalloc.h#4 integrate .. //depot/projects/ia64/crypto/openssl/CHANGES#9 integrate .. //depot/projects/ia64/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/ia64/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/ia64/crypto/openssl/Configure#9 integrate .. //depot/projects/ia64/crypto/openssl/FAQ#9 integrate .. //depot/projects/ia64/crypto/openssl/FREEBSD-Xlist#5 integrate .. //depot/projects/ia64/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/crypto/openssl/INSTALL#6 integrate .. //depot/projects/ia64/crypto/openssl/LICENSE#5 integrate .. //depot/projects/ia64/crypto/openssl/Makefile#2 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.org#9 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/ia64/crypto/openssl/NEWS#9 integrate .. //depot/projects/ia64/crypto/openssl/PROBLEMS#6 integrate .. //depot/projects/ia64/crypto/openssl/README#9 integrate .. //depot/projects/ia64/crypto/openssl/apps/CA.pl#7 integrate .. //depot/projects/ia64/crypto/openssl/apps/CA.pl.in#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/apps.c#8 integrate .. //depot/projects/ia64/crypto/openssl/apps/apps.h#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/asn1pars.c#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/ca.c#8 integrate .. //depot/projects/ia64/crypto/openssl/apps/ciphers.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/crl.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/der_chop#6 delete .. //depot/projects/ia64/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/ia64/crypto/openssl/apps/dgst.c#7 integrate .. //depot/projects/ia64/crypto/openssl/apps/dh.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/dhparam.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/dsa.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/dsaparam.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/ia64/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/ia64/crypto/openssl/apps/enc.c#7 integrate .. //depot/projects/ia64/crypto/openssl/apps/engine.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/gendh.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/gendsa.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/genrsa.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/ocsp.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/openssl.c#7 integrate .. //depot/projects/ia64/crypto/openssl/apps/openssl.cnf#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/passwd.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/pkcs12.c#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/progs.h#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/rand.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/req.c#8 integrate .. //depot/projects/ia64/crypto/openssl/apps/rsa.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/rsautl.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_apps.h#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_cb.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 8 02:12:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EE6B16A417; Sun, 8 Oct 2006 02:12:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DF4D16A412 for ; Sun, 8 Oct 2006 02:12:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83C8843D46 for ; Sun, 8 Oct 2006 02:12:00 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k982C0qI024142 for ; Sun, 8 Oct 2006 02:12:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9829U9N022216 for perforce@freebsd.org; Sun, 8 Oct 2006 02:09:30 GMT (envelope-from marcel@freebsd.org) Date: Sun, 8 Oct 2006 02:09:30 GMT Message-Id: <200610080209.k9829U9N022216@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 107475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 02:12:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107475 Change 107475 by marcel@marcel_nfs on 2006/10/08 02:08:23 IFC @107454 Affected files ... .. //depot/projects/tty/MAINTAINERS#23 integrate .. //depot/projects/tty/Makefile#20 integrate .. //depot/projects/tty/Makefile.inc1#31 integrate .. //depot/projects/tty/ObsoleteFiles.inc#9 integrate .. //depot/projects/tty/UPDATING#32 integrate .. //depot/projects/tty/bin/cp/cp.1#8 integrate .. //depot/projects/tty/bin/cp/cp.c#8 integrate .. //depot/projects/tty/bin/cp/extern.h#5 integrate .. //depot/projects/tty/bin/cp/utils.c#8 integrate .. //depot/projects/tty/bin/date/netdate.c#4 integrate .. //depot/projects/tty/bin/df/df.c#8 integrate .. //depot/projects/tty/bin/ed/main.c#5 integrate .. //depot/projects/tty/bin/getfacl/getfacl.1#6 integrate .. //depot/projects/tty/bin/ls/ls.1#15 integrate .. //depot/projects/tty/bin/pax/pax.1#6 integrate .. //depot/projects/tty/bin/ps/ps.1#9 integrate .. //depot/projects/tty/bin/setfacl/setfacl.1#8 integrate .. //depot/projects/tty/bin/sh/histedit.c#5 integrate .. //depot/projects/tty/bin/sh/jobs.c#10 integrate .. //depot/projects/tty/bin/sh/jobs.h#3 integrate .. //depot/projects/tty/bin/sh/main.c#4 integrate .. //depot/projects/tty/bin/sh/parser.c#6 integrate .. //depot/projects/tty/bin/sh/sh.1#16 integrate .. //depot/projects/tty/bin/test/test.1#5 integrate .. //depot/projects/tty/contrib/bind9/CHANGES#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/tty/contrib/bind9/version#5 integrate .. //depot/projects/tty/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/tty/contrib/gcc/ChangeLog#7 integrate .. //depot/projects/tty/contrib/gcc/ansidecl.h#4 integrate .. //depot/projects/tty/contrib/gcc/builtins.c#7 integrate .. //depot/projects/tty/contrib/gcc/c-common.c#6 integrate .. //depot/projects/tty/contrib/gcc/c-common.h#5 integrate .. //depot/projects/tty/contrib/gcc/c-decl.c#8 integrate .. //depot/projects/tty/contrib/gcc/c-objc-common.c#5 integrate .. //depot/projects/tty/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/tty/contrib/gcc/c-typeck.c#7 integrate .. //depot/projects/tty/contrib/gcc/cccp.1#2 delete .. //depot/projects/tty/contrib/gcc/cfgcleanup.c#6 integrate .. //depot/projects/tty/contrib/gcc/combine.c#7 integrate .. //depot/projects/tty/contrib/gcc/config.gcc#7 integrate .. //depot/projects/tty/contrib/gcc/config.host#2 integrate .. //depot/projects/tty/contrib/gcc/config.in#6 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.c#6 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.md#6 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.md#5 integrate .. //depot/projects/tty/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/tty/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/i386.c#7 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.md#6 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/hpux.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix51.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/linux64.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000-protos.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.c#7 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.md#7 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/sysv4.h#8 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/gmon-sol2.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-gas-bi.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.c#6 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/x-linux#1 branch .. //depot/projects/tty/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/tty/contrib/gcc/configure#7 integrate .. //depot/projects/tty/contrib/gcc/configure.ac#3 integrate .. //depot/projects/tty/contrib/gcc/coverage.c#2 integrate .. //depot/projects/tty/contrib/gcc/cp/ChangeLog#7 integrate .. //depot/projects/tty/contrib/gcc/cp/call.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/class.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/cp-tree.def#4 integrate .. //depot/projects/tty/contrib/gcc/cp/cp-tree.h#7 integrate .. //depot/projects/tty/contrib/gcc/cp/cvt.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/decl.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/decl2.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/error.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/init.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/lex.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/method.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/name-lookup.c#3 integrate .. //depot/projects/tty/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/tty/contrib/gcc/cp/parser.c#3 integrate .. //depot/projects/tty/contrib/gcc/cp/pt.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/search.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/semantics.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/typeck.c#7 integrate .. //depot/projects/tty/contrib/gcc/cpp.1#2 delete .. //depot/projects/tty/contrib/gcc/cppfiles.c#5 integrate .. //depot/projects/tty/contrib/gcc/cpphash.h#4 integrate .. //depot/projects/tty/contrib/gcc/cppinit.c#5 integrate .. //depot/projects/tty/contrib/gcc/cse.c#6 integrate .. //depot/projects/tty/contrib/gcc/doc/contrib.texi#5 integrate .. //depot/projects/tty/contrib/gcc/doc/cpp.1#3 integrate .. //depot/projects/tty/contrib/gcc/doc/gcc.1#3 integrate .. //depot/projects/tty/contrib/gcc/doc/gcov.1#3 integrate .. //depot/projects/tty/contrib/gcc/doc/hostconfig.texi#3 integrate .. //depot/projects/tty/contrib/gcc/doc/include/gcc-common.texi#7 integrate .. //depot/projects/tty/contrib/gcc/doc/invoke.texi#7 integrate .. //depot/projects/tty/contrib/gcc/expmed.c#5 integrate .. //depot/projects/tty/contrib/gcc/f/ChangeLog#7 integrate .. //depot/projects/tty/contrib/gcc/f/g77.texi#4 integrate .. //depot/projects/tty/contrib/gcc/f/g77spec.c#4 integrate .. //depot/projects/tty/contrib/gcc/flow.c#5 integrate .. //depot/projects/tty/contrib/gcc/fold-const.c#6 integrate .. //depot/projects/tty/contrib/gcc/gcc.1#5 delete .. //depot/projects/tty/contrib/gcc/gcc.c#7 integrate .. //depot/projects/tty/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/tty/contrib/gcc/gcov.c#4 integrate .. //depot/projects/tty/contrib/gcc/gcse.c#5 integrate .. //depot/projects/tty/contrib/gcc/ggc-common.c#4 integrate .. //depot/projects/tty/contrib/gcc/global.c#5 integrate .. //depot/projects/tty/contrib/gcc/hooks.c#5 integrate .. //depot/projects/tty/contrib/gcc/hooks.h#5 integrate .. //depot/projects/tty/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/tty/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/tty/contrib/gcc/local-alloc.c#4 integrate .. //depot/projects/tty/contrib/gcc/longlong.h#4 integrate .. //depot/projects/tty/contrib/gcc/loop.c#7 integrate .. //depot/projects/tty/contrib/gcc/md5.c#3 integrate .. //depot/projects/tty/contrib/gcc/md5.h#2 integrate .. //depot/projects/tty/contrib/gcc/mips-tdump.c#3 integrate .. //depot/projects/tty/contrib/gcc/mips-tfile.c#3 integrate .. //depot/projects/tty/contrib/gcc/mklibgcc.in#7 integrate .. //depot/projects/tty/contrib/gcc/optabs.c#5 integrate .. //depot/projects/tty/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/tty/contrib/gcc/reg-stack.c#6 integrate .. //depot/projects/tty/contrib/gcc/regrename.c#5 integrate .. //depot/projects/tty/contrib/gcc/regs.h#5 integrate .. //depot/projects/tty/contrib/gcc/rtl.h#5 integrate .. //depot/projects/tty/contrib/gcc/sched-rgn.c#4 integrate .. //depot/projects/tty/contrib/gcc/simplify-rtx.c#5 integrate .. //depot/projects/tty/contrib/gcc/stmt.c#6 integrate .. //depot/projects/tty/contrib/gcc/toplev.c#6 integrate .. //depot/projects/tty/contrib/gcc/tree.c#7 integrate .. //depot/projects/tty/contrib/gcc/unroll.c#5 integrate .. //depot/projects/tty/contrib/gcc/version.c#7 integrate .. //depot/projects/tty/contrib/gdb/FREEBSD-Xlist#3 integrate .. //depot/projects/tty/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/tty/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/tty/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/tty/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/tty/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/tty/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/tty/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/tty/contrib/ipfilter/BSD/Makefile#5 integrate .. //depot/projects/tty/contrib/ipfilter/HISTORY#6 integrate .. //depot/projects/tty/contrib/ipfilter/Makefile#7 integrate .. //depot/projects/tty/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipf.h#5 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/iplang_y.y#5 integrate .. //depot/projects/tty/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsend.c#6 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptests.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/lsock.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/resend.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sbpf.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sock.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/tty/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/tty/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/tty/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipmon.8#7 integrate .. //depot/projects/tty/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/Makefile#6 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/tty/contrib/ipfilter/todo#3 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipf_y.y#4 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipmon.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/tty/contrib/less/LICENSE#3 integrate .. //depot/projects/tty/contrib/less/Makefile.aut#3 integrate .. //depot/projects/tty/contrib/less/Makefile.in#3 integrate .. //depot/projects/tty/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/tty/contrib/less/NEWS#3 integrate .. //depot/projects/tty/contrib/less/README#3 integrate .. //depot/projects/tty/contrib/less/brac.c#3 integrate .. //depot/projects/tty/contrib/less/ch.c#3 integrate .. //depot/projects/tty/contrib/less/charset.c#3 integrate .. //depot/projects/tty/contrib/less/charset.h#1 branch .. //depot/projects/tty/contrib/less/cmd.h#3 integrate .. //depot/projects/tty/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/tty/contrib/less/command.c#3 integrate .. //depot/projects/tty/contrib/less/configure#3 integrate .. //depot/projects/tty/contrib/less/configure.ac#2 integrate .. //depot/projects/tty/contrib/less/decode.c#3 integrate .. //depot/projects/tty/contrib/less/defines.ds#3 integrate .. //depot/projects/tty/contrib/less/defines.h.in#3 integrate .. //depot/projects/tty/contrib/less/defines.o2#3 integrate .. //depot/projects/tty/contrib/less/defines.o9#2 integrate .. //depot/projects/tty/contrib/less/defines.wn#3 integrate .. //depot/projects/tty/contrib/less/edit.c#3 integrate .. //depot/projects/tty/contrib/less/filename.c#3 integrate .. //depot/projects/tty/contrib/less/forwback.c#3 integrate .. //depot/projects/tty/contrib/less/funcs.h#3 integrate .. //depot/projects/tty/contrib/less/ifile.c#3 integrate .. //depot/projects/tty/contrib/less/input.c#3 integrate .. //depot/projects/tty/contrib/less/jump.c#3 integrate .. //depot/projects/tty/contrib/less/less.h#3 integrate .. //depot/projects/tty/contrib/less/less.man#3 integrate .. //depot/projects/tty/contrib/less/less.nro#3 integrate .. //depot/projects/tty/contrib/less/lessecho.c#3 integrate .. //depot/projects/tty/contrib/less/lessecho.man#1 branch .. //depot/projects/tty/contrib/less/lessecho.nro#1 branch .. //depot/projects/tty/contrib/less/lesskey.c#3 integrate .. //depot/projects/tty/contrib/less/lesskey.h#3 integrate .. //depot/projects/tty/contrib/less/lesskey.man#3 integrate .. //depot/projects/tty/contrib/less/lesskey.nro#3 integrate .. //depot/projects/tty/contrib/less/lglob.h#3 integrate .. //depot/projects/tty/contrib/less/line.c#4 integrate .. //depot/projects/tty/contrib/less/linenum.c#3 integrate .. //depot/projects/tty/contrib/less/lsystem.c#3 integrate .. //depot/projects/tty/contrib/less/main.c#3 integrate .. //depot/projects/tty/contrib/less/mark.c#3 integrate .. //depot/projects/tty/contrib/less/mkhelp.c#3 integrate .. //depot/projects/tty/contrib/less/optfunc.c#3 integrate .. //depot/projects/tty/contrib/less/option.c#3 integrate .. //depot/projects/tty/contrib/less/option.h#3 integrate .. //depot/projects/tty/contrib/less/opttbl.c#3 integrate .. //depot/projects/tty/contrib/less/os.c#3 integrate .. //depot/projects/tty/contrib/less/output.c#3 integrate .. //depot/projects/tty/contrib/less/pckeys.h#3 integrate .. //depot/projects/tty/contrib/less/position.c#3 integrate .. //depot/projects/tty/contrib/less/position.h#3 integrate .. //depot/projects/tty/contrib/less/prompt.c#3 integrate .. //depot/projects/tty/contrib/less/screen.c#3 integrate .. //depot/projects/tty/contrib/less/scrsize.c#3 integrate .. //depot/projects/tty/contrib/less/search.c#3 integrate .. //depot/projects/tty/contrib/less/signal.c#3 integrate .. //depot/projects/tty/contrib/less/tags.c#3 integrate .. //depot/projects/tty/contrib/less/ttyin.c#3 integrate .. //depot/projects/tty/contrib/less/version.c#3 integrate .. //depot/projects/tty/contrib/libf2c/ChangeLog#7 integrate .. //depot/projects/tty/contrib/libobjc/ChangeLog#7 integrate .. //depot/projects/tty/contrib/libobjc/README#2 integrate .. //depot/projects/tty/contrib/libpcap/CHANGES#5 integrate .. //depot/projects/tty/contrib/libpcap/CREDITS#5 integrate .. //depot/projects/tty/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/libpcap/README.dag#2 integrate .. //depot/projects/tty/contrib/libpcap/VERSION#6 integrate .. //depot/projects/tty/contrib/libpcap/config.h.in#5 integrate .. //depot/projects/tty/contrib/libpcap/configure#5 integrate .. //depot/projects/tty/contrib/libpcap/configure.in#5 integrate .. //depot/projects/tty/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/tty/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/tty/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/tty/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/tty/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/tty/contrib/libpcap/gencode.c#7 integrate .. //depot/projects/tty/contrib/libpcap/gencode.h#5 integrate .. //depot/projects/tty/contrib/libpcap/grammar.y#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.c#8 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dlpi.c#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap-int.h#6 integrate .. //depot/projects/tty/contrib/libpcap/pcap-linux.c#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/tty/contrib/libpcap/pcap.3#7 integrate .. //depot/projects/tty/contrib/libpcap/pcap.c#6 integrate .. //depot/projects/tty/contrib/libpcap/pcap.h#6 integrate .. //depot/projects/tty/contrib/libpcap/savefile.c#5 integrate .. //depot/projects/tty/contrib/libpcap/scanner.l#6 integrate .. //depot/projects/tty/contrib/libstdc++/ChangeLog#7 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/c++config#7 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/fstream.tcc#6 integrate .. //depot/projects/tty/contrib/libstdc++/include/c_std/std_cmath.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/tty/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/tty/contrib/lukemftpd/src/Makefile#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/cmds.c#4 integrate .. //depot/projects/tty/contrib/lukemftpd/src/conf.c#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/extern.h#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/ftpcmd.y#4 integrate .. //depot/projects/tty/contrib/lukemftpd/src/ftpd.8#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/ftpd.c#4 integrate .. //depot/projects/tty/contrib/lukemftpd/src/ftpd.conf.5#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/logutmp.c#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/logwtmp.c#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/pathnames.h#3 integrate .. //depot/projects/tty/contrib/lukemftpd/src/popen.c#4 integrate .. //depot/projects/tty/contrib/lukemftpd/src/version.h#4 integrate .. //depot/projects/tty/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/tty/contrib/ntp/include/ntpd.h#3 integrate .. //depot/projects/tty/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/openbsm/HISTORY#4 integrate .. //depot/projects/tty/contrib/openbsm/README#3 integrate .. //depot/projects/tty/contrib/openbsm/TODO#3 integrate .. //depot/projects/tty/contrib/openbsm/VERSION#4 integrate .. //depot/projects/tty/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/tty/contrib/openbsm/bsm/audit.h#3 delete .. //depot/projects/tty/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/tty/contrib/openbsm/bsm/audit_internal.h#2 delete .. //depot/projects/tty/contrib/openbsm/bsm/audit_kevents.h#3 delete .. //depot/projects/tty/contrib/openbsm/bsm/audit_record.h#4 delete .. //depot/projects/tty/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/tty/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/tty/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/tty/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/tty/contrib/openbsm/configure#4 integrate .. //depot/projects/tty/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/tty/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/tty/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/tty/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/tty/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/tty/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/tty/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/tty/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/tty/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/tty/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/tty/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/tty/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/tty/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/tty/contrib/pnpinfo/pnpinfo.c#3 integrate .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#12 integrate .. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#12 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#12 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#12 integrate .. //depot/projects/tty/contrib/sendmail/contrib/cidrexpand#4 integrate .. //depot/projects/tty/contrib/sendmail/src/main.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/queue.c#12 integrate .. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#12 integrate .. //depot/projects/tty/contrib/sendmail/src/version.c#12 integrate .. //depot/projects/tty/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/tty/contrib/smbfs/smbutil/view.c#3 integrate .. //depot/projects/tty/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/tty/contrib/tar/AUTHORS#2 delete .. //depot/projects/tty/contrib/tar/COPYING#2 delete .. //depot/projects/tty/contrib/tar/ChangeLog#2 delete .. //depot/projects/tty/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/tty/contrib/tar/FREEBSD-Xlist#3 delete .. //depot/projects/tty/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/tty/contrib/tar/INSTALL#2 delete .. //depot/projects/tty/contrib/tar/NEWS#2 delete .. //depot/projects/tty/contrib/tar/PORTS#2 delete .. //depot/projects/tty/contrib/tar/README#2 delete .. //depot/projects/tty/contrib/tar/README-alpha#2 delete .. //depot/projects/tty/contrib/tar/THANKS#2 delete .. //depot/projects/tty/contrib/tar/TODO#2 delete .. //depot/projects/tty/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/tty/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/tty/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/tty/contrib/tar/doc/header.texi#2 delete .. //depot/projects/tty/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/tty/contrib/tar/doc/version.texi#2 delete .. //depot/projects/tty/contrib/tar/lib/addext.c#2 delete .. //depot/projects/tty/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/tty/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/tty/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/tty/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/tty/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/tty/contrib/tar/lib/basename.c#2 delete .. //depot/projects/tty/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/tty/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/tty/contrib/tar/lib/error.c#2 delete .. //depot/projects/tty/contrib/tar/lib/error.h#2 delete .. //depot/projects/tty/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/tty/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/tty/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/tty/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/tty/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/tty/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/tty/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/tty/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/tty/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/tty/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/tty/contrib/tar/lib/getline.c#2 delete .. //depot/projects/tty/contrib/tar/lib/getline.h#2 delete .. //depot/projects/tty/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/tty/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/tty/contrib/tar/lib/hash.c#2 delete .. //depot/projects/tty/contrib/tar/lib/hash.h#2 delete .. //depot/projects/tty/contrib/tar/lib/human.c#2 delete .. //depot/projects/tty/contrib/tar/lib/human.h#2 delete .. //depot/projects/tty/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/tty/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/tty/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/tty/contrib/tar/lib/memset.c#2 delete .. //depot/projects/tty/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/tty/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/tty/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/tty/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/tty/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/tty/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/tty/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/tty/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/tty/contrib/tar/lib/quote.c#2 delete .. //depot/projects/tty/contrib/tar/lib/quote.h#2 delete .. //depot/projects/tty/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/tty/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/tty/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/tty/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/tty/contrib/tar/lib/rename.c#2 delete .. //depot/projects/tty/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/tty/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/tty/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/tty/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/tty/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/tty/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/tty/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/tty/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/tty/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/tty/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/tty/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/tty/contrib/tar/lib/utime.c#2 delete .. //depot/projects/tty/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/tty/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/tty/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/tty/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/tty/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/tty/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/tty/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/tty/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/tty/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/tty/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/tty/contrib/tar/src/arith.h#2 delete .. //depot/projects/tty/contrib/tar/src/buffer.c#3 delete .. //depot/projects/tty/contrib/tar/src/common.h#2 delete .. //depot/projects/tty/contrib/tar/src/compare.c#2 delete .. //depot/projects/tty/contrib/tar/src/create.c#2 delete .. //depot/projects/tty/contrib/tar/src/delete.c#2 delete .. //depot/projects/tty/contrib/tar/src/extract.c#2 delete .. //depot/projects/tty/contrib/tar/src/incremen.c#2 delete .. //depot/projects/tty/contrib/tar/src/list.c#2 delete .. //depot/projects/tty/contrib/tar/src/mangle.c#2 delete .. //depot/projects/tty/contrib/tar/src/misc.c#2 delete .. //depot/projects/tty/contrib/tar/src/names.c#2 delete .. //depot/projects/tty/contrib/tar/src/rmt.c#2 delete .. //depot/projects/tty/contrib/tar/src/rmt.h#2 delete .. //depot/projects/tty/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/tty/contrib/tar/src/system.h#2 delete .. //depot/projects/tty/contrib/tar/src/tar.c#3 delete .. //depot/projects/tty/contrib/tar/src/tar.h#2 delete .. //depot/projects/tty/contrib/tar/src/update.c#2 delete .. //depot/projects/tty/contrib/tcpdump/CHANGES#6 integrate .. //depot/projects/tty/contrib/tcpdump/CREDITS#6 integrate .. //depot/projects/tty/contrib/tcpdump/FILES#6 integrate .. //depot/projects/tty/contrib/tcpdump/INSTALL#6 integrate .. //depot/projects/tty/contrib/tcpdump/Makefile.in#5 integrate .. //depot/projects/tty/contrib/tcpdump/VERSION#7 integrate .. //depot/projects/tty/contrib/tcpdump/addrtoname.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/configure#6 integrate .. //depot/projects/tty/contrib/tcpdump/configure.in#6 integrate .. //depot/projects/tty/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/tty/contrib/tcpdump/ethertype.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/icmp6.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/interface.h#6 integrate .. //depot/projects/tty/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/ipproto.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/llc.h#5 integrate .. //depot/projects/tty/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/ospf.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/ppp.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-802_11.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ascii.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-atm.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-chdlc.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-cip.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-ether.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-fddi.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-fr.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-icmp6.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip6.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ipx.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-isoclns.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-lane.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ldp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-llc.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-null.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-ospf.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-pim.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-radius.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-rsvp.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-sctp.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-sll.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-tcp.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-token.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump-stdinc.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump.1#7 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/tty/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/tty/contrib/telnet/telnet/telnet.1#4 integrate .. //depot/projects/tty/contrib/telnet/telnetd/telnetd.c#4 integrate .. //depot/projects/tty/crypto/openssh/CREDITS#5 integrate .. //depot/projects/tty/crypto/openssh/ChangeLog#8 integrate .. //depot/projects/tty/crypto/openssh/FREEBSD-upgrade#7 integrate .. //depot/projects/tty/crypto/openssh/INSTALL#5 integrate .. //depot/projects/tty/crypto/openssh/LICENCE#5 integrate .. //depot/projects/tty/crypto/openssh/Makefile.in#8 integrate .. //depot/projects/tty/crypto/openssh/OVERVIEW#4 integrate .. //depot/projects/tty/crypto/openssh/README#8 integrate .. //depot/projects/tty/crypto/openssh/README.platform#5 integrate .. //depot/projects/tty/crypto/openssh/README.tun#2 integrate .. //depot/projects/tty/crypto/openssh/acss.c#3 integrate .. //depot/projects/tty/crypto/openssh/atomicio.c#4 integrate .. //depot/projects/tty/crypto/openssh/atomicio.h#4 integrate .. //depot/projects/tty/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/tty/crypto/openssh/audit.c#3 integrate .. //depot/projects/tty/crypto/openssh/audit.h#2 integrate .. //depot/projects/tty/crypto/openssh/auth-bsdauth.c#3 integrate .. //depot/projects/tty/crypto/openssh/auth-chall.c#8 integrate .. //depot/projects/tty/crypto/openssh/auth-krb5.c#8 integrate .. //depot/projects/tty/crypto/openssh/auth-options.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth-options.h#3 integrate .. //depot/projects/tty/crypto/openssh/auth-pam.c#8 integrate .. //depot/projects/tty/crypto/openssh/auth-passwd.c#7 integrate .. //depot/projects/tty/crypto/openssh/auth-rh-rsa.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth-rhosts.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth-rsa.c#6 integrate .. //depot/projects/tty/crypto/openssh/auth-shadow.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth-sia.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth-skey.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth.c#7 integrate .. //depot/projects/tty/crypto/openssh/auth.h#7 integrate .. //depot/projects/tty/crypto/openssh/auth1.c#7 integrate .. //depot/projects/tty/crypto/openssh/auth2-chall.c#6 integrate .. //depot/projects/tty/crypto/openssh/auth2-gss.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/tty/crypto/openssh/auth2-kbdint.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth2-none.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth2-passwd.c#4 integrate .. //depot/projects/tty/crypto/openssh/auth2-pubkey.c#5 integrate .. //depot/projects/tty/crypto/openssh/auth2.c#8 integrate .. //depot/projects/tty/crypto/openssh/authfd.c#6 integrate .. //depot/projects/tty/crypto/openssh/authfd.h#4 integrate .. //depot/projects/tty/crypto/openssh/authfile.c#7 integrate .. //depot/projects/tty/crypto/openssh/authfile.h#2 integrate .. //depot/projects/tty/crypto/openssh/bufaux.c#7 integrate .. //depot/projects/tty/crypto/openssh/bufaux.h#4 integrate .. //depot/projects/tty/crypto/openssh/bufbn.c#1 branch .. //depot/projects/tty/crypto/openssh/buffer.c#5 integrate .. //depot/projects/tty/crypto/openssh/buffer.h#3 integrate .. //depot/projects/tty/crypto/openssh/buildpkg.sh.in#4 integrate .. //depot/projects/tty/crypto/openssh/canohost.c#8 integrate .. //depot/projects/tty/crypto/openssh/canohost.h#3 integrate .. //depot/projects/tty/crypto/openssh/channels.c#9 integrate .. //depot/projects/tty/crypto/openssh/channels.h#8 integrate .. //depot/projects/tty/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/tty/crypto/openssh/cipher-acss.c#3 integrate .. //depot/projects/tty/crypto/openssh/cipher-aes.c#3 integrate .. //depot/projects/tty/crypto/openssh/cipher-bf1.c#2 integrate .. //depot/projects/tty/crypto/openssh/cipher-ctr.c#5 integrate .. //depot/projects/tty/crypto/openssh/cipher.c#8 integrate .. //depot/projects/tty/crypto/openssh/cipher.h#4 integrate .. //depot/projects/tty/crypto/openssh/cleanup.c#2 integrate .. //depot/projects/tty/crypto/openssh/clientloop.c#8 integrate .. //depot/projects/tty/crypto/openssh/clientloop.h#6 integrate .. //depot/projects/tty/crypto/openssh/compat.c#6 integrate .. //depot/projects/tty/crypto/openssh/compat.h#6 integrate .. //depot/projects/tty/crypto/openssh/compress.c#3 integrate .. //depot/projects/tty/crypto/openssh/compress.h#2 integrate .. //depot/projects/tty/crypto/openssh/config.h#9 integrate .. //depot/projects/tty/crypto/openssh/configure.ac#8 integrate .. //depot/projects/tty/crypto/openssh/crc32.c#3 integrate .. //depot/projects/tty/crypto/openssh/crc32.h#3 integrate .. //depot/projects/tty/crypto/openssh/deattack.c#4 integrate .. //depot/projects/tty/crypto/openssh/deattack.h#2 integrate .. //depot/projects/tty/crypto/openssh/defines.h#8 integrate .. //depot/projects/tty/crypto/openssh/dh.c#5 integrate .. //depot/projects/tty/crypto/openssh/dh.h#3 integrate .. //depot/projects/tty/crypto/openssh/dispatch.c#3 integrate .. //depot/projects/tty/crypto/openssh/dispatch.h#2 integrate .. //depot/projects/tty/crypto/openssh/dns.c#5 integrate .. //depot/projects/tty/crypto/openssh/dns.h#3 integrate .. //depot/projects/tty/crypto/openssh/entropy.c#5 integrate .. //depot/projects/tty/crypto/openssh/fatal.c#3 integrate .. //depot/projects/tty/crypto/openssh/getput.h#2 delete .. //depot/projects/tty/crypto/openssh/groupaccess.c#3 integrate .. //depot/projects/tty/crypto/openssh/groupaccess.h#2 integrate .. //depot/projects/tty/crypto/openssh/gss-genr.c#4 integrate .. //depot/projects/tty/crypto/openssh/gss-serv-krb5.c#5 integrate .. //depot/projects/tty/crypto/openssh/gss-serv.c#4 integrate .. //depot/projects/tty/crypto/openssh/hostfile.c#7 integrate .. //depot/projects/tty/crypto/openssh/hostfile.h#5 integrate .. //depot/projects/tty/crypto/openssh/includes.h#8 integrate .. //depot/projects/tty/crypto/openssh/kex.c#7 integrate .. //depot/projects/tty/crypto/openssh/kex.h#6 integrate .. //depot/projects/tty/crypto/openssh/kexdh.c#4 integrate .. //depot/projects/tty/crypto/openssh/kexdhc.c#4 integrate .. //depot/projects/tty/crypto/openssh/kexdhs.c#4 integrate .. //depot/projects/tty/crypto/openssh/kexgex.c#4 integrate .. //depot/projects/tty/crypto/openssh/kexgexc.c#4 integrate .. //depot/projects/tty/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/tty/crypto/openssh/key.c#7 integrate .. //depot/projects/tty/crypto/openssh/key.h#4 integrate .. //depot/projects/tty/crypto/openssh/log.c#6 integrate .. //depot/projects/tty/crypto/openssh/log.h#6 integrate .. //depot/projects/tty/crypto/openssh/loginrec.c#10 integrate .. //depot/projects/tty/crypto/openssh/loginrec.h#5 integrate .. //depot/projects/tty/crypto/openssh/logintest.c#4 integrate .. //depot/projects/tty/crypto/openssh/mac.c#4 integrate .. //depot/projects/tty/crypto/openssh/mac.h#2 integrate .. //depot/projects/tty/crypto/openssh/match.c#3 integrate .. //depot/projects/tty/crypto/openssh/match.h#2 integrate .. //depot/projects/tty/crypto/openssh/md-sha256.c#1 branch .. //depot/projects/tty/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/tty/crypto/openssh/misc.c#9 integrate .. //depot/projects/tty/crypto/openssh/misc.h#7 integrate .. //depot/projects/tty/crypto/openssh/moduli.c#5 integrate .. //depot/projects/tty/crypto/openssh/monitor.c#9 integrate .. //depot/projects/tty/crypto/openssh/monitor.h#5 integrate .. //depot/projects/tty/crypto/openssh/monitor_fdpass.c#4 integrate .. //depot/projects/tty/crypto/openssh/monitor_fdpass.h#2 integrate .. //depot/projects/tty/crypto/openssh/monitor_mm.c#5 integrate .. //depot/projects/tty/crypto/openssh/monitor_mm.h#2 integrate .. //depot/projects/tty/crypto/openssh/monitor_wrap.c#8 integrate .. //depot/projects/tty/crypto/openssh/monitor_wrap.h#6 integrate .. //depot/projects/tty/crypto/openssh/msg.c#5 integrate .. //depot/projects/tty/crypto/openssh/msg.h#4 integrate .. //depot/projects/tty/crypto/openssh/myproposal.h#5 integrate .. //depot/projects/tty/crypto/openssh/nchan.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/Makefile.in#7 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/basename.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bindresvport.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-arc4random.c#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-asprintf.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-closefrom.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-cray.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-getpeereid.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-misc.c#8 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-nextstep.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-openpty.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-snprintf.c#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/bsd-waitpid.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/daemon.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/fake-rfc2553.h#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/getrrsetbyname.c#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/glob.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/glob.h#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/mktemp.c#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/openbsd-compat.h#7 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-aix.c#6 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-aix.h#7 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-irix.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-linux.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-linux.h#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-solaris.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-solaris.h#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-tun.c#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-tun.h#2 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/port-uw.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/readpassphrase.c#5 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/regress/Makefile.in#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/regress/closefromtest.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/regress/snprintftest.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/regress/strduptest.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/regress/strtonumtest.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/rresvport.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/setproctitle.c#4 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/sha2.c#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/sha2.h#1 branch .. //depot/projects/tty/crypto/openssh/openbsd-compat/strtonum.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/xcrypt.c#3 integrate .. //depot/projects/tty/crypto/openssh/openbsd-compat/xmmap.c#5 integrate .. //depot/projects/tty/crypto/openssh/openssh.xml.in#1 branch .. //depot/projects/tty/crypto/openssh/packet.c#9 integrate .. //depot/projects/tty/crypto/openssh/packet.h#6 integrate .. //depot/projects/tty/crypto/openssh/pathnames.h#4 integrate .. //depot/projects/tty/crypto/openssh/platform.c#1 branch .. //depot/projects/tty/crypto/openssh/platform.h#1 branch .. //depot/projects/tty/crypto/openssh/progressmeter.c#6 integrate .. //depot/projects/tty/crypto/openssh/progressmeter.h#2 integrate .. //depot/projects/tty/crypto/openssh/readconf.c#8 integrate .. //depot/projects/tty/crypto/openssh/readconf.h#8 integrate .. //depot/projects/tty/crypto/openssh/readpass.c#6 integrate .. //depot/projects/tty/crypto/openssh/regress/Makefile#6 integrate .. //depot/projects/tty/crypto/openssh/regress/agent-getpeereid.sh#4 integrate .. //depot/projects/tty/crypto/openssh/regress/cfgmatch.sh#1 branch .. //depot/projects/tty/crypto/openssh/regress/cipher-speed.sh#1 branch .. //depot/projects/tty/crypto/openssh/regress/forcecommand.sh#1 branch .. //depot/projects/tty/crypto/openssh/regress/forwarding.sh#4 integrate .. //depot/projects/tty/crypto/openssh/rsa.c#2 integrate .. //depot/projects/tty/crypto/openssh/rsa.h#2 integrate .. //depot/projects/tty/crypto/openssh/scard-opensc.c#4 integrate .. //depot/projects/tty/crypto/openssh/scard.c#4 integrate .. //depot/projects/tty/crypto/openssh/scard.h#3 integrate .. //depot/projects/tty/crypto/openssh/scp.1#7 integrate .. //depot/projects/tty/crypto/openssh/scp.c#8 integrate .. //depot/projects/tty/crypto/openssh/servconf.c#8 integrate .. //depot/projects/tty/crypto/openssh/servconf.h#7 integrate .. //depot/projects/tty/crypto/openssh/serverloop.c#7 integrate .. //depot/projects/tty/crypto/openssh/serverloop.h#2 integrate .. //depot/projects/tty/crypto/openssh/session.c#9 integrate .. //depot/projects/tty/crypto/openssh/session.h#6 integrate .. //depot/projects/tty/crypto/openssh/sftp-client.c#8 integrate .. //depot/projects/tty/crypto/openssh/sftp-common.c#4 integrate .. //depot/projects/tty/crypto/openssh/sftp-common.h#4 integrate .. //depot/projects/tty/crypto/openssh/sftp-glob.c#3 integrate .. //depot/projects/tty/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/tty/crypto/openssh/sftp-server.c#7 integrate .. //depot/projects/tty/crypto/openssh/sftp.c#8 integrate .. //depot/projects/tty/crypto/openssh/sftp.h#2 integrate .. //depot/projects/tty/crypto/openssh/ssh-add.c#8 integrate .. //depot/projects/tty/crypto/openssh/ssh-agent.1#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-agent.c#10 integrate .. //depot/projects/tty/crypto/openssh/ssh-dss.c#4 integrate .. //depot/projects/tty/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/tty/crypto/openssh/ssh-keygen.c#8 integrate .. //depot/projects/tty/crypto/openssh/ssh-keyscan.c#8 integrate .. //depot/projects/tty/crypto/openssh/ssh-keysign.8#4 integrate .. //depot/projects/tty/crypto/openssh/ssh-keysign.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-rand-helper.c#7 integrate .. //depot/projects/tty/crypto/openssh/ssh-rsa.c#5 integrate .. //depot/projects/tty/crypto/openssh/ssh.1#8 integrate .. //depot/projects/tty/crypto/openssh/ssh.c#8 integrate .. //depot/projects/tty/crypto/openssh/ssh.h#5 integrate .. //depot/projects/tty/crypto/openssh/ssh1.h#4 integrate .. //depot/projects/tty/crypto/openssh/ssh2.h#3 integrate .. //depot/projects/tty/crypto/openssh/ssh_config#10 integrate .. //depot/projects/tty/crypto/openssh/ssh_config.5#10 integrate .. //depot/projects/tty/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/tty/crypto/openssh/sshconnect.c#8 integrate .. //depot/projects/tty/crypto/openssh/sshconnect.h#3 integrate .. //depot/projects/tty/crypto/openssh/sshconnect1.c#7 integrate .. //depot/projects/tty/crypto/openssh/sshconnect2.c#7 integrate .. //depot/projects/tty/crypto/openssh/sshd.8#9 integrate .. //depot/projects/tty/crypto/openssh/sshd.c#10 integrate .. //depot/projects/tty/crypto/openssh/sshd_config#10 integrate .. //depot/projects/tty/crypto/openssh/sshd_config.5#11 integrate .. //depot/projects/tty/crypto/openssh/sshlogin.c#5 integrate .. //depot/projects/tty/crypto/openssh/sshlogin.h#3 integrate .. //depot/projects/tty/crypto/openssh/sshpty.c#6 integrate .. //depot/projects/tty/crypto/openssh/sshpty.h#3 integrate .. //depot/projects/tty/crypto/openssh/sshtty.c#4 integrate .. //depot/projects/tty/crypto/openssh/ttymodes.c#4 integrate .. //depot/projects/tty/crypto/openssh/ttymodes.h#3 integrate .. //depot/projects/tty/crypto/openssh/uidswap.c#4 integrate .. //depot/projects/tty/crypto/openssh/uidswap.h#2 integrate .. //depot/projects/tty/crypto/openssh/uuencode.c#3 integrate .. //depot/projects/tty/crypto/openssh/uuencode.h#3 integrate .. //depot/projects/tty/crypto/openssh/version.h#11 integrate .. //depot/projects/tty/crypto/openssh/xmalloc.c#2 integrate .. //depot/projects/tty/crypto/openssh/xmalloc.h#2 integrate .. //depot/projects/tty/crypto/openssl/CHANGES#7 integrate .. //depot/projects/tty/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/tty/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/tty/crypto/openssl/Configure#7 integrate .. //depot/projects/tty/crypto/openssl/FAQ#7 integrate .. //depot/projects/tty/crypto/openssl/FREEBSD-Xlist#4 integrate .. //depot/projects/tty/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/tty/crypto/openssl/INSTALL#5 integrate .. //depot/projects/tty/crypto/openssl/LICENSE#4 integrate .. //depot/projects/tty/crypto/openssl/Makefile#2 integrate .. //depot/projects/tty/crypto/openssl/Makefile.org#7 integrate .. //depot/projects/tty/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/tty/crypto/openssl/NEWS#7 integrate .. //depot/projects/tty/crypto/openssl/PROBLEMS#6 integrate .. //depot/projects/tty/crypto/openssl/README#7 integrate .. //depot/projects/tty/crypto/openssl/apps/CA.pl#6 integrate .. //depot/projects/tty/crypto/openssl/apps/CA.pl.in#4 integrate .. //depot/projects/tty/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/tty/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/tty/crypto/openssl/apps/apps.c#7 integrate .. //depot/projects/tty/crypto/openssl/apps/apps.h#6 integrate .. //depot/projects/tty/crypto/openssl/apps/asn1pars.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/ca.c#7 integrate .. //depot/projects/tty/crypto/openssl/apps/ciphers.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/crl.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/der_chop#5 delete .. //depot/projects/tty/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/tty/crypto/openssl/apps/dgst.c#6 integrate .. //depot/projects/tty/crypto/openssl/apps/dh.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/dhparam.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/dsa.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/dsaparam.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/tty/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/tty/crypto/openssl/apps/enc.c#6 integrate .. //depot/projects/tty/crypto/openssl/apps/engine.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/gendh.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/gendsa.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/genrsa.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/ocsp.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/openssl.c#6 integrate .. //depot/projects/tty/crypto/openssl/apps/openssl.cnf#5 integrate .. //depot/projects/tty/crypto/openssl/apps/passwd.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/pkcs12.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/tty/crypto/openssl/apps/progs.h#5 integrate .. //depot/projects/tty/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/tty/crypto/openssl/apps/rand.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/req.c#6 integrate .. //depot/projects/tty/crypto/openssl/apps/rsa.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/rsautl.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/s_apps.h#4 integrate .. //depot/projects/tty/crypto/openssl/apps/s_cb.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/s_client.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/s_server.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 8 02:29:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73B7816A40F; Sun, 8 Oct 2006 02:29:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 500A016A415 for ; Sun, 8 Oct 2006 02:29:27 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 977BD43D7B for ; Sun, 8 Oct 2006 02:29:23 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k982TNsv033036 for ; Sun, 8 Oct 2006 02:29:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k982TNqc033030 for perforce@freebsd.org; Sun, 8 Oct 2006 02:29:23 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 8 Oct 2006 02:29:23 GMT Message-Id: <200610080229.k982TNqc033030@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 107476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 02:29:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=107476 Change 107476 by kmacy@kmacy_storage:sun4v_work_stable on 2006/10/08 02:28:26 fix TLS initialization for dynamic and static linking reviewed by: marcel and jmg Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/lib/csu/sparc64/crt1.c#2 edit .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/tls.c#4 edit .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sparc64/gen/_set_tp.c#2 edit .. //depot/projects/kmacy_sun4v_stable/src/libexec/rtld-elf/sparc64/reloc.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/lib/csu/sparc64/crt1.c#2 (text+ko) ==== @@ -98,13 +98,12 @@ __progname = s + 1; } - __sparc_utrap_setup(); - if (&_DYNAMIC != NULL) atexit(cleanup); - else + else { + __sparc_utrap_setup(); _init_tls(); - + } #ifdef GCRT atexit(_mcleanup); #endif ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/tls.c#4 (text+ko) ==== @@ -58,6 +58,15 @@ void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign); void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign); +#if defined(__ia64__) || defined(__amd64__) +#define TLS_TCB_ALIGN 16 +#elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \ + defined(__sparc64__) +#define TLS_TCB_ALIGN sizeof(void *) +#else +#error TLS_TCB_ALIGN undefined for target architecture +#endif + #if defined(__ia64__) || defined(__powerpc__) #define TLS_VARIANT_I #endif @@ -299,7 +308,7 @@ } } - tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, 1); + tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); _set_tp(tls); #endif ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/sparc64/gen/_set_tp.c#2 (text+ko) ==== @@ -29,7 +29,6 @@ void _set_tp(void *tpval) { - register void* tp __asm__("%g7"); - tp = tpval; + __asm __volatile("mov %0, %%g7" : : "r" (tpval)); } ==== //depot/projects/kmacy_sun4v_stable/src/libexec/rtld-elf/sparc64/reloc.c#2 (text+ko) ==== @@ -723,7 +723,7 @@ void allocate_initial_tls(Obj_Entry *objs) { - register Elf_Addr** tp __asm__("%g7"); + Elf_Addr* tpval; /* * Fix the size of the static TLS block by using the maximum @@ -731,7 +731,8 @@ * use. */ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; - tp = allocate_tls(objs, NULL, 3*sizeof(Elf_Addr), sizeof(Elf_Addr)); + tpval = allocate_tls(objs, NULL, 3*sizeof(Elf_Addr), sizeof(Elf_Addr)); + __asm __volatile("mov %0, %%g7" : : "r" (tpval)); } void *__tls_get_addr(tls_index *ti) From owner-p4-projects@FreeBSD.ORG Sun Oct 8 02:33:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FC4A16A415; Sun, 8 Oct 2006 02:33:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2877216A40F for ; Sun, 8 Oct 2006 02:33:23 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4ACEA43D95 for ; Sun, 8 Oct 2006 02:32:58 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k982WwQQ035536 for ; Sun, 8 Oct 2006 02:32:58 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k982WRxx035234 for perforce@freebsd.org; Sun, 8 Oct 2006 02:32:27 GMT (envelope-from marcel@freebsd.org) Date: Sun, 8 Oct 2006 02:32:27 GMT Message-Id: <200610080232.k982WRxx035234@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 107477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 02:33:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=107477 Change 107477 by marcel@marcel_nfs on 2006/10/08 02:32:13 IFC @107454 Affected files ... .. //depot/projects/uart/Makefile#8 integrate .. //depot/projects/uart/amd64/acpica/madt.c#6 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#22 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/uart/amd64/amd64/nexus.c#8 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#42 integrate .. //depot/projects/uart/amd64/amd64/support.S#7 integrate .. //depot/projects/uart/amd64/amd64/trap.c#14 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#13 integrate .. //depot/projects/uart/amd64/conf/GENERIC#24 integrate .. //depot/projects/uart/amd64/conf/NOTES#12 integrate .. //depot/projects/uart/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/uart/amd64/ia32/ia32_sigtramp.S#4 integrate .. //depot/projects/uart/amd64/include/clock.h#8 integrate .. //depot/projects/uart/amd64/include/elf.h#4 integrate .. //depot/projects/uart/amd64/include/pmap.h#12 integrate .. //depot/projects/uart/amd64/include/stdarg.h#4 integrate .. //depot/projects/uart/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/uart/amd64/isa/clock.c#11 integrate .. //depot/projects/uart/amd64/linux32/linux.h#3 integrate .. //depot/projects/uart/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/uart/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/uart/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/uart/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/uart/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/uart/amd64/linux32/syscalls.master#10 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#11 integrate .. //depot/projects/uart/arm/arm/cpufunc.c#7 integrate .. //depot/projects/uart/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/uart/arm/arm/fusu.S#6 integrate .. //depot/projects/uart/arm/arm/identcpu.c#7 integrate .. //depot/projects/uart/arm/arm/mem.c#3 integrate .. //depot/projects/uart/arm/arm/pmap.c#19 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#13 integrate .. //depot/projects/uart/arm/at91/at91.c#6 integrate .. //depot/projects/uart/arm/at91/at91_st.c#5 integrate .. //depot/projects/uart/arm/at91/at91_twi.c#4 integrate .. //depot/projects/uart/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/uart/arm/at91/if_ate.c#7 integrate .. //depot/projects/uart/arm/at91/if_atereg.h#2 integrate .. //depot/projects/uart/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/uart/arm/conf/EP80219#1 branch .. //depot/projects/uart/arm/include/armreg.h#4 integrate .. //depot/projects/uart/arm/include/asm.h#4 integrate .. //depot/projects/uart/arm/include/clock.h#3 integrate .. //depot/projects/uart/arm/include/cpuconf.h#7 integrate .. //depot/projects/uart/arm/include/cpufunc.h#7 integrate .. //depot/projects/uart/arm/include/elf.h#5 integrate .. //depot/projects/uart/arm/include/pmap.h#13 integrate .. //depot/projects/uart/arm/include/sf_buf.h#2 integrate .. //depot/projects/uart/arm/include/stdarg.h#4 integrate .. //depot/projects/uart/arm/include/vmparam.h#4 integrate .. //depot/projects/uart/arm/sa11x0/assabet_machdep.c#10 integrate .. //depot/projects/uart/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/uart/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/uart/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/uart/arm/xscale/i80321/i80321_intr.h#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_pci.c#8 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321reg.h#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321var.h#4 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#14 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321.c#11 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321reg.h#3 integrate .. //depot/projects/uart/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/uart/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/uart/boot/Makefile#9 integrate .. //depot/projects/uart/boot/arm/Makefile#1 branch .. //depot/projects/uart/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/uart/boot/arm/at91/boot0/Makefile#3 integrate .. //depot/projects/uart/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/uart/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/uart/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/uart/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/uart/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/uart/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/uart/boot/arm/at91/bootiic/Makefile#3 integrate .. //depot/projects/uart/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/uart/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/uart/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/uart/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/uart/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/uart/boot/arm/at91/bootiic/main.c#3 integrate .. //depot/projects/uart/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/uart/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/uart/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/uart/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/uart/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/uart/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/uart/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/uart/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/uart/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/uart/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/uart/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/uart/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/loader_prompt.c#3 delete .. //depot/projects/uart/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/uart/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/uart/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/uart/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/uart/boot/common/help.common#6 integrate .. //depot/projects/uart/boot/common/loader.8#10 integrate .. //depot/projects/uart/boot/common/merge_help.awk#2 integrate .. //depot/projects/uart/boot/common/panic.c#3 integrate .. //depot/projects/uart/boot/ficl/Makefile#7 integrate .. //depot/projects/uart/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/uart/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/uart/boot/forth/loader.conf#12 integrate .. //depot/projects/uart/boot/i386/Makefile.inc#5 integrate .. //depot/projects/uart/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/uart/boot/i386/libi386/biospci.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/biossmap.c#5 integrate .. //depot/projects/uart/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/uart/boot/i386/libi386/elf64_freebsd.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/libi386.h#9 integrate .. //depot/projects/uart/boot/i386/loader/help.i386#4 integrate .. //depot/projects/uart/boot/i386/loader/main.c#8 integrate .. //depot/projects/uart/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/uart/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/uart/boot/pc98/boot2/inode.h#3 integrate .. //depot/projects/uart/boot/pc98/loader/main.c#7 integrate .. //depot/projects/uart/bsm/audit.h#5 integrate .. //depot/projects/uart/bsm/audit_internal.h#3 integrate .. //depot/projects/uart/bsm/audit_kevents.h#5 integrate .. //depot/projects/uart/bsm/audit_record.h#4 integrate .. //depot/projects/uart/cam/cam_periph.c#11 integrate .. //depot/projects/uart/cam/cam_xpt.c#14 integrate .. //depot/projects/uart/cam/scsi/scsi_all.c#7 integrate .. //depot/projects/uart/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#20 integrate .. //depot/projects/uart/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32.h#4 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.conf#3 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/uart/compat/ia32/ia32_genassym.c#3 integrate .. //depot/projects/uart/compat/ia32/ia32_signal.h#5 integrate .. //depot/projects/uart/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/uart/compat/linux/linux_emul.c#1 branch .. //depot/projects/uart/compat/linux/linux_emul.h#1 branch .. //depot/projects/uart/compat/linux/linux_file.c#9 integrate .. //depot/projects/uart/compat/linux/linux_futex.c#1 branch .. //depot/projects/uart/compat/linux/linux_futex.h#1 branch .. //depot/projects/uart/compat/linux/linux_misc.c#18 integrate .. //depot/projects/uart/compat/linux/linux_signal.c#8 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#14 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#12 integrate .. //depot/projects/uart/compat/linux/linux_time.c#1 branch .. //depot/projects/uart/compat/linux/linux_util.c#6 integrate .. //depot/projects/uart/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/uart/compat/svr4/svr4_proto.h#7 integrate .. //depot/projects/uart/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/uart/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_stream.c#10 integrate .. //depot/projects/uart/compat/svr4/svr4_syscall.h#7 integrate .. //depot/projects/uart/compat/svr4/svr4_syscallnames.c#7 integrate .. //depot/projects/uart/compat/svr4/svr4_sysent.c#7 integrate .. //depot/projects/uart/compat/svr4/syscalls.conf#3 integrate .. //depot/projects/uart/conf/Makefile.sun4v#1 branch .. //depot/projects/uart/conf/NOTES#43 integrate .. //depot/projects/uart/conf/files#75 integrate .. //depot/projects/uart/conf/files.amd64#25 integrate .. //depot/projects/uart/conf/files.i386#31 integrate .. //depot/projects/uart/conf/files.pc98#25 integrate .. //depot/projects/uart/conf/files.powerpc#12 integrate .. //depot/projects/uart/conf/files.sun4v#1 branch .. //depot/projects/uart/conf/kern.post.mk#16 integrate .. //depot/projects/uart/conf/kern.pre.mk#14 integrate .. //depot/projects/uart/conf/kmod.mk#23 integrate .. //depot/projects/uart/conf/options#41 integrate .. //depot/projects/uart/conf/options.amd64#10 integrate .. //depot/projects/uart/conf/options.arm#10 integrate .. //depot/projects/uart/conf/options.i386#16 integrate .. //depot/projects/uart/conf/options.pc98#14 integrate .. //depot/projects/uart/conf/options.sun4v#1 branch .. //depot/projects/uart/contrib/dev/acpica/acfreebsd.h#7 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_if.m#5 delete .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.c#8 delete .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.h#7 delete .. //depot/projects/uart/contrib/ipfilter/netinet/fil.c#9 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.h#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_frag.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_log.c#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_proxy.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rcmd_pxy.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ipl.h#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/uart/contrib/pf/net/pf.c#10 integrate .. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#10 integrate .. //depot/projects/uart/crypto/sha2/sha2.c#3 integrate .. //depot/projects/uart/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/uart/ddb/db_ps.c#12 integrate .. //depot/projects/uart/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdHardware.c#10 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdMemory.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi.c#25 integrate .. //depot/projects/uart/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_pci_link.c#11 integrate .. //depot/projects/uart/dev/acpica/acpi_thermal.c#11 integrate .. //depot/projects/uart/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#13 integrate .. //depot/projects/uart/dev/aic/aic_pccard.c#7 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_eisa.c#6 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_pci.c#8 integrate .. //depot/projects/uart/dev/aic7xxx/ahd_pci.c#9 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/uart/dev/arl/if_arlreg.h#3 integrate .. //depot/projects/uart/dev/ata/ata-all.c#23 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#15 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#12 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#17 integrate .. //depot/projects/uart/dev/ata/ata-raid.c#13 integrate .. //depot/projects/uart/dev/ata/ata-raid.h#9 integrate .. //depot/projects/uart/dev/ata/ata-usb.c#4 integrate .. //depot/projects/uart/dev/ath/ah_osdep.c#1 branch .. //depot/projects/uart/dev/ath/ah_osdep.h#1 branch .. //depot/projects/uart/dev/ath/if_ath.c#34 integrate .. //depot/projects/uart/dev/ath/if_athioctl.h#11 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#22 integrate .. //depot/projects/uart/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/uart/dev/atkbdc/atkbdc.c#5 integrate .. //depot/projects/uart/dev/bce/if_bce.c#4 integrate .. //depot/projects/uart/dev/bge/if_bge.c#30 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#20 integrate .. //depot/projects/uart/dev/bktr/CHANGELOG.TXT#4 integrate .. //depot/projects/uart/dev/bktr/bktr_i2c.c#7 integrate .. //depot/projects/uart/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/uart/dev/cs/if_cs.c#9 integrate .. //depot/projects/uart/dev/cs/if_csvar.h#7 integrate .. //depot/projects/uart/dev/dc/dcphy.c#3 integrate .. //depot/projects/uart/dev/dc/if_dc.c#8 integrate .. //depot/projects/uart/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/uart/dev/dc/pnphy.c#2 integrate .. //depot/projects/uart/dev/de/if_de.c#3 integrate .. //depot/projects/uart/dev/de/if_devar.h#2 integrate .. //depot/projects/uart/dev/digi/digi.c#9 integrate .. //depot/projects/uart/dev/dpt/dpt_scsi.c#8 integrate .. //depot/projects/uart/dev/drm/drmP.h#10 integrate .. //depot/projects/uart/dev/drm/drm_drv.c#4 integrate .. //depot/projects/uart/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/uart/dev/drm/i915_dma.c#4 integrate .. //depot/projects/uart/dev/drm/i915_drm.h#4 integrate .. //depot/projects/uart/dev/drm/i915_drv.h#4 integrate .. //depot/projects/uart/dev/drm/i915_irq.c#4 integrate .. //depot/projects/uart/dev/drm/mach64_drm.h#3 integrate .. //depot/projects/uart/dev/drm/radeon_cp.c#10 integrate .. //depot/projects/uart/dev/drm/radeon_drm.h#10 integrate .. //depot/projects/uart/dev/drm/radeon_drv.h#10 integrate .. //depot/projects/uart/dev/drm/radeon_state.c#12 integrate .. //depot/projects/uart/dev/em/README#7 integrate .. //depot/projects/uart/dev/em/if_em.c#24 integrate .. //depot/projects/uart/dev/em/if_em.h#20 integrate .. //depot/projects/uart/dev/em/if_em_hw.c#10 integrate .. //depot/projects/uart/dev/em/if_em_hw.h#7 integrate .. //depot/projects/uart/dev/em/if_em_osdep.h#7 integrate .. //depot/projects/uart/dev/en/if_en_pci.c#10 integrate .. //depot/projects/uart/dev/en/midway.c#11 integrate .. //depot/projects/uart/dev/exca/exca.c#12 integrate .. //depot/projects/uart/dev/exca/excareg.h#3 integrate .. //depot/projects/uart/dev/fb/creator.c#6 integrate .. //depot/projects/uart/dev/fdc/fdc.c#13 integrate .. //depot/projects/uart/dev/fe/if_fe.c#9 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#24 integrate .. //depot/projects/uart/dev/gem/if_gem.c#9 integrate .. //depot/projects/uart/dev/hme/if_hme.c#15 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/uart/dev/ic/nec765.h#4 integrate .. //depot/projects/uart/dev/ichsmb/ichsmb.c#8 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/uart/dev/iicbus/if_ic.c#6 integrate .. //depot/projects/uart/dev/iicbus/iic.c#7 integrate .. //depot/projects/uart/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/uart/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/uart/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/uart/dev/ipmi/ipmi_acpi.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmi_isa.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmi_kcs.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/uart/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/uart/dev/ipmi/ipmi_smbus.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmi_smic.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmi_ssif.c#1 branch .. //depot/projects/uart/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/uart/dev/ips/ips.c#9 integrate .. //depot/projects/uart/dev/ips/ips.h#8 integrate .. //depot/projects/uart/dev/ips/ipsreg.h#3 integrate .. //depot/projects/uart/dev/isp/isp.c#15 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#14 integrate .. //depot/projects/uart/dev/isp/isp_ioctl.h#8 integrate .. //depot/projects/uart/dev/isp/isp_library.c#5 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#16 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/uart/dev/isp/isp_target.c#10 integrate .. //depot/projects/uart/dev/isp/isp_target.h#8 integrate .. //depot/projects/uart/dev/isp/isp_tpublic.h#8 integrate .. //depot/projects/uart/dev/isp/ispvar.h#13 integrate .. //depot/projects/uart/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/uart/dev/ispfw/ispfw.c#8 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb.c#8 integrate .. //depot/projects/uart/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/uart/dev/lge/if_lge.c#14 integrate .. //depot/projects/uart/dev/lge/if_lgereg.h#6 integrate .. //depot/projects/uart/dev/mfi/mfi.c#7 integrate .. //depot/projects/uart/dev/mfi/mfi_debug.c#1 branch .. //depot/projects/uart/dev/mfi/mfireg.h#4 integrate .. //depot/projects/uart/dev/mfi/mfivar.h#4 integrate .. //depot/projects/uart/dev/mii/brgphy.c#16 integrate .. //depot/projects/uart/dev/mii/miidevs#10 integrate .. //depot/projects/uart/dev/mii/rgephy.c#8 integrate .. //depot/projects/uart/dev/mk48txx/mk48txx.c#7 integrate .. //depot/projects/uart/dev/mpt/mpt.c#20 integrate .. //depot/projects/uart/dev/mpt/mpt.h#18 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#19 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#23 integrate .. //depot/projects/uart/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/uart/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/uart/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/uart/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/uart/dev/my/if_my.c#11 integrate .. //depot/projects/uart/dev/my/if_myreg.h#4 integrate .. //depot/projects/uart/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/uart/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/uart/dev/nge/if_nge.c#15 integrate .. //depot/projects/uart/dev/nge/if_ngereg.h#7 integrate .. //depot/projects/uart/dev/ofw/openfirmio.c#6 integrate .. //depot/projects/uart/dev/patm/if_patm_intr.c#6 integrate .. //depot/projects/uart/dev/pccard/pccard_cis.c#12 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#21 integrate .. //depot/projects/uart/dev/pccbb/pccbb_pci.c#11 integrate .. //depot/projects/uart/dev/pccbb/pccbbreg.h#8 integrate .. //depot/projects/uart/dev/pci/pci.c#25 integrate .. //depot/projects/uart/dev/pci/pci_user.c#9 integrate .. //depot/projects/uart/dev/pci/pcivar.h#9 integrate .. //depot/projects/uart/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/uart/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/uart/dev/puc/pucdata.c#49 integrate .. //depot/projects/uart/dev/ral/rt2560.c#6 integrate .. //depot/projects/uart/dev/re/if_re.c#20 integrate .. //depot/projects/uart/dev/sio/sio_pccard.c#9 integrate .. //depot/projects/uart/dev/sk/if_sk.c#11 integrate .. //depot/projects/uart/dev/smbus/smb.c#5 integrate .. //depot/projects/uart/dev/smbus/smb.h#3 integrate .. //depot/projects/uart/dev/smbus/smbconf.c#3 integrate .. //depot/projects/uart/dev/smbus/smbconf.h#2 integrate .. //depot/projects/uart/dev/smbus/smbus.c#5 integrate .. //depot/projects/uart/dev/smbus/smbus.h#3 integrate .. //depot/projects/uart/dev/smbus/smbus_if.m#3 integrate .. //depot/projects/uart/dev/sound/driver.c#8 integrate .. //depot/projects/uart/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/uart/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/uart/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/uart/dev/sound/pci/atiixp.c#6 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#12 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/uart/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/uart/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/uart/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/uart/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/uart/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/uart/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/uart/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/uart/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/uart/dev/sound/pci/ich.c#23 integrate .. //depot/projects/uart/dev/sound/pci/spicds.c#1 branch .. //depot/projects/uart/dev/sound/pci/spicds.h#1 branch .. //depot/projects/uart/dev/sound/pcm/ac97.c#13 integrate .. //depot/projects/uart/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/uart/dev/sound/pcm/ac97_patch.h#5 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.h#6 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#10 integrate .. //depot/projects/uart/dev/sound/pcm/channel.h#6 integrate .. //depot/projects/uart/dev/sound/pcm/channel_if.m#3 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#14 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.h#5 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.c#10 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.h#6 integrate .. //depot/projects/uart/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#12 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/uart/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/uart/dev/stge/if_stge.c#2 integrate .. //depot/projects/uart/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/uart/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/uart/dev/syscons/scmouse.c#7 integrate .. //depot/projects/uart/dev/syscons/scvidctl.c#8 integrate .. //depot/projects/uart/dev/syscons/syscons.c#16 integrate .. //depot/projects/uart/dev/syscons/syscons.h#8 integrate .. //depot/projects/uart/dev/ti/if_ti.c#3 integrate .. //depot/projects/uart/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/uart/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/uart/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/uart/dev/txp/if_txp.c#13 integrate .. //depot/projects/uart/dev/uart/uart_kbd_sun.c#9 integrate .. //depot/projects/uart/dev/ubsec/ubsec.c#14 integrate .. //depot/projects/uart/dev/usb/ehci.c#18 integrate .. //depot/projects/uart/dev/usb/ehci_pci.c#13 integrate .. //depot/projects/uart/dev/usb/ehcivar.h#10 integrate .. //depot/projects/uart/dev/usb/hid.c#7 integrate .. //depot/projects/uart/dev/usb/if_aue.c#13 integrate .. //depot/projects/uart/dev/usb/if_axe.c#14 integrate .. //depot/projects/uart/dev/usb/if_cdce.c#5 integrate .. //depot/projects/uart/dev/usb/if_cue.c#11 integrate .. //depot/projects/uart/dev/usb/if_kue.c#10 integrate .. //depot/projects/uart/dev/usb/if_rue.c#10 integrate .. //depot/projects/uart/dev/usb/if_udav.c#7 integrate .. //depot/projects/uart/dev/usb/if_udavreg.h#6 integrate .. //depot/projects/uart/dev/usb/if_ural.c#11 integrate .. //depot/projects/uart/dev/usb/if_uralvar.h#4 integrate .. //depot/projects/uart/dev/usb/kue_fw.h#3 integrate .. //depot/projects/uart/dev/usb/ohci.c#19 integrate .. //depot/projects/uart/dev/usb/ohci_pci.c#12 integrate .. //depot/projects/uart/dev/usb/ohcivar.h#10 integrate .. //depot/projects/uart/dev/usb/sl811hs.c#4 integrate .. //depot/projects/uart/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/uart/dev/usb/ubsa.c#7 integrate .. //depot/projects/uart/dev/usb/ubser.c#5 integrate .. //depot/projects/uart/dev/usb/ucom.c#11 integrate .. //depot/projects/uart/dev/usb/ucomvar.h#4 integrate .. //depot/projects/uart/dev/usb/udbp.c#7 integrate .. //depot/projects/uart/dev/usb/ufm.c#8 integrate .. //depot/projects/uart/dev/usb/ufoma.c#2 integrate .. //depot/projects/uart/dev/usb/uftdi.c#9 integrate .. //depot/projects/uart/dev/usb/ugen.c#14 integrate .. //depot/projects/uart/dev/usb/uhci.c#18 integrate .. //depot/projects/uart/dev/usb/uhcivar.h#9 integrate .. //depot/projects/uart/dev/usb/uhid.c#12 integrate .. //depot/projects/uart/dev/usb/uhub.c#12 integrate .. //depot/projects/uart/dev/usb/ukbd.c#9 integrate .. //depot/projects/uart/dev/usb/ulpt.c#9 integrate .. //depot/projects/uart/dev/usb/umass.c#19 integrate .. //depot/projects/uart/dev/usb/umct.c#7 integrate .. //depot/projects/uart/dev/usb/umodem.c#7 integrate .. //depot/projects/uart/dev/usb/ums.c#11 integrate .. //depot/projects/uart/dev/usb/uplcom.c#17 integrate .. //depot/projects/uart/dev/usb/urio.c#7 integrate .. //depot/projects/uart/dev/usb/usb.c#12 integrate .. //depot/projects/uart/dev/usb/usb.h#4 integrate .. //depot/projects/uart/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/uart/dev/usb/usb_mem.c#10 integrate .. //depot/projects/uart/dev/usb/usb_port.h#13 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#9 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#17 integrate .. //depot/projects/uart/dev/usb/usbdevs#26 integrate .. //depot/projects/uart/dev/usb/usbdi.c#12 integrate .. //depot/projects/uart/dev/usb/usbdi.h#8 integrate .. //depot/projects/uart/dev/usb/usbdi_util.c#8 integrate .. //depot/projects/uart/dev/usb/usbdi_util.h#6 integrate .. //depot/projects/uart/dev/usb/usbdivar.h#10 integrate .. //depot/projects/uart/dev/usb/uscanner.c#15 integrate .. //depot/projects/uart/dev/usb/uvisor.c#10 integrate .. //depot/projects/uart/dev/usb/uvscom.c#7 integrate .. //depot/projects/uart/dev/vge/if_vge.c#9 integrate .. //depot/projects/uart/dev/vkbd/vkbd.c#7 integrate .. //depot/projects/uart/dev/wi/if_wavelan_ieee.h#3 integrate .. //depot/projects/uart/dev/wi/if_wi.c#18 integrate .. //depot/projects/uart/dev/wi/if_wireg.h#5 integrate .. //depot/projects/uart/fs/devfs/devfs.h#7 integrate .. //depot/projects/uart/fs/devfs/devfs_devs.c#10 integrate .. //depot/projects/uart/fs/devfs/devfs_vfsops.c#12 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/uart/fs/hpfs/hpfs.h#6 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#12 integrate .. //depot/projects/uart/fs/msdosfs/denode.h#6 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_conv.c#9 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#16 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#16 integrate .. //depot/projects/uart/fs/nullfs/null_vfsops.c#11 integrate .. //depot/projects/uart/fs/nwfs/nwfs_io.c#11 integrate .. //depot/projects/uart/fs/nwfs/nwfs_subr.c#5 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vfsops.c#8 integrate .. //depot/projects/uart/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/uart/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/uart/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#12 integrate .. //depot/projects/uart/fs/udf/osta.h#3 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#16 integrate .. //depot/projects/uart/fs/umapfs/umap_vfsops.c#8 integrate .. //depot/projects/uart/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/uart/geom/bde/g_bde_work.c#6 integrate .. //depot/projects/uart/geom/cache/g_cache.c#1 branch .. //depot/projects/uart/geom/cache/g_cache.h#1 branch .. //depot/projects/uart/geom/eli/g_eli.c#10 integrate .. //depot/projects/uart/geom/eli/g_eli.h#5 integrate .. //depot/projects/uart/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/uart/geom/gate/g_gate.c#7 integrate .. //depot/projects/uart/geom/gate/g_gate.h#5 integrate .. //depot/projects/uart/geom/geom.h#13 integrate .. //depot/projects/uart/geom/geom_event.c#7 integrate .. //depot/projects/uart/geom/geom_gpt.c#9 integrate .. //depot/projects/uart/geom/geom_subr.c#9 integrate .. //depot/projects/uart/geom/label/g_label.c#6 integrate .. //depot/projects/uart/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/uart/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/uart/geom/label/g_label_ufs.c#8 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#18 integrate .. //depot/projects/uart/geom/nop/g_nop.c#5 integrate .. //depot/projects/uart/geom/nop/g_nop.h#3 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#21 integrate .. //depot/projects/uart/geom/raid3/g_raid3_ctl.c#10 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_raid5.h#3 integrate .. //depot/projects/uart/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/uart/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/uart/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/uart/i386/acpica/Makefile#3 integrate .. //depot/projects/uart/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/uart/i386/acpica/acpi_wakeup.c#14 integrate .. //depot/projects/uart/i386/acpica/madt.c#6 integrate .. //depot/projects/uart/i386/bios/apm.c#7 integrate .. //depot/projects/uart/i386/conf/GENERIC#23 integrate .. //depot/projects/uart/i386/conf/NOTES#23 integrate .. //depot/projects/uart/i386/conf/XBOX#6 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#19 integrate .. //depot/projects/uart/i386/i386/identcpu.c#21 integrate .. //depot/projects/uart/i386/i386/local_apic.c#12 integrate .. //depot/projects/uart/i386/i386/machdep.c#25 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#25 integrate .. //depot/projects/uart/i386/i386/nexus.c#7 integrate .. //depot/projects/uart/i386/i386/pmap.c#43 integrate .. //depot/projects/uart/i386/i386/support.s#7 integrate .. //depot/projects/uart/i386/i386/sys_machdep.c#16 integrate .. //depot/projects/uart/i386/i386/trap.c#15 integrate .. //depot/projects/uart/i386/i386/tsc.c#7 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_isc_syscall.h#6 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_proto.h#8 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_syscall.h#8 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.c#6 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix.h#7 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_syscall.h#7 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.conf#3 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.isc.conf#3 integrate .. //depot/projects/uart/i386/ibcs2/syscalls.xenix.conf#3 integrate .. //depot/projects/uart/i386/include/clock.h#11 integrate .. //depot/projects/uart/i386/include/elf.h#4 integrate .. //depot/projects/uart/i386/include/pmap.h#11 integrate .. //depot/projects/uart/i386/include/stdarg.h#4 integrate .. //depot/projects/uart/i386/isa/atpic_vector.s#3 integrate .. //depot/projects/uart/i386/isa/clock.c#13 integrate .. //depot/projects/uart/i386/isa/pmtimer.c#3 integrate .. //depot/projects/uart/i386/linux/linux.h#5 integrate .. //depot/projects/uart/i386/linux/linux_dummy.c#6 integrate .. //depot/projects/uart/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/uart/i386/linux/linux_proto.h#12 integrate .. //depot/projects/uart/i386/linux/linux_syscall.h#12 integrate .. //depot/projects/uart/i386/linux/linux_sysent.c#12 integrate .. //depot/projects/uart/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/uart/i386/linux/syscalls.conf#3 integrate .. //depot/projects/uart/i386/linux/syscalls.master#12 integrate .. //depot/projects/uart/i386/xbox/xbox.c#3 integrate .. //depot/projects/uart/ia64/conf/GENERIC#15 integrate .. //depot/projects/uart/ia64/conf/NOTES#8 integrate .. //depot/projects/uart/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/uart/ia64/ia32/ia32_trap.c#7 integrate .. //depot/projects/uart/ia64/ia64/clock.c#7 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#25 integrate .. //depot/projects/uart/ia64/ia64/support.S#5 integrate .. //depot/projects/uart/ia64/ia64/trap.c#18 integrate .. //depot/projects/uart/ia64/include/clock.h#4 integrate .. //depot/projects/uart/ia64/include/elf.h#4 integrate .. //depot/projects/uart/ia64/include/pmap.h#7 integrate .. //depot/projects/uart/ia64/include/stdarg.h#3 integrate .. //depot/projects/uart/ia64/include/vmparam.h#6 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#15 integrate .. //depot/projects/uart/kern/Makefile#3 integrate .. //depot/projects/uart/kern/bus_if.m#6 integrate .. //depot/projects/uart/kern/init_main.c#16 integrate .. //depot/projects/uart/kern/init_sysent.c#19 integrate .. //depot/projects/uart/kern/kern_acct.c#11 integrate .. //depot/projects/uart/kern/kern_descrip.c#25 integrate .. //depot/projects/uart/kern/kern_event.c#15 integrate .. //depot/projects/uart/kern/kern_exec.c#20 integrate .. //depot/projects/uart/kern/kern_exit.c#17 integrate .. //depot/projects/uart/kern/kern_fork.c#17 integrate .. //depot/projects/uart/kern/kern_jail.c#8 integrate .. //depot/projects/uart/kern/kern_ktr.c#12 integrate .. //depot/projects/uart/kern/kern_ktrace.c#13 integrate .. //depot/projects/uart/kern/kern_lock.c#13 integrate .. //depot/projects/uart/kern/kern_mac.c#14 integrate .. //depot/projects/uart/kern/kern_mbuf.c#12 integrate .. //depot/projects/uart/kern/kern_mutex.c#16 integrate .. //depot/projects/uart/kern/kern_proc.c#16 integrate .. //depot/projects/uart/kern/kern_prot.c#13 integrate .. //depot/projects/uart/kern/kern_resource.c#11 integrate .. //depot/projects/uart/kern/kern_sig.c#31 integrate .. //depot/projects/uart/kern/kern_subr.c#7 integrate .. //depot/projects/uart/kern/kern_sx.c#8 integrate .. //depot/projects/uart/kern/kern_syscalls.c#3 integrate .. //depot/projects/uart/kern/kern_tc.c#16 integrate .. //depot/projects/uart/kern/kern_thr.c#14 integrate .. //depot/projects/uart/kern/kern_thread.c#23 integrate .. //depot/projects/uart/kern/kern_time.c#9 integrate .. //depot/projects/uart/kern/kern_umtx.c#15 integrate .. //depot/projects/uart/kern/makesyscalls.sh#5 integrate .. //depot/projects/uart/kern/sched_4bsd.c#15 integrate .. //depot/projects/uart/kern/sched_core.c#3 integrate .. //depot/projects/uart/kern/sched_ule.c#19 integrate .. //depot/projects/uart/kern/subr_bus.c#17 integrate .. //depot/projects/uart/kern/subr_clock.c#5 integrate .. //depot/projects/uart/kern/subr_prf.c#11 integrate .. //depot/projects/uart/kern/subr_rman.c#11 integrate .. //depot/projects/uart/kern/subr_rtc.c#1 branch .. //depot/projects/uart/kern/subr_turnstile.c#11 integrate .. //depot/projects/uart/kern/subr_witness.c#17 integrate .. //depot/projects/uart/kern/sys_generic.c#14 integrate .. //depot/projects/uart/kern/sys_process.c#15 integrate .. //depot/projects/uart/kern/syscalls.c#19 integrate .. //depot/projects/uart/kern/syscalls.master#20 integrate .. //depot/projects/uart/kern/systrace_args.c#1 branch .. //depot/projects/uart/kern/sysv_msg.c#9 integrate .. //depot/projects/uart/kern/sysv_sem.c#13 integrate .. //depot/projects/uart/kern/sysv_shm.c#13 integrate .. //depot/projects/uart/kern/tty.c#12 integrate .. //depot/projects/uart/kern/tty_pts.c#4 integrate .. //depot/projects/uart/kern/tty_pty.c#10 integrate .. //depot/projects/uart/kern/tty_tty.c#7 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#14 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#6 integrate .. //depot/projects/uart/kern/uipc_proto.c#5 delete .. //depot/projects/uart/kern/uipc_sem.c#9 integrate .. //depot/projects/uart/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/uart/kern/uipc_socket.c#22 integrate .. //depot/projects/uart/kern/uipc_socket2.c#17 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#23 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#17 integrate .. //depot/projects/uart/kern/vfs_aio.c#17 integrate .. //depot/projects/uart/kern/vfs_bio.c#25 integrate .. //depot/projects/uart/kern/vfs_cluster.c#16 integrate .. //depot/projects/uart/kern/vfs_default.c#17 integrate .. //depot/projects/uart/kern/vfs_export.c#8 integrate .. //depot/projects/uart/kern/vfs_lookup.c#14 integrate .. //depot/projects/uart/kern/vfs_mount.c#28 integrate .. //depot/projects/uart/kern/vfs_subr.c#35 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#28 integrate .. //depot/projects/uart/libkern/strstr.c#1 branch .. //depot/projects/uart/modules/Makefile#41 integrate .. //depot/projects/uart/modules/agp/Makefile#7 integrate .. //depot/projects/uart/modules/ath/Makefile#4 integrate .. //depot/projects/uart/modules/ath_hal/Makefile#7 integrate .. //depot/projects/uart/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/uart/modules/ath_rate_onoe/Makefile#3 integrate .. //depot/projects/uart/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/uart/modules/digi/digi/Makefile#3 integrate .. //depot/projects/uart/modules/geom/Makefile#5 integrate .. //depot/projects/uart/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/uart/modules/if_ef/Makefile#5 integrate .. //depot/projects/uart/modules/if_ppp/Makefile#6 integrate .. //depot/projects/uart/modules/if_tap/Makefile#4 integrate .. //depot/projects/uart/modules/ipfw/Makefile#5 integrate .. //depot/projects/uart/modules/ipmi/Makefile#2 integrate .. //depot/projects/uart/modules/ispfw/Makefile#3 integrate .. //depot/projects/uart/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/uart/modules/kbdmux/Makefile#4 integrate .. //depot/projects/uart/modules/libalias/Makefile#3 integrate .. //depot/projects/uart/modules/libalias/libalias/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/Makefile.inc#1 branch .. //depot/projects/uart/modules/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/irc/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/modules.inc#1 branch .. //depot/projects/uart/modules/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/uart/modules/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/uart/modules/linprocfs/Makefile#3 integrate .. //depot/projects/uart/modules/linsysfs/Makefile#2 integrate .. //depot/projects/uart/modules/linux/Makefile#8 integrate .. //depot/projects/uart/modules/mfi/Makefile#4 integrate .. //depot/projects/uart/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/uart/modules/pf/Makefile#8 integrate .. //depot/projects/uart/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/uart/modules/procfs/Makefile#3 integrate .. //depot/projects/uart/modules/sound/driver/Makefile#6 integrate .. //depot/projects/uart/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/uart/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/uart/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/uart/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/uart/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/uart/modules/sound/sound/Makefile#5 integrate .. //depot/projects/uart/modules/ukbd/Makefile#7 integrate .. //depot/projects/uart/modules/vkbd/Makefile#4 integrate .. //depot/projects/uart/modules/wlan/Makefile#5 integrate .. //depot/projects/uart/net/bpf.c#18 integrate .. //depot/projects/uart/net/bpf.h#8 integrate .. //depot/projects/uart/net/bridgestp.c#7 integrate .. //depot/projects/uart/net/bridgestp.h#2 integrate .. //depot/projects/uart/net/if.c#23 integrate .. //depot/projects/uart/net/if.h#13 integrate .. //depot/projects/uart/net/if_bridge.c#13 integrate .. //depot/projects/uart/net/if_bridgevar.h#7 integrate .. //depot/projects/uart/net/if_ethersubr.c#17 integrate .. //depot/projects/uart/net/if_faith.c#10 integrate .. //depot/projects/uart/net/if_gif.c#11 integrate .. //depot/projects/uart/net/if_gre.c#11 integrate .. //depot/projects/uart/net/if_loop.c#11 integrate .. //depot/projects/uart/net/if_spppsubr.c#8 integrate .. //depot/projects/uart/net/if_stf.c#12 integrate .. //depot/projects/uart/net/if_tap.c#12 integrate .. //depot/projects/uart/net/if_tap.h#3 integrate .. //depot/projects/uart/net/if_tun.c#10 integrate .. //depot/projects/uart/net/if_var.h#13 integrate .. //depot/projects/uart/net/if_vlan.c#18 integrate .. //depot/projects/uart/net/if_vlan_var.h#9 integrate .. //depot/projects/uart/net/net_osdep.h#6 delete .. //depot/projects/uart/net80211/ieee80211_input.c#19 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#18 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#19 integrate .. //depot/projects/uart/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/uart/netatalk/ddp_usrreq.c#9 integrate .. //depot/projects/uart/netgraph/atm/ccatm/ng_ccatm.c#3 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#10 integrate .. //depot/projects/uart/netgraph/ng_eiface.c#10 integrate .. //depot/projects/uart/netgraph/ng_ether.c#9 integrate .. //depot/projects/uart/netgraph/ng_fec.c#7 integrate .. //depot/projects/uart/netgraph/ng_pppoe.c#10 integrate .. //depot/projects/uart/netgraph/ng_pppoe.h#6 integrate .. //depot/projects/uart/netgraph/ng_vlan.c#3 integrate .. //depot/projects/uart/netinet/if_ether.c#15 integrate .. //depot/projects/uart/netinet/in.c#11 integrate .. //depot/projects/uart/netinet/in_gif.c#9 integrate .. //depot/projects/uart/netinet/in_pcb.c#21 integrate .. //depot/projects/uart/netinet/in_var.h#7 integrate .. //depot/projects/uart/netinet/ip_carp.c#8 integrate .. //depot/projects/uart/netinet/ip_encap.c#5 integrate .. //depot/projects/uart/netinet/ip_fastfwd.c#11 integrate .. //depot/projects/uart/netinet/ip_fw.h#14 integrate .. //depot/projects/uart/netinet/ip_fw2.c#27 integrate .. //depot/projects/uart/netinet/ip_input.c#18 integrate .. //depot/projects/uart/netinet/ip_mroute.c#12 integrate .. //depot/projects/uart/netinet/ip_mroute.h#6 integrate .. //depot/projects/uart/netinet/ip_output.c#18 integrate .. //depot/projects/uart/netinet/ip_var.h#11 integrate .. //depot/projects/uart/netinet/libalias/alias.c#3 integrate .. //depot/projects/uart/netinet/libalias/alias.h#2 integrate .. //depot/projects/uart/netinet/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/uart/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/uart/netinet/libalias/alias_dummy.c#1 branch .. //depot/projects/uart/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/uart/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/uart/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/uart/netinet/libalias/alias_mod.c#1 branch .. //depot/projects/uart/netinet/libalias/alias_mod.h#1 branch .. //depot/projects/uart/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/uart/netinet/libalias/alias_old.c#2 integrate .. //depot/projects/uart/netinet/libalias/alias_pptp.c#2 integrate .. //depot/projects/uart/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/uart/netinet/libalias/alias_skinny.c#3 integrate .. //depot/projects/uart/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/uart/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/uart/netinet/libalias/libalias.3#4 integrate .. //depot/projects/uart/netinet/raw_ip.c#18 integrate .. //depot/projects/uart/netinet/tcp_input.c#26 integrate .. //depot/projects/uart/netinet/tcp_output.c#10 integrate .. //depot/projects/uart/netinet/tcp_subr.c#23 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#18 integrate .. //depot/projects/uart/netinet/tcp_timer.c#15 integrate .. //depot/projects/uart/netinet/tcp_timer.h#5 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#17 integrate .. //depot/projects/uart/netinet/tcp_var.h#14 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#21 integrate .. //depot/projects/uart/netinet6/ah_aesxcbcmac.c#4 integrate .. //depot/projects/uart/netinet6/ah_core.c#7 integrate .. //depot/projects/uart/netinet6/ah_input.c#5 integrate .. //depot/projects/uart/netinet6/ah_output.c#4 integrate .. //depot/projects/uart/netinet6/esp_aesctr.c#4 integrate .. //depot/projects/uart/netinet6/esp_core.c#6 integrate .. //depot/projects/uart/netinet6/esp_input.c#5 integrate .. //depot/projects/uart/netinet6/esp_output.c#5 integrate .. //depot/projects/uart/netinet6/esp_rijndael.c#5 integrate .. //depot/projects/uart/netinet6/frag6.c#9 integrate .. //depot/projects/uart/netinet6/icmp6.c#12 integrate .. //depot/projects/uart/netinet6/in6.c#13 integrate .. //depot/projects/uart/netinet6/in6_cksum.c#8 integrate .. //depot/projects/uart/netinet6/in6_gif.c#8 integrate .. //depot/projects/uart/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/uart/netinet6/in6_proto.c#9 integrate .. //depot/projects/uart/netinet6/in6_src.c#11 integrate .. //depot/projects/uart/netinet6/ip6_forward.c#11 integrate .. //depot/projects/uart/netinet6/ip6_input.c#13 integrate .. //depot/projects/uart/netinet6/ip6_mroute.c#9 integrate .. //depot/projects/uart/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/uart/netinet6/ip6_output.c#14 integrate .. //depot/projects/uart/netinet6/ipcomp_core.c#4 integrate .. //depot/projects/uart/netinet6/ipcomp_input.c#5 integrate .. //depot/projects/uart/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/uart/netinet6/ipsec.c#11 integrate .. //depot/projects/uart/netinet6/mld6.c#9 integrate .. //depot/projects/uart/netinet6/nd6.c#14 integrate .. //depot/projects/uart/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/uart/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/uart/netinet6/udp6_output.c#7 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/uart/netkey/key.c#9 integrate .. //depot/projects/uart/netkey/keydb.c#5 integrate .. //depot/projects/uart/netncp/ncp_sock.c#4 integrate .. //depot/projects/uart/netsmb/smb_crypt.c#5 integrate .. //depot/projects/uart/netsmb/smb_iod.c#5 integrate .. //depot/projects/uart/netsmb/smb_rq.c#4 integrate .. //depot/projects/uart/netsmb/smb_rq.h#4 integrate .. //depot/projects/uart/netsmb/smb_trantcp.c#5 integrate .. //depot/projects/uart/nfs4client/nfs4_vfsops.c#10 integrate .. //depot/projects/uart/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#15 integrate .. //depot/projects/uart/nfsclient/nfs_lock.c#7 integrate .. //depot/projects/uart/nfsclient/nfs_node.c#13 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/uart/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/uart/nfsclient/nfsnode.h#9 integrate .. //depot/projects/uart/nfsserver/nfs.h#7 integrate .. //depot/projects/uart/nfsserver/nfs_srvcache.c#5 integrate .. //depot/projects/uart/nfsserver/nfs_srvsubs.c#12 integrate .. //depot/projects/uart/nfsserver/nfs_syscalls.c#9 integrate .. //depot/projects/uart/pc98/cbus/clock.c#4 integrate .. //depot/projects/uart/pc98/cbus/fdc.c#6 integrate .. //depot/projects/uart/pc98/cbus/pckbd.c#3 integrate .. //depot/projects/uart/pc98/conf/GENERIC#18 integrate .. //depot/projects/uart/pc98/conf/NOTES#19 integrate .. //depot/projects/uart/pc98/include/md_var.h#2 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#11 integrate .. //depot/projects/uart/pc98/pc98/pc98_machdep.c#6 integrate .. //depot/projects/uart/pci/agp.c#6 integrate .. //depot/projects/uart/pci/agp_amd64.c#7 integrate .. //depot/projects/uart/pci/agp_ati.c#3 integrate .. //depot/projects/uart/pci/agp_i810.c#11 integrate .. //depot/projects/uart/pci/alpm.c#6 integrate .. //depot/projects/uart/pci/amdpm.c#11 integrate .. //depot/projects/uart/pci/amdsmb.c#3 integrate .. //depot/projects/uart/pci/if_rl.c#21 integrate .. //depot/projects/uart/pci/if_rlreg.h#18 integrate .. //depot/projects/uart/pci/if_sf.c#14 integrate .. //depot/projects/uart/pci/if_sfreg.h#8 integrate .. //depot/projects/uart/pci/if_sis.c#18 integrate .. //depot/projects/uart/pci/if_sisreg.h#8 integrate .. //depot/projects/uart/pci/if_ste.c#11 integrate .. //depot/projects/uart/pci/if_tl.c#10 integrate .. //depot/projects/uart/pci/if_tlreg.h#7 integrate .. //depot/projects/uart/pci/if_vr.c#11 integrate .. //depot/projects/uart/pci/if_vrreg.h#7 integrate .. //depot/projects/uart/pci/if_wb.c#11 integrate .. //depot/projects/uart/pci/if_wbreg.h#7 integrate .. //depot/projects/uart/pci/if_xl.c#19 integrate .. //depot/projects/uart/pci/if_xlreg.h#8 integrate .. //depot/projects/uart/pci/intpm.c#6 integrate .. //depot/projects/uart/pci/intpmreg.h#2 integrate .. //depot/projects/uart/pci/ncr.c#9 integrate .. //depot/projects/uart/pci/nfsmb.c#3 integrate .. //depot/projects/uart/pci/viapm.c#8 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#13 integrate .. //depot/projects/uart/powerpc/conf/NOTES#3 integrate .. //depot/projects/uart/powerpc/include/clock.h#4 integrate .. //depot/projects/uart/powerpc/include/elf.h#4 integrate .. //depot/projects/uart/powerpc/include/gdb_machdep.h#1 branch .. //depot/projects/uart/powerpc/include/stdarg.h#4 integrate .. //depot/projects/uart/powerpc/include/vmparam.h#3 integrate .. //depot/projects/uart/powerpc/powerpc/clock.c#10 integrate .. //depot/projects/uart/powerpc/powerpc/copyinout.c#4 integrate .. //depot/projects/uart/powerpc/powerpc/gdb_machdep.c#1 branch .. //depot/projects/uart/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/uart/powerpc/powerpc/machdep.c#14 integrate .. //depot/projects/uart/powerpc/powerpc/mmu_if.m#5 integrate .. //depot/projects/uart/powerpc/powerpc/mmu_oea.c#6 integrate .. //depot/projects/uart/powerpc/powerpc/pmap_dispatch.c#5 integrate .. //depot/projects/uart/powerpc/powerpc/trap.c#10 integrate .. //depot/projects/uart/powerpc/powerpc/vm_machdep.c#12 integrate .. //depot/projects/uart/security/audit/audit.c#6 integrate .. //depot/projects/uart/security/audit/audit.h#4 integrate .. //depot/projects/uart/security/audit/audit_arg.c#5 integrate .. //depot/projects/uart/security/audit/audit_bsm.c#6 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/uart/security/audit/audit_ioctl.h#3 integrate .. //depot/projects/uart/security/audit/audit_pipe.c#5 integrate .. //depot/projects/uart/security/audit/audit_private.h#5 integrate .. //depot/projects/uart/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/uart/security/audit/audit_worker.c#3 integrate .. //depot/projects/uart/security/mac/mac_framework.h#1 branch .. //depot/projects/uart/security/mac/mac_inet.c#2 integrate .. //depot/projects/uart/security/mac/mac_internal.h#2 integrate .. //depot/projects/uart/security/mac/mac_net.c#3 integrate .. //depot/projects/uart/security/mac/mac_pipe.c#2 integrate .. //depot/projects/uart/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/uart/security/mac/mac_process.c#5 integrate .. //depot/projects/uart/security/mac/mac_socket.c#4 integrate .. //depot/projects/uart/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/uart/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/uart/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/uart/security/mac/mac_vfs.c#8 integrate .. //depot/projects/uart/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/uart/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/uart/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#24 integrate .. //depot/projects/uart/sparc64/conf/NOTES#12 integrate .. //depot/projects/uart/sparc64/include/clock.h#2 integrate .. //depot/projects/uart/sparc64/include/elf.h#5 integrate .. //depot/projects/uart/sparc64/include/stdarg.h#4 integrate .. //depot/projects/uart/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#24 integrate .. //depot/projects/uart/sparc64/sparc64/support.S#4 integrate .. //depot/projects/uart/sparc64/sparc64/tsb.c#5 integrate .. //depot/projects/uart/sun4v/compile/.cvsignore#1 branch .. //depot/projects/uart/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/uart/sun4v/conf/GENERIC#1 branch .. //depot/projects/uart/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/uart/sun4v/conf/MAC#1 branch .. //depot/projects/uart/sun4v/conf/Makefile#1 branch .. //depot/projects/uart/sun4v/conf/NOTES#1 branch .. //depot/projects/uart/sun4v/include/_bus.h#1 branch .. //depot/projects/uart/sun4v/include/_inttypes.h#1 branch .. //depot/projects/uart/sun4v/include/_limits.h#1 branch .. //depot/projects/uart/sun4v/include/_stdint.h#1 branch .. //depot/projects/uart/sun4v/include/_types.h#1 branch .. //depot/projects/uart/sun4v/include/asi.h#1 branch .. //depot/projects/uart/sun4v/include/asm.h#1 branch .. //depot/projects/uart/sun4v/include/asmacros.h#1 branch .. //depot/projects/uart/sun4v/include/atomic.h#1 branch .. //depot/projects/uart/sun4v/include/bus.h#1 branch .. //depot/projects/uart/sun4v/include/bus_common.h#1 branch .. //depot/projects/uart/sun4v/include/bus_dma.h#1 branch .. //depot/projects/uart/sun4v/include/bus_private.h#1 branch .. //depot/projects/uart/sun4v/include/cache.h#1 branch .. //depot/projects/uart/sun4v/include/ccr.h#1 branch .. //depot/projects/uart/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/uart/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/uart/sun4v/include/clock.h#1 branch .. //depot/projects/uart/sun4v/include/cpu.h#1 branch .. //depot/projects/uart/sun4v/include/cpufunc.h#1 branch .. //depot/projects/uart/sun4v/include/db_machdep.h#1 branch .. //depot/projects/uart/sun4v/include/elf.h#1 branch .. //depot/projects/uart/sun4v/include/endian.h#1 branch .. //depot/projects/uart/sun4v/include/exec.h#1 branch .. //depot/projects/uart/sun4v/include/float.h#1 branch .. //depot/projects/uart/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/uart/sun4v/include/fp.h#1 branch .. //depot/projects/uart/sun4v/include/frame.h#1 branch .. //depot/projects/uart/sun4v/include/fsr.h#1 branch .. //depot/projects/uart/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/uart/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/uart/sun4v/include/hviommu.h#1 branch .. //depot/projects/uart/sun4v/include/hypervisor_api.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 8 02:34:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1339316A47E; Sun, 8 Oct 2006 02:34:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBEB116A403 for ; Sun, 8 Oct 2006 02:34:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E078D43D64 for ; Sun, 8 Oct 2006 02:34:03 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k982Y31k036288 for ; Sun, 8 Oct 2006 02:34:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k982XxVZ036276 for perforce@freebsd.org; Sun, 8 Oct 2006 02:33:59 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 8 Oct 2006 02:33:59 GMT Message-Id: <200610080233.k982XxVZ036276@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 107478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 02:34:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=107478 Change 107478 by kmacy@kmacy_storage:sun4v_work_stable on 2006/10/08 02:32:30 IFC Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/Makefile.inc1#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.1#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/utils.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/main.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/mixer#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/include/Makefile#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthread_db/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/doc/papers/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man1/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/aue.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/kue.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sched_ule.4#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ural.4#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/uscanner.4#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man5/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/kqueue.9#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/mk/sys.mk#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/NOTES#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/options#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/geom/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/usr.bin/calendar/calendars/calendar.australia#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/usr.sbin/Makefile#5 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1012,56 +1012,58 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.35 2006/08/25 09:58:13 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $ .\" -.Dd August 24, 2006 +.Dd October 7, 2006 .Dt CP 1 .Os .Sh NAME @@ -252,8 +252,37 @@ .Fl r option. This implementation supports that option, however, its use is strongly -discouraged, as it does not correctly copy special files, symbolic links -or fifo's. +discouraged as its behavior is very implementation dependent. +In this version of +.Nm , +.Fl r +is just a synonym for +.Fl RL . +The +.Fl R +option gives the correct behavior while +.Fl L +preserves the sometimes-useful historical behavior of following symbolic links. +The +.Fl r +option is deprecated in +.Tn POSIX + and its behavior is likely to be different +in future versions of +.Nm +and its behavior is likely to be different +in future versions of +.Fx . +Previous versions of +.Nm +in +.Fx , +the +.Fl r +behavior was to not correctly copy special files, symbolic links +or fifos. +Symbolic links were followed, and the contents of special +files and fifos were copied to regular files. .Pp The .Fl v ==== //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.55 2006/09/29 06:06:39 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.56 2006/10/07 22:14:43 trhodes Exp $"); /* * Cp copies source files to target files. @@ -138,7 +138,8 @@ pflag = 1; break; case 'r': - rflag = 1; + rflag = Lflag = 1; + Hflag = Pflag = 0; break; case 'v': vflag = 1; @@ -155,15 +156,12 @@ fts_options = FTS_NOCHDIR | FTS_PHYSICAL; if (rflag) { - if (Rflag) + if (Rflag) errx(1, "the -R and -r options may not be specified together."); - if (Hflag || Lflag || Pflag) - errx(1, - "the -H, -L, and -P options may not be specified with the -r option."); - fts_options &= ~FTS_PHYSICAL; - fts_options |= FTS_LOGICAL; - } + } + if (rflag && !Hflag && !Pflag) + Rflag = 1; if (Rflag) { if (Hflag) fts_options |= FTS_COMFOLLOW; @@ -227,12 +225,12 @@ * the initial mkdir(). */ if (r == -1) { - if (rflag || (Rflag && (Lflag || Hflag))) + if (Rflag && (Lflag || Hflag)) stat(*argv, &tmp_stat); else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag)) + if (S_ISDIR(tmp_stat.st_mode) && (Rflag)) type = DIR_TO_DNE; else type = FILE_TO_FILE; @@ -420,7 +418,7 @@ } break; case S_IFDIR: - if (!Rflag && !rflag) { + if (!Rflag) { warnx("%s is a directory (not copied).", curr->fts_path); (void)fts_set(ftsp, curr, FTS_SKIP); ==== //depot/projects/kmacy_sun4v_stable/src/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); #include #include @@ -54,17 +54,18 @@ #include #include "extern.h" -#define cp_pct(x,y) (int)(100.0 * (double)(x) / (double)(y)) + +#define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) int copy_file(const FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; - int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; ssize_t wcount; size_t wresid; - size_t wtotal; + off_t wtotal; + int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; @@ -149,16 +150,17 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { @@ -179,16 +181,17 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { ==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC void deljob(struct job *); STATIC struct job *getcurjob(struct job *); #endif -STATIC void showjob(struct job *, pid_t, int, int); +STATIC void showjob(struct job *, pid_t, int); /* @@ -265,18 +265,21 @@ jobscmd(int argc, char *argv[]) { char *id; - int ch, sformat, lformat; + int ch, mode; optind = optreset = 1; opterr = 0; - sformat = lformat = 0; - while ((ch = getopt(argc, argv, "ls")) != -1) { + mode = SHOWJOBS_DEFAULT; + while ((ch = getopt(argc, argv, "lps")) != -1) { switch (ch) { case 'l': - lformat = 1; + mode = SHOWJOBS_VERBOSE; + break; + case 'p': + mode = SHOWJOBS_PGIDS; break; case 's': - sformat = 1; + mode = SHOWJOBS_PIDS; break; case '?': default: @@ -287,24 +290,25 @@ argv += optind; if (argc == 0) - showjobs(0, sformat, lformat); + showjobs(0, mode); else while ((id = *argv++) != NULL) - showjob(getjob(id), 0, sformat, lformat); + showjob(getjob(id), 0, mode); return (0); } STATIC void -showjob(struct job *jp, pid_t pid, int sformat, int lformat) +showjob(struct job *jp, pid_t pid, int mode) { char s[64]; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; + pid_t ppid; char c; - procno = jp->nprocs; + procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; jobno = jp - jobtab + 1; curr = prev = 0; #if JOBS @@ -315,11 +319,13 @@ } #endif for (ps = jp->ps ; ; ps++) { /* for each process */ - if (sformat) { - out1fmt("%d\n", (int)ps->pid); + if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) { + ppid = (mode == SHOWJOBS_PIDS) ? ps->pid : + getpgid(ps->pid); + out1fmt("%d\n", (int)ppid); goto skip; } - if (!lformat && ps != jp->ps && pid == 0) + if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0) goto skip; if (pid != 0 && pid != ps->pid) goto skip; @@ -335,7 +341,7 @@ fmtstr(s, 64, " %c ", c); out1str(s); col = strlen(s); - if (lformat) { + if (mode == SHOWJOBS_VERBOSE) { fmtstr(s, 64, "%d ", (int)ps->pid); out1str(s); col += strlen(s); @@ -388,7 +394,7 @@ */ void -showjobs(int change, int sformat, int lformat) +showjobs(int change, int mode) { int jobno; struct job *jp; @@ -404,7 +410,7 @@ } if (change && ! jp->changed) continue; - showjob(jp, 0, sformat, lformat); + showjob(jp, 0, mode); jp->changed = 0; if (jp->state == JOBDONE) { freejob(jp); @@ -992,7 +998,7 @@ out1str(" (core dumped)"); out1c('\n'); } else - showjob(thisjob, pid, 0, 0); + showjob(thisjob, pid, SHOWJOBS_DEFAULT); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); ==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/jobs.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/jobs.h,v 1.18 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/jobs.h,v 1.19 2006/10/07 16:51:16 stefanf Exp $ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ @@ -74,6 +74,13 @@ #endif }; +enum { + SHOWJOBS_DEFAULT, /* job number, status, command */ + SHOWJOBS_VERBOSE, /* job number, PID, status, command */ + SHOWJOBS_PIDS, /* PID only */ + SHOWJOBS_PGIDS /* PID of the group leader only */ +}; + extern pid_t backgndpid; /* pid of last background process */ extern int job_warning; /* user was warned about stopped jobs */ extern int in_waitcmd; /* are we in waitcmd()? */ @@ -84,7 +91,7 @@ int fgcmd(int, char **); int bgcmd(int, char **); int jobscmd(int, char **); -void showjobs(int, int, int); +void showjobs(int, int); int waitcmd(int, char **); int jobidcmd(int, char **); struct job *makejob(union node *, int); ==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/main.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.28 2006/04/02 18:51:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.29 2006/10/07 16:51:16 stefanf Exp $"); #include #include @@ -211,7 +211,7 @@ inter = 0; if (iflag && top) { inter++; - showjobs(1, 0, 0); + showjobs(1, SHOWJOBS_DEFAULT); chkmail(0); flushout(&output); } ==== //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ .\" -.Dd July 29, 2006 +.Dd October 7, 2006 .Dt SH 1 .Os .Sh NAME @@ -1777,7 +1777,7 @@ If the .Ar job argument is omitted, use the current job. -.It Ic jobs Oo Fl ls Oc Op Ar job ... +.It Ic jobs Oo Fl lps Oc Op Ar job ... Print information about the specified jobs, or all jobs if no .Ar job argument is given. @@ -1787,8 +1787,13 @@ .Fl l option is specified, the PID of each job is also printed. If the +.Fl p +option is specified, only the process IDs for the process group leaders +are printed, one per line. +If the .Fl s -option is specified, only the PIDs of the jobs are printed, one per line. +option is specified, only the PIDs of the job commands are printed, one per +line. .It Ic local Oo Ar variable ... Oc Op Fl See the .Sx Functions ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#5 (text+ko) ==== @@ -1314,7 +1314,7 @@ /* #undef WORDS_BIGENDIAN */ /* Define if xauth is found in your path */ -#define XAUTH_PATH "/usr/X11R6/bin/xauth" +/* #undef XAUTH_PATH */ /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ ==== //depot/projects/kmacy_sun4v_stable/src/etc/defaults/rc.conf#6 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.297 2006/09/29 15:45:09 bms Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.298 2006/10/06 23:22:12 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -535,6 +535,7 @@ # ruleset file. newsyslog_enable="YES" # Run newsyslog at startup. newsyslog_flags="-CN" # Newsyslog flags to create marked files +mixer_enable="YES" # Run the sound mixer. ############################################################## ### Jail Configuration ####################################### ==== //depot/projects/kmacy_sun4v_stable/src/etc/mtree/BSD.include.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -100,6 +100,8 @@ .. .. geom + cache + .. concat .. eli ==== //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#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/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $ +# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $ # # @@ -41,10 +41,6 @@ { _cfg=1 - if checkyesno ipv6_enable; then - ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 - fi - ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up ==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.77 2006/10/07 15:45:56 ume Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 auditd \ + apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ ==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/mixer#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mixer,v 1.7 2006/10/06 23:22:13 flz Exp $ # # PROVIDE: mixer @@ -34,6 +34,7 @@ . /etc/rc.subr name="mixer" +rcvar="mixer_enable" stop_cmd="mixer_stop" start_cmd="mixer_start" reload_cmd="mixer_start" ==== //depot/projects/kmacy_sun4v_stable/src/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.226 2006/09/17 21:36:16 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.227 2006/10/07 08:29:20 phk Exp $ % ======================================================================= @@ -5192,6 +5192,22 @@ \ \ /___\/ \ \ \ \____\/ \__\/ % + THE + NORMAL + LAW OF ERROR + STANDS OUT IN THE + EXPERIENCE OF MANKIND + AS ONE OF THE BROADEST + GENERALIZATIONS OF NATURAL + PHILOSOPHY * IT SERVES AS THE + GUIDING INSTRUMENT IN RESEARCHES + IN THE PHYSICAL AND SOCIAL SCIENCES AND + IN MEDICINE, AGRICULTURE AND ENGINEERING * + IT IS AN INDISPENSABLE TOOL FOR THE ANALYSIS AND THE +INTERPRETATION OF THE BASIC DATA OBTAINED BY OBSERVATION AND EXPERIMENT + + -- W. J. Youden +% *** ******* ********* ==== //depot/projects/kmacy_sun4v_stable/src/gnu/lib/libstdc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.57 2006/09/30 12:52:15 ru Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.58 2006/10/05 20:55:37 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -12,6 +12,9 @@ SHLIB_MAJOR= 5 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H +.if ${MACHINE_ARCH} == "arm" +CFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1 +.endif CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ ==== //depot/projects/kmacy_sun4v_stable/src/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.263 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -45,8 +45,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \ - geom/raid3 geom/shsec geom/stripe \ + geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \ + geom/nop geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/getobjformat.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.10 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.11 2006/10/07 21:27:20 trhodes Exp $ .\" .Dd September 7, 1998 .Dt GETOBJFORMAT 3 @@ -116,7 +116,8 @@ If the environment variable .Ev OBJFORMAT is set, it overrides the default object file format. -.Ev OBJFORMAT takes precedence over +.Ev OBJFORMAT +takes precedence over .Pa /etc/objformat . .El .Sh FILES ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/getenv.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.17 2005/01/20 09:17:04 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $ .\" .Dd December 11, 1993 .Dt GETENV 3 @@ -90,8 +90,7 @@ .Fa overwrite is tested; if .Fa overwrite -is -zero, the +is zero, the variable is not reset, otherwise it is reset to the given .Fa value . ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/aio_return.2#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/lib/libc/sys/aio_return.2,v 1.17 2003/01/13 10:37:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.19 2006/10/07 10:49:20 trhodes Exp $ .\" -.Dd June 2, 1999 +.Dd October 7, 2006 .Dt AIO_RETURN 2 .Os .Sh NAME @@ -47,10 +47,10 @@ .Fn aio_return system call should only be called once, to obtain the final status of an asynchronous -I/O operation once -.Xr aio_error 2 +I/O operation once it has completed +.Xr ( aio_error 2 returns something other than -.Er EINPROGRESS . +.Er EINPROGRESS ) . .Sh RETURN VALUES If the asynchronous I/O request has completed, the status is returned as described in @@ -58,12 +58,10 @@ .Xr write 2 , or .Xr fsync 2 . -On failure, +Otherwise, .Fn aio_return -returns -.Dv -1 -and sets -.Dv errno +returns \-1 and sets +.Va errno to indicate the error condition. .Sh ERRORS The @@ -74,7 +72,7 @@ The .Fa iocb argument -does not reference an outstanding asynchronous I/O request. +does not reference a completed asynchronous I/O request. .El .Sh SEE ALSO .Xr aio_cancel 2 , ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/lio_listio.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.5 2005/12/13 13:43:35 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.6 2006/10/07 05:13:32 trhodes Exp $ .\" .Dd January 12, 2003 .Dt LIO_LISTIO 2 @@ -112,7 +112,7 @@ .Dv LIO_NOWAIT , the .Fn lio_listio -function 0 if the operations are successfully queued, +function returns 0 if the operations are successfully queued, otherwise \-1. .Sh ERRORS The ==== //depot/projects/kmacy_sun4v_stable/src/lib/libthread_db/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthread_db/Makefile,v 1.7 2006/03/29 14:08:45 deischen Exp $ +# $FreeBSD: src/lib/libthread_db/Makefile,v 1.8 2006/10/05 06:26:31 davidxu Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} @@ -6,7 +6,6 @@ SHLIB_MAJOR= 2 SRCS= thread_db.c SRCS+= libpthread_db.c libpthread_md.c -SRCS+= libc_r_db.c libc_r_md.c SRCS+= libthr_db.c INCS= thread_db.h WARNS?= 1 ==== //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.977 2006/09/28 15:36:59 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.979 2006/10/08 00:22:20 bmah Exp $ 2000 @@ -218,6 +218,10 @@ security advisory FreeBSD-SA-06:21.gzip. &merged; + Several vulnerabilities have been fixed in OpenSSH. More + details can be found in security advisory + FreeBSD-SA-06:22.openssh. &merged; + Multiple errors in the OpenSSL &man.crypto.3; library have been fixed. Potential effects are varied, and are documented in more detail in security advisory @@ -777,17 +781,18 @@ This feature can be re-enabled by using a new sysctl variable net.inet6.ip6.mcast_pmtu. &merged; + IPv6 link-local addresses are now enabled only + if ipv6_enable is set in &man.rc.conf.5;. + &merged; + The &man.ipfw.4; IP packet filter now supports IPv6. &merged; - The &man.ipfw.4; firewall system now supports substitution of the action - argument with the value obtained from table lookup, - which allows some optimization of rulesets. - This is now applicable only to pipe, - queue, - divert, - tee, - netgraph, - and ngtee rules. &merged; + The &man.ipfw.4; firewall system now supports + a tablearg feature, which allows + values obtained from a table lookup to be used as part of a + rule. &merged; + This feature can be used to optimize some rulesets + or to implement policy-based routing inside a firewall. For example, the following rules will throw different packets to different pipes: @@ -805,7 +810,7 @@ The tag acts as an internal marker (it is not sent out over the wire) that can be used to identify these packets later on, for example, by using tagged - rule option. For more details, see &man.ipfw.8;. + rule option. For more details, see &man.ipfw.8;. &merged; The IPFIREWALL_FORWARD_EXTENDED kernel >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 8 03:42:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AE4716A40F; Sun, 8 Oct 2006 03:42:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2453016A416 for ; Sun, 8 Oct 2006 03:42:30 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6E4043D46 for ; Sun, 8 Oct 2006 03:42:29 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k983gTme073648 for ; Sun, 8 Oct 2006 03:42:29 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k983gTPP073642 for perforce@freebsd.org; Sun, 8 Oct 2006 03:42:29 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 8 Oct 2006 03:42:29 GMT Message-Id: <200610080342.k983gTPP073642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 107482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 03:42:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=107482 Change 107482 by howardsu@su_laptop on 2006/10/08 03:42:22 Remove a duplicate METHOD Affected files ... .. //depot/projects/dtrace/src/sys/kern/bus_if.m#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/bus_if.m#6 (text+ko) ==== @@ -509,18 +509,6 @@ } DEFAULT bus_generic_config_intr; /** - * @brief Returns bus_dma_tag_t for use w/ devices on the bus. - * - * @param _dev the parent device of @p _child - * @param _child the device to which the tag will belong - */ - -METHOD bus_dma_tag_t get_dma_tag { - device_t _dev; - device_t _child; -} DEFAULT bus_generic_get_dma_tag; - -/** * @brief Notify a (bus) driver about a child that the hints mechanism * believes it has discovered. * From owner-p4-projects@FreeBSD.ORG Sun Oct 8 03:43:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8486216A415; Sun, 8 Oct 2006 03:43:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6329D16A403 for ; Sun, 8 Oct 2006 03:43:32 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3A4843D4C for ; Sun, 8 Oct 2006 03:43:31 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k983hVXf074271 for ; Sun, 8 Oct 2006 03:43:31 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k983hVan074268 for perforce@freebsd.org; Sun, 8 Oct 2006 03:43:31 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 8 Oct 2006 03:43:31 GMT Message-Id: <200610080343.k983hVan074268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 107483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 03:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=107483 Change 107483 by howardsu@su_laptop on 2006/10/08 03:42:53 one unclose #endif prevent building. Remove it. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_umtx.c#9 (text+ko) ==== @@ -316,7 +316,6 @@ uc = umtxq_getchain(key); mtx_lock(&uc->uc_lock); } -#endif /* * Unlock a chain. From owner-p4-projects@FreeBSD.ORG Sun Oct 8 05:02:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C82D416A47B; Sun, 8 Oct 2006 05:02:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 646ED16A415 for ; Sun, 8 Oct 2006 05:02:09 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA1C243D58 for ; Sun, 8 Oct 2006 05:02:08 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k98528SG027783 for ; Sun, 8 Oct 2006 05:02:08 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k98528EH027777 for perforce@freebsd.org; Sun, 8 Oct 2006 05:02:08 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 8 Oct 2006 05:02:08 GMT Message-Id: <200610080502.k98528EH027777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 107485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 05:02:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107485 Change 107485 by howardsu@su_laptop on 2006/10/08 05:01:19 Remove file st_bugs.c Add file fixup_tdescs.c Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#8 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#8 (text+ko) ==== @@ -12,13 +12,13 @@ ctf.c \ ctfconvert.c \ dwarf.c \ + fixup_tdescs.c \ hash.c \ iidesc.c \ input.c \ list.c \ merge.c \ output.c \ - st_bugs.c \ st_parse.c \ stabs.c \ stack.c \ From owner-p4-projects@FreeBSD.ORG Sun Oct 8 05:46:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B30D916A4C8; Sun, 8 Oct 2006 05:46:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 348E116A59D for ; Sun, 8 Oct 2006 05:46:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4BC743D55 for ; Sun, 8 Oct 2006 05:46:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k985k26f052624 for ; Sun, 8 Oct 2006 05:46:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k985k2Eb052621 for perforce@freebsd.org; Sun, 8 Oct 2006 05:46:02 GMT (envelope-from imp@freebsd.org) Date: Sun, 8 Oct 2006 05:46:02 GMT Message-Id: <200610080546.k985k2Eb052621@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 107486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 05:46:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=107486 Change 107486 by imp@imp_paco-paco on 2006/10/08 05:45:21 compile Affected files ... .. //depot/projects/usb/src/sys/dev/usb/udbp.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/udbp.h#5 (text+ko) ==== @@ -60,8 +60,8 @@ /* This structure is returned by the NGM_UDBP_GET_STATUS command */ struct ngudbpstat { - uint packets_in; /* packets in from downstream */ - uint packets_out; /* packets out towards downstream */ + int packets_in; /* packets in from downstream */ + int packets_out; /* packets out towards downstream */ }; /* From owner-p4-projects@FreeBSD.ORG Sun Oct 8 12:35:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C1FD16A417; Sun, 8 Oct 2006 12:35:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7B9B16A415 for ; Sun, 8 Oct 2006 12:35:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95BF643D58 for ; Sun, 8 Oct 2006 12:34:41 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k98CYfnZ098326 for ; Sun, 8 Oct 2006 12:34:41 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k98CYdN4098300 for perforce@freebsd.org; Sun, 8 Oct 2006 12:34:39 GMT (envelope-from piso@freebsd.org) Date: Sun, 8 Oct 2006 12:34:39 GMT Message-Id: <200610081234.k98CYdN4098300@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 107497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 12:35:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107497 Change 107497 by piso@piso_newluxor on 2006/10/08 12:33:57 IFC@107496 Affected files ... .. //depot/projects/soc2005/libalias/Makefile.inc1#6 integrate .. //depot/projects/soc2005/libalias/bin/cp/cp.1#3 integrate .. //depot/projects/soc2005/libalias/bin/cp/cp.c#5 integrate .. //depot/projects/soc2005/libalias/bin/cp/utils.c#3 integrate .. //depot/projects/soc2005/libalias/bin/sh/jobs.c#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/jobs.h#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/main.c#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/sh.1#5 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/config.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/configure.ac#3 integrate .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/soc2005/libalias/etc/network.subr#5 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#5 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/mixer#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/soc2005/libalias/include/Makefile#4 integrate .. //depot/projects/soc2005/libalias/include/elf.h#2 integrate .. //depot/projects/soc2005/libalias/lib/csu/sparc64/crt1.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/tls.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/Makefile#2 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/soc2005/libalias/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/soc2005/libalias/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/soc2005/libalias/sbin/gpt/add.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/gpt/label.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/gpt/remove.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/soc2005/libalias/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/doc/papers/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/man/man1/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/aue.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/kue.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ural.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/uscanner.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/Makefile#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#5 integrate .. //depot/projects/soc2005/libalias/share/man/man9/kqueue.9#1 branch .. //depot/projects/soc2005/libalias/share/mk/sys.mk#2 integrate .. //depot/projects/soc2005/libalias/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/soc2005/libalias/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/elf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/elf.h#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/soc2005/libalias/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/soc2005/libalias/sys/conf/NOTES#9 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#13 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.sun4v#1 branch .. //depot/projects/soc2005/libalias/sys/conf/options#7 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.sun4v#1 branch .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ips/ips.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/umass.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/soc2005/libalias/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/elf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/elf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_sig.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/compile/.cvsignore#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/conf/GENERIC#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/conf/MAC#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/conf/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/conf/NOTES#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/_bus.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/_inttypes.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/_limits.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/_stdint.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/_types.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/asi.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/asm.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/asmacros.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/atomic.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/bus.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/bus_common.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/bus_dma.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/bus_private.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/cache.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ccr.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/clock.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/cpu.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/cpufunc.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/db_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/elf.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/endian.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/exec.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/float.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/fp.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/frame.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/fsr.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/hviommu.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/idprom.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ieee.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ieeefp.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/in_cksum.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/instr.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/iommureg.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/iommuvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/kdb.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/kerneldump.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ktr.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/limits.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/lsu.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/md_var.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/memdev.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/metadata.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/mmu.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/mutex.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/nexusvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/param.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/pcb.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/pcpu.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/pmap.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/proc.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/profile.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/pstate.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ptrace.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/reg.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/reloc.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/resource.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/runq.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/setjmp.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/sf_buf.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/sigframe.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/signal.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/smp.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/stdarg.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/sysarch.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/tick.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/tlb.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/trap.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/tsb.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/tstate.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/tte.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/tte_hash.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ucontext.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/upa.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/utrap.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/varargs.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/ver.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/vmparam.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/watch.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/include/wstate.h#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/counter.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/exception.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/genassym.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/locore.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/mem.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/support.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tick.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/trap.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tte.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/soc2005/libalias/sys/sys/elf32.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/elf64.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/elf_common.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/signalvar.h#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.australia#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/Makefile#7 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1012,56 +1012,58 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/soc2005/libalias/bin/cp/cp.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.35 2006/08/25 09:58:13 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $ .\" -.Dd August 24, 2006 +.Dd October 7, 2006 .Dt CP 1 .Os .Sh NAME @@ -252,8 +252,37 @@ .Fl r option. This implementation supports that option, however, its use is strongly -discouraged, as it does not correctly copy special files, symbolic links -or fifo's. +discouraged as its behavior is very implementation dependent. +In this version of +.Nm , +.Fl r +is just a synonym for +.Fl RL . +The +.Fl R +option gives the correct behavior while +.Fl L +preserves the sometimes-useful historical behavior of following symbolic links. +The +.Fl r +option is deprecated in +.Tn POSIX + and its behavior is likely to be different +in future versions of +.Nm +and its behavior is likely to be different +in future versions of +.Fx . +Previous versions of +.Nm +in +.Fx , +the +.Fl r +behavior was to not correctly copy special files, symbolic links +or fifos. +Symbolic links were followed, and the contents of special +files and fifos were copied to regular files. .Pp The .Fl v ==== //depot/projects/soc2005/libalias/bin/cp/cp.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.55 2006/09/29 06:06:39 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.56 2006/10/07 22:14:43 trhodes Exp $"); /* * Cp copies source files to target files. @@ -138,7 +138,8 @@ pflag = 1; break; case 'r': - rflag = 1; + rflag = Lflag = 1; + Hflag = Pflag = 0; break; case 'v': vflag = 1; @@ -155,15 +156,12 @@ fts_options = FTS_NOCHDIR | FTS_PHYSICAL; if (rflag) { - if (Rflag) + if (Rflag) errx(1, "the -R and -r options may not be specified together."); - if (Hflag || Lflag || Pflag) - errx(1, - "the -H, -L, and -P options may not be specified with the -r option."); - fts_options &= ~FTS_PHYSICAL; - fts_options |= FTS_LOGICAL; - } + } + if (rflag && !Hflag && !Pflag) + Rflag = 1; if (Rflag) { if (Hflag) fts_options |= FTS_COMFOLLOW; @@ -227,12 +225,12 @@ * the initial mkdir(). */ if (r == -1) { - if (rflag || (Rflag && (Lflag || Hflag))) + if (Rflag && (Lflag || Hflag)) stat(*argv, &tmp_stat); else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag)) + if (S_ISDIR(tmp_stat.st_mode) && (Rflag)) type = DIR_TO_DNE; else type = FILE_TO_FILE; @@ -420,7 +418,7 @@ } break; case S_IFDIR: - if (!Rflag && !rflag) { + if (!Rflag) { warnx("%s is a directory (not copied).", curr->fts_path); (void)fts_set(ftsp, curr, FTS_SKIP); ==== //depot/projects/soc2005/libalias/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); #include #include @@ -54,17 +54,18 @@ #include #include "extern.h" -#define cp_pct(x,y) (int)(100.0 * (double)(x) / (double)(y)) + +#define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) int copy_file(const FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; - int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; ssize_t wcount; size_t wresid; - size_t wtotal; + off_t wtotal; + int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; @@ -149,16 +150,17 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { @@ -179,16 +181,17 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { ==== //depot/projects/soc2005/libalias/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC void deljob(struct job *); STATIC struct job *getcurjob(struct job *); #endif -STATIC void showjob(struct job *, pid_t, int, int); +STATIC void showjob(struct job *, pid_t, int); /* @@ -265,18 +265,21 @@ jobscmd(int argc, char *argv[]) { char *id; - int ch, sformat, lformat; + int ch, mode; optind = optreset = 1; opterr = 0; - sformat = lformat = 0; - while ((ch = getopt(argc, argv, "ls")) != -1) { + mode = SHOWJOBS_DEFAULT; + while ((ch = getopt(argc, argv, "lps")) != -1) { switch (ch) { case 'l': - lformat = 1; + mode = SHOWJOBS_VERBOSE; + break; + case 'p': + mode = SHOWJOBS_PGIDS; break; case 's': - sformat = 1; + mode = SHOWJOBS_PIDS; break; case '?': default: @@ -287,24 +290,25 @@ argv += optind; if (argc == 0) - showjobs(0, sformat, lformat); + showjobs(0, mode); else while ((id = *argv++) != NULL) - showjob(getjob(id), 0, sformat, lformat); + showjob(getjob(id), 0, mode); return (0); } STATIC void -showjob(struct job *jp, pid_t pid, int sformat, int lformat) +showjob(struct job *jp, pid_t pid, int mode) { char s[64]; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; + pid_t ppid; char c; - procno = jp->nprocs; + procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; jobno = jp - jobtab + 1; curr = prev = 0; #if JOBS @@ -315,11 +319,13 @@ } #endif for (ps = jp->ps ; ; ps++) { /* for each process */ - if (sformat) { - out1fmt("%d\n", (int)ps->pid); + if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) { + ppid = (mode == SHOWJOBS_PIDS) ? ps->pid : + getpgid(ps->pid); + out1fmt("%d\n", (int)ppid); goto skip; } - if (!lformat && ps != jp->ps && pid == 0) + if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0) goto skip; if (pid != 0 && pid != ps->pid) goto skip; @@ -335,7 +341,7 @@ fmtstr(s, 64, " %c ", c); out1str(s); col = strlen(s); - if (lformat) { + if (mode == SHOWJOBS_VERBOSE) { fmtstr(s, 64, "%d ", (int)ps->pid); out1str(s); col += strlen(s); @@ -388,7 +394,7 @@ */ void -showjobs(int change, int sformat, int lformat) +showjobs(int change, int mode) { int jobno; struct job *jp; @@ -404,7 +410,7 @@ } if (change && ! jp->changed) continue; - showjob(jp, 0, sformat, lformat); + showjob(jp, 0, mode); jp->changed = 0; if (jp->state == JOBDONE) { freejob(jp); @@ -992,7 +998,7 @@ out1str(" (core dumped)"); out1c('\n'); } else - showjob(thisjob, pid, 0, 0); + showjob(thisjob, pid, SHOWJOBS_DEFAULT); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); ==== //depot/projects/soc2005/libalias/bin/sh/jobs.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/jobs.h,v 1.18 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/jobs.h,v 1.19 2006/10/07 16:51:16 stefanf Exp $ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ @@ -74,6 +74,13 @@ #endif }; +enum { + SHOWJOBS_DEFAULT, /* job number, status, command */ + SHOWJOBS_VERBOSE, /* job number, PID, status, command */ + SHOWJOBS_PIDS, /* PID only */ + SHOWJOBS_PGIDS /* PID of the group leader only */ +}; + extern pid_t backgndpid; /* pid of last background process */ extern int job_warning; /* user was warned about stopped jobs */ extern int in_waitcmd; /* are we in waitcmd()? */ @@ -84,7 +91,7 @@ int fgcmd(int, char **); int bgcmd(int, char **); int jobscmd(int, char **); -void showjobs(int, int, int); +void showjobs(int, int); int waitcmd(int, char **); int jobidcmd(int, char **); struct job *makejob(union node *, int); ==== //depot/projects/soc2005/libalias/bin/sh/main.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.28 2006/04/02 18:51:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.29 2006/10/07 16:51:16 stefanf Exp $"); #include #include @@ -211,7 +211,7 @@ inter = 0; if (iflag && top) { inter++; - showjobs(1, 0, 0); + showjobs(1, SHOWJOBS_DEFAULT); chkmail(0); flushout(&output); } ==== //depot/projects/soc2005/libalias/bin/sh/sh.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ .\" -.Dd July 29, 2006 +.Dd October 7, 2006 .Dt SH 1 .Os .Sh NAME @@ -1777,7 +1777,7 @@ If the .Ar job argument is omitted, use the current job. -.It Ic jobs Oo Fl ls Oc Op Ar job ... +.It Ic jobs Oo Fl lps Oc Op Ar job ... Print information about the specified jobs, or all jobs if no .Ar job argument is given. @@ -1787,8 +1787,13 @@ .Fl l option is specified, the PID of each job is also printed. If the +.Fl p +option is specified, only the process IDs for the process group leaders +are printed, one per line. +If the .Fl s -option is specified, only the PIDs of the jobs are printed, one per line. +option is specified, only the PIDs of the job commands are printed, one per +line. .It Ic local Oo Ar variable ... Oc Op Fl See the .Sx Functions ==== //depot/projects/soc2005/libalias/crypto/openssh/config.h#3 (text+ko) ==== @@ -1314,7 +1314,7 @@ /* #undef WORDS_BIGENDIAN */ /* Define if xauth is found in your path */ -#define XAUTH_PATH "/usr/X11R6/bin/xauth" +/* #undef XAUTH_PATH */ /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ ==== //depot/projects/soc2005/libalias/crypto/openssh/configure.ac#3 (text+ko) ==== @@ -1,5 +1,4 @@ -# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $ -# $FreeBSD: src/crypto/openssh/configure.ac,v 1.14 2006/09/30 13:38:04 des Exp $ +# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -16,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.367 $) +AC_REVISION($Revision: 1.369 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -128,6 +127,136 @@ ] ) +# Allow user to specify flags +AC_ARG_WITH(cflags, + [ --with-cflags Specify additional flags to pass to compiler], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CFLAGS="$CFLAGS $withval" + fi + ] +) +AC_ARG_WITH(cppflags, + [ --with-cppflags Specify additional flags to pass to preprocessor] , + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CPPFLAGS="$CPPFLAGS $withval" + fi + ] +) +AC_ARG_WITH(ldflags, + [ --with-ldflags Specify additional flags to pass to linker], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LDFLAGS="$LDFLAGS $withval" + fi + ] +) +AC_ARG_WITH(libs, + [ --with-libs Specify additional libraries to link with], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LIBS="$LIBS $withval" + fi + ] +) +AC_ARG_WITH(Werror, + [ --with-Werror Build main code with -Werror], + [ + if test -n "$withval" && test "x$withval" != "xno"; then + werror_flags="-Werror" + if test "x${withval}" != "xyes"; then + werror_flags="$withval" + fi + fi + ] +) + +AC_CHECK_HEADERS( \ + bstring.h \ + crypt.h \ + crypto/sha2.h \ + dirent.h \ + endian.h \ + features.h \ + fcntl.h \ + floatingpoint.h \ + getopt.h \ + glob.h \ + ia.h \ + iaf.h \ + limits.h \ + login.h \ + maillock.h \ + ndir.h \ + net/if_tun.h \ + netdb.h \ + netgroup.h \ + pam/pam_appl.h \ + paths.h \ + pty.h \ + readpassphrase.h \ + rpc/types.h \ + security/pam_appl.h \ + sha2.h \ + shadow.h \ + stddef.h \ + stdint.h \ + string.h \ + strings.h \ + sys/audit.h \ + sys/bitypes.h \ + sys/bsdtty.h \ + sys/cdefs.h \ + sys/dir.h \ + sys/mman.h \ + sys/ndir.h \ + sys/prctl.h \ + sys/pstat.h \ + sys/select.h \ + sys/stat.h \ + sys/stream.h \ + sys/stropts.h \ + sys/strtio.h \ + sys/sysmacros.h \ + sys/time.h \ + sys/timers.h \ + sys/un.h \ + time.h \ + tmpdir.h \ + ttyent.h \ + unistd.h \ + usersec.h \ + util.h \ + utime.h \ + utmp.h \ + utmpx.h \ + vis.h \ +) + +# lastlog.h requires sys/time.h to be included first on Solaris +AC_CHECK_HEADERS(lastlog.h, [], [], [ +#ifdef HAVE_SYS_TIME_H +# include +#endif +]) + +# sys/ptms.h requires sys/stream.h to be included first on Solaris +AC_CHECK_HEADERS(sys/ptms.h, [], [], [ +#ifdef HAVE_SYS_STREAM_H +# include +#endif +]) + +# login_cap.h requires sys/types.h on NetBSD +AC_CHECK_HEADERS(login_cap.h, [], [], [ +#include +]) + # Messages for features tested for in target-specific section SIA_MSG="no" SPC_MSG="no" @@ -664,55 +793,6 @@ ;; esac >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 8 12:40:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FF8816A4D0; Sun, 8 Oct 2006 12:40:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7D9616A4C8 for ; Sun, 8 Oct 2006 12:40:05 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF1BF43D64 for ; Sun, 8 Oct 2006 12:39:48 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k98CdmSD099327 for ; Sun, 8 Oct 2006 12:39:48 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k98CdmmY099324 for perforce@freebsd.org; Sun, 8 Oct 2006 12:39:48 GMT (envelope-from piso@freebsd.org) Date: Sun, 8 Oct 2006 12:39:48 GMT Message-Id: <200610081239.k98CdmmY099324@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 107498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 12:40:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=107498 Change 107498 by piso@piso_newluxor on 2006/10/08 12:39:42 Update the date Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/libalias.3#10 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/libalias.3#10 (text+ko) ==== @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.56 2006/09/26 23:26:53 piso Exp $ .\" -.Dd July 04, 2006 +.Dd October 1, 2006 .Dt LIBALIAS 3 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Sun Oct 8 15:45:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A28DF16A416; Sun, 8 Oct 2006 15:45:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 725EB16A403 for ; Sun, 8 Oct 2006 15:45:42 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEF5543D4C for ; Sun, 8 Oct 2006 15:45:41 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k98Fjfmo084462 for ; Sun, 8 Oct 2006 15:45:41 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k98Fjf5b084459 for perforce@freebsd.org; Sun, 8 Oct 2006 15:45:41 GMT (envelope-from howardsu@FreeBSD.org) Date: Sun, 8 Oct 2006 15:45:41 GMT Message-Id: <200610081545.k98Fjf5b084459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 107503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 15:45:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=107503 Change 107503 by howardsu@su_laptop on 2006/10/08 15:45:40 Init list header correctly. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#5 (text+ko) ==== @@ -48,8 +48,9 @@ { vmem_t *idpool; struct entry *e; - e = malloc(sizeof(struct entry), M_VMEM, M_WAITOK); - idpool = malloc(sizeof(vmem_t), M_VMEM, M_WAITOK); + e = malloc(sizeof(struct entry), M_VMEM, M_WAITOK | M_ZERO); + idpool = malloc(sizeof(vmem_t), M_VMEM, M_WAITOK | M_ZERO); + LIST_INIT(idpool); e->start = base; e->end = (char*)~0; @@ -87,7 +88,7 @@ return; } else { - newnp = malloc(sizeof(vmem_t), M_VMEM, M_WAITOK); + newnp = malloc(sizeof(vmem_t), M_VMEM, M_WAITOK | M_ZERO); newnp->start = newnp->end = vaddr; LIST_INSERT_BEFORE(np, newnp, entries); return; From owner-p4-projects@FreeBSD.ORG Sun Oct 8 21:33:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E1F216A47E; Sun, 8 Oct 2006 21:33:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F6A916A403 for ; Sun, 8 Oct 2006 21:33:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B11F643D45 for ; Sun, 8 Oct 2006 21:32:59 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k98LWxsJ079330 for ; Sun, 8 Oct 2006 21:32:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k98LWxMr079318 for perforce@freebsd.org; Sun, 8 Oct 2006 21:32:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Oct 2006 21:32:59 GMT Message-Id: <200610082132.k98LWxMr079318@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 107514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 21:33:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=107514 Change 107514 by hselasky@hselasky_mini_itx on 2006/10/08 21:32:00 UCOM API change: Pass initializers to ucom_attach() instead of writing them directly to the "ucom_softc", except sc_portno. Make the UCOM-layer multi-port friendly, by allowing to specify number of "sub_units" when attaching a ucom device. Allow calls to "ucom_get_data()" and "ucom_put_data()" outside open/close. This makes supporting multi-port devices easier. Some other small changes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ucom.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#12 (text+ko) ==== @@ -440,13 +440,15 @@ { 0, 0 } }; +static devclass_t ubsa_devclass; + static driver_t ubsa_driver = { - .name = "ucom", + .name = "ubsa", .methods = ubsa_methods, .size = sizeof(struct ubsa_softc), }; -DRIVER_MODULE(ubsa, uhub, ubsa_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(ubsa, uhub, ubsa_driver, ubsa_devclass, usbd_driver_load, 0); MODULE_DEPEND(ubsa, usb, 1, 1, 1); MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(ubsa, UBSA_MODVER); @@ -526,12 +528,8 @@ sc->sc_dtr = -1; sc->sc_rts = -1; - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &ubsa_callback; - - error = ucom_attach(&(sc->sc_ucom), dev); - + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &ubsa_callback, &Giant); if (error) { DPRINTF(0, "ucom_attach failed\n"); goto detach; @@ -551,7 +549,7 @@ DPRINTF(0, "sc=%p\n", sc); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer, UBSA_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#11 (text+ko) ==== @@ -97,7 +97,19 @@ #define DPRINTF(...) #endif +static uint8_t +ucom_units_alloc(uint32_t sub_units, uint32_t *p_root_unit); + static void +ucom_units_free(uint32_t root_unit, uint32_t sub_units); + +static int +ucom_attach_sub(struct ucom_softc *sc); + +static void +ucom_detach_sub(struct ucom_softc *sc); + +static void ucom_shutdown(struct ucom_softc *sc); static int @@ -134,8 +146,6 @@ static void ucom_stop_write(struct tty *tp, int fflags); -devclass_t ucom_devclass; - static moduledata_t ucom_mod = { "ucom", NULL, @@ -146,25 +156,153 @@ MODULE_DEPEND(ucom, usb, 1, 1, 1); MODULE_VERSION(ucom, UCOM_MODVER); +#define UCOM_UNIT_MAX 0x1000 /* exclusive */ + +static uint8_t ucom_bitmap[(UCOM_UNIT_MAX+7)/8]; + +static uint8_t +ucom_units_alloc(uint32_t sub_units, uint32_t *p_root_unit) +{ + uint32_t n; + uint32_t o; + uint32_t x; + uint32_t max = UCOM_UNIT_MAX - (UCOM_UNIT_MAX % sub_units); + uint8_t error = 1; + + mtx_lock(&Giant); + + for (n = 0; n < max; n += sub_units) { + + /* check for free consecutive bits */ + + for (o = 0; o < sub_units; o++) { + + x = n + o; + + if (ucom_bitmap[x/8] & (1<< (x % 8))) { + goto skip; + } + } + + /* allocate */ + + for (o = 0; o < sub_units; o++) { + + x = n + o; + + ucom_bitmap[x/8] |= (1<< (x % 8)); + } + + *p_root_unit = n; + + error = 0; + + break; + + skip: ; + } + + mtx_unlock(&Giant); + + return error; +} + +static void +ucom_units_free(uint32_t root_unit, uint32_t sub_units) +{ + uint32_t x; + + mtx_lock(&Giant); + + while(sub_units--) { + x = root_unit + sub_units; + ucom_bitmap[x/8] &= ~(1<<(x%8)); + } + + mtx_unlock(&Giant); + + return; +} + +/* + * "N" sub_units are setup at a time. All sub-units will + * be given sequential unit numbers. The number of + * sub-units can be used to differentiate among + * different types of devices. + * + * The mutex pointed to by "p_mtx" is applied before all + * callbacks are called back. Also "p_mtx" must be applied + * before calling into the ucom-layer! Currently only Giant + * is supported. + */ int -ucom_attach(struct ucom_softc *sc, device_t dev) +ucom_attach(struct ucom_softc *sc, uint32_t sub_units, void *parent, + const struct ucom_callback *callback, struct mtx *p_mtx) { - struct tty *tp; + uint32_t n; + uint32_t root_unit; int error = 0; - int unit; + + if ((p_mtx != &Giant) || /* XXX TTY layer requires Giant */ + (sc == NULL) || + (sub_units == 0) || + (callback == NULL)) { + return EINVAL; + } + + if (ucom_units_alloc(sub_units, &root_unit)) { + return ENOMEM; + } + + for (n = 0; n < sub_units; n++, sc++) { + sc->sc_unit = root_unit + n; + sc->sc_parent_mtx = p_mtx; + sc->sc_parent = parent; + sc->sc_callback = callback; + + mtx_lock(&Giant); /* XXX TTY layer */ + error = ucom_attach_sub(sc); + mtx_unlock(&Giant); /* XXX TTY layer */ + + if (error) { + ucom_detach(sc - n, n); + ucom_units_free(root_unit + n, sub_units - n); + break; + } + sc->sc_flag |= UCOM_FLAG_ATTACHED; + } + return error; +} + +/* NOTE: the following function will do nothing if + * structure pointed to by "sc" is zero. + */ +void +ucom_detach(struct ucom_softc *sc, uint32_t sub_units) +{ + uint32_t n; + + for (n = 0; n < sub_units; n++, sc++) { + if (sc->sc_flag & UCOM_FLAG_ATTACHED) { + + mtx_lock(&Giant); /* XXX TTY layer */ + ucom_detach_sub(sc); + mtx_unlock(&Giant); /* XXX TTY layer */ - mtx_assert(&Giant, MA_OWNED); + ucom_units_free(sc->sc_unit, 1); - if (device_get_devclass(dev) != ucom_devclass) { - /* NOTE: if all devices are not in the same - * devclass, we get duplicate unit numbers - * which will crash the TTY layer! - */ - error = EINVAL; - goto done; + /* avoid duplicate detach: */ + sc->sc_flag &= ~UCOM_FLAG_ATTACHED; + } } + return; +} - unit = device_get_unit(dev); +static int +ucom_attach_sub(struct ucom_softc *sc) +{ + struct tty *tp; + int error = 0; tp = ttyalloc(); @@ -183,12 +321,12 @@ tp->t_modem = ucom_modem; tp->t_ioctl = ucom_ioctl; - DPRINTF(0, "tp = %p\n", tp); + DPRINTF(0, "tp = %p, unit = %d\n", tp, sc->sc_unit); #ifndef TS_CALLOUT -#define TS_CALLOUT NULL, unit, MINOR_CALLOUT /* compile fix for FreeBSD 6.x */ +#define TS_CALLOUT NULL, sc->sc_unit, MINOR_CALLOUT /* compile fix for FreeBSD 6.x */ #endif - error = ttycreate(tp, TS_CALLOUT, "U%d", unit); + error = ttycreate(tp, TS_CALLOUT, "U%d", sc->sc_unit); if (error) { ttyfree(tp); goto done; @@ -198,23 +336,22 @@ TASK_INIT(&(sc->sc_task), 0, &ucom_notify, sc); - DPRINTF(0, "ttycreate: ttyU%d\n", unit); + DPRINTF(0, "ttycreate: ttyU%d\n", sc->sc_unit); done: return error; } -void -ucom_detach(struct ucom_softc *sc) +static void +ucom_detach_sub(struct ucom_softc *sc) { struct tty *tp = sc->sc_tty; - mtx_assert(&Giant, MA_OWNED); - DPRINTF(0, "sc = %p, tp = %p\n", sc, sc->sc_tty); sc->sc_flag |= UCOM_FLAG_GONE; - + sc->sc_flag &= ~(UCOM_FLAG_READ_ON| + UCOM_FLAG_WRITE_ON); if (tp) { ttygone(tp); @@ -299,6 +436,8 @@ } } + sc->sc_flag |= UCOM_FLAG_READ_ON; + if (sc->sc_callback->ucom_start_read) { (sc->sc_callback->ucom_start_read)(sc); } @@ -321,6 +460,9 @@ ucom_shutdown(sc); + sc->sc_flag &= ~(UCOM_FLAG_READ_ON| + UCOM_FLAG_WRITE_ON); + if (sc->sc_callback->ucom_stop_read) { (sc->sc_callback->ucom_stop_read)(sc); } @@ -547,6 +689,8 @@ } #if 0 + sc->sc_flag &= ~UCOM_FLAG_READ_ON; + if (sc->sc_callback->ucom_stop_read) { (sc->sc_callback->ucom_stop_read)(sc); } @@ -570,6 +714,8 @@ ttyldoptim(tp); #if 0 + sc->sc_flag |= UCOM_FLAG_READ_ON; + if (sc->sc_callback->ucom_start_read) { (sc->sc_callback->ucom_start_read)(sc); } @@ -593,6 +739,8 @@ tp->t_state |= TS_BUSY; + sc->sc_flag |= UCOM_FLAG_WRITE_ON; + if (sc->sc_callback->ucom_start_write) { (sc->sc_callback->ucom_start_write)(sc); } @@ -645,6 +793,10 @@ actlen[0] = 0; + if (!(sc->sc_flag & UCOM_FLAG_WRITE_ON)) { + return 0; /* multiport device polling */ + } + if (tp->t_state & TS_TBLOCK) { if ((sc->sc_mcr & SER_RTS) && (sc->sc_flag & UCOM_FLAG_RTS_IFLOW)) { @@ -699,6 +851,10 @@ mtx_assert(&Giant, MA_OWNED); + if (!(sc->sc_flag & UCOM_FLAG_READ_ON)) { + return; /* multiport device polling */ + } + /* set a flag to prevent recursation */ if (len == 0) { ==== //depot/projects/usb/src/sys/dev/usb/ucomvar.h#7 (text+ko) ==== @@ -105,13 +105,19 @@ const struct ucom_callback *sc_callback; struct tty *sc_tty; + struct mtx *sc_parent_mtx; void *sc_parent; + uint32_t sc_unit; + u_int16_t sc_portno; u_int8_t sc_flag; #define UCOM_FLAG_RTS_IFLOW 0x01 /* use RTS input flow control */ #define UCOM_FLAG_GONE 0x02 /* the device is gone */ +#define UCOM_FLAG_ATTACHED 0x04 /* set if attached */ +#define UCOM_FLAG_READ_ON 0x08 /* set if read is enabled */ +#define UCOM_FLAG_WRITE_ON 0x10 /* set if write is enabled */ u_int8_t sc_lsr; u_int8_t sc_msr; @@ -120,13 +126,11 @@ u_int8_t sc_last_status; }; -extern devclass_t ucom_devclass; - extern int -ucom_attach(struct ucom_softc *sc, device_t dev); - +ucom_attach(struct ucom_softc *sc, uint32_t sub_units, void *parent, + const struct ucom_callback *callback, struct mtx *p_mtx); extern void -ucom_detach(struct ucom_softc *); +ucom_detach(struct ucom_softc *sc, uint32_t sub_units); extern void ucom_status_change(struct ucom_softc *); @@ -134,7 +138,6 @@ extern u_int8_t ucom_get_data(struct ucom_softc *sc, u_int8_t *buf, u_int32_t len, u_int32_t *actlen); - extern void ucom_put_data(struct ucom_softc *sc, u_int8_t *ptr, u_int16_t len); ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#8 (text+ko) ==== @@ -191,13 +191,15 @@ { 0, 0 } }; +static devclass_t ucycom_devclass; + static driver_t ucycom_driver = { - .name = "ucom", + .name = "ucycom", .methods = ucycom_methods, .size = sizeof(struct ucycom_softc), }; -DRIVER_MODULE(ucycom, uhub, ucycom_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(ucycom, uhub, ucycom_driver, ucycom_devclass, usbd_driver_load, 0); MODULE_VERSION(ucycom, 1); MODULE_DEPEND(ucycom, usb, 1, 1, 1); @@ -339,12 +341,9 @@ goto detach; } - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &ucycom_callback; + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &ucycom_callback, &Giant); - error = ucom_attach(&(sc->sc_ucom), dev); - if (error) { goto detach; } @@ -368,7 +367,7 @@ { struct ucycom_softc *sc = device_get_softc(dev); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer, UCYCOM_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#10 (text+ko) ==== @@ -397,13 +397,15 @@ { 0, 0 } }; +static devclass_t ufoma_devclass; + static driver_t ufoma_driver = { - .name = "ucom", + .name = "ufoma", .methods = ufoma_methods, .size = sizeof(struct ufoma_softc), }; -DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(ufoma, uhub, ufoma_driver, ufoma_devclass, usbd_driver_load, 0); MODULE_DEPEND(ufoma, usb, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); @@ -520,14 +522,8 @@ sc->sc_currentmode = UMCPC_ACM_MODE_UNLINKED; sc->sc_modetoactivate = mad->bMode[0]; - /* setup UCOM */ - - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &ufoma_callback; - - error = ucom_attach(&(sc->sc_ucom), dev); - + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &ufoma_callback, &Giant); if (error) { DPRINTF(0, "ucom_attach failed\n"); goto detach; @@ -562,7 +558,7 @@ mtx_unlock(&Giant); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_ctrl_xfer, UFOMA_CTRL_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#11 (text+ko) ==== @@ -278,13 +278,15 @@ { 0, 0 } }; +static devclass_t uftdi_devclass; + static driver_t uftdi_driver = { - .name = "ucom", + .name = "uftdi", .methods = uftdi_methods, .size = sizeof (struct uftdi_softc), }; -DRIVER_MODULE(uftdi, uhub, uftdi_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(uftdi, uhub, uftdi_driver, uftdi_devclass, usbd_driver_load, 0); MODULE_DEPEND(uftdi, usb, 1, 1, 1); MODULE_DEPEND(uftdi, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); @@ -462,9 +464,7 @@ goto detach; } - sc->sc_ucom.sc_parent = sc; sc->sc_ucom.sc_portno = FTDI_PIT_SIOA; - sc->sc_ucom.sc_callback = &uftdi_callback; if (uaa->iface) { id = usbd_get_interface_descriptor(uaa->iface); @@ -476,7 +476,8 @@ sc->sc_ucom.sc_portno += id->bInterfaceNumber; } - error = ucom_attach(&(sc->sc_ucom), dev); + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &uftdi_callback, &Giant); if (error) { goto detach; @@ -500,7 +501,7 @@ mtx_unlock(&Giant); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer, UFTDI_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb/umct.c#8 (text+ko) ==== @@ -292,13 +292,15 @@ { 0, 0 } }; +static devclass_t umct_devclass; + static driver_t umct_driver = { - .name = "ucom", + .name = "umct", .methods = umct_methods, .size = sizeof(struct umct_softc), }; -DRIVER_MODULE(umct, uhub, umct_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(umct, uhub, umct_driver, umct_devclass, usbd_driver_load, 0); MODULE_DEPEND(umct, usb, 1, 1, 1); MODULE_DEPEND(umct, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(umct, 1); @@ -408,12 +410,8 @@ goto detach; } - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &umct_callback; - - error = ucom_attach(&(sc->sc_ucom), dev); - + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &umct_callback, &Giant); if (error) { goto detach; } @@ -436,7 +434,7 @@ mtx_unlock(&Giant); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer, UMCT_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#12 (text+ko) ==== @@ -343,13 +343,15 @@ { 0, 0 } }; +static devclass_t umodem_devclass; + static driver_t umodem_driver = { - .name = "ucom", + .name = "umodem", .methods = umodem_methods, .size = sizeof(struct umodem_softc), }; -DRIVER_MODULE(umodem, uhub, umodem_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(umodem, uhub, umodem_driver, umodem_devclass, usbd_driver_load, 0); MODULE_DEPEND(umodem, usb, 1, 1, 1); MODULE_DEPEND(umodem, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(umodem, UMODEM_MODVER); @@ -511,12 +513,8 @@ sc->sc_dtr = -1; sc->sc_break = -1; - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &umodem_callback; - - error = ucom_attach(&(sc->sc_ucom), dev); - + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &umodem_callback, &Giant); if (error) { goto detach; } @@ -1089,7 +1087,7 @@ DPRINTF(0, "sc=%p\n", sc); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer_intr, UMODEM_N_INTR_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#11 (text+ko) ==== @@ -402,13 +402,15 @@ { 0, 0 } }; +static devclass_t uplcom_devclass; + static driver_t uplcom_driver = { - .name = "ucom", + .name = "uplcom", .methods = uplcom_methods, .size = sizeof (struct uplcom_softc), }; -DRIVER_MODULE(uplcom, uhub, uplcom_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(uplcom, uhub, uplcom_driver, uplcom_devclass, usbd_driver_load, 0); MODULE_DEPEND(uplcom, usb, 1, 1, 1); MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uplcom, UPLCOM_MODVER); @@ -547,10 +549,6 @@ sc->sc_rts = -1; sc->sc_break = -1; - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &uplcom_callback; - error = uplcom_reset(sc, uaa->device); if (error) { @@ -559,8 +557,8 @@ goto detach; } - error = ucom_attach(&(sc->sc_ucom), dev); - + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &uplcom_callback, &Giant); if (error) { goto detach; } @@ -589,7 +587,7 @@ DPRINTF(0, "sc=%p\n", sc); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer_intr, UPLCOM_N_INTR_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#10 (text+ko) ==== @@ -281,13 +281,15 @@ { 0, 0 } }; +static devclass_t uvisor_devclass; + static driver_t uvisor_driver = { - .name = "ucom", + .name = "uvisor", .methods = uvisor_methods, .size = sizeof (struct uvisor_softc), }; -DRIVER_MODULE(uvisor, uhub, uvisor_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(uvisor, uhub, uvisor_driver, uvisor_devclass, usbd_driver_load, 0); MODULE_DEPEND(uvisor, usb, 1, 1, 1); MODULE_DEPEND(uvisor, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uvisor, UVISOR_MODVER); @@ -407,12 +409,8 @@ goto detach; } - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &uvisor_callback; - - error = ucom_attach(&(sc->sc_ucom), dev); - + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &uvisor_callback, &Giant); if (error) { DPRINTF(0, "ucom_attach failed\n"); goto detach; @@ -432,7 +430,7 @@ DPRINTF(0, "sc=%p\n", sc); - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer, UVISOR_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#13 (text+ko) ==== @@ -377,13 +377,15 @@ { 0, 0 } }; +static devclass_t uvscom_devclass; + static driver_t uvscom_driver = { - .name = "ucom", + .name = "uvscom", .methods = uvscom_methods, .size = sizeof (struct uvscom_softc), }; -DRIVER_MODULE(uvscom, uhub, uvscom_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(uvscom, uhub, uvscom_driver, uvscom_devclass, usbd_driver_load, 0); MODULE_DEPEND(uvscom, usb, 1, 1, 1); MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uvscom, UVSCOM_MODVER); @@ -462,12 +464,8 @@ sc->sc_rts = -1; sc->sc_line_ctrl = UVSCOM_LINE_INIT; - sc->sc_ucom.sc_parent = sc; - sc->sc_ucom.sc_portno = 0; - sc->sc_ucom.sc_callback = &uvscom_callback; - - error = ucom_attach(&(sc->sc_ucom), dev); - + error = ucom_attach(&(sc->sc_ucom), 1, sc, + &uvscom_callback, &Giant); if (error) { goto detach; } @@ -504,7 +502,7 @@ usbd_transfer_stop(sc->sc_xfer[4]); } - ucom_detach(&(sc->sc_ucom)); + ucom_detach(&(sc->sc_ucom), 1); usbd_transfer_unsetup(sc->sc_xfer, UVSCOM_N_TRANSFER); From owner-p4-projects@FreeBSD.ORG Sun Oct 8 21:33:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9BBB16A558; Sun, 8 Oct 2006 21:33:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9718116A556 for ; Sun, 8 Oct 2006 21:33:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DE1643D45 for ; Sun, 8 Oct 2006 21:33:00 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k98LX009079342 for ; Sun, 8 Oct 2006 21:33:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k98LWxmg079333 for perforce@freebsd.org; Sun, 8 Oct 2006 21:32:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Oct 2006 21:32:59 GMT Message-Id: <200610082132.k98LWxmg079333@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 107515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2006 21:33:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107515 Change 107515 by hselasky@hselasky_mini_itx on 2006/10/08 21:32:41 Finished reworking "ubser". Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubser.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#7 (text+ko) ==== @@ -72,406 +72,309 @@ #include __FBSDID("$FreeBSD: src/sys/dev/usb/ubser.c,v 1.20 2006/09/07 00:06:41 imp Exp $"); -#if 0 - /* * BWCT serial adapter driver */ -#include - #include #include #include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include +#include -#include - -#include - +#include #include -#include +#include +#include -#include -#include #include "usbdevs.h" -#include +#define UBSER_UNIT_MAX 32 + +/* Vendor Interface Requests */ +#define VENDOR_GET_NUMSER 0x01 +#define VENDOR_SET_BREAK 0x02 +#define VENDOR_CLEAR_BREAK 0x03 #ifdef USB_DEBUG -static int ubserdebug = 0; +#define DPRINTF(sc,n,fmt,...) \ + do { if (ubser_debug > (n)) { \ + printf("%s:%s: " fmt, (sc)->sc_name, \ + __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int ubser_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser"); SYSCTL_INT(_hw_usb_ubser, OID_AUTO, debug, CTLFLAG_RW, - &ubserdebug, 0, "ubser debug level"); -#define DPRINTF(x) do { \ - if (ubserdebug) \ - logprintf x; \ - } while (0) - -#define DPRINTFN(n, x) do { \ - if (ubserdebug > (n)) \ - logprintf x; \ - } while (0) + &ubser_debug, 0, "ubser debug level"); #else -#define DPRINTF(x) -#define DPRINTFN(n,x) +#define DPRINTF(...) #endif -#define ISSET(t, f) ((t) & (f)) -#define SET(t, f) (t) |= (f) -#define CLR(t, f) (t) &= ~((unsigned)(f)) +#define UBSER_TR_DT_WRITE 0 +#define UBSER_TR_DT_READ 1 +#define UBSER_TR_CS_WRITE 2 +#define UBSER_TR_CS_READ 3 +#define UBSER_TR_DT_BREAK 4 +#define UBSER_TR_MAX 5 + +struct ubser_softc { + struct ucom_softc sc_ucom[UBSER_UNIT_MAX]; + + struct usbd_xfer *sc_xfer[UBSER_TR_MAX]; + + uint16_t sc_tx_size; + + uint8_t sc_numser; + uint8_t sc_send_break[(UBSER_UNIT_MAX+7)/8]; + uint8_t sc_flags; +#define UBSER_FLAG_READ_STALL 0x01 +#define UBSER_FLAG_WRITE_STALL 0x02 -struct ubser_port { - int p_port; - struct ubser_softc *p_sc; - usbd_xfer_handle p_oxfer; /* write request */ - u_char *p_obuf; /* write buffer */ - struct tty *p_tty; + uint8_t sc_iface_no; + uint8_t sc_iface_index; + uint8_t sc_curr_tx_unit; + uint8_t sc_curr_break_unit; + uint8_t sc_name[16]; }; -struct ubser_softc { - device_t sc_dev; - usbd_device_handle sc_udev; - usbd_interface_handle sc_iface; /* data interface */ - int sc_ifaceno; +static device_probe_t ubser_probe; +static device_attach_t ubser_attach; +static device_detach_t ubser_detach; + +static int ubser_param(struct ucom_softc *ucom, struct termios *t); +static void ubser_write_clear_stall_callback(struct usbd_xfer *xfer); +static void ubser_write_callback(struct usbd_xfer *xfer); +static void ubser_read_clear_stall_callback(struct usbd_xfer *xfer); +static void ubser_read_callback(struct usbd_xfer *xfer); +static void ubser_set_break(struct ucom_softc *ucom, u_int8_t onoff); +static void ubser_send_break_callback(struct usbd_xfer *xfer); +static int ubser_open(struct ucom_softc *ucom); +static void ubser_start_write(struct ucom_softc *ucom); + +static const struct usbd_config ubser_config[UBSER_TR_MAX] = { + + [UBSER_TR_DT_WRITE] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = 0, /* use wMaxPacketSize */ + .flags = USBD_FORCE_SHORT_XFER, + .callback = &ubser_write_callback, + }, + + [UBSER_TR_DT_READ] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = 0, /* use wMaxPacketSize */ + .flags = USBD_SHORT_XFER_OK, + .callback = &ubser_read_callback, + }, + + [UBSER_TR_CS_WRITE] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &ubser_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, - int sc_refcnt; - u_char sc_dying; - u_char sc_opening; - int sc_state; - uint8_t sc_numser; + [UBSER_TR_CS_READ] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &ubser_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, - int sc_bulkin_no; /* bulk in endpoint address */ - usbd_pipe_handle sc_bulkin_pipe; /* bulk in pipe */ - usbd_xfer_handle sc_ixfer; /* read request */ - u_char *sc_ibuf; /* read buffer */ - u_int sc_ibufsize; /* read buffer size */ - u_int sc_ibufsizepad; /* read buffer size padded */ + [UBSER_TR_DT_BREAK] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = 0, + .callback = &ubser_send_break_callback, + .timeout = 1000, /* 1 second */ + }, +}; - int sc_bulkout_no; /* bulk out endpoint address */ - usbd_pipe_handle sc_bulkout_pipe;/* bulk out pipe */ - u_int sc_obufsize; /* write buffer size */ - u_int sc_opkthdrlen; /* header length of - output packet */ +static const struct ucom_callback ubser_callback = { + .ucom_open = &ubser_open, + .ucom_set_break = &ubser_set_break, + .ucom_param = &ubser_param, + .ucom_start_write = &ubser_start_write, +}; - struct ubser_port *sc_port; +static device_method_t ubser_methods[] = { + DEVMETHOD(device_probe, ubser_probe), + DEVMETHOD(device_attach, ubser_attach), + DEVMETHOD(device_detach, ubser_detach), + { 0, 0 } }; -static int ubserparam(struct tty *, struct termios *); -static void ubserstart(struct tty *); -static void ubserstop(struct tty *, int); -static usbd_status ubserstartread(struct ubser_softc *); -static void ubserreadcb(usbd_xfer_handle, usbd_private_handle, usbd_status); -static void ubserwritecb(usbd_xfer_handle, usbd_private_handle, usbd_status); -static void ubser_cleanup(struct ubser_softc *sc); +static devclass_t ubser_devclass; -static t_break_t ubserbreak; -static t_open_t ubseropen; -static t_close_t ubserclose; -static t_modem_t ubsermodem; +static driver_t ubser_driver = { + .name = "ubser", + .methods = ubser_methods, + .size = sizeof(struct ubser_softc), +}; -USB_DECLARE_DRIVER(ubser); +DRIVER_MODULE(ubser, uhub, ubser_driver, ubser_devclass, usbd_driver_load, 0); +MODULE_DEPEND(ubser, usb, 1, 1, 1); +MODULE_DEPEND(ubser, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); -USB_MATCH(ubser) +static int +ubser_probe(device_t dev) { - USB_MATCH_START(ubser, uaa); - usb_string_descriptor_t us; + struct usb_attach_arg *uaa = device_get_ivars(dev); usb_interface_descriptor_t *id; usb_device_descriptor_t *dd; - int err, size; + char buf[6]; + usbd_status err; if (uaa->iface == NULL) return (UMATCH_NONE); - DPRINTFN(20,("ubser: vendor=0x%x, product=0x%x\n", - uaa->vendor, uaa->product)); - dd = usbd_get_device_descriptor(uaa->device); if (dd == NULL) { - printf("ubser: failed to get device descriptor\n"); return (UMATCH_NONE); } id = usbd_get_interface_descriptor(uaa->iface); if (id == NULL) { - printf("ubser: failed to get interface descriptor\n"); return (UMATCH_NONE); } - err = usbd_get_string_desc(uaa->device, dd->iManufacturer, 0, &us, - &size); + err = usbreq_get_string_any(uaa->device, dd->iManufacturer, + buf, sizeof(buf)); if (err != 0) return (UMATCH_NONE); /* check if this is a BWCT vendor specific ubser interface */ - if (strcmp((char*)us.bString, "B\0W\0C\0T\0") == 0 && - id->bInterfaceClass == 0xff && id->bInterfaceSubClass == 0x00) + if ((strcmp(buf, "BWCT") == 0) && + (id->bInterfaceClass == 0xff) && + (id->bInterfaceSubClass == 0x00)) return (UMATCH_VENDOR_IFACESUBCLASS); return (UMATCH_NONE); } -USB_ATTACH(ubser) +static int +ubser_attach(device_t dev) { - USB_ATTACH_START(ubser, sc, uaa); - usbd_device_handle udev = uaa->device; - usb_endpoint_descriptor_t *ed; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ubser_softc *sc = device_get_softc(dev); usb_interface_descriptor_t *id; usb_device_request_t req; - char *devinfo; - struct tty *tp; - usbd_status err; - int i; - int alen; - uint8_t epcount; - struct ubser_port *pp; + uint8_t n; + int error; - devinfo = malloc(1024, M_USBDEV, M_WAITOK); - usbd_devinfo(udev, 0, devinfo); - USB_ATTACH_SETUP; + if (sc == NULL) { + return ENOMEM; + } - DPRINTFN(10,("\nubser_attach: sc=%p\n", sc)); + usbd_set_desc(dev, uaa->device); - sc->sc_udev = udev = uaa->device; - sc->sc_iface = uaa->iface; - sc->sc_numser = 0; - sc->sc_port = NULL; + snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", + device_get_nameunit(dev)); - /* get interface index */ id = usbd_get_interface_descriptor(uaa->iface); - if (id == NULL) { - printf("ubser: failed to get interface descriptor\n"); - return (UMATCH_NONE); - } - sc->sc_ifaceno = id->bInterfaceNumber; + + sc->sc_iface_no = id->bInterfaceNumber; + sc->sc_iface_index = uaa->iface_index; /* get number of serials */ req.bmRequestType = UT_READ_VENDOR_INTERFACE; req.bRequest = VENDOR_GET_NUMSER; USETW(req.wValue, 0); - USETW(req.wIndex, sc->sc_ifaceno); + USETW(req.wIndex, sc->sc_iface_no); USETW(req.wLength, 1); - err = usbd_do_request_flags(udev, &req, &sc->sc_numser, - USBD_SHORT_XFER_OK, &alen, USBD_DEFAULT_TIMEOUT); - if (err) { - printf("%s: failed to get number of serials\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } else if (alen != 1) { - printf("%s: bogus answer on get_numser\n", - device_get_nameunit(sc->sc_dev)); - goto bad; + error = usbd_do_request_flags(uaa->device, &req, &sc->sc_numser, + 0, NULL, USBD_DEFAULT_TIMEOUT); + if (error || (sc->sc_numser == 0)) { + device_printf(dev, "failed to get number " + "of serial ports: %s\n", + usbd_errstr(error)); + goto detach; } - if (sc->sc_numser > MAX_SER) - sc->sc_numser = MAX_SER; - printf("%s: found %i serials\n", device_get_nameunit(sc->sc_dev), sc->sc_numser); - sc->sc_port = malloc(sizeof(*sc->sc_port) * sc->sc_numser, - M_USBDEV, M_WAITOK); + if (sc->sc_numser > UBSER_UNIT_MAX) + sc->sc_numser = UBSER_UNIT_MAX; - /* find our bulk endpoints */ - epcount = 0; - usbd_endpoint_count(sc->sc_iface, &epcount); - sc->sc_bulkin_no = -1; - sc->sc_bulkout_no = -1; - for (i = 0; i < epcount; i++) { - ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); - if (ed == NULL) { - printf("%s: couldn't get ep %d\n", - device_get_nameunit(sc->sc_dev), i); - USB_ATTACH_ERROR_RETURN; - } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) { - sc->sc_bulkin_no = ed->bEndpointAddress; - sc->sc_ibufsizepad = UGETW(ed->wMaxPacketSize); - sc->sc_ibufsizepad = UGETW(ed->wMaxPacketSize) - 1; - } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) { - sc->sc_bulkout_no = ed->bEndpointAddress; - sc->sc_obufsize = UGETW(ed->wMaxPacketSize) - 1; - sc->sc_opkthdrlen = 1; - } - } - if (sc->sc_bulkin_no == -1 || sc->sc_bulkout_no == -1) { - printf("%s: could not find bulk in/out endpoint\n", - device_get_nameunit(sc->sc_dev)); - sc->sc_dying = 1; - goto bad; - } + device_printf(dev, "found %i serials\n", sc->sc_numser); - /* Open the bulk pipes */ - /* Bulk-in pipe */ - err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkin_no, 0, - &sc->sc_bulkin_pipe); - if (err) { - printf("%s: open bulk in error (addr %d): %s\n", - device_get_nameunit(sc->sc_dev), sc->sc_bulkin_no, - usbd_errstr(err)); - goto fail_0; + error = usbd_transfer_setup(uaa->device, sc->sc_iface_index, + sc->sc_xfer, ubser_config, + UBSER_TR_MAX, sc, &Giant); + if (error) { + goto detach; } - /* Bulk-out pipe */ - err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkout_no, - USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe); - if (err) { - printf("%s: open bulk out error (addr %d): %s\n", - device_get_nameunit(sc->sc_dev), sc->sc_bulkout_no, - usbd_errstr(err)); - goto fail_1; - } - /* Allocate a request and an input buffer */ - sc->sc_ixfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_ixfer == NULL) { - goto fail_2; - } + sc->sc_tx_size = sc->sc_xfer[UBSER_TR_DT_WRITE]->length; - sc->sc_ibuf = usbd_alloc_buffer(sc->sc_ixfer, - sc->sc_ibufsizepad); - if (sc->sc_ibuf == NULL) { - goto fail_3; + if (sc->sc_tx_size == 0) { + DPRINTF(sc, -1, "invalid tx_size!\n"); + goto detach; } - for (i = 0; i < sc->sc_numser; i++) { - pp = &sc->sc_port[i]; - pp->p_port = i; - pp->p_sc = sc; - tp = pp->p_tty = ttyalloc(); - tp->t_sc = pp; - DPRINTF(("ubser_attach: tty_attach tp = %p\n", tp)); - tp->t_oproc = ubserstart; - tp->t_param = ubserparam; - tp->t_stop = ubserstop; - tp->t_break = ubserbreak; - tp->t_open = ubseropen; - tp->t_close = ubserclose; - tp->t_modem = ubsermodem; - ttycreate(tp, 0, "y%r%r", device_get_unit(sc->sc_dev), i); - } + /* initialize port numbers */ - - for (i = 0; i < sc->sc_numser; i++) { - sc->sc_port[i].p_oxfer = NULL; - sc->sc_port[i].p_obuf = NULL; + for (n = 0; n < sc->sc_numser; n++) { + sc->sc_ucom[n].sc_portno = n; } - for (i = 0; i < sc->sc_numser; i++) { - sc->sc_port[i].p_oxfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_port[i].p_oxfer == NULL) { - goto fail_4; - } - sc->sc_port[i].p_obuf = usbd_alloc_buffer(sc->sc_port[i].p_oxfer, - sc->sc_obufsize + - sc->sc_opkthdrlen); - if (sc->sc_port[i].p_obuf == NULL) { - goto fail_4; - } + error = ucom_attach(sc->sc_ucom, sc->sc_numser, sc, + &ubser_callback, &Giant); + if (error) { + goto detach; } - ubserstartread(sc); + mtx_lock(&Giant); - free(devinfo, M_USBDEV); - USB_ATTACH_SUCCESS_RETURN; + sc->sc_flags |= (UBSER_FLAG_READ_STALL| + UBSER_FLAG_WRITE_STALL); -fail_4: - for (i = 0; i < sc->sc_numser; i++) { - if (sc->sc_port[i].p_oxfer != NULL) { - usbd_free_xfer(sc->sc_port[i].p_oxfer); - sc->sc_port[i].p_oxfer = NULL; - } - } -fail_3: - usbd_free_xfer(sc->sc_ixfer); - sc->sc_ixfer = NULL; -fail_2: - usbd_close_pipe(sc->sc_bulkout_pipe); - sc->sc_bulkout_pipe = NULL; -fail_1: - usbd_close_pipe(sc->sc_bulkin_pipe); - sc->sc_bulkin_pipe = NULL; -fail_0: - sc->sc_opening = 0; - wakeup(&sc->sc_opening); + usbd_transfer_start(sc->sc_xfer[UBSER_TR_DT_READ]); -bad: - ubser_cleanup(sc); - if (sc->sc_port != NULL) { - for (i = 0; i < sc->sc_numser; i++) { - pp = &sc->sc_port[i]; - if (pp->p_tty != NULL) - ttyfree(pp->p_tty); - } - free(sc->sc_port, M_USBDEV); - sc->sc_port = NULL; - } + mtx_unlock(&Giant); - DPRINTF(("ubser_attach: ATTACH ERROR\n")); - free(devinfo, M_USBDEV); + return 0; /* success */ - USB_ATTACH_ERROR_RETURN; + detach: + ubser_detach(dev); + return ENXIO; /* failure */ } -USB_DETACH(ubser) +static int +ubser_detach(device_t dev) { - USB_DETACH_START(ubser, sc); - int i; - struct ubser_port *pp; + struct ubser_softc *sc = device_get_softc(dev); - DPRINTF(("ubser_detach: sc=%p\n", sc)); + DPRINTF(sc, 0, "\n"); - sc->sc_dying = 1; - for (i = 0; i < sc->sc_numser; i++) { - pp = &sc->sc_port[i]; - if (pp->p_tty != NULL) - ttygone(pp->p_tty); - } + ucom_detach(sc->sc_ucom, sc->sc_numser); - if (sc->sc_bulkin_pipe != NULL) - usbd_abort_pipe(sc->sc_bulkin_pipe); - if (sc->sc_bulkout_pipe != NULL) - usbd_abort_pipe(sc->sc_bulkout_pipe); + /* "usbd_transfer_unsetup" will stop all active + * USB transfers: + */ + usbd_transfer_unsetup(sc->sc_xfer, UBSER_TR_MAX); - if (sc->sc_port != NULL) { - for (i = 0; i < sc->sc_numser; i++) { - pp = &sc->sc_port[i]; - if (pp->p_tty != NULL) - ttyfree(pp->p_tty); - } - free(sc->sc_port, M_USBDEV); - sc->sc_port = NULL; - } - - if (--sc->sc_refcnt >= 0) { - /* Wait for processes to go away. */ - usb_detach_wait(USBDEV(sc->sc_dev)); - } - - return (0); + return 0; } static int -ubserparam(struct tty *tp, struct termios *t) +ubser_param(struct ucom_softc *ucom, struct termios *t) { - struct ubser_softc *sc; - struct ubser_port *pp; + struct ubser_softc *sc = ucom->sc_parent; - pp = tp->t_sc; - sc = pp->p_sc; + DPRINTF(sc, 0, "\n"); - if (sc->sc_dying) - return (EIO); - - DPRINTF(("ubserparam: sc = %p\n", sc)); - /* * The firmware on our devices can only do 8n1@9600bps * without handshake. @@ -487,15 +390,15 @@ } /* 2 stop bits not possible */ - if (ISSET(t->c_cflag, CSTOPB)) + if (t->c_cflag & CSTOPB) return (EINVAL); /* XXX parity handling not possible with current firmware */ - if (ISSET(t->c_cflag, PARENB)) + if (t->c_cflag & PARENB) return (EINVAL); /* we can only do 8 data bits */ - switch (ISSET(t->c_cflag, CSIZE)) { + switch (t->c_cflag & CSIZE) { case CS8: break; default: @@ -513,364 +416,233 @@ * because of delayed reaction due to device buffering. */ - ttsetwater(tp); - return (0); } -static void -ubserstart(struct tty *tp) +static __inline void +ubser_inc_tx_unit(struct ubser_softc *sc) { - struct ubser_softc *sc; - struct ubser_port *pp; - struct cblock *cbp; - usbd_status err; - u_char *data; - int cnt; - uint8_t serial; - - pp = tp->t_sc; - sc = pp->p_sc; - serial = pp->p_port; - DPRINTF(("ubserstart: sc = %p, tp = %p\n", sc, tp)); - - if (sc->sc_dying) - return; - - if (ISSET(tp->t_state, TS_BUSY | TS_TIMEOUT | TS_TTSTOP)) { - ttwwakeup(tp); - DPRINTF(("ubserstart: stopped\n")); - return; + sc->sc_curr_tx_unit ++; + if (sc->sc_curr_tx_unit >= sc->sc_numser) { + sc->sc_curr_tx_unit = 0; } + return; +} - if (tp->t_outq.c_cc <= tp->t_olowat) { - if (ISSET(tp->t_state, TS_SO_OLOWAT)) { - CLR(tp->t_state, TS_SO_OLOWAT); - wakeup(TSA_OLOWAT(tp)); - } - selwakeuppri(&tp->t_wsel, TTIPRI); - if (tp->t_outq.c_cc == 0) { - if (ISSET(tp->t_state, TS_BUSY | TS_SO_OCOMPLETE) == - TS_SO_OCOMPLETE && tp->t_outq.c_cc == 0) { - CLR(tp->t_state, TS_SO_OCOMPLETE); - wakeup(TSA_OCOMPLETE(tp)); - } - return; - } - } +static void +ubser_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct ubser_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[UBSER_TR_DT_WRITE]; - /* Grab the first contiguous region of buffer space. */ - data = tp->t_outq.c_cf; - cbp = (struct cblock *) ((intptr_t) tp->t_outq.c_cf & ~CROUND); - cnt = min((char *) (cbp+1) - tp->t_outq.c_cf, tp->t_outq.c_cc); + USBD_CHECK_STATUS(xfer); - if (cnt == 0) { - DPRINTF(("ubserstart: cnt == 0\n")); - return; - } + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; - SET(tp->t_state, TS_BUSY); + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + sc->sc_flags &= ~UBSER_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + return; - if (cnt + sc->sc_opkthdrlen > sc->sc_obufsize) { - DPRINTF(("ubserstart: big buffer %d chars\n", cnt)); - cnt = sc->sc_obufsize; - } - sc->sc_port[serial].p_obuf[0] = serial; - memcpy(sc->sc_port[serial].p_obuf + sc->sc_opkthdrlen, data, cnt); - - - DPRINTF(("ubserstart: %d chars\n", cnt)); - usbd_setup_xfer(sc->sc_port[serial].p_oxfer, sc->sc_bulkout_pipe, - (usbd_private_handle)tp, sc->sc_port[serial].p_obuf, - cnt + sc->sc_opkthdrlen, - USBD_NO_COPY, USBD_NO_TIMEOUT, ubserwritecb); - /* What can we do on error? */ - err = usbd_transfer(sc->sc_port[serial].p_oxfer); - if (err != USBD_IN_PROGRESS) - printf("ubserstart: err=%s\n", usbd_errstr(err)); - - ttwwakeup(tp); + tr_error: + sc->sc_flags &= ~UBSER_FLAG_WRITE_STALL; + DPRINTF(sc, -1, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; } static void -ubserstop(struct tty *tp, int flag) +ubser_write_callback(struct usbd_xfer *xfer) { - struct ubser_softc *sc; + struct ubser_softc *sc = xfer->priv_sc; + uint8_t *buf = xfer->buffer; + uint8_t first_unit = sc->sc_curr_tx_unit; + uint32_t actlen; - sc = tp->t_sc; + USBD_CHECK_STATUS(xfer); - DPRINTF(("ubserstop: %d\n", flag)); + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flags |= UBSER_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[UBSER_TR_CS_WRITE]); + } + return; - if (flag & FWRITE) { - DPRINTF(("ubserstop: write\n")); - if (ISSET(tp->t_state, TS_BUSY)) { - /* XXX do what? */ - if (!ISSET(tp->t_state, TS_TTSTOP)) - SET(tp->t_state, TS_FLUSH); - } + tr_setup: + tr_transferred: + if (sc->sc_flags & UBSER_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[UBSER_TR_CS_WRITE]); + return; } - DPRINTF(("ubserstop: done\n")); -} + do { + if (ucom_get_data(sc->sc_ucom + sc->sc_curr_tx_unit, + buf + 1, sc->sc_tx_size - 1, &actlen)) { -static void -ubserwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status) -{ - struct tty *tp; - struct ubser_softc *sc; - struct ubser_port *pp; - u_int32_t cc; + buf[0] = sc->sc_curr_tx_unit; - tp = (struct tty *)p; - pp = tp->t_sc; - sc = pp->p_sc; + xfer->length = actlen + 1; - DPRINTF(("ubserwritecb: status = %d\n", status)); + usbd_start_hardware(xfer); - if (status == USBD_CANCELLED || sc->sc_dying) - goto error; + ubser_inc_tx_unit(sc); /* round robin */ - if (status != USBD_NORMAL_COMPLETION) { - printf("%s: ubserwritecb: %s\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(status)); - if (status == USBD_STALLED) - usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe); - /* XXX we should restart after some delay. */ - goto error; - } + break; + } - usbd_get_xfer_status(xfer, NULL, NULL, &cc, NULL); - DPRINTF(("ubserwritecb: cc = %d\n", cc)); - if (cc <= sc->sc_opkthdrlen) { - printf("%s: sent size too small, cc = %d\n", - device_get_nameunit(sc->sc_dev), cc); - goto error; - } - - /* convert from USB bytes to tty bytes */ - cc -= sc->sc_opkthdrlen; - - CLR(tp->t_state, TS_BUSY); - if (ISSET(tp->t_state, TS_FLUSH)) - CLR(tp->t_state, TS_FLUSH); - else - ndflush(&tp->t_outq, cc); - ttyld_start(tp); + ubser_inc_tx_unit(sc); + + } while (sc->sc_curr_tx_unit != first_unit); return; - -error: - CLR(tp->t_state, TS_BUSY); - return; } -static usbd_status -ubserstartread(struct ubser_softc *sc) +static void +ubser_read_clear_stall_callback(struct usbd_xfer *xfer) { - usbd_status err; + struct ubser_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[UBSER_TR_DT_READ]; - DPRINTF(("ubserstartread: start\n")); + USBD_CHECK_STATUS(xfer); - if (sc->sc_bulkin_pipe == NULL) - return (USBD_NORMAL_COMPLETION); + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; - usbd_setup_xfer(sc->sc_ixfer, sc->sc_bulkin_pipe, - (usbd_private_handle)sc, - sc->sc_ibuf, sc->sc_ibufsizepad, - USBD_SHORT_XFER_OK | USBD_NO_COPY, - USBD_NO_TIMEOUT, ubserreadcb); + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + sc->sc_flags &= ~UBSER_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + return; - err = usbd_transfer(sc->sc_ixfer); - if (err != USBD_IN_PROGRESS) { - DPRINTF(("ubserstartread: err = %s\n", usbd_errstr(err))); - return (err); - } - - return (USBD_NORMAL_COMPLETION); + tr_error: + sc->sc_flags &= ~UBSER_FLAG_READ_STALL; + DPRINTF(sc, -1, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; } static void -ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status) +ubser_read_callback(struct usbd_xfer *xfer) { - struct ubser_softc *sc = (struct ubser_softc *)p; - struct tty *tp; - usbd_status err; - u_int32_t cc; - u_char *cp; - int lostcc; + struct ubser_softc *sc = xfer->priv_sc; + uint8_t *buf = xfer->buffer; + + USBD_CHECK_STATUS(xfer); - if (status == USBD_IOERROR) { - printf("%s: ubserreadcb: %s - restarting\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(status)); - goto resubmit; + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flags |= UBSER_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[UBSER_TR_CS_READ]); } + return; - DPRINTF(("ubserreadcb: status = %d\n", status)); + tr_transferred: + if (xfer->actlen < 1) { + DPRINTF(sc, 0, "invalid actlen=0!\n"); + goto tr_setup; + } - if (status != USBD_NORMAL_COMPLETION) { - if (status != USBD_CANCELLED) { - printf("%s: ubserreadcb: %s\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(status)); - } - if (status == USBD_STALLED) - usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe); - return; + if (buf[0] >= sc->sc_numser) { + DPRINTF(sc, 0, "invalid serial number!\n"); + goto tr_setup; } - usbd_get_xfer_status(xfer, NULL, (void **)&cp, &cc, NULL); + ucom_put_data(sc->sc_ucom + buf[0], + buf + 1, xfer->actlen -1); - DPRINTF(("ubserreadcb: got %d bytes from device\n", cc)); - if (cc == 0) - goto resubmit; - - if (cc > sc->sc_ibufsizepad) { - printf("%s: invalid receive data size, %d chars\n", - device_get_nameunit(sc->sc_dev), cc); - goto resubmit; + tr_setup: + if (sc->sc_flags & UBSER_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[UBSER_TR_CS_READ]); + } else { + usbd_start_hardware(xfer); } + return; +} - /* parse header */ - if (cc < 1) - goto resubmit; - DPRINTF(("ubserreadcb: got %d chars for serial %d\n", cc - 1, *cp)); - tp = sc->sc_port[*cp].p_tty; - cp++; - cc--; +static void +ubser_set_break(struct ucom_softc *ucom, u_int8_t onoff) +{ + struct ubser_softc *sc = ucom->sc_parent; + uint8_t x = ucom->sc_portno; - if (cc < 1) - goto resubmit; - - if (!(tp->t_state & TS_ISOPEN)) /* drop data for unused serials */ - goto resubmit; - - if (tp->t_state & TS_CAN_BYPASS_L_RINT) { - if (tp->t_rawq.c_cc + cc > tp->t_ihiwat - && (tp->t_iflag & IXOFF) - && !(tp->t_state & TS_TBLOCK)) - ttyblock(tp); - lostcc = b_to_q((char *)cp, cc, &tp->t_rawq); - tp->t_rawcc += cc; - ttwakeup(tp); - if (tp->t_state & TS_TTSTOP - && (tp->t_iflag & IXANY - || tp->t_cc[VSTART] == tp->t_cc[VSTOP])) { - tp->t_state &= ~TS_TTSTOP; - tp->t_lflag &= ~FLUSHO; - ubserstart(tp); - } - if (lostcc > 0) - printf("%s: lost %d chars\n", device_get_nameunit(sc->sc_dev), - lostcc); - } else { - /* Give characters to tty layer. */ - while (cc > 0) { - DPRINTFN(7, ("ubserreadcb: char = 0x%02x\n", *cp)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 9 06:18:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4341516A40F; Mon, 9 Oct 2006 06:18:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1324316A403 for ; Mon, 9 Oct 2006 06:18:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3B5543D55 for ; Mon, 9 Oct 2006 06:18:55 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k996ItG8066587 for ; Mon, 9 Oct 2006 06:18:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k996ItDv066569 for perforce@freebsd.org; Mon, 9 Oct 2006 06:18:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 9 Oct 2006 06:18:55 GMT Message-Id: <200610090618.k996ItDv066569@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 107531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 06:18:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=107531 Change 107531 by hselasky@hselasky_mini_itx on 2006/10/09 06:18:00 ubser: Need to stop all transfers atomically at detach, else an outstanding clear stall transfer can call "usbd_transfer_start()" passing a NULL pointer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubser.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#8 (text+ko) ==== @@ -355,14 +355,24 @@ ubser_detach(device_t dev) { struct ubser_softc *sc = device_get_softc(dev); + uint8_t n; DPRINTF(sc, 0, "\n"); ucom_detach(sc->sc_ucom, sc->sc_numser); - /* "usbd_transfer_unsetup" will stop all active - * USB transfers: + /* need to stop all transfers atomically, + * hence when clear stall completes, it + * might start other transfers ! */ + mtx_lock(&Giant); + for (n = 0; n < UBSER_TR_MAX; n++) { + if (sc->sc_xfer[n]) { + usbd_transfer_stop(sc->sc_xfer[n]); + } + } + mtx_unlock(&Giant); + usbd_transfer_unsetup(sc->sc_xfer, UBSER_TR_MAX); return 0; From owner-p4-projects@FreeBSD.ORG Mon Oct 9 10:49:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADEA916A417; Mon, 9 Oct 2006 10:49:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B05216A403 for ; Mon, 9 Oct 2006 10:49:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B82C543D53 for ; Mon, 9 Oct 2006 10:49:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99AnXG9073868 for ; Mon, 9 Oct 2006 10:49:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99AYtcC064485 for perforce@freebsd.org; Mon, 9 Oct 2006 10:34:55 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Oct 2006 10:34:55 GMT Message-Id: <200610091034.k99AYtcC064485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 10:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=107544 Change 107544 by jb@jb_freebsd7 on 2006/10/09 10:21:52 This submit is the result of an integrate -ifb from current because it appears that p4 gets confused by integrating files from different branches which share the same file names. It can't or won't detect changes in the content of the files because of it's secret dea of what a revision is. As A SCM user I expect that the tool will deal with content. If I integrate a file from one branch, I expect that the tool will notice when I integrate the same file subsequently from a different branch. If there are differences in the _content_ then _that_ is what I want merged. But p4 doesn't do that. Take src/sys/sun4v/sun4v/eeprom.c as an example. I initially integrated the sun4v_stable branch and got that file. I subsequently integrated from the sun4v stable branch and eeprom.c didn't change. Finally I integrated from the freebsd_to_dtrace branch where the eeprom.c had been committed to current, but with the $FreeBSD$ line added. p4 missed that change. I don't really care what a SCM does internally. If, however, I want to merge a file, I expect the merge to operate on the _content_ not the SCM's confused idea of what the 'revision' history is. The fact that I merge from a different branch should be a hint to a simple SCM that the history from the previous branch might be conflicting. And all it has to do in that case it tell me. But p4 doesn't do that. It just ignores it. Phhhhhh. This submit contains a lot of updates that reset the files to the contents of current. There are so many, but it seems the easiest thing to do. I will have to re-merge in the changes that existed prior to this commit. p4 simply isn't capable of handling it. Sigh. Affected files ... .. //depot/projects/dtrace/doc/Makefile#2 integrate .. //depot/projects/dtrace/doc/README#2 integrate .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/Makefile#2 integrate .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/Makefile#2 integrate .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#2 integrate .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/Makefile#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/Makefile#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/post#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/pre#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/license.sgml#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/new-users/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/flyer/Makefile#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/flyer/flyer.tex#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/articles.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/books.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/extra.css#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/articles.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/teams.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/console-server/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/console-server/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#28 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#19 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#14 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fonts/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fonts/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hats/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hats/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hubs/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hubs/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mh/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/multi-os/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/new-users/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/new-users/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/converse.c#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/su.c#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/install.cfg#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/loader.rc#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/post#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/pre#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/extra.css#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/solid-state/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vinum/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vinum/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vm-design/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/bibliography/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/bibliography/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/book.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/Makefile#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapters.ent#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#26 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/Makefile#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/mk/doc.local.mk#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/README#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/admin.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/applications.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/includes.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/install.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/misc.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/network.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/preface.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/serial.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/x.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/extra.css#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/Makefile#3 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/authors.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/flyer/Makefile#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/flyer/flyer.tex#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#2 integrate .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/mh/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/converse.c#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/su.c#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/post#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/pre#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/extra.css#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/Makefile#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/Makefile#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/flyer.tex#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/builtin.1#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/cat.1#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/chkey.1#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/echo.1#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/head.1#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/intro.1#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/agp.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/amd.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/ncr.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/sd.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/sn.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/spic.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/st.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man5/intro.5#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man5/publickey.5#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man6/intro.6#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man7/ascii.7#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man7/intro.7#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/books.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/euro/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/euro/article.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/new-users/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/Makefile#3 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/flyer/Makefile#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/flyer/flyer.tex#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/articles.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/books.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/catalog#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/translators.ent#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#2 integrate .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/Makefile#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/Makefile#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/Makefile.inc#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributing/Makefile#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributing/article.sgml#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributors/Makefile#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributors/article.sgml#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 9 11:30:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9440B16A47B; Mon, 9 Oct 2006 11:30:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5786416A416 for ; Mon, 9 Oct 2006 11:30:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F78244139 for ; Mon, 9 Oct 2006 11:24:18 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99BOHki002780 for ; Mon, 9 Oct 2006 11:24:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99BOH7n002774 for perforce@freebsd.org; Mon, 9 Oct 2006 11:24:17 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 9 Oct 2006 11:24:17 GMT Message-Id: <200610091124.k99BOH7n002774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 11:30:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=107545 Change 107545 by rdivacky@rdivacky_witten on 2006/10/09 11:24:06 Use segment 4 instead of 3. This enables amd64 bash to start (ie. its working). Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#10 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#10 (text+ko) ==== @@ -647,13 +647,13 @@ * looks like we're getting the idx we returned * in the set_thread_area() syscall */ - if (idx != 6 && idx != 3) + if (idx != 6 && idx != 4) return (EINVAL); /* this doesnt happen in practice */ if (idx == 6) { - /* we might copy out the entry_number as 3 */ - info.entry_number = 3; + /* we might copy out the entry_number as 4 */ + info.entry_number = 4; error = copyout(&info, (void *) td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) return (error); @@ -1221,10 +1221,10 @@ /* * we support just GLIBC TLS now - * we should let 3 proceed as well because we use this segment so + * we should let 4 proceed as well because we use this segment so * if code does two subsequent calls it should succeed */ - if (idx != 6 && idx != -1 && idx != 3) + if (idx != 6 && idx != -1 && idx != 4) return (EINVAL); /* @@ -1233,7 +1233,7 @@ * XXX: what if userspace program doesnt check this value and tries * to use 6, 7 or 8? */ - idx = info.entry_number = 3; + idx = info.entry_number = 4; error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) return (error); From owner-p4-projects@FreeBSD.ORG Mon Oct 9 14:48:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD71A16A407; Mon, 9 Oct 2006 14:48:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F11916A47B for ; Mon, 9 Oct 2006 14:48:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11ECD43D46 for ; Mon, 9 Oct 2006 14:48:37 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99Emap4034428 for ; Mon, 9 Oct 2006 14:48:36 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99Ema1F034409 for perforce@freebsd.org; Mon, 9 Oct 2006 14:48:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 9 Oct 2006 14:48:36 GMT Message-Id: <200610091448.k99Ema1F034409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 14:48:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=107550 Change 107550 by rdivacky@rdivacky_witten on 2006/10/09 14:48:00 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/boot/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/linuxolator/src/sys/conf/files#5 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_output.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/t1_copy.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/boot/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.30 2006/08/10 06:29:43 imp Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ .include @@ -18,6 +18,6 @@ .endif # Pick the machine-dependent subdir based on the target architecture. -SUBDIR+= ${MACHINE:S/amd64/i386/} +SUBDIR+= ${MACHINE:S/amd64/i386/:S/sun4v/sparc64/} .include ==== //depot/projects/linuxolator/src/sys/boot/ofw/libofw/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.9 2004/10/24 15:32:50 ru Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.10 2006/10/09 04:43:06 kmacy Exp $ LIB= ofw INTERNALLIB= SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ - ofw_time.c openfirm.c + ofw_time.c openfirm.c openfirm_mmu.c CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ==== //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.12 2005/10/20 10:39:09 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.13 2006/10/09 04:43:07 kmacy Exp $"); #include @@ -87,6 +87,20 @@ panic("failed to get mmu ihandle"); } +phandle_t +OF_chosennode(void) +{ + static phandle_t chosen; + + if (chosen) + return (chosen); + + if ((chosen = OF_finddevice("/chosen")) == -1) + OF_exit(); + + return (chosen); +} + /* * Generic functions */ ==== //depot/projects/linuxolator/src/sys/boot/sparc64/loader/main.c#2 (text+ko) ==== @@ -8,8 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.26 2005/01/05 22:16:58 imp Exp $"); - +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.28 2006/10/09 05:59:04 kmacy Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part * @@ -25,7 +24,9 @@ #include #include #include +#include +#include #include #include #include @@ -50,6 +51,12 @@ vm_offset_t size; }; +struct mmu_ops { + void (*tlb_init)(void); + int (*mmu_mapin)(vm_offset_t va, vm_size_t len); +} *mmu_ops; + + typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); @@ -60,7 +67,33 @@ extern vm_offset_t md_load(char *, vm_offset_t *); static int __elfN(exec)(struct preloaded_file *); static int sparc64_autoload(void); -static int mmu_mapin(vm_offset_t, vm_size_t); +static int mmu_mapin_sun4u(vm_offset_t, vm_size_t); +static int mmu_mapin_sun4v(vm_offset_t, vm_size_t); +static void tlb_init_sun4u(void); +static void tlb_init_sun4v(void); + +struct mmu_ops mmu_ops_sun4u = { tlb_init_sun4u, mmu_mapin_sun4u }; +struct mmu_ops mmu_ops_sun4v = { tlb_init_sun4v, mmu_mapin_sun4v }; + +extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[]; + +/* sun4u */ +struct tlb_entry *dtlb_store; +struct tlb_entry *itlb_store; +int dtlb_slot; +int itlb_slot; +int dtlb_slot_max; +int itlb_slot_max; + +/* sun4v */ +struct tlb_entry *tlb_store; +/* + * no direct TLB access on sun4v + * we somewhat arbitrarily declare enough + * slots to cover a 4GB AS with 4MB pages + */ +#define SUN4V_TLB_SLOT_MAX (1 << 10) + extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[]; @@ -204,14 +237,14 @@ static ssize_t sparc64_readin(const int fd, vm_offset_t va, const size_t len) { - mmu_mapin(va, len); + mmu_ops->mmu_mapin(va, len); return read(fd, (void *)va, len); } static ssize_t sparc64_copyin(const void *src, vm_offset_t dest, size_t len) { - mmu_mapin(dest, len); + mmu_ops->mmu_mapin(dest, len); memcpy((void *)dest, src, len); return len; } @@ -252,7 +285,7 @@ } static int -mmu_mapin(vm_offset_t va, vm_size_t len) +mmu_mapin_sun4u(vm_offset_t va, vm_size_t len) { vm_offset_t pa, mva; u_long data; @@ -307,6 +340,53 @@ } if (pa != (vm_offset_t)-1) OF_release_phys(pa, PAGE_SIZE_4M); + + return 0; +} + +static int +mmu_mapin_sun4v(vm_offset_t va, vm_size_t len) +{ + + vm_offset_t pa, mva; + u_long data; + int ret; + + if (va + len > curkva) + curkva = va + len; + + pa = (vm_offset_t)-1; + len += va & PAGE_MASK_4M; + va &= ~PAGE_MASK_4M; + while (len) { + if ((va >> 22) > SUN4V_TLB_SLOT_MAX) + panic("trying to map more than 4GB"); + if (tlb_store[va >> 22].te_pa == -1) { + /* Allocate a physical page, claim the virtual area */ + if (pa == (vm_offset_t)-1) { + pa = (vm_offset_t)OF_alloc_phys(PAGE_SIZE_4M, + PAGE_SIZE_4M); + if (pa == (vm_offset_t)-1) + panic("out of memory"); + mva = (vm_offset_t)OF_claim_virt(va, + PAGE_SIZE_4M, 0); + if (mva != va) { + panic("can't claim virtual page " + "(wanted %#lx, got %#lx)", + va, mva); + } + } + + tlb_store[va >> 22].te_pa = pa; + if ((ret = OF_map_phys(-1, PAGE_SIZE_4M, va, pa)) != 0) + printf("OF_map_phys failed: %d\n", ret); + pa = (vm_offset_t)-1; + } + len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; + va += PAGE_SIZE_4M; + } + if (pa != (vm_offset_t)-1) + OF_release_phys(pa, PAGE_SIZE_4M); return 0; } @@ -324,7 +404,7 @@ } static void -tlb_init(void) +tlb_init_sun4u(void) { phandle_t child; phandle_t root; @@ -361,11 +441,20 @@ panic("init_tlb: malloc"); } +static void +tlb_init_sun4v(void) +{ + tlb_store = malloc(SUN4V_TLB_SLOT_MAX * sizeof(*tlb_store)); + memset(tlb_store, 0xFF, SUN4V_TLB_SLOT_MAX * sizeof(*tlb_store)); +} + int main(int (*openfirm)(void *)) { char bootpath[64]; + char compatible[32]; struct devsw **dp; + phandle_t rooth; phandle_t chosenh; /* @@ -381,13 +470,22 @@ init_heap(); setheap((void *)heapva, (void *)(heapva + HEAPSZ)); - /* * Probe for a console. */ cons_probe(); - tlb_init(); + rooth = OF_peer(0); + OF_getprop(rooth, "compatible", compatible, sizeof(compatible)); + if (!strcmp(compatible, "sun4v")) { + printf("\nBooting with sun4v support.\n"); + mmu_ops = &mmu_ops_sun4v; + } else { + printf("\nBooting with sun4u support.\n"); + mmu_ops = &mmu_ops_sun4u; + } + + mmu_ops->tlb_init(); bcache_init(32, 512); ==== //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.192 2006/09/16 21:21:07 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.194 2006/10/07 19:04:23 flz Exp $"); #include @@ -443,6 +443,22 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "STORAGE DEVICE*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + /* + * Rekam Digital CAMERA + * PR: usb/98713 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "CAMERA*", "4MP-9J6*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * iRiver H10 MP3 player + * PR: usb/102547 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "iriver", "H10*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.97 2006/08/08 12:29:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.98 2006/10/08 16:55:27 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.6 2006/09/09 16:55:55 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.7 2006/10/08 17:10:34 netchild Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.187 2006/09/16 14:12:04 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.188 2006/10/08 17:08:27 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1149 2006/10/06 10:43:41 ru Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1150 2006/10/08 13:51:27 piso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1749,10 +1749,10 @@ netinet/udp_usrreq.c optional inet netinet/libalias/alias.c optional libalias netinet/libalias/alias_db.c optional libalias +netinet/libalias/alias_mod.c optional libalias +netinet/libalias/alias_old.c optional libalias netinet/libalias/alias_proxy.c optional libalias netinet/libalias/alias_util.c optional libalias -netinet/libalias/alias_old.c optional libalias -netinet/libalias/alias_mod.c optional libalias netinet6/ah_aesxcbcmac.c optional ipsec netinet6/ah_core.c optional ipsec netinet6/ah_input.c optional ipsec ==== //depot/projects/linuxolator/src/sys/conf/files.sun4v#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.2 2006/10/09 04:45:17 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -58,12 +58,6 @@ sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci sparc64/pci/ofw_pci_if.m optional pci -sparc64/dtrace/dtrace_asm.s optional dtrace -sparc64/dtrace/dtrace_isa.c optional dtrace -sparc64/dtrace/fasttrap_isa.c optional dtrace -sparc64/dtrace/fbt.c optional dtrace -sparc64/dtrace/sdt.c optional dtrace -sparc64/dtrace/dtrace_stub.c standard # XXX hvcons should be optional sun4v/sun4v/hvcons.c standard ==== //depot/projects/linuxolator/src/sys/ddb/db_command.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.68 2006/07/19 18:26:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.70 2006/10/08 18:37:00 bde Exp $"); #include #include @@ -113,6 +113,7 @@ { "delete", db_delete_cmd, 0, 0 }, { "d", db_delete_cmd, 0, 0 }, { "break", db_breakpoint_cmd, 0, 0 }, + { "b", db_breakpoint_cmd, 0, 0 }, { "dwatch", db_deletewatch_cmd, 0, 0 }, { "watch", db_watchpoint_cmd, CS_MORE,0 }, { "dhwatch", db_deletehwatch_cmd, 0, 0 }, @@ -125,6 +126,7 @@ { "next", db_trace_until_matching_cmd,0, 0 }, { "match", db_trace_until_matching_cmd,0, 0 }, { "trace", db_stack_trace, CS_OWN, 0 }, + { "t", db_stack_trace, CS_OWN, 0 }, { "alltrace", db_stack_trace_all, 0, 0 }, { "where", db_stack_trace, CS_OWN, 0 }, { "bt", db_stack_trace, CS_OWN, 0 }, @@ -132,6 +134,7 @@ { "show", 0, 0, &db_show_table }, { "ps", db_ps, 0, 0 }, { "gdb", db_gdb, 0, 0 }, + { "registers", db_show_regs, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { "watchdog", db_watchdog, 0, 0 }, @@ -266,14 +269,14 @@ for (cmd = table->table; cmd->name != 0; cmd++) { db_printf("%-12s", cmd->name); - db_end_line(); + db_end_line(12); } if (table->aux_tablep == NULL) return; for (aux_cmdp = table->aux_tablep; aux_cmdp < table->aux_tablep_end; aux_cmdp++) { db_printf("%-12s", (*aux_cmdp)->name); - db_end_line(); + db_end_line(12); } } ==== //depot/projects/linuxolator/src/sys/ddb/db_examine.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_examine.c,v 1.32 2005/01/06 01:34:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_examine.c,v 1.33 2006/10/08 18:15:07 bde Exp $"); #include #include @@ -176,7 +176,7 @@ break; } if (db_print_position() != 0) - db_end_line(); + db_end_line(1); break; } } ==== //depot/projects/linuxolator/src/sys/ddb/db_output.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.35 2006/07/12 21:22:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.36 2006/10/08 18:15:08 bde Exp $"); #include #include @@ -304,8 +304,8 @@ * End line if too long. */ void -db_end_line() +db_end_line(int field_width) { - if (db_output_position >= db_max_width) + if (db_output_position + field_width > db_max_width) db_printf("\n"); } ==== //depot/projects/linuxolator/src/sys/ddb/db_output.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_output.h,v 1.14 2006/07/12 21:22:43 jhb Exp $ + * $FreeBSD: src/sys/ddb/db_output.h,v 1.15 2006/10/08 18:15:08 bde Exp $ */ #ifndef _DDB_DB_OUTPUT_H_ @@ -40,7 +40,7 @@ void db_disable_pager(void); void db_enable_pager(void); -void db_end_line(void); +void db_end_line(int); void db_force_whitespace(void); int db_print_position(void); ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.176 2006/09/25 11:26:29 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.177 2006/10/08 09:58:00 sos Exp $"); #include "opt_ata.h" #include @@ -950,6 +950,7 @@ struct ata_chip_id *idx; static struct ata_chip_id ids[] = {{ ATA_ALI_5289, 0x00, 2, ALISATA, ATA_SA150, "M5289" }, + { ATA_ALI_5288, 0x00, 4, ALISATA, ATA_SA300, "M5288" }, { ATA_ALI_5287, 0x00, 4, ALISATA, ATA_SA150, "M5287" }, { ATA_ALI_5281, 0x00, 2, ALISATA, ATA_SA150, "M5281" }, { ATA_ALI_5229, 0xc5, 0, ALINEW, ATA_UDMA6, "M5229" }, ==== //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.15 2005/11/22 14:21:03 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.16 2006/10/09 04:45:17 kmacy Exp $"); /*- * Copyright (C) 2000 Benno Rice. * All rights reserved. @@ -814,3 +814,36 @@ entry(0, 0, openfirmware, arg, len); } #endif + + +/* + * Extensions added for sun4v support + * + */ + +/* + * This interface allows the client to safely take over the %tba by + * the prom's service. The prom will take care of the quiescence of + * interrupts and handle any pending soft interrupts. + * This call also sets the MMU fault status area for the cpu. + */ +void +OF_set_mmfsa_traptable(void *tba_addr, uint64_t mmfsa_ra) +{ + static struct { + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t tba_addr; + cell_t mmfsa_ra; + } args = { + (cell_t)"SUNW,set-trap-table", + 2, + 0, + }; + + args.tba_addr = p1275_ptr2cell(tba_addr); + args.mmfsa_ra = p1275_ptr2cell(mmfsa_ra); + openfirmware(&args); +} + ==== //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.h#2 (text+ko) ==== @@ -54,7 +54,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ofw/openfirm.h,v 1.11 2005/01/06 01:43:00 imp Exp $ + * $FreeBSD: src/sys/dev/ofw/openfirm.h,v 1.12 2006/10/09 04:45:17 kmacy Exp $ */ #ifndef _OPENFIRM_H_ @@ -74,6 +74,27 @@ #include #include +#define p1275_ptr2cell(p) ((cell_t)((uintptr_t)((void *)(p)))) +#define p1275_int2cell(i) ((cell_t)((int)(i))) +#define p1275_uint2cell(u) ((cell_t)((unsigned int)(u))) +#define p1275_size2cell(u) ((cell_t)((size_t)(u))) +#define p1275_phandle2cell(ph) ((cell_t)((unsigned int)((phandle_t)(ph)))) +#define p1275_dnode2cell(d) ((cell_t)((unsigned int)((pnode_t)(d)))) +#define p1275_ihandle2cell(ih) ((cell_t)((unsigned int)((ihandle_t)(ih)))) +#define p1275_ull2cell_high(ll) (0LL) +#define p1275_ull2cell_low(ll) ((cell_t)(ll)) +#define p1275_uintptr2cell(i) ((cell_t)((uintptr_t)(i))) + +#define p1275_cell2ptr(p) ((void *)((cell_t)(p))) +#define p1275_cell2int(i) ((int)((cell_t)(i))) +#define p1275_cell2uint(u) ((unsigned int)((cell_t)(u))) +#define p1275_cell2size(u) ((size_t)((cell_t)(u))) +#define p1275_cell2phandle(ph) ((phandle_t)((cell_t)(ph))) +#define p1275_cell2dnode(d) ((pnode_t)((cell_t)(d))) +#define p1275_cell2ihandle(ih) ((ihandle_t)((cell_t)(ih))) +#define p1275_cells2ull(h, l) ((unsigned long long)(cell_t)(l)) +#define p1275_cell2uintptr(i) ((uintptr_t)((cell_t)(i))) + MALLOC_DECLARE(M_OFWPROP); /* @@ -138,5 +159,10 @@ /* Time function */ int OF_milliseconds(void); +/* sun4v additions */ +void OF_set_mmfsa_traptable(void *tba_addr, uint64_t mmfsa_ra); +int OF_translate_virt(vm_offset_t va, int *valid, vm_paddr_t *physaddr, int *mode); +vm_paddr_t OF_vtophys(vm_offset_t va); + #endif /* _KERNEL */ #endif /* _OPENFIRM_H_ */ ==== //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#2 (text+ko) ==== @@ -80,10 +80,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20061007_0030" +#define HDA_DRV_TEST_REV "20061009_0031" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.4 2006/10/06 18:59:27 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.5 2006/10/08 18:51:58 ariff Exp $"); #undef HDA_DEBUG_ENABLED #define HDA_DEBUG_ENABLED 1 @@ -125,19 +125,36 @@ #define INTEL_VENDORID 0x8086 #define HDA_INTEL_82801F HDA_MODEL_CONSTRUCT(INTEL, 0x2668) #define HDA_INTEL_82801G HDA_MODEL_CONSTRUCT(INTEL, 0x27d8) +#define HDA_INTEL_82801H HDA_MODEL_CONSTRUCT(INTEL, 0x284b) +#define HDA_INTEL_63XXESB HDA_MODEL_CONSTRUCT(INTEL, 0x269a) #define HDA_INTEL_ALL HDA_MODEL_CONSTRUCT(INTEL, 0xffff) /* Nvidia */ #define NVIDIA_VENDORID 0x10de #define HDA_NVIDIA_MCP51 HDA_MODEL_CONSTRUCT(NVIDIA, 0x026c) #define HDA_NVIDIA_MCP55 HDA_MODEL_CONSTRUCT(NVIDIA, 0x0371) +#define HDA_NVIDIA_MCP61A HDA_MODEL_CONSTRUCT(NVIDIA, 0x03e4) +#define HDA_NVIDIA_MCP61B HDA_MODEL_CONSTRUCT(NVIDIA, 0x03f0) +#define HDA_NVIDIA_MCP65A HDA_MODEL_CONSTRUCT(NVIDIA, 0x044a) +#define HDA_NVIDIA_MCP65B HDA_MODEL_CONSTRUCT(NVIDIA, 0x044b) #define HDA_NVIDIA_ALL HDA_MODEL_CONSTRUCT(NVIDIA, 0xffff) /* ATI */ #define ATI_VENDORID 0x1002 #define HDA_ATI_SB450 HDA_MODEL_CONSTRUCT(ATI, 0x437b) +#define HDA_ATI_SB600 HDA_MODEL_CONSTRUCT(ATI, 0x4383) #define HDA_ATI_ALL HDA_MODEL_CONSTRUCT(ATI, 0xffff) +/* VIA */ +#define VIA_VENDORID 0x1106 +#define HDA_VIA_VT82XX HDA_MODEL_CONSTRUCT(VIA, 0x3288) +#define HDA_VIA_ALL HDA_MODEL_CONSTRUCT(VIA, 0xffff) + +/* SiS */ +#define SIS_VENDORID 0x1039 +#define HDA_SIS_966 HDA_MODEL_CONSTRUCT(SIS, 0x7502) +#define HDA_SIS_ALL HDA_MODEL_CONSTRUCT(SIS, 0xffff) + /* OEM/subvendors */ /* HP/Compaq */ @@ -204,7 +221,7 @@ { "gpio2", HDA_QUIRK_GPIO2 }, { "softpcmvol", HDA_QUIRK_SOFTPCMVOL }, { "fixedrate", HDA_QUIRK_FIXEDRATE }, - { "forcestereo", HDA_QUIRK_FORCESTEREO } + { "forcestereo", HDA_QUIRK_FORCESTEREO }, }; #define HDAC_QUIRKS_TAB_LEN \ (sizeof(hdac_quirks_tab) / sizeof(hdac_quirks_tab[0])) @@ -242,13 +259,24 @@ } hdac_devices[] = { { HDA_INTEL_82801F, "Intel 82801F" }, { HDA_INTEL_82801G, "Intel 82801G" }, + { HDA_INTEL_82801H, "Intel 82801H" }, + { HDA_INTEL_63XXESB, "Intel 631x/632xESB" }, { HDA_NVIDIA_MCP51, "NVidia MCP51" }, { HDA_NVIDIA_MCP55, "NVidia MCP55" }, + { HDA_NVIDIA_MCP61A, "NVidia MCP61A" }, + { HDA_NVIDIA_MCP61B, "NVidia MCP61B" }, + { HDA_NVIDIA_MCP65A, "NVidia MCP65A" }, + { HDA_NVIDIA_MCP65B, "NVidia MCP65B" }, { HDA_ATI_SB450, "ATI SB450" }, + { HDA_ATI_SB600, "ATI SB600" }, + { HDA_VIA_VT82XX, "VIA VT8251/8237A" }, + { HDA_SIS_966, "SiS 966" }, /* Unknown */ { HDA_INTEL_ALL, "Intel (Unknown)" }, { HDA_NVIDIA_ALL, "NVidia (Unknown)" }, { HDA_ATI_ALL, "ATI (Unknown)" }, + { HDA_VIA_ALL, "VIA (Unknown)" }, + { HDA_SIS_ALL, "SiS (Unknown)" }, }; #define HDAC_DEVICES_LEN (sizeof(hdac_devices) / sizeof(hdac_devices[0])) ==== //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.97 2006/09/29 09:10:54 ru Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.98 2006/10/08 17:13:54 netchild Exp $"); #define OLDPCM_IOCTL @@ -1965,8 +1965,6 @@ if (ret != 0) { if (smrd != NULL) free(smrd, M_DEVBUF); - if (smwr != NULL) - free(smwr, M_DEVBUF); if ((sg != NULL) && SLIST_EMPTY(&sg->members)) { sg_ids[2] = sg->id; SLIST_REMOVE(&snd_pcm_syncgroups, sg, pcmchan_syncgroup, link); ==== //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.99 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.100 2006/10/07 17:58:50 flz Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -169,6 +169,7 @@ {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5}, PII }, + {{ USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101}, PII }, {{ USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM}, PII }, {{ USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC},PII }, {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB}, 0 }, ==== //depot/projects/linuxolator/src/sys/dev/usb/if_cdce.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.15 2006/09/22 12:45:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.16 2006/10/07 17:35:37 flz Exp $"); #include #include @@ -104,6 +104,7 @@ {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION }, {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION }, + {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX }, CDCE_NO_UNION }, }; #define cdce_lookup(v, p) ((const struct cdce_type *)usb_lookup(cdce_devs, v, p)) ==== //depot/projects/linuxolator/src/sys/dev/usb/if_kue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.70 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.71 2006/10/07 18:03:39 flz Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -124,6 +124,7 @@ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3 }, { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT }, { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450 }, + { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE }, { 0, 0 } }; ==== //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.45 2006/09/07 00:06:41 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.46 2006/10/07 18:18:40 flz Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.45 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.46 2006/10/07 18:18:40 flz Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -97,6 +97,7 @@ { USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570 }, { USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_2 }, { USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_3 }, + { USB_VENDOR_NOVATECH, USB_PRODUCT_NOVATECH_NV902 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2 }, { USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570 }, ==== //depot/projects/linuxolator/src/sys/dev/usb/umass.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.137 2006/09/07 00:06:42 imp Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.138 2006/10/07 20:08:37 flz Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -426,6 +426,10 @@ UMASS_PROTO_ATAPI | UMASS_PROTO_BBB, NO_INQUIRY | NO_GETMAXLUN }, + { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXL840AN, RID_WILDCARD, + UMASS_PROTO_ATAPI | UMASS_PROTO_BBB, + NO_GETMAXLUN + }, { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLCB20AN, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS ==== //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.50 2006/09/06 23:44:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.54 2006/10/07 19:42:45 flz Exp $"); #include #include @@ -79,6 +79,8 @@ { USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0x009, { UQ_AU_NO_FRAC }}, { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE, 0x100, { UQ_AU_INP_ASYNC }}, + { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN53B, ANY, { UQ_NO_STRINGS }}, + { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMAMODEM, ANY, { UQ_ASSUME_CM_OVER_DATA }}, /* XXX These should have a revision number, but I don't know what they are. */ { USB_VENDOR_HP, USB_PRODUCT_HP_895C, ANY, { UQ_BROKEN_BIDIR }}, { USB_VENDOR_HP, USB_PRODUCT_HP_880C, ANY, { UQ_BROKEN_BIDIR }}, @@ -101,9 +103,13 @@ ANY, { UQ_ASSUME_CM_OVER_DATA }}, { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX, 0x100, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_A41XV32X, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, /* Devices which should be ignored by uhid */ { USB_VENDOR_APC, USB_PRODUCT_APC_UPS, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, ==== //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.265 2006/10/07 16:00:58 flz Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.275 2006/10/07 20:08:37 flz Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -483,6 +483,7 @@ vendor GMATE 0x0e7e G.Mate, Inc vendor OTI 0x0ea0 Ours vendor PILOTECH 0x0eaf Pilotech +vendor NOVATECH 0x0eb0 NovaTech vendor EGALAX 0x0eef eGalax vendor MICROTUNE 0x0f4d Microtune vendor VTECH 0x0f88 VTech @@ -520,6 +521,7 @@ vendor INSIDEOUT 0x1608 Inside Out Networks vendor ENTREGA 0x1645 Entrega vendor ACTIONTEC 0x1668 Actiontec +vendor CMOTECH 0x16d8 CMOTECH CO., LTD. vendor LINKSYS3 0x1915 Linksys vendor DLINK 0x2001 D-Link vendor ERICSSON 0x2282 Ericsson @@ -709,6 +711,7 @@ product BELKIN F5U109 0x0109 F5U109 Serial product BELKIN F5U208 0x0208 F5U208 VideoBus II product BELKIN F5U409 0x0409 F5U409 Serial +product BELKIN F6C550AVR 0x0551 F6C550-AVR UPS product BELKIN F5U120 0x1203 F5U120-PC Hub product BELKIN F5D7050 0x7050 F5D7050 wireless adapter @@ -759,8 +762,12 @@ /* Chicony products */ product CHICONY KB8933 0x0001 KB-8933 keyboard +/* CMOTECH products */ +product CMOTECH CDMAMODEM 0x5141 CMOTECH CDMA Technologies USB modem + /* Compaq products */ product COMPAQ PJB100 0x504a Personal Jukebox PJB100 +product COMPAQ IPAQLINUX 0x505a iPAQ Linux /* Connectix products */ product CONNECTIX QUICKCAM 0x0001 QuickCam @@ -894,6 +901,7 @@ product EPSON 4990 0x012a Perfection 4990 Photo scanner product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner +product EPSON 4200 0x0820 CX4200 MP scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial @@ -1170,10 +1178,11 @@ product LOGITECH WMMOUSE 0xc004 WingMan Gaming Mouse product LOGITECH BD58 0xc00c BD58 mouse product LOGITECH UN58A 0xc030 iFeel Mouse -product LOGITECH BB13 0xc401 USB-PS/2 Trackball +product LOGITECH UN53B 0xc032 iFeel MouseMan product LOGITECH WMPAD 0xc208 WingMan GamePad Extreme product LOGITECH WMRPAD 0xc20a WingMan RumblePad product LOGITECH WMJOY 0xc281 WingMan Force joystick +product LOGITECH BB13 0xc401 USB-PS/2 Trackball product LOGITECH RK53 0xc501 Cordless mouse product LOGITECH RB6 0xc503 Cordless keyboard product LOGITECH MX700 0xc506 Cordless optical mouse @@ -1275,6 +1284,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 9 18:58:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A6DF16A4A7; Mon, 9 Oct 2006 18:58:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA77A16A4C9 for ; Mon, 9 Oct 2006 18:58:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFED943D53 for ; Mon, 9 Oct 2006 18:57:52 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99Ivqgn059854 for ; Mon, 9 Oct 2006 18:57:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99IvqM2059851 for perforce@freebsd.org; Mon, 9 Oct 2006 18:57:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 9 Oct 2006 18:57:52 GMT Message-Id: <200610091857.k99IvqM2059851@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 107559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 18:58:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=107559 Change 107559 by hselasky@hselasky_mini_itx on 2006/10/09 18:57:08 Prototype device methods. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.c#8 (text+ko) ==== @@ -106,6 +106,10 @@ struct mtx usb_global_lock; #endif +static device_probe_t usb_probe; +static device_attach_t usb_attach; +static device_detach_t usb_detach; + /* these variables are protected by "usb_global_lock" */ static int usb_nevents = 0; static struct selinfo usb_selevent; @@ -565,7 +569,7 @@ SYSINIT(usb_post_init, SI_SUB_PSEUDO, SI_ORDER_ANY, usb_post_init, NULL); static int -usb_detach(device_t dev, int flags) +usb_detach(device_t dev) { struct usbd_bus *bus = device_get_softc(dev); struct usb_event ue; From owner-p4-projects@FreeBSD.ORG Mon Oct 9 19:33:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82BD716A47B; Mon, 9 Oct 2006 19:33:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0919116A403 for ; Mon, 9 Oct 2006 19:33:40 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B358B43D5A for ; Mon, 9 Oct 2006 19:33:39 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99JXda4092232 for ; Mon, 9 Oct 2006 19:33:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99JXdOs092226 for perforce@freebsd.org; Mon, 9 Oct 2006 19:33:39 GMT (envelope-from millert@freebsd.org) Date: Mon, 9 Oct 2006 19:33:39 GMT Message-Id: <200610091933.k99JXdOs092226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 19:33:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=107563 Change 107563 by millert@millert_g5tower on 2006/10/09 19:32:51 Must initialize buf_len before call to sysctlbyname(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/canonicalize_context.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/check_context.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/canonicalize_context.c#3 (text+ko) ==== @@ -16,6 +16,7 @@ ssize_t con_len; int ret = -1; + buf_len = sizeof(buf); con_len = strlen(con) + 1; ret = sysctlbyname("security.mac.sebsd.canon_context", buf, &buf_len, con, con_len); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/check_context.c#3 (text+ko) ==== @@ -16,6 +16,7 @@ int ret; /* Just check validity, don't care about returned buffer. */ + buf_len = sizeof(buf); con_len = strlen(con) + 1; ret = sysctlbyname("security.mac.sebsd.canon_context", buf, &buf_len, con, con_len); From owner-p4-projects@FreeBSD.ORG Mon Oct 9 19:33:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC94716A562; Mon, 9 Oct 2006 19:33:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0D2316A52F for ; Mon, 9 Oct 2006 19:33:40 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B32043D5A for ; Mon, 9 Oct 2006 19:33:40 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99JXeae092260 for ; Mon, 9 Oct 2006 19:33:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99JXeFp092250 for perforce@freebsd.org; Mon, 9 Oct 2006 19:33:40 GMT (envelope-from millert@freebsd.org) Date: Mon, 9 Oct 2006 19:33:40 GMT Message-Id: <200610091933.k99JXeFp092250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 19:33:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=107567 Change 107567 by millert@millert_g5tower on 2006/10/09 19:33:15 Build with -DPID1_REAP_ADOPTED_CHILDREN so init will reap zombies. Fixes a problem with zombies piling up. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#2 (text+ko) ==== @@ -16,7 +16,7 @@ CODE_GEN_STYLE = DYNAMIC MAKEFILE = tool.make NEXTSTEP_INSTALLDIR = /sbin -OTHER_CFLAGS= $(DARWIN_HDRS) +OTHER_CFLAGS= $(DARWIN_HDRS) -DPID1_REAP_ADOPTED_CHILDREN LIBS = $(LIBMAC) $(LIBBSM) DEBUG_LIBS = $(LIBS) PROF_LIBS = $(LIBS) From owner-p4-projects@FreeBSD.ORG Mon Oct 9 19:34:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98B0316A415; Mon, 9 Oct 2006 19:34:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7470C16A40F for ; Mon, 9 Oct 2006 19:34:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31D0E43D45 for ; Mon, 9 Oct 2006 19:34:42 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99JYgqg093364 for ; Mon, 9 Oct 2006 19:34:42 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99JYfDD093359 for perforce@freebsd.org; Mon, 9 Oct 2006 19:34:41 GMT (envelope-from millert@freebsd.org) Date: Mon, 9 Oct 2006 19:34:41 GMT Message-Id: <200610091934.k99JYfDD093359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 19:34:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=107568 Change 107568 by millert@millert_g5tower on 2006/10/09 19:34:16 Clean up buffer freeing by doing it once at the end of process_line(). Use memory more efficiently by only allocating as much as we need for each regex/type/context tuple instead of 3 * length(buffer). While here, use strok() instead of sscanf() since it is OK to modify to line_buf. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchpathcon.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchpathcon.c#3 (text+ko) ==== @@ -48,7 +48,6 @@ static int default_canoncon(const char *path, unsigned lineno, char **context) { -#ifdef notyet char *tmpcon; if (security_canonicalize_context_raw(*context, &tmpcon) < 0) { if (errno == ENOENT) @@ -62,7 +61,6 @@ } free(*context); *context = tmpcon; -#endif return 0; } @@ -444,11 +442,13 @@ static int process_line(const char *path, const char *prefix, char *line_buf, int pass, unsigned lineno) { - int items, len, regerr; + int items, len, regerr, ret; char *buf_p; char *regex, *type, *context; const char *reg_buf; char *anchored_regex; + + ret = 0; len = strlen(line_buf); if (line_buf[len - 1] == '\n') line_buf[len - 1] = 0; @@ -458,55 +458,35 @@ /* Skip comment lines and empty lines. */ if (*buf_p == '#' || *buf_p == 0) return 0; - /* XXXSEBSD - Allocate space for regex, type, and context. We do this only to - minimize diffs with stock SELinux code which uses %as in the - sscanf() format string rather than using something reasonable like - strtok() or strsep(). We additionally just assume that no substring - of line_buf can be longer than line_buf itself for this allocation. - */ - regex = (char *)malloc(strlen(line_buf) + 1); - if (regex == NULL) - return(-1); - type = (char *)malloc(strlen(line_buf) + 1); - if (type == NULL) - { - free(regex); - return(-1); - } - - context = (char *)malloc(strlen(line_buf) + 1); - if (context == NULL) - { - free(regex); - free(type); - return(-1); - } - - items = sscanf(line_buf, "%s %s %s", regex, type, context); + regex = strtok(buf_p, " \t"); + type = strtok(NULL, " \t"); + context = strtok(NULL, " \t"); + items = !!regex + !!type + !!context; if (items < 2) { myprintf("%s: line %d is missing fields, skipping\n", path, lineno); - free(regex); - free(type); - free(context); return 0; } else if (items == 2) { /* The type field is optional. */ - free(context); context = type; - type = 0; + type = NULL; + } + + regex = strdup(regex); + if (type != NULL) + type = strdup(type); + context = strdup(context); + if (!!regex + !!type + !!context != items) { + ret = -1; + goto finish; } reg_buf = regex; len = get_stem_from_spec(reg_buf); if (len && prefix && strncmp(prefix, regex, len)) { /* Stem of regex does not match requested prefix, discard. */ - free(regex); - free(type); - free(context); - return 0; + goto finish; } if (pass == 1) { @@ -519,10 +499,8 @@ len = strlen(reg_buf); cp = anchored_regex = malloc(len + 3); if (!anchored_regex) { - free(regex); - free(type); - free(context); - return -1; + ret = -1; + goto finish; } /* Create ^...$ regexp. */ *cp++ = '^'; @@ -550,10 +528,7 @@ path, lineno, anchored_regex, (errbuf ? errbuf : "out of memory")); free(anchored_regex); - free(regex); - free(type); - free(context); - return 0; + goto finish; } free(anchored_regex); @@ -566,10 +541,7 @@ if (type[0] != '-' || len != 2) { myprintf("%s: line %d has invalid file type %s\n", path, lineno, type); - free(regex); - free(type); - free(context); - return 0; + goto finish; } switch (type[1]) { case 'b': @@ -596,10 +568,7 @@ default: myprintf("%s: line %d has invalid file type %s\n", path, lineno, type); - free(regex); - free(type); - free(context); - return 0; + goto finish; } skip_type: @@ -607,20 +576,12 @@ if (myflags & MATCHPATHCON_VALIDATE) { if (myinvalidcon) { /* Old-style validation of context. */ - if (myinvalidcon(path, lineno, context)) { - free(regex); - free(type); - free(context); - return 0; - } + if (myinvalidcon(path, lineno, context)) + goto finish; } else { /* New canonicalization of context. */ - if (mycanoncon(path, lineno, &context)) { - free(regex); - free(type); - free(context); - return 0; - } + if (mycanoncon(path, lineno, &context)) + goto finish; } spec_arr[nspec].context_valid = 1; } @@ -631,16 +592,19 @@ /* Determine if specification has * any meta characters in the RE */ spec_hasMetaChars(&spec_arr[nspec]); + + /* Prevent stored strings from being freed */ + regex = NULL; + type = NULL; + context = NULL; } nspec++; - if (pass == 0) { - free(regex); - if (type) - free(type); - free(context); - } - return 0; +finish: + free(regex); + free(type); + free(context); + return ret; } int matchpathcon_init_prefix(const char *path, const char *prefix) From owner-p4-projects@FreeBSD.ORG Mon Oct 9 19:35:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C121916A412; Mon, 9 Oct 2006 19:35:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B68A16A407 for ; Mon, 9 Oct 2006 19:35:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18CC643D58 for ; Mon, 9 Oct 2006 19:35:44 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99JZhN6094101 for ; Mon, 9 Oct 2006 19:35:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99JZhRO094092 for perforce@freebsd.org; Mon, 9 Oct 2006 19:35:43 GMT (envelope-from millert@freebsd.org) Date: Mon, 9 Oct 2006 19:35:43 GMT Message-Id: <200610091935.k99JZhRO094092@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 19:35:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=107569 Change 107569 by millert@millert_g5tower on 2006/10/09 19:34:54 Enable code that was #ifdef notyet Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/query_user_context.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list.c#3 (text+ko) ==== @@ -286,9 +286,7 @@ if (buf[plen - 1] == '\n') buf[plen - 1] = 0; -#ifdef notyet retry: -#endif nlen = strlen(user) + 1 + plen + 1; *newcon = malloc(nlen); if (!(*newcon)) @@ -300,7 +298,6 @@ return -1; } -#ifdef notyet /* If possible, check the context to catch errors early rather than waiting until the caller tries to use setexeccon on the context. @@ -315,7 +312,6 @@ } return -1; } -#endif return 0; } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/query_user_context.c#3 (text+ko) ==== @@ -72,7 +72,6 @@ return 0; } -#ifdef notyet /* get_field - given fieldstr - the "name" of a field, query the user * and set the new value of the field */ @@ -179,5 +178,3 @@ return -1; return 0; } -#endif - ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#3 (text+ko) ==== @@ -722,13 +722,10 @@ printf("Your new context is %s\n", new_context); #endif -#ifdef notyet - /* XXX - no security_check_context() in SEBSD so far */ if (security_check_context(new_context) < 0) { fprintf(stderr, _("%s is not a valid context\n"), new_context); exit(-1); } -#endif /* * ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#4 (text+ko) ==== @@ -414,7 +414,6 @@ if (policyfile) { valid = (sepol_check_context(context) >= 0); -#ifdef notyet } else if (security_canonicalize_context_raw(context, &tmpcon) < 0) { if (errno != ENOENT) { valid = 0; @@ -423,7 +422,6 @@ } else { free(context); *contextp = tmpcon; -#endif } if (!valid) { From owner-p4-projects@FreeBSD.ORG Mon Oct 9 20:44:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8251516A417; Mon, 9 Oct 2006 20:44:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 598BC16A415 for ; Mon, 9 Oct 2006 20:44:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74BBC43D77 for ; Mon, 9 Oct 2006 20:44:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99KiFZZ058303 for ; Mon, 9 Oct 2006 20:44:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99KiD8G058270 for perforce@freebsd.org; Mon, 9 Oct 2006 20:44:13 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Oct 2006 20:44:13 GMT Message-Id: <200610092044.k99KiD8G058270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 20:44:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107577 Change 107577 by jb@jb_freebsd7 on 2006/10/09 20:43:52 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#29 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#20 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#14 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#15 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/syrinx.key#1 branch .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mail/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#6 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/articles/hubs/article.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/share/sgml/authors.ent#3 integrate .. //depot/projects/dtrace/ports/KNOBS#8 integrate .. //depot/projects/dtrace/ports/MOVED#22 integrate .. //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#5 integrate .. //depot/projects/dtrace/ports/UPDATING#16 integrate .. //depot/projects/dtrace/src/Makefile.inc1#21 integrate .. //depot/projects/dtrace/src/etc/libalias.conf#3 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch .. //depot/projects/dtrace/src/lib/csu/sparc64/crt1.c#4 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/Makefile.inc#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/cuseeme/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/dummy/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/ftp/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/irc/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/nbt/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/pptp/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/skinny/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/modules/smedia/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libc/gen/tls.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/sparc64/gen/_set_tp.c#4 integrate .. //depot/projects/dtrace/src/lib/libdisk/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libkvm/Makefile#5 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm_sparc64.c#4 integrate .. //depot/projects/dtrace/src/libexec/rtld-elf/sparc64/reloc.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#14 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#9 integrate .. //depot/projects/dtrace/src/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/dtrace/src/sys/boot/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/openfirm.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/dtrace/src/sys/conf/files#33 integrate .. //depot/projects/dtrace/src/sys/conf/files.sun4v#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.c#7 integrate .. //depot/projects/dtrace/src/sys/ddb/db_examine.c#4 integrate .. //depot/projects/dtrace/src/sys/ddb/db_output.c#5 integrate .. //depot/projects/dtrace/src/sys/ddb/db_output.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_skreg.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/libalias.3#6 integrate .. //depot/projects/dtrace/src/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/asi.h#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#12 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/asi.h#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tte.h#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/t1_copy.S#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tsb.c#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#5 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#5 integrate .. //depot/projects/dtrace/src/tools/regression/execve/Makefile#3 integrate .. //depot/projects/dtrace/src/tools/regression/execve/execve.t#3 integrate .. //depot/projects/dtrace/src/usr.bin/find/find.1#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/disks.c#4 integrate .. //depot/projects/dtrace/www/en/cgi/dosendpr.cgi#4 integrate .. //depot/projects/dtrace/www/en/cgi/query-pr-summary.cgi#4 integrate .. //depot/projects/dtrace/www/en/developers.sgml#11 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#15 integrate .. //depot/projects/dtrace/www/en/search/site.map#3 integrate .. //depot/projects/dtrace/www/en/search/web.atoz#3 integrate .. //depot/projects/dtrace/www/en/where.sgml#6 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#5 integrate .. //depot/projects/dtrace/www/zh_CN/releases/6.1R/errata.html#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#10 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.248 2006/09/06 09:22:10 pav Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.249 2006/10/09 19:28:30 joel Exp $ 1999 @@ -1077,6 +1077,11 @@ + Also add your author entity to + www/en/developers.sgml. + + + Add yourself to the Developers section of the Contributors List and remove yourself from the Additional ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#29 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -1261,6 +1261,11 @@ &prompt.root; portsclean -D + Or to remove all distfiles not referenced by any port + currently installed on your system: + + &prompt.root; portsclean -DD + The portsclean utility is part of the portupgrade suite. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#14 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.399 2006/09/29 20:58:53 xride Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.400 2006/10/08 13:18:57 syrinx Exp $ --> aaron@FreeBSD.org"> @@ -906,6 +906,8 @@ swallace@FreeBSD.org"> +syrinx@FreeBSD.org"> + tackerman@FreeBSD.org"> takawata@FreeBSD.org"> ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#15 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -214,6 +214,7 @@ + ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml#4 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.14 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml,v 1.3 2006/09/15 04:29:12 delphij Exp $ + Original Revision: 1.24 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml,v 1.4 2006/10/08 16:11:54 delphij Exp $ --> - - ^- - ½ûÓöÔÓÚʧ°ÜʼþµÄÉó¼Æ¡£ + ^ ²»Éó¼Æ±¾ÀàÖеijɹ¦»òʧ°Üʼþ¡£ - ^+ - ÆôÓöÔÓڳɹ¦Ê¼þµÄÉó¼Æ¡£ + ^+ ²»Éó¼Æ±¾ÀàÖеijɹ¦Ê¼þ¡£ - ^ - ͬʱ½ûÓóɹ¦ºÍʧ°ÜʼþµÄÉó¼Æ¡£ + ^- ²»Éó¼Æ±¾ÀàÖеÄʧ°Üʼþ¡£ + + + ÏÂÃæÀý×ÓÖеÄɸѡ×Ö·û´®±íʾɸѡ³É¹¦ºÍʧ°ÜµÄµÇ¼/×¢Ïúʼþ£¬ + ¶ø¶ÔÖ´ÐÐʼþ£¬ ÔòÖ»Éó¼Æ³É¹¦µÄ£º + + lo,+ex + @@ -354,112 +385,176 @@ ¶àÊýÇé¿öÏ£¬ ÔÚÅäÖÃÉó¼Æϵͳʱ£¬ ¹ÜÀíÔ±Ö»ÐèÐÞ¸ÄÁ½¸öÎļþ£º audit_control - ºÍ audit_user¡£ µÚÒ»¸öÎļþ¿ØÖÆϵͳ¼¶µÄÉó¼Æ²ÎÊý£¬ - ÒÔ¼°ËùÓÐÓÐÖ÷»òÎÞÖ÷ʼþµÄĬÈϲÎÊý¡£ µÚ¶þ¸öÎļþÓÃÓÚµ÷ÕûÕë¶Ô¾ßÌåÓû§µÄÉó¼Æ¼¶±ðºÍÐÔÖÊ¡£ + ºÍ audit_user¡£ Ç°Õß¿ØÖÆϵͳ¼¶µÄÉó¼ÆÊôÐԺͲßÂÔ£¬ + ¶øºóÕßÔòÓÃÓÚÕë¶Ô¾ßÌåµÄÓû§À´Î¢µ÷¡£ - ´«ËµÖÐµÄ <filename>audit_control</filename> Îļþ + <filename>audit_control</filename> Îļþ - audit_control Îļþ°üº¬ÁËһЩ»ù±¾µÄĬÈÏÖµ£¬ - ¹ÜÀíԱͨ³£»áÏ£Íû¼ÓÒÔÐ޸ģ¬ ÓÐʱÉõÖÁÊÇÉèÖÃһЩеÄÅäÖᣠ- ²ì¿´Õâ¸öÎļþµÄÄÚÈÝ£¬ ÎÒÃǻᷢÏÖ£º + audit_control ÎļþÖ¸¶¨ÁËһϵÁÐÓÃÓÚÉó¼Æ×ÓϵͳµÄĬÈÏÉèÖᣠ+ ͨ¹ý²é¿´Õâ¸öÎļþ£¬ ÎÒÃÇ¿ÉÒÔ¿´µ½ÏÂÃæµÄÄÚÈÝ£º dir:/var/audit flags:lo minfree:20 -naflags:lo +naflags:lo +policy:cnt +filesz:0 - ÕâÀïµÄ ÓÃÓÚÉèÖÃÉó¼ÆÈÕÖ¾µÄĬÈÏ´æ·ÅĿ¼¡£ + ÕâÀïµÄ Ñ¡Ïî¿ÉÒÔÓÃÀ´ÉèÖÃÓÃÓÚ±£´æÉó¼ÆÈÕÖ¾µÄÒ»¸ö»ò¶à¸öĿ¼¡£ + Èç¹ûÖ¸¶¨Á˶à¸öĿ¼£¬ Ôò½«ÔÚÌîÂúÒ»¸öÖ®ºó»»ÓÃÏÂÒ»¸ö¡£ Ò»°ã¶øÑÔ£¬ Éó¼Æͨ³£¶¼»áÅäÖÃΪ±£´æÔÚÒ»¸öרÓõÄÎļþϵͳ֮Ï£¬ ÒÔ±ÜÃâÉó¼ÆϵͳÓëÆäËü×ÓϵͳÔÚÎļþϵͳÂúµÄʱºòËù²úÉúµÄ³åÍ»¡£ - Ñ¡ÏîÔòÓÃÀ´ÉèÖÃϵͳ¼¶µÄĬÈÏ¡£ - Ä¿Ç°µÄÉèÖ㬠¼´ - ÅäÖÃÉó¼ÆËùÓÐµÄ &man.login.1; ºÍ &man.logout.1; - ¶¯×÷¡£ ¶ø¸üΪ¸´ÔÓµÄÀý×Ó£¬ - ±íʾÉó¼ÆËùÓеÄϵͳ - &man.login.1; ºÍ &man.logout.1; ¶¯×÷¡¢ ËùÓйÜÀí¶¯×÷£¬ - ÒÔ¼°ËùÓÐϵͳÖÐʧ°ÜµÄ¶¯×÷£¬ µ«×îºó½ûÓÃ¶Ô ¡¢ - £¬ ÒÔ¼° µÄʧ°Ü³£ÊÇ¡£ - ¾¡¹Ü »á´ò¿ªËùÓÐʼþµÄʧ°Ü³£ÊÇ£¬ - µ«Ö®ºóµÄÑ¡ÏîÖÐµÄ Ç°×ºÔò»á¸Ä±äÏàÓ¦µÄÉèÖᣠ+ ×Ö¶ÎÓÃÓÚΪÓÐÖ÷ʼþÅäÖÃϵͳ¼¶µÄԤѡÌõ¼þ¡£ + ÔÚÇ°ÃæµÄÀý×ÓÖУ¬ ËùÓÐÓû§³É¹¦ºÍʧ°ÜµÄµÇ¼ºÍ×¢Ïú¶¼»á±»Éó¼Æ¡£ + + ²ÎÊýÓÃÓÚ¶¨Òå±£´æÉó¼ÆÈÕÖ¾µÄÎļþϵͳÉÏÊ£Óà¿Õ¼äµÄ×îС°Ù·Ö±È¡£ + µ±³¬¹ýÕâÒ»ãÐֵʱ£¬ ½«²úÉúÒ»¸ö¾¯¸æ¡£ Ç°ÃæµÄÀý×ÓÖУ¬ ×îСʣÓà¿Õ¼ä±ÈÀýÉèÖóÉÁËÁ½³É¡£ - Çë×¢ÒâÇ°Ò»½ÚҲ˵Ã÷ÁËÅäÖÃÊÇ´Ó×óµ½ÓÒ¶ÁÈ¡µÄ¡£ ͬÑùµØ£¬ - ½ÏΪ¿¿ÓÒµÄÖµ¿ÉÒÔÌæ´ú¿¿×óµÄÖµËùÉ趨µÄĬÈÏ¡£ + Ñ¡Ïî±íʾÉó¼ÆÀàÉó¼ÆÎÞÖ÷ʼþ£¬ + ÀýÈç×÷ΪµÇ¼½ø³ÌºÍϵͳ·þÎñµÄÄÇЩ½ø³ÌµÄʼþ¡£ - ²ÎÊý¶¨ÒåÁËÓÃÓÚÉó¼ÆµÄÎļþϵͳÉÏ£¬ - Ê£Óà¿Õ¼äµÄ×îСֵ¡£ ÕâÒ»°Ù·Ö±ÈÖµÊÇÏà¶ÔÓÚ±£´æÉó¼ÆÈÕÖ¾µÄÎļþϵͳÀ´¼ÆËãµÄ¡£ - ÀýÈ磬 Èç¹û Ö¸¶¨ÁË - /var/audit ¶ø - ÉèΪÁ½³É (20)£¬ Ôòµ± - /var ÎļþϵͳÓÐ°Ë³É - (80) ¿Õ¼ä±»ÌîÂúʱ½«»á¸ø³ö¾¯¸æÏûÏ¢¡£ + Ñ¡ÏîÓÃÓÚÖ¸¶¨Ò»¸öÒÔ¶ººÅ·Ö¸ôµÄ²ßÂÔ±êÖ¾±í£¬ + ÒÔ¿ØÖÆһϵÁÐÉó¼ÆÐÐΪ¡£ ĬÈ쵀 cnt ±êÖ¾±íʾϵͳӦÔÚÉó¼Æʧ°Üʱ¼ÌÐøÔËÐÐ + (Ç¿ÁÒ½¨ÒéʹÓÃÕâ¸ö±êÖ¾)¡£ ÁíÒ»¸ö³£ÓõıêÖ¾ÊÇ + argv£¬ Ëü±íʾÔÚÉó¼ÆÃüÁîÖ´ÐвÙ×÷ʱ£¬ + ͬʱÉó¼Æ´«¸ø &man.execve.2; ϵͳµ÷ÓõÄÃüÁîÐвÎÊý¡£ - ²ÎÊýÓÃÓÚÖ¸¶¨ÎÞÖ÷ʼþ — - Ò²¾ÍÊÇÄÇЩ²¢²»ÓëÌض¨Óû§¹ØÁªµÄʼþµÄÉó¼Æ¡£ - + Ñ¡ÏîÖ¸Ã÷ÁËÉó¼ÆÈÕÖ¾ÔÚ×Ô¶¯Í£Ö¹¼Ç¼ºÍ·­×ªÖ®Ç°ÔÊÐíµÄ×î´ó³ß´ç¡£ + ĬÈÏÖµ 0 ±íʾ½ûÓÃ×Ô¶¯ÈÕÖ¾·­×ª¡£ Èç¹ûÅäÖõÄÖµ²»ÊÇÁ㣬 µ«Ð¡ÓÚ×îСֵ 512k£¬ + ÔòÕâ¸öÅäÖûᱻºöÂÔ£¬ ²¢ÔÚÈÕÖ¾ÖмǼÕâÒ»ÏûÏ¢¡£ <filename>audit_user</filename> Îļþ - audit_user ÎļþÔÊÐí¹ÜÀíÔ±¾ö¶¨ÄÄЩϵͳÓû§Ëù²úÉúµÄÄÄЩÀàµÄʼþÓ¦±»¼Ç¼ÔÚ°¸¡£ + audit_user ÎļþÔÊÐí¹ÜÀíԱΪÌض¨Óû§Ö¸¶¨½øÒ»²½µÄÉó¼ÆÐèÇó¡£ + ÿһÐÐʹÓÃÁ½¸ö×Ö¶ÎÀ´ÅäÖÃÓû§µÄÉó¼Æ£º + µÚÒ»¸öÊÇ alwaysaudit ×ֶΣ¬ ËüÖ¸Ã÷ÁËÒ»×é¶Ô¸ÃÓû§×Ü»á½øÐÐÉó¼ÆµÄʼþ£» + ¶øµÚ¶þ¸öÔòÊÇ neveraudit ×ֶΣ¬ + ËüÖ¸Ã÷ÁËһϵÁжԸÃÓû§²»Éó¼ÆµÄʼþ¡£ - ÏÂÃæÊÇ audit_user ÎļþÖеÄһЩĬÈÏÖµ£º + ÔÚÏÂÊö audit_user ʾÀýÎļþÖУ¬ + Éó¼ÆÁË root Óû§µÄ µÇ¼/×¢Ïú ʼþ£¬ ÒÔ¼°³É¹¦µÄÃüÁîÖ´ÐÐʼþ£¬ + ´ËÍ⣬ »¹Éó¼ÆÁË www Óû§µÄÎļþ´´½¨ºÍ³É¹¦µÄÃüÁîÖ´ÐÐʼþ¡£ + Èç¹ûÓëÇ°ÃæµÄʾ·¶ audit_control ÎļþÅäºÏʹÓ㬠+ Ôò root µÄ lo Ïî¾ÍÊǶàÓàµÄ£¬ ¶ø¶Ô + www Óû§¶øÑÔ£¬ ÆäµÇ¼/×¢ÏúʼþÒ²»á±»Éó¼Æ£º - root:lo:no -audit:fc:no + root:lo,+ex:no +www:fc,+ex:no - ×¢ÒâĬÈÏÖµ½«Éó¼ÆËùÓÐµÄ - login/logout - ʼþ£¬ ¶ø½ûÖ¹Éó¼ÆËùÓÐÆäËûÓÉ - root Íê³ÉµÄ¶¯×÷¡£ - ÕâÒ»ÅäÖÃÒ²»áÉó¼ÆËùÓÐÎļþ´´½¨²Ù×÷£¬ - ²¢½ûÖ¹ËùÓÐÆäËûÓÉ audit - Óû§Íê³ÉµÄ²Ù×÷¡£ ¾¡¹ÜʼþÉó¼Æ²¢²»ÒÀÀµÌØÊâµÄÓû§²ÅÄÜÕý³£¹¤×÷£¬ - ijЩÅäÖ㬠ÌرðÊÇʹÓÃÁË MAC µÄ»·¾³ÖУ¬ - È´¿ÉÄÜÐèÒªÕâ¸öÓû§´æÔÚ¡£ - ¹ÜÀíʼþÉó¼Æ + ¹ÜÀíÉó¼Æ×Óϵͳ + + + ²é¿´Éó¼ÆÈÕÖ¾ + + Éó¼Æ¼ÇÕÊÊÇÒÔ BSM ¶þ½øÖƸñʽ±£´æµÄ£¬ Òò´Ë±ØÐëʹÓù¤¾ßÀ´¶ÔÆä½øÐÐÐ޸ģ¬ + »ò½«Æäת»»ÎªÎı¾¡£ praudit + ÃüÁîÄܹ»½«¼ÇÕÊÎļþת»»Îª¼òµ¥µÄÎı¾¸ñʽ£» ¶ø + auditreduce ÃüÁîÔò¿ÉÒÔΪ·ÖÎö¡¢ ´æµµ»ò´òÓ¡Ä¿µÄÀ´Å¨ËõÉó¼ÆÈÕÖ¾Îļþ¡£ + auditreduce Ö§³ÖһϵÁÐɸѡ²ÎÊý£¬ °üÀ¨Ê¼þÀàÐÍ¡¢ ʼþÀà¡¢ + Óû§¡¢ ʼþµÄÈÕÆÚºÍʱ¼ä£¬ ÒÔ¼°Îļþ·¾¶»ò²Ù×÷¶ÔÏó¡£ + + ÀýÈ磬 praudit ¹¤¾ß»á½«Ö¸¶¨µÄÉó¼Æ¼ÇÕÊת´æΪ¼òµ¥Îı¾¸ñʽµÄÉó¼ÆÈÕÖ¾£º + + &prompt.root; praudit /var/audit/AUDITFILE + + ´Ë´¦ AUDITFILE ÊÇҪת´æµÄÉó¼ÆÈÕÖ¾Îļþ¡£ + + Éó¼Æ¼ÇÕÊÖаüÀ¨Ò»ÏµÁÐÉó¼Æ¼Ç¼£¬ ÕâЩ¼Ç¼ÓÉһϵÁжÌÓï (token) ×é³É£¬ + ¶ø praudit ÄÜ°ÑËüÃÇ˳ÐòÏÔʾΪһÐС£ + ÿ¸ö¶ÌÓﶼÊôÓÚij¸öÌض¨µÄÀàÐÍ£¬ ÀýÈç + header ±íʾÉó¼Æ¼Ç¼ͷ£¬ ¶ø + path Ôò±íʾÔÚÒ»´ÎÃû×Ö²éÕÒÖеÄÎļþ·¾¶¡£ ÏÂÃæÊÇÒ»¸ö + execve ʼþµÄÀý×Ó£º + + header,133,10,execve(2),0,Mon Sep 25 15:58:03 2006, + 384 msec +exec arg,finger,doug +path,/usr/bin/finger +attribute,555,root,wheel,90,24918,104944 +subject,robert,root,wheel,root,wheel,38439,38032,42086,128.232.9.100 +return,success,0 +trailer,133 - ÓÉÄÚºËÉó¼Æ×Óϵͳд³öµÄʼþ£¬ ²¢²»ÄÜÒÔÆÕͨÎı¾µÄÐÎʽ¼ÓÒÔÐ޸ĻòÔĶÁ¡£ - ÕâЩÊý¾ÝÒÔÀàËÆ &man.ktrace.1; ºÍ &man.kdump.1; ÄÇÑùµÄ·½Ê½À´´æ´¢ºÍ·ÃÎÊ£¬ - Ò²¾ÍÊÇ˵£¬ Ö»ÄÜͨ¹ýʹÓà - praudit ÃüÁîÖ´ÐÐת´æ²Ù×÷²ÅÄܲ쿴ËüÃÇ£» - Éó¼ÆÕËÄ¿¿ÉÒÔͨ¹ý auditreduce ÃüÁîÀ´¼õÉÙ£¬ - ËüÄܹ»¸ù¾ÝÄú¸ÐÐËȤµÄÊôÐÔ£¬ ÀýÈçÓû§¡¢ ʼþ·¢ÉúµÄʱ¼ä£¬ - ÒÔ¼°²Ù×÷ÀàÐÍÀ´Ñ¡Ôñ²éѯ¼Ç¼¡£ + Õâ¸öÉó¼Æ¼Ç¼±íʾһ´Î³É¹¦µÄ execve + µ÷Ó㬠ִÐÐÁË "finger doug"¡£ ÔÚ²ÎÊý¶ÌÓïÖÐÊÇÓÉ shell Ìá½»¸øÄں˵ÄÃüÁîÐС£ + path ¶ÌÓï°üº¬ÁËÓÉÄں˲éÕҵõ½µÄ¿ÉÖ´ÐÐÎļþ·¾¶¡£ ÊôÐÔ¶ÌÓïÖаüº¬Á˶ԿÉÖ´ÐÐÎļþµÄÃèÊö£¬ + ÌرðµØ£¬ Ëü°üÀ¨ÁËÎļþµÄȨÏÞģʽ£¬ ÓÃÒÔÈ·¶¨Ó¦ÓóÌÐòÊÇ·ñÊÇ setuid µÄ¡£ + Ö÷Ìå¶ÌÓïÃèÊöÁËÖ÷Ìå½ø³Ì£¬ ²¢Ë³Ðò¼Ç¼ÁËÉó¼ÆÓû§ ID¡¢ ÉúЧÓû§ ID ºÍ×é ID¡¢ + ʵ¼ÊÓû§ ID ºÍ×é ID¡¢ ½ø³Ì ID¡¢ »á»° ID¡¢ ¶Ë¿Ú ID£¬ ÒÔ¼°µÇ¼µØÖ·¡£ + ×¢ÒâÉó¼ÆÓû§ ID ºÍʵ¼ÊÓû§ ID ÊDz»Í¬µÄ£º + Óû§ robert ÔÚÖ´ÐÐÕâ¸öÃüÁî֮ǰÒѾ­Çл»Îª + root ÕÊ»§£¬ µ«Ëü»áÒÔ×î³õ½øÐÐÉí·ÝÑéÖ¤µÄÓû§Éí·Ý½øÐÐÉó¼Æ¡£ + ×îºó£¬ ·µ»ØÖµ¶ÌÓï±íʾִÐгɹ¦£¬ ²¢ÖÕ½áÕâÒ»¼Ç¼¡£ - ÀýÈ磬 praudit Äܹ»½«Ñ¡¶¨Éó¼ÆÈÕÖ¾µÄÍêÕûÄÚÈÝ£¬ - ת´æΪÆÕͨµÄÎı¾Îļþ¡£ Òª½«Õû¸öÉó¼ÆÈÕ־ת´æ£¬ ¿ÉʹÓ㺠+ - &prompt.root; praudit /var/audit/AUDITFILE + + ŨËõÉó¼Æ¼ÇÕÊ - ÕâÀï AUDITFILE ÊÇÏ£Íû²é¿´µÄÉó¼ÆÈÕÖ¾¡£ - ÓÉÓÚÉó¼ÆÈÕÖ¾¿ÉÄÜ°üº¬´óÁ¿µÄÊý¾Ý£¬ - ¹ÜÀíÔ±¿ÉÄܸüÏ£ÍûÑ¡ÔñijһÌض¨Óû§µÄÏà¹Øʼþ¡£ - Òª´ïµ½Õâ¸öÄ¿µÄ£¬ ¿ÉÒÔʹÓÃÏÂÃæµÄÃüÁ - ÕâÀïÎÒÃÇÑ¡ÔñµÄÓû§ÊÇ trhodes£º + ÓÉÓÚÉó¼ÆÈÕÖ¾¿ÉÄÜ»áºÜ´ó£¬ ¹ÜÀíÔ±¿ÉÄÜ»áÏ£ÍûÑ¡Ôñ¼Ç¼µÄÒ»¸ö×Ó¼¯À´Ê¹Ó㬠+ ÀýÈçÓëÌض¨Óû§Ïà¹ØµÄ¼Ç¼£º - &prompt.root; auditreduce -e trhodes /var/audit/AUDITFILE | praudit + &prompt.root; auditreduce -u trhodes /var/audit/AUDITFILE | praudit Õ⽫ѡÔñ±£´æÔÚ AUDITFILE ÖеÄËùÓÐÓÉ trhodes ²úÉúµÄÉó¼ÆÈÕÖ¾¡£ + + + + ίÅÉÉó¼Æ¸´ÉóȨÏÞ + + ÔÚ audit ×éÖеÄÓû§£¬ + ÓµÓжÁÈ¡ /var/audit ϵÄÉó¼Æ¼ÇÕʵÄȨÏÞ£» + ĬÈÏÇé¿öÏ£¬ Õâ¸ö×éÊǿյģ¬ Òò´ËÖ»ÓÐ root Óû§¿ÉÒÔ¶ÁÈ¡Éó¼Æ¼ÇÕÊ¡£ + Èç¹ûÏ£Íû¸øij¸öÓû§Ö¸¶¨Éó¼Æ¸´ÉóȨ£¬ Ôò¿ÉÒÔ½«Æä¼ÓÈë audit¡£ + ÓÉÓڲ鿴Éó¼ÆÈÕÖ¾µÄÄÚÈÝ¿ÉÒÔÌṩ¹ØÓÚÓû§ºÍ½ø³ÌÐÐΪµÄ´óÁ¿Éî¶ÈÐÅÏ¢£¬ + ÔÚÄúίÅÉÕâЩȨÁ¦Ê±£¬ ÇëÎñ±Ø½÷É÷ÐÐÊ¡£ + - »¹ÓÐÐí¶àÆäËûÑ¡Ïî¿ÉÒÔÔÚÔĶÁÉó¼Æ¼Ç¼ʱʹÓᣠÇë²Î¼ûÇ°ÊöÃüÁîµÄÁª»úÊé²á£¬ - ÒÔ»ñµÃ½øÒ»²½µÄ½âÊÍ¡£ + + ͨ¹ýÉó¼Æ¹ÜµÀÀ´ÊµÊ±¼à¿Ø + + Éó¼Æ¹ÜµÀÊÇλÓÚÉ豸ÎļþϵͳÖеÄ×Ô¶¯¸´ÖÆ (cloning) µÄÐéÄâÉ豸£¬ + ÓÃÓÚÈÃÓ¦ÓóÌÐò¿ØÖÆÕýÔÚÔËÐеÄÉó¼Æ¼Ç¼Á÷£¬ ÕâÖ÷ÒªÊÇΪÁËÂú×ãÈëÇÖ¼ì²âºÍϵͳ¼à¿ØÈí¼þ×÷ÕßµÄÐèÒª¡£ + ²»¹ý£¬ ¶Ô¹ÜÀíÔ±¶øÑÔ£¬ Éó¼Æ¹ÜµÀÉ豸ҲÌṩÁËÒ»ÖÖÎÞÐèðÉó¼Æ¼ÇÕÊÎļþÊôÖ÷³öÏÖÎÊÌâµÄÂé·³£¬ + »òÓÉÓÚÈÕÖ¾·­×ª¶ø´ò¶ÏʼþÁ÷µÄÂé·³£¬ ¶øʵÏÖʵʱ¼à¿ØµÄ·½±ã;¾¶¡£ Òª¸ú×ÙʵʱʼþÁ÷£¬ + ʹÓÃÏÂÃæµÄÃüÁîÐУº + + &prompt.root; praudit /dev/auditpipe + + ĬÈÏÇé¿öÏ£¬ Éó¼Æ¹ÜµÀÉ豸½ÚµãÖ»ÓÐ root Óû§²ÅÄÜ·ÃÎÊ¡£ Èç¹ûÏ£Íû + audit ×éµÄ³ÉÔ±Äܹ»·ÃÎÊËü£¬ Ó¦ÔÚ devfs.rules + ÖмÓÈëÏÂÊö devfs ¹æÔò£º + + add path 'auditpipe*' mode 0440 group audit + + Çë²Î¼û &man.devfs.rules.5; ÒÔÁ˽â¹ØÓÚÅäÖà devfs ÎļþϵͳµÄ½øÒ»²½ÐÅÏ¢¡£ + + + ºÜÈÝÒ×ÅäÖóöÉó¼Æʼþ·´À¡Ñ­»·£¬ Ò²¾ÍÊDz鿴ʼþµÄ²Ù×÷±¾Éí»á²úÉú¸ü¶àµÄʼþ¡£ + ÀýÈ磬 Èç¹ûËùÓеÄÍøÂç I/O ¾ù±»Éó¼Æ£¬ ÓÖÔÚ SSH »á»°ÖÐÖ´ÐÐ + praudit£¬ ¾Í»áÒԺܸߵÄËÙÂʲúÉú³ÖÐøµÄÉó¼ÆʼþÁ÷£¬ + ÒòΪÿÏÔʾһ¸öʼþ¶¼»á²úÉúеÄʼþ¡£ ½¨ÒéÄúÔÚÐèÒªÔÚÉó¼Æ¹ÜµÀÉ豸ÉÏÖ´ÐÐ + praudit ʱ£¬ Ñ¡ÔñÒ»¸öûÓнøÐÐϸÁ£¶È + I/O Éó¼ÆµÄ»á»°À´ÔËÐС£ + + - Éó¼ÆÈÕÖ¾ÎļþµÄÂÖת + Éó¼Æ¼ÇÕÊÎļþµÄÂÖת - ÓÉÓÚÈÕÖ¾¿É¿¿ÐÔµÄÒªÇó£¬ Éó¼Æ¼ÆÕËÖ»ÓÉÄÚºËдÈ룬 ÇÒÖ»ÄÜÓÉ + Éó¼Æ¼ÆÕËÖ»ÓÉÄÚºËдÈ룬 ÇÒÖ»ÄÜÓÉ auditd ¹ÜÀí¡£ ¹ÜÀíÔ±²»Ó¦³¢ÊÔʹÓà &man.newsyslog.conf.5; - »òÆäËü¹¤¾ßÀ´Íê³ÉÉó¼ÆÈÕÖ¾µÄÂÖת¹¤×÷¡£ ÄúӦʹÓà audit + »òÆäËü¹¤¾ßÀ´Íê³ÉÉó¼ÆÈÕÖ¾µÄÂÖת¹¤×÷¡£ Äú¿ÉÒÔʹÓà audit ¹ÜÀí¹¤¾ßÀ´¹Ø±ÕÉó¼Æ¡¢ ÖØÐÂÅäÖÃÉó¼Æϵͳ£¬ ²¢Íê³ÉÈÕÖ¾ÂÖת¡£ ÏÂÃæµÄÃüÁÈÃÉó¼Æ·þÎñ´´½¨ÐµÄÉó¼ÆÈÕÖ¾£¬ ²¢·¢ÐźŸøÄÚºËÒªÇóÆäʹÓÃеÄÈÕÖ¾¡£ ¾ÉÈÕÖ¾½«ÖÕÖ¹²¢±»¸ÄÃû£¬ @@ -469,7 +564,7 @@ Èç¹û auditd ·þÎñ³ÌÐòûÓÐÔÚÔËÐУ¬ - ÔòÇ°ÊöÃüÁʧ°Ü²¢¸ø³ö´íÎóÌáʾ¡£ + ÔòÕâ¸öÃüÁʧ°Ü²¢¸ø³ö´íÎóÌáʾ¡£ ÔÚ /etc/crontab ¼ÓÈëÈçÏÂÉèÖ㬠@@ -478,17 +573,30 @@ * */12 * * * root /usr/sbin/audit -n ÕâЩÐ޸ĻáÔÚÄú±£´æ /etc/crontab ºóÉúЧ¡£ + + ¶ÔÓÚÉó¼Æ¼ÇÕÊÎļþ»ùÓڳߴçµÄ×Ô¶¯·­×ª£¬ ¿ÉÒÔͨ¹ý + &man.audit.control.5; ÖÐµÄ Ñ¡ÏîÀ´ÅäÖ㬠+ Õâ¸öÑ¡ÏîÔÚÕâÒ»ÕµÄÅäÖÃÎļþÒ»½ÚÖÐÒѾ­½éÉܹý¡£ - ΪÆäËüÓû§Ö¸ÅÉÉó¼Æ¸´ÉóȨÏÞ + ѹËõÉó¼Æ¼ÇÕÊ + + ÓÉÓÚÉó¼Æ¼ÇÕÊÎļþ»á±äµÃºÜ´ó£¬ ͨ³£»áÏ£ÍûÔÚÉó¼Æ·þÎñ¹Ø±ÕËüʱ£¬ + ¶ÔÆä½øÐÐѹËõ»ò¹éµµ¡£ audit_warn ½Å±¾¿ÉÒÔÓÃÀ´ÔÚһϵÁÐÓëÉó¼ÆÓйصÄʼþ·¢Éúʱ£¬ + Ö´ÐÐһЩÓû§¶¨ÒåµÄ²Ù×÷£¬ ÕâÒ²°üÀ¨ÔÚÉó¼Æ¼ÇÕÊ·­×ªÊ±½øÐÐÇåÀí²Ù×÷¡£ ¾ÙÀý¶øÑÔ£¬ ¿ÉÒÔÔÚ + audit_warn ½Å±¾ÖмÓÈëÏÂÁÐÄÚÈÝÀ´ÔÚÉó¼Æ¼ÇÕʹرÕʱѹËõËü£º + + # +# Compress audit trail files on close. +# +if [ "$1" = closefile ]; then + gzip -9 $2 +fi - ĬÈÏÇé¿öÏ£¬ Ö»ÓÐ root Óû§ÓµÓжÁȡϵͳÉó¼ÆÈÕÖ¾µÄȨÏÞ¡£ - µ«ÄúÒ²¿ÉÒÔ½«ÕâÖÖȨÏÞͨ¹ý - audit ×éµÄ³ÉÔ±Éí·ÝÀ´Ö¸¶¨¸øÆäËüÓû§£¬ - ÒòΪÉó¼ÆĿ¼ºÍ¼ÇÕËÎļþ¶¼ÊÇÊôÓÚÕâ¸ö×éµÄ£¬ ¶øÇÒÊÇͬ×é¿É¶ÁµÄ¡£ - ÓÉÓÚÔĶÁÉó¼ÆÈÕÖ¾µÄÄÚÈÝ»áÌṩ¹ØÓÚÓû§ºÍ½ø³ÌµÄ´óÁ¿ÐÐΪÐÅÏ¢£¬ - Ç¿ÁÒ½¨ÒéÔÚÖ¸ÅÉÕâһȨÏÞʱ½÷É÷ÐÐÊ¡£ + ÆäËü´æµµ²Ù×÷Ò²°üÀ¨½«Éó¼Æ¼ÇÕʸ´ÖƵ½Ò»¸öÖÐÑëµÄ·þÎñÆ÷£¬ ɾ³ý¾ÉµÄ¼ÇÕÊÎļþ£¬ + »òŨËõÉó¼Æ¼ÇÕʲ¢É¾³ý²»ÐèÒªµÄ¼Ç¼µÈ¡£ Õâ¸ö½Å±¾»áÔÚÉó¼Æ¼ÇÕÊÎļþÕý³£¹Ø±ÕʱִÐÐÒ»´Î£¬ + Òò´ËÔÚ·ÇÕý³£¹Ø±Õϵͳʱ£¬ ¾Í²»»áÖ´ÐÐËüÁË¡£ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml#4 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.177 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml,v 1.5 2006/07/08 13:01:34 delphij Exp $ + Original Revision: 1.178 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/eresources/chapter.sgml,v 1.6 2006/10/08 16:13:05 delphij Exp $ --> @@ -1372,6 +1372,11 @@ it.comp.os.freebsd (Òâ´óÀûÓï) + + + tw.bbs.comp.386bsd (·±ÌåÖÐÎÄ) + ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#7 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Simplified Chinese Project Original Revision: 1.72 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.7 2006/08/26 13:45:54 delphij Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml,v 1.9 2006/10/08 16:16:16 delphij Exp $ --> @@ -347,7 +347,7 @@ Packet Filter »á´Ó &man.pf.conf.5; ÎļþÖжÁÈ¡ÅäÖùæÔò£¬ ²¢¸ù¾ÝÄÇÀïµÄ¹æÔòÐ޸ġ¢ ¶ªÆú»òÈÃÊý¾Ý°üͨ¹ý¡£ ĬÈÏ°²×°µÄ &os; - ÒѾ­ÌṩÁËÒ»¸ñĬÈϵġ¢ °üº¬Ò»Ð©ÓÐÓÃÀý×ÓºÍ×¢Ê굀 + ÒѾ­ÌṩÁËÒ»¸öĬÈϵġ¢ °üº¬Ò»Ð©ÓÐÓÃÀý×ÓºÍ×¢Ê굀 /etc/pf.conf¡£ ¾¡¹Ü &os; ÌṩÁË×Ô¼ºµÄ /etc/pf.conf£¬ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml#5 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.114 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml,v 1.7 2006/07/08 13:01:34 delphij Exp $ + Original Revision: 1.116 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml,v 1.8 2006/10/08 16:20:40 delphij Exp $ --> @@ -557,15 +557,15 @@ ÕâÊǽ«½üÈýÄêµÄ¿ª·¢µÄáÛ·åÖ®×÷£¬ ͬʱҲ±êÖ¾ÁË FreeBSD ÔÚÏȽøµÄ¶à´¦ÀíÆ÷ºÍÓ¦ÓóÌÐòÏß³ÌÖ§³ÖµÄ¾Þ´ó³É¾Í£¬ ²¢ÒýÈëÁ˶ÔÓÚ &ultrasparc; ºÍ ia64 ƽ̨µÄÖ§³Ö¡£ - Ö®ºóÓÚ 2003 Äê 6 Ô·¢²¼ÁË 5.1¡£ ×îºóÒ»¸ö + Ö®ºóÓÚ 2003 Äê 6 Ô·¢²¼ÁË 5.1¡£ ×îºóÒ»¸ö´Ó -CURRENT ·ÖÖ§µÄ 5.X °æ±¾ÊÇ 5.2.1-RELEASE£¬ ËüÔÚ 2004 Äê 2 ÔÂÕýʽ·¢²¼¡£ - RELENG_5 ÓÚ 2004 Äê 8 ÔÂÕýʽ´´½¨£¬ ÆäºóÊÇ 5.3-RELEASE£¬ + RELENG_5 ÓÚ 2004 Äê 8 ÔÂÕýʽ´´½¨£¬ ½ôËæÆäºóµÄÊÇ 5.3-RELEASE£¬ ËüÊÇ 5-STABLE ·ÖÖ§µÄ±êÖ¾ÐÔ·¢Ðа档 ×îÐ嵀 &rel2.current;-RELEASE - ÊÇÔÚ &rel2.current.date; ·¢²¼µÄ£¬ RELENG_5 ·ÖÖ§»¹½«ÓкóÐøµÄ·¢Ðа档 + ÊÇÔÚ &rel2.current.date; ·¢²¼µÄ¡£ RELENG_5 ·ÖÖ§²»»áÓкóÐøµÄ·¢ÐаæÁË¡£ - ÆäºóÔÚ 2005 Äê 7 Ô½¨Á¢ÁË RELENG_6 ·ÖÖ§¡£ 6.X ·ÖÖ§ÉϵĵÚÒ»¸ö°æ±¾£¬ + ÆäºóÔÚ 2005 Äê 7 ÔÂÓÖ½¨Á¢ÁË RELENG_6 ·ÖÖ§¡£ ¶ø 6.X ·ÖÖ§ÉϵĵÚÒ»¸ö°æ±¾£¬ ¼´ 6.0-RELEASE£¬ ÔòÊÇÔÚ 2005 Äê 11 Ô·¢²¼µÄ¡£ ×îÐ嵀 &rel.current;-RELEASE ·¢²¼ÓÚ &rel.current.date;¡£ ÎÒÃÇ»¹½«¼ÌÐø´Ó RELENG_6 ·¢²¼Ðµİ汾¡£ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#7 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Simplified Chinese Project Original Revision: 1.68 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml,v 1.7 2006/08/14 02:26:10 delphij Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml,v 1.8 2006/10/08 16:22:59 delphij Exp $ --> @@ -17,31 +17,31 @@ - ¼¯È¨Ê½·ÃÎÊ¿ØÖÆ + Ç¿ÖÆ·ÃÎÊ¿ØÖÆ ¸ÅÒª MAC - ¼¯È¨Ê½·ÃÎÊ¿ØÖÆ + Ç¿ÖÆ·ÃÎÊ¿ØÖÆ MAC &os; 5.X ÔÚ &posix;.1e ²Ý°¸µÄ»ù´¡ÉÏÒýÈëÁË TrustedBSD ÏîÄ¿ÌṩµÄÐµİ²È«ÐÔÀ©Õ¹¡£ а²È«»úÖÆÖÐ×îÖØÒªµÄÁ½¸ö£¬ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 9 21:02:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D17A16A525; Mon, 9 Oct 2006 21:02:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52C9E16A4A7 for ; Mon, 9 Oct 2006 21:02:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63D1F43D66 for ; Mon, 9 Oct 2006 21:01:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99L1bHC081199 for ; Mon, 9 Oct 2006 21:01:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99L1bJ8081192 for perforce@freebsd.org; Mon, 9 Oct 2006 21:01:37 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Oct 2006 21:01:37 GMT Message-Id: <200610092101.k99L1bJ8081192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 21:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107579 Change 107579 by jb@jb_freebsd7 on 2006/10/09 21:01:27 Remove the CTF option because it really needs to be left as NO_CTF rather than WITH/WITHOUT_CTF. To do the latter would require this mk file to be included in _every_ Makefile or sys.mk would break. Affected files ... .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#9 edit Differences ... ==== //depot/projects/dtrace/src/share/mk/bsd.own.mk#9 (text+ko) ==== @@ -298,7 +298,6 @@ CDDL \ CPP \ CRYPT \ - CTF \ CVS \ CXX \ DICT \ @@ -434,7 +433,6 @@ # .for var in \ CDDL \ - CTF \ GNU \ INET6 \ IPX \ From owner-p4-projects@FreeBSD.ORG Mon Oct 9 21:11:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3742216A412; Mon, 9 Oct 2006 21:11:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D385D16A407 for ; Mon, 9 Oct 2006 21:11:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C1A943D45 for ; Mon, 9 Oct 2006 21:11:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99LBowr092244 for ; Mon, 9 Oct 2006 21:11:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99LBoja092238 for perforce@freebsd.org; Mon, 9 Oct 2006 21:11:50 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Oct 2006 21:11:50 GMT Message-Id: <200610092111.k99LBoja092238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 21:11:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=107580 Change 107580 by jb@jb_freebsd7 on 2006/10/09 21:11:19 Reset this file to match current. Affected files ... .. //depot/projects/dtrace/src/lib/libc_r/Makefile#7 edit Differences ... ==== //depot/projects/dtrace/src/lib/libc_r/Makefile#7 (text+ko) ==== @@ -1,7 +1,5 @@ # $FreeBSD: src/lib/libc_r/Makefile,v 1.45 2006/08/22 07:51:07 ru Exp $ -.include - # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does From owner-p4-projects@FreeBSD.ORG Mon Oct 9 21:13:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C4A316A417; Mon, 9 Oct 2006 21:13:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FE0F16A412 for ; Mon, 9 Oct 2006 21:13:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8ECE43D4C for ; Mon, 9 Oct 2006 21:13:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99LDrrA094255 for ; Mon, 9 Oct 2006 21:13:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99LDrmv094252 for perforce@freebsd.org; Mon, 9 Oct 2006 21:13:53 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Oct 2006 21:13:53 GMT Message-Id: <200610092113.k99LDrmv094252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 21:13:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107581 Change 107581 by jb@jb_freebsd7 on 2006/10/09 21:13:32 Reset this file to match current, removing the T1 simulator code for sun4v. Affected files ... .. //depot/projects/dtrace/src/lib/libstand/ufs.c#6 edit Differences ... ==== //depot/projects/dtrace/src/lib/libstand/ufs.c#6 (text+ko) ==== @@ -81,7 +81,6 @@ #include #include #include -#include #include #include #include @@ -111,136 +110,6 @@ ufs_readdir }; -#if defined(__sparc64__) && defined(T1_SIMULATOR) -typedef int32_t daddr32_t; -typedef int32_t time32_t; -typedef unsigned char uchar_t; -#define MAXCSBUFS 32 -typedef struct _quad { int val[2]; } squad_t; -struct solaris_fs { - uint32_t fs_link; /* linked list of file systems */ - uint32_t fs_rolled; /* logging only: fs fully rolled */ - daddr32_t fs_sblkno; /* addr of super-block in filesys */ - daddr32_t fs_cblkno; /* offset of cyl-block in filesys */ - daddr32_t fs_iblkno; /* offset of inode-blocks in filesys */ - daddr32_t fs_dblkno; /* offset of first data after cg */ - int32_t fs_cgoffset; /* cylinder group offset in cylinder */ - int32_t fs_cgmask; /* used to calc mod fs_ntrak */ - time32_t fs_time; /* last time written */ - int32_t fs_size; /* number of blocks in fs */ - int32_t fs_dsize; /* number of data blocks in fs */ - int32_t fs_ncg; /* number of cylinder groups */ - int32_t fs_bsize; /* size of basic blocks in fs */ - int32_t fs_fsize; /* size of frag blocks in fs */ - int32_t fs_frag; /* number of frags in a block in fs */ -/* these are configuration parameters */ - int32_t fs_minfree; /* minimum percentage of free blocks */ - int32_t fs_rotdelay; /* num of ms for optimal next block */ - int32_t fs_rps; /* disk revolutions per second */ -/* these fields can be computed from the others */ - int32_t fs_bmask; /* ``blkoff'' calc of blk offsets */ - int32_t fs_fmask; /* ``fragoff'' calc of frag offsets */ - int32_t fs_bshift; /* ``lblkno'' calc of logical blkno */ - int32_t fs_fshift; /* ``numfrags'' calc number of frags */ -/* these are configuration parameters */ - int32_t fs_maxcontig; /* max number of contiguous blks */ - int32_t fs_maxbpg; /* max number of blks per cyl group */ -/* these fields can be computed from the others */ - int32_t fs_fragshift; /* block to frag shift */ - int32_t fs_fsbtodb; /* fsbtodb and dbtofsb shift constant */ - int32_t fs_sbsize; /* actual size of super block */ - int32_t fs_csmask; /* csum block offset */ - int32_t fs_csshift; /* csum block number */ - int32_t fs_nindir; /* value of NINDIR */ - int32_t fs_inopb; /* value of INOPB */ - int32_t fs_nspf; /* value of NSPF */ -/* yet another configuration parameter */ - int32_t fs_optim; /* optimization preference, see below */ -/* these fields are derived from the hardware */ - /* USL SVR4 compatibility */ -#ifdef _LITTLE_ENDIAN - /* - * USL SVR4 compatibility - * - * There was a significant divergence here between Solaris and - * SVR4 for x86. By swapping these two members in the superblock, - * we get read-only compatibility of SVR4 filesystems. Otherwise - * there would be no compatibility. This change was introduced - * during bootstrapping of Solaris on x86. By making this ifdef'ed - * on byte order, we provide ongoing compatibility across all - * platforms with the same byte order, the highest compatibility - * that can be achieved. - */ - int32_t fs_state; /* file system state time stamp */ -#else - int32_t fs_npsect; /* # sectors/track including spares */ -#endif - int32_t fs_si; /* summary info state - lufs only */ - int32_t fs_trackskew; /* sector 0 skew, per track */ -/* a unique id for this filesystem (currently unused and unmaintained) */ -/* In 4.3 Tahoe this space is used by fs_headswitch and fs_trkseek */ -/* Neither of those fields is used in the Tahoe code right now but */ -/* there could be problems if they are. */ - int32_t fs_id[2]; /* file system id */ -/* sizes determined by number of cylinder groups and their sizes */ - daddr32_t fs_csaddr; /* blk addr of cyl grp summary area */ - int32_t fs_cssize; /* size of cyl grp summary area */ - int32_t fs_cgsize; /* cylinder group size */ -/* these fields are derived from the hardware */ - int32_t fs_ntrak; /* tracks per cylinder */ - int32_t fs_nsect; /* sectors per track */ - int32_t fs_spc; /* sectors per cylinder */ -/* this comes from the disk driver partitioning */ - int32_t fs_ncyl; /* cylinders in file system */ -/* these fields can be computed from the others */ - int32_t fs_cpg; /* cylinders per group */ - int32_t fs_ipg; /* inodes per group */ - int32_t fs_fpg; /* blocks per group * fs_frag */ -/* this data must be re-computed after crashes */ - struct csum fs_cstotal; /* cylinder summary information */ -/* these fields are cleared at mount time */ - char fs_fmod; /* super block modified flag */ - char fs_clean; /* file system state flag */ - char fs_ronly; /* mounted read-only flag */ - char fs_flags; /* largefiles flag, etc. */ - char fs_fsmnt[512]; /* name mounted on */ -/* these fields retain the current block allocation info */ - int32_t fs_cgrotor; /* last cg searched */ - /* - * The following used to be fs_csp[MAXCSBUFS]. It was not - * used anywhere except in old utilities. We removed this - * in 5.6 and expect fs_u.fs_csp to be used instead. - * We no longer limit fs_cssize based on MAXCSBUFS. - */ - union { /* fs_cs (csum) info */ - uint32_t fs_csp_pad[MAXCSBUFS]; - struct csum *fs_csp; - } fs_u; - int32_t fs_cpc; /* cyl per cycle in postbl */ - short fs_opostbl[16*8]; /* old rotation block list head */ - int32_t fs_sparecon[51]; /* reserved for future constants */ - int32_t fs_version; /* minor version of MTB ufs */ - int32_t fs_logbno; /* block # of embedded log */ - int32_t fs_reclaim; /* reclaim open, deleted files */ - int32_t fs_sparecon2; /* reserved for future constant */ -#ifdef _LITTLE_ENDIAN - /* USL SVR4 compatibility */ - int32_t fs_npsect; /* # sectors/track including spares */ -#else - int32_t fs_state; /* file system state time stamp */ -#endif - squad_t fs_qbmask; /* ~fs_bmask - for use with quad size */ - squad_t fs_qfmask; /* ~fs_fmask - for use with quad size */ - int32_t fs_postblformat; /* format of positional layout tables */ - int32_t fs_nrpos; /* number of rotaional positions */ - int32_t fs_postbloff; /* (short) rotation block list head */ - int32_t fs_rotbloff; /* (uchar_t) blocks for each rotation */ - int32_t fs_magic; /* magic number */ - uchar_t fs_space[1]; /* list of blocks for each rotation */ -/* actually longer */ -}; -#endif - /* * In-core open file. */ @@ -273,51 +142,7 @@ static int buf_write_file(struct open_file *, char *, size_t *); static int search_directory(char *, struct open_file *, ino_t *); - /* - * Search a directory for a name and return its - * i_number. - */ - -#ifdef DEBUG -static void hdump(uint8_t *bp, int size) -{ - int i; - int f = 1; - uint8_t tmp[17]; - - tmp[16] = '\0'; - - for (i=0; i126) c='.'; - tmp[i&15] = c; - - if ((i&15)==15) { - printf(" : %s\n", tmp); - f=1; - } - } - if (!f) { - for (i=(i&15); i<16; i++) { - printf(" --"); - tmp[i]=' '; - } - printf(" : %s\n", tmp); - } -} -#endif - - -/* * Read a new inode into a file structure. */ static int @@ -334,13 +159,6 @@ if (fs == NULL) panic("fs == NULL"); -#ifdef DEBUG - printf("read_inode : inumber=0x%llx fsba=0x%llx dba=0x%llx\n", - (uint64_t)inumber, - (uint64_t)ino_to_fsba(fs, inumber), - (uint64_t)fsbtodb(fs, ino_to_fsba(fs, inumber)) ); -#endif - /* * Read inode and save it. */ @@ -509,7 +327,6 @@ file_block = lblkno(fs, fp->f_seekp); block_size = sblksize(fs, DIP(fp, di_size), file_block); - rc = block_map(f, file_block, &disk_block); if (rc) return (rc); @@ -576,7 +393,6 @@ struct file *fp = (struct file *)f->f_fsdata; struct fs *fs = fp->f_fs; long off; - size_t file_size; ufs_lbn_t file_block; ufs2_daddr_t disk_block; size_t block_size; @@ -584,26 +400,8 @@ off = blkoff(fs, fp->f_seekp); file_block = lblkno(fs, fp->f_seekp); - file_size = DIP(fp, di_size); - block_size = sblksize(fs, file_size, file_block); -#ifdef DEBUG - printf("buf_read_file: fs->f_seekp=0x%llx : off=0x%lx : file_block=0x%lx : block_size=0x%llx\n", - (uint64_t)fp->f_seekp, off, file_block, (uint64_t)block_size); - printf("\tfile_size=0x%llx : fs_bsize=0x%llx\n", (uint64_t)file_size, (uint64_t)fs->fs_bsize); - printf("fragroundup[blkoff[%lld]=%lld]=%lld\n", file_size, blkoff(fs, file_size), - fragroundup(fs, blkoff(fs, file_size))); - printf("fs->fs_qbmask=%llx fs->fs_qfmask=%llx fs->fs_fmask=%lx\n", fs->fs_qbmask, fs->fs_qfmask, fs->fs_fmask); -#endif + block_size = sblksize(fs, DIP(fp, di_size), file_block); -#if defined(__sparc64__) && defined(T1_SIMULATOR) - if (block_size > 8192) { - block_size=8192; - printf("FORCE ROUND block_size\n"); - } -#endif -#ifdef DEBUG - printf("\tfp->f_buf_blkno = 0x%lx\n", fp->f_buf_blkno); -#endif if (file_block != fp->f_buf_blkno) { if (fp->f_buf == (char *)0) fp->f_buf = malloc(fs->fs_bsize); @@ -611,27 +409,17 @@ rc = block_map(f, file_block, &disk_block); if (rc) return (rc); -#ifdef DEBUG - printf("\tblock_map : disk_block = 0x%lx\n", disk_block); -#endif + if (disk_block == 0) { bzero(fp->f_buf, block_size); fp->f_buf_size = block_size; } else { twiddle(); -#ifdef DEBUG - printf("\tcalling dev_strategy for block read fsbtodb[0x%lx]=0x%lx\n", - disk_block, fsbtodb(fs, disk_block)); -#endif rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); if (rc) return (rc); -#ifdef DEBUG - printf("\treturned from block read with 0x%lx bytes\n", fp->f_buf_size); - hdump(fp->f_buf, fp->f_buf_size); -#endif } fp->f_buf_blkno = file_block; @@ -654,37 +442,10 @@ return (0); } -#if defined(__sparc64__) && defined(T1_SIMULATOR) -static void -test_disk(struct open_file *f) -{ - int i, rc; - char *buf; - uint64_t read_size; - - struct file *fp = (struct file *)f->f_fsdata; - struct fs *fs = fp->f_fs; - - buf = (char *)malloc(512); - - for (i = 0; i < 10; i++) { - rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, - fsbtodb(fs, i), - 512, buf, &read_size); - - - if (rc || read_size != 512) - printf("strategy failed\n"); -#ifdef DEBUG - printf("%04d\n", i); - hdump(buf, 512); -#endif - - } - -} -#endif - +/* + * Search a directory for a name and return its + * i_number. + */ static int search_directory(name, f, inumber_p) char *name; @@ -698,34 +459,18 @@ size_t buf_size; int namlen, length; int rc; -#if defined(__sparc64__) && defined(T1_SIMULATOR) - test_disk(f); -#endif + length = strlen(name); -#ifdef DEBUG - printf("search_directory: name=%s\n", name); -#endif + fp->f_seekp = 0; while (fp->f_seekp < DIP(fp, di_size)) { - int i; rc = buf_read_file(f, &buf, &buf_size); if (rc) return (rc); -#ifdef DEBUG - printf("scan directory entries: @ 0x%llx (size=0x%llx)\n", - (uint64_t)buf, (uint64_t)buf_size); -#endif + dp = (struct direct *)buf; edp = (struct direct *)(buf + buf_size); - i = 0; -#ifdef DEBUG - hdump(buf, buf_size); -#endif while (dp < edp) { -#ifdef DEBUG - printf("\tdirent# %d (dp=0x%llx edp=0x%llx\n", i, - (uint64_t)dp, (uint64_t)edp); -#endif if (dp->d_ino == (ino_t)0) goto next; #if BYTE_ORDER == LITTLE_ENDIAN @@ -734,9 +479,6 @@ else #endif namlen = dp->d_namlen; -#ifdef DEBUG - printf("namlen: %d dp->d_name: %s\n", namlen, dp->d_name); -#endif if (namlen == length && !strcmp(name, dp->d_name)) { /* found entry */ @@ -745,7 +487,6 @@ } next: dp = (struct direct *)((char *)dp + dp->d_reclen); - i++; } fp->f_seekp += buf_size; } @@ -753,33 +494,7 @@ } static int sblock_try[] = SBLOCKSEARCH; -#if defined(__sparc64__) && defined(T1_SIMULATOR) -#define SOLARIS_SBLOCK_CONVERT 1 -void map_sblock(struct fs *fsp) -{ - struct solaris_fs sfs = *(struct solaris_fs *)fsp; -#ifdef DEBUG - printf("fbsd fs_qfmask offset %lx solaris fs_qfmask offset %lx\n", - offsetof(struct fs, fs_qfmask), offsetof(struct solaris_fs, fs_qfmask)); - printf("fbsd fs_qbmask offset %lx solaris fs_qbmask offset %lx\n", - offsetof(struct fs, fs_qbmask), offsetof(struct solaris_fs, fs_qbmask)); - - printf(" fsp->fs_qbmask: %llx = sfs.fs_qbmask %08lx%08lx;\n", - fsp->fs_qbmask, sfs.fs_qbmask.val[0], sfs.fs_qbmask.val[1]); - printf(" fsp->fs_qfmask: %llx = sfs.fs_qfmask %08lx%08lx;\n", - fsp->fs_qfmask, sfs.fs_qfmask.val[0], sfs.fs_qfmask.val[1]); -#endif - fsp->fs_qbmask = ((uint64_t)sfs.fs_qbmask.val[0]) << 32 | sfs.fs_qbmask.val[1]; - fsp->fs_qfmask = ((uint64_t)sfs.fs_qfmask.val[0]) << 32 | sfs.fs_qfmask.val[1]; - -} -#endif - - - - - /* * Open a file. */ @@ -818,16 +533,6 @@ (char *)fs, &buf_size); if (rc) goto out; - - - - -#ifdef DEBUG - printf("fs->fs_magic: %x fs->fs_bsize: %x fs->fs_sblockloc: %lx\n", - fs->fs_magic, fs->fs_bsize, fs->fs_sblockloc); - printf("sblock_try[i]: %x buf_size %lx\n", - sblock_try[i], buf_size); -#endif if ((fs->fs_magic == FS_UFS1_MAGIC || (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_sblockloc == sblock_try[i])) && @@ -840,9 +545,6 @@ rc = EINVAL; goto out; } -#if defined(__sparc64__) && defined(T1_SIMULATOR) - map_sblock(fs); -#endif /* * Calculate indirect block levels. */ @@ -858,14 +560,9 @@ } inumber = ROOTINO; - if ((rc = read_inode(inumber, f)) != 0) { - printf("failed to read root inode \n"); - goto out; + if ((rc = read_inode(inumber, f)) != 0) + goto out; - } -#ifdef DEBUG - printf("read root inode \n"); -#endif cp = path = strdup(upath); if (path == NULL) { rc = ENOMEM; @@ -912,10 +609,6 @@ * symbolic link. */ parent_inumber = inumber; -#ifdef DEBUG - printf("-- searching %s @ inode = 0x%x - found @ 0x%x\n", - ncp, parent_inumber, inumber); -#endif rc = search_directory(ncp, f, &inumber); *cp = c; if (rc) From owner-p4-projects@FreeBSD.ORG Mon Oct 9 21:18:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A48C16A412; Mon, 9 Oct 2006 21:18:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29C5316A407 for ; Mon, 9 Oct 2006 21:18:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C0B443D6D for ; Mon, 9 Oct 2006 21:17:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99LHxmO097199 for ; Mon, 9 Oct 2006 21:17:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99LHxK4097190 for perforce@freebsd.org; Mon, 9 Oct 2006 21:17:59 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Oct 2006 21:17:59 GMT Message-Id: <200610092117.k99LHxK4097190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 21:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107582 Change 107582 by jb@jb_freebsd7 on 2006/10/09 21:17:37 Fix a p4 mis-merge to retain KSE support but as a kernel option. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#9 (text+ko) ==== @@ -302,7 +302,7 @@ #ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); - i = trap_pfault(&frame, TRUE); +#endif i = trap_pfault(&frame, TRUE); if (i == -1) goto userout; From owner-p4-projects@FreeBSD.ORG Mon Oct 9 21:21:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4A1216A47C; Mon, 9 Oct 2006 21:21:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CD7716A416 for ; Mon, 9 Oct 2006 21:21:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C50F443D7C for ; Mon, 9 Oct 2006 21:21:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99LL3cH099820 for ; Mon, 9 Oct 2006 21:21:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99LL3sB099812 for perforce@freebsd.org; Mon, 9 Oct 2006 21:21:03 GMT (envelope-from jb@freebsd.org) Date: Mon, 9 Oct 2006 21:21:03 GMT Message-Id: <200610092121.k99LL3sB099812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2006 21:21:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=107583 Change 107583 by jb@jb_freebsd7 on 2006/10/09 21:20:06 Make KSE support a kernel option. Affected files ... .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#11 edit Differences ... ==== //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#11 (text) ==== @@ -454,7 +454,11 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); +#ifdef KSE + proc_linkup(&proc0, &ksegrp0, &thread0); +#else proc_linkup(&proc0, &thread0); +#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; From owner-p4-projects@FreeBSD.ORG Tue Oct 10 01:38:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9562716A47B; Tue, 10 Oct 2006 01:38:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BF3616A416; Tue, 10 Oct 2006 01:38:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68FB643D4C; Tue, 10 Oct 2006 01:38:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k9A1cjDN082407; Mon, 9 Oct 2006 21:38:47 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Mon, 9 Oct 2006 21:37:38 -0400 User-Agent: KMail/1.9.1 References: <200610091034.k99AYtcC064485@repoman.freebsd.org> In-Reply-To: <200610091034.k99AYtcC064485@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200610092137.39154.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Mon, 09 Oct 2006 21:38:47 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2016/Mon Oct 9 12:58:54 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 107544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Oct 2006 01:38:50 -0000 On Monday 09 October 2006 06:34, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=107544 > > Change 107544 by jb@jb_freebsd7 on 2006/10/09 10:21:52 > > This submit is the result of an integrate -ifb from current because it > appears that p4 gets confused by integrating files from different branches > which share the same file names. It can't or won't detect changes in the > content of the files because of it's secret dea of what a revision is. Read the docs. :) When you do p4 integ -i, it assumes that your version of the file is the master copy, so it leaves your version unchanged when a file is added on the parent but already exists on the child branch and you do p4 integ -i. Note that because CVS commits are just submitted as new submits to //depot/vendor, p4 has no way to know that the import it gets from a CVS commit is really adding the same file that was added over in a p4 branch. If HEAD were actually in p4 and and the original commit had been done via a reverse integrate up into HEAD from the sun4v branch, p4 would be able to DTRT. However, since HEAD is in CVS and we clone a copy into p4, p4 doesn't have any history to know that a new file in //depot/vendor/freebsd/... is really a commit of a file in a child branch. This is one reason why having the work trees and the actual HEAD in the same VCS would be helpful. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Oct 10 02:13:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A191F16A47B; Tue, 10 Oct 2006 02:13:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7AFB116A403 for ; Tue, 10 Oct 2006 02:13:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB23743D69 for ; Tue, 10 Oct 2006 02:13:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9A2D4J9053288 for ; Tue, 10 Oct 2006 02:13:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9A2D4dL053282 for perforce@freebsd.org; Tue, 10 Oct 2006 02:13:04 GMT (envelope-from jb@freebsd.org) Date: Tue, 10 Oct 2006 02:13:04 GMT Message-Id: <200610100213.k9A2D4dL053282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Oct 2006 02:13:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=107590 Change 107590 by jb@jb_freebsd8 on 2006/10/10 02:12:17 Re-do the change for the lastest version of OpenSolaris. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#9 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#9 (text+ko) ==== @@ -12,13 +12,13 @@ ctf.c \ ctfconvert.c \ dwarf.c \ - fixup_tdescs.c \ hash.c \ iidesc.c \ input.c \ list.c \ merge.c \ output.c \ + st_bugs.c \ st_parse.c \ stabs.c \ stack.c \ From owner-p4-projects@FreeBSD.ORG Tue Oct 10 02:17:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0A6316A47C; Tue, 10 Oct 2006 02:17:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CD4116A416 for ; Tue, 10 Oct 2006 02:17:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9DBC43D49 for ; Tue, 10 Oct 2006 02:17:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9A2HAEF056206 for ; Tue, 10 Oct 2006 02:17:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9A2HA5H056193 for perforce@freebsd.org; Tue, 10 Oct 2006 02:17:10 GMT (envelope-from jb@freebsd.org) Date: Tue, 10 Oct 2006 02:17:10 GMT Message-Id: <200610100217.k9A2HA5H056193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Oct 2006 02:17:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=107591 Change 107591 by jb@jb_freebsd8 on 2006/10/10 02:16:37 Re-do the change to add ctfconvert support to the generated makefile. Affected files ... .. //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#8 edit Differences ... ==== //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#8 (text+ko) ==== @@ -739,7 +739,7 @@ printf("config: don't know rules for %s\n", np); break; } - snprintf(cmd, sizeof(cmd), "${%s_%c%s}", ftype, + snprintf(cmd, sizeof(cmd), "${%s_%c%s}; ${NORMAL_CTFCONVERT}", ftype, toupper(och), ftp->f_flags & NOWERROR ? "_NOWERROR" : ""); compilewith = cmd; From owner-p4-projects@FreeBSD.ORG Tue Oct 10 13:17:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6319A16A416; Tue, 10 Oct 2006 13:17:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 170B716A407 for ; Tue, 10 Oct 2006 13:17:28 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F4A243D60 for ; Tue, 10 Oct 2006 13:17:27 +0000 (GMT) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9ADHRff070729 for ; Tue, 10 Oct 2006 13:17:27 GMT (envelope-from attilio@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9ADHRu4070726 for perforce@freebsd.org; Tue, 10 Oct 2006 13:17:27 GMT (envelope-from attilio@FreeBSD.org) Date: Tue, 10 Oct 2006 13:17:27 GMT Message-Id: <200610101317.k9ADHRu4070726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to attilio@FreeBSD.org using -f From: Attilio Rao To: Perforce Change Reviews Cc: Subject: PERFORCE change 107614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Oct 2006 13:17:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=107614 Change 107614 by attilio@attilio_laptop on 2006/10/10 13:17:10 Stylize it Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#3 (text+ko) ==== @@ -41,51 +41,51 @@ #ifndef _USB_CDC_H_ #define _USB_CDC_H_ -#define UDESCSUB_CDC_HEADER 0 -#define UDESCSUB_CDC_CM 1 /* Call Management */ -#define UDESCSUB_CDC_ACM 2 /* Abstract Control Model */ -#define UDESCSUB_CDC_DLM 3 /* Direct Line Management */ -#define UDESCSUB_CDC_TRF 4 /* Telephone Ringer */ -#define UDESCSUB_CDC_TCLSR 5 /* Telephone Call ... */ -#define UDESCSUB_CDC_UNION 6 -#define UDESCSUB_CDC_CS 7 /* Country Selection */ -#define UDESCSUB_CDC_TOM 8 /* Telephone Operational Modes */ -#define UDESCSUB_CDC_USBT 9 /* USB Terminal */ -#define UDESCSUB_CDC_NCT 10 -#define UDESCSUB_CDC_PUF 11 -#define UDESCSUB_CDC_EUF 12 -#define UDESCSUB_CDC_MCMF 13 -#define UDESCSUB_CDC_CCMF 14 -#define UDESCSUB_CDC_ENF 15 -#define UDESCSUB_CDC_ANF 16 +#define UDESCSUB_CDC_HEADER 0 +#define UDESCSUB_CDC_CM 1 /* Call Management */ +#define UDESCSUB_CDC_ACM 2 /* Abstract Control Model */ +#define UDESCSUB_CDC_DLM 3 /* Direct Line Management */ +#define UDESCSUB_CDC_TRF 4 /* Telephone Ringer */ +#define UDESCSUB_CDC_TCLSR 5 /* Telephone Call */ +#define UDESCSUB_CDC_UNION 6 +#define UDESCSUB_CDC_CS 7 /* Country Selection */ +#define UDESCSUB_CDC_TOM 8 /* Telephone Operational Modes */ +#define UDESCSUB_CDC_USBT 9 /* USB Terminal */ +#define UDESCSUB_CDC_NCT 10 +#define UDESCSUB_CDC_PUF 11 +#define UDESCSUB_CDC_EUF 12 +#define UDESCSUB_CDC_MCMF 13 +#define UDESCSUB_CDC_CCMF 14 +#define UDESCSUB_CDC_ENF 15 +#define UDESCSUB_CDC_ANF 16 typedef struct { uByte bLength; uByte bDescriptorType; uByte bDescriptorSubtype; uWord bcdCDC; -} UPACKED usb_cdc_header_descriptor_t; +} __packed usb_cdc_header_descriptor_t; typedef struct { uByte bLength; uByte bDescriptorType; uByte bDescriptorSubtype; uByte bmCapabilities; -#define USB_CDC_CM_DOES_CM 0x01 -#define USB_CDC_CM_OVER_DATA 0x02 +#define USB_CDC_CM_DOES_CM 0x01 +#define USB_CDC_CM_OVER_DATA 0x02 uByte bDataInterface; -} UPACKED usb_cdc_cm_descriptor_t; +} __packed usb_cdc_cm_descriptor_t; typedef struct { uByte bLength; uByte bDescriptorType; uByte bDescriptorSubtype; uByte bmCapabilities; -#define USB_CDC_ACM_HAS_FEATURE 0x01 -#define USB_CDC_ACM_HAS_LINE 0x02 -#define USB_CDC_ACM_HAS_BREAK 0x04 -#define USB_CDC_ACM_HAS_NETWORK_CONN 0x08 -} UPACKED usb_cdc_acm_descriptor_t; +#define USB_CDC_ACM_HAS_FEATURE 0x01 +#define USB_CDC_ACM_HAS_LINE 0x02 +#define USB_CDC_ACM_HAS_BREAK 0x04 +#define USB_CDC_ACM_HAS_NETWORK_CONN 0x08 +} __packed usb_cdc_acm_descriptor_t; typedef struct { uByte bLength; @@ -93,7 +93,7 @@ uByte bDescriptorSubtype; uByte bMasterInterface; uByte bSlaveInterface[1]; -} UPACKED usb_cdc_union_descriptor_t; +} __packed usb_cdc_union_descriptor_t; typedef struct { uByte bLength; @@ -104,85 +104,88 @@ uWord wMaxSegmentSize; uWord wNumberMCFikters; uByte bNumberPowerFilters; -} UPACKED usb_cdc_ethernet_descriptor_t; +} __packed usb_cdc_ethernet_descriptor_t; -#define UCDC_SEND_ENCAPSULATED_COMMAND 0x00 -#define UCDC_GET_ENCAPSULATED_RESPONSE 0x01 -#define UCDC_SET_COMM_FEATURE 0x02 -#define UCDC_GET_COMM_FEATURE 0x03 -#define UCDC_ABSTRACT_STATE 0x01 -#define UCDC_COUNTRY_SETTING 0x02 -#define UCDC_CLEAR_COMM_FEATURE 0x04 -#define UCDC_SET_LINE_CODING 0x20 -#define UCDC_GET_LINE_CODING 0x21 -#define UCDC_SET_CONTROL_LINE_STATE 0x22 -#define UCDC_LINE_DTR 0x0001 -#define UCDC_LINE_RTS 0x0002 -#define UCDC_SEND_BREAK 0x23 -#define UCDC_BREAK_ON 0xffff -#define UCDC_BREAK_OFF 0x0000 +#define UCDC_SEND_ENCAPSULATED_COMMAND 0x00 +#define UCDC_GET_ENCAPSULATED_RESPONSE 0x01 +#define UCDC_SET_COMM_FEATURE 0x02 +#define UCDC_GET_COMM_FEATURE 0x03 +#define UCDC_ABSTRACT_STATE 0x01 +#define UCDC_COUNTRY_SETTING 0x02 +#define UCDC_CLEAR_COMM_FEATURE 0x04 +#define UCDC_SET_LINE_CODING 0x20 +#define UCDC_GET_LINE_CODING 0x21 +#define UCDC_SET_CONTROL_LINE_STATE 0x22 +#define UCDC_LINE_DTR 0x0001 +#define UCDC_LINE_RTS 0x0002 +#define UCDC_SEND_BREAK 0x23 +#define UCDC_BREAK_ON 0xffff +#define UCDC_BREAK_OFF 0x0000 typedef struct { uWord wState; -#define UCDC_IDLE_SETTING 0x0001 -#define UCDC_DATA_MULTIPLEXED 0x0002 -} UPACKED usb_cdc_abstract_state_t; -#define UCDC_ABSTRACT_STATE_LENGTH 2 +#define UCDC_IDLE_SETTING 0x0001 +#define UCDC_DATA_MULTIPLEXED 0x0002 +} __packed usb_cdc_abstract_state_t; + +#define UCDC_ABSTRACT_STATE_LENGTH 2 typedef struct { uDWord dwDTERate; uByte bCharFormat; -#define UCDC_STOP_BIT_1 0 -#define UCDC_STOP_BIT_1_5 1 -#define UCDC_STOP_BIT_2 2 +#define UCDC_STOP_BIT_1 0 +#define UCDC_STOP_BIT_1_5 1 +#define UCDC_STOP_BIT_2 2 uByte bParityType; -#define UCDC_PARITY_NONE 0 -#define UCDC_PARITY_ODD 1 -#define UCDC_PARITY_EVEN 2 -#define UCDC_PARITY_MARK 3 -#define UCDC_PARITY_SPACE 4 +#define UCDC_PARITY_NONE 0 +#define UCDC_PARITY_ODD 1 +#define UCDC_PARITY_EVEN 2 +#define UCDC_PARITY_MARK 3 +#define UCDC_PARITY_SPACE 4 uByte bDataBits; -} UPACKED usb_cdc_line_state_t; -#define UCDC_LINE_STATE_LENGTH 7 +} __packed usb_cdc_line_state_t; + +#define UCDC_LINE_STATE_LENGTH 7 typedef struct { uByte bmRequestType; -#define UCDC_NOTIFICATION 0xa1 +#define UCDC_NOTIFICATION 0xa1 uByte bNotification; -#define UCDC_N_NETWORK_CONNECTION 0x00 -#define UCDC_N_RESPONSE_AVAILABLE 0x01 -#define UCDC_N_AUX_JACK_HOOK_STATE 0x08 -#define UCDC_N_RING_DETECT 0x09 -#define UCDC_N_SERIAL_STATE 0x20 -#define UCDC_N_CALL_STATE_CHANGED 0x28 -#define UCDC_N_LINE_STATE_CHANGED 0x29 -#define UCDC_N_CONNECTION_SPEED_CHANGE 0x2a +#define UCDC_N_NETWORK_CONNECTION 0x00 +#define UCDC_N_RESPONSE_AVAILABLE 0x01 +#define UCDC_N_AUX_JACK_HOOK_STATE 0x08 +#define UCDC_N_RING_DETECT 0x09 +#define UCDC_N_SERIAL_STATE 0x20 +#define UCDC_N_CALL_STATE_CHANGED 0x28 +#define UCDC_N_LINE_STATE_CHANGED 0x29 +#define UCDC_N_CONNECTION_SPEED_CHANGE 0x2a uWord wValue; uWord wIndex; uWord wLength; uByte data[16]; -} UPACKED usb_cdc_notification_t; -#define UCDC_NOTIFICATION_LENGTH 8 +} __packed usb_cdc_notification_t; + +#define UCDC_NOTIFICATION_LENGTH 8 /* * Bits set in the SERIAL STATE notifcation (first byte of data) */ -#define UCDC_N_SERIAL_OVERRUN 0x40 -#define UCDC_N_SERIAL_PARITY 0x20 -#define UCDC_N_SERIAL_FRAMING 0x10 -#define UCDC_N_SERIAL_RI 0x08 -#define UCDC_N_SERIAL_BREAK 0x04 -#define UCDC_N_SERIAL_DSR 0x02 -#define UCDC_N_SERIAL_DCD 0x01 +#define UCDC_N_SERIAL_OVERRUN 0x40 +#define UCDC_N_SERIAL_PARITY 0x20 +#define UCDC_N_SERIAL_FRAMING 0x10 +#define UCDC_N_SERIAL_RI 0x08 +#define UCDC_N_SERIAL_BREAK 0x04 +#define UCDC_N_SERIAL_DSR 0x02 +#define UCDC_N_SERIAL_DCD 0x01 /* Serial state bit masks */ -#define UCDC_MDM_RXCARRIER 0x01 -#define UCDC_MDM_TXCARRIER 0x02 -#define UCDC_MDM_BREAK 0x04 -#define UCDC_MDM_RING 0x08 -#define UCDC_MDM_FRAMING_ERR 0x10 -#define UCDC_MDM_PARITY_ERR 0x20 -#define UCDC_MDM_OVERRUN_ERR 0x40 +#define UCDC_MDM_RXCARRIER 0x01 +#define UCDC_MDM_TXCARRIER 0x02 +#define UCDC_MDM_BREAK 0x04 +#define UCDC_MDM_RING 0x08 +#define UCDC_MDM_FRAMING_ERR 0x10 +#define UCDC_MDM_PARITY_ERR 0x20 +#define UCDC_MDM_OVERRUN_ERR 0x40 #endif /* _USB_CDC_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Oct 10 13:32:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CDE416A47C; Tue, 10 Oct 2006 13:32:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BB6316A40F for ; Tue, 10 Oct 2006 13:32:55 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1736E43D77 for ; Tue, 10 Oct 2006 13:32:47 +0000 (GMT) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9ADWlE8081210 for ; Tue, 10 Oct 2006 13:32:47 GMT (envelope-from attilio@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9ADWlhm081205 for perforce@freebsd.org; Tue, 10 Oct 2006 13:32:47 GMT (envelope-from attilio@FreeBSD.org) Date: Tue, 10 Oct 2006 13:32:47 GMT Message-Id: <200610101332.k9ADWlhm081205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to attilio@FreeBSD.org using -f From: Attilio Rao To: Perforce Change Reviews Cc: Subject: PERFORCE change 107616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Oct 2006 13:32:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=107616 Change 107616 by attilio@attilio_laptop on 2006/10/10 13:31:58 Stylize it. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucomvar.h#8 (text+ko) ==== @@ -65,79 +65,68 @@ */ /* Module interface related macros */ -#define UCOM_MODVER 1 +#define UCOM_MODVER 1 -#define UCOM_MINVER 1 -#define UCOM_PREFVER UCOM_MODVER -#define UCOM_MAXVER 1 +#define UCOM_MINVER 1 +#define UCOM_PREFVER UCOM_MODVER +#define UCOM_MAXVER 1 struct ucom_softc; struct thread; struct ucom_callback { - void (*ucom_get_status)(struct ucom_softc *, u_int8_t *, u_int8_t *); - void (*ucom_set_dtr)(struct ucom_softc *, u_int8_t); - void (*ucom_set_rts)(struct ucom_softc *, u_int8_t); - void (*ucom_set_break)(struct ucom_softc *, u_int8_t); - int (*ucom_param)(struct ucom_softc *, struct termios *); - int (*ucom_ioctl)(struct ucom_softc *, u_long, caddr_t, int, struct thread *); - int (*ucom_open)(struct ucom_softc *); - void (*ucom_close)(struct ucom_softc *); - void (*ucom_start_read)(struct ucom_softc *); - void (*ucom_stop_read)(struct ucom_softc *); - void (*ucom_start_write)(struct ucom_softc *); - void (*ucom_stop_write)(struct ucom_softc *); + void (*ucom_get_status)(struct ucom_softc *, uint8_t *, uint8_t *); + void (*ucom_set_dtr)(struct ucom_softc *, uint8_t); + void (*ucom_set_rts)(struct ucom_softc *, uint8_t); + void (*ucom_set_break)(struct ucom_softc *, uint8_t); + int (*ucom_param)(struct ucom_softc *, struct termios *); + int (*ucom_ioctl)(struct ucom_softc *, ulong, caddr_t, int, + struct thread *); + int (*ucom_open)(struct ucom_softc *); + void (*ucom_close)(struct ucom_softc *); + void (*ucom_start_read)(struct ucom_softc *); + void (*ucom_stop_read)(struct ucom_softc *); + void (*ucom_start_write)(struct ucom_softc *); + void (*ucom_stop_write)(struct ucom_softc *); }; -/* line status register */ -#define ULSR_RCV_FIFO 0x80 -#define ULSR_TSRE 0x40 /* Transmitter empty: byte sent */ -#define ULSR_TXRDY 0x20 /* Transmitter buffer empty */ -#define ULSR_BI 0x10 /* Break detected */ -#define ULSR_FE 0x08 /* Framing error: bad stop bit */ -#define ULSR_PE 0x04 /* Parity error */ -#define ULSR_OE 0x02 /* Overrun, lost incoming byte */ -#define ULSR_RXRDY 0x01 /* Byte ready in Receive Buffer */ -#define ULSR_RCV_MASK 0x1f /* Mask for incoming data or error */ +/* Line status register */ +#define ULSR_RCV_FIFO 0x80 +#define ULSR_TSRE 0x40 /* Transmitter empty: byte sent */ +#define ULSR_TXRDY 0x20 /* Transmitter buffer empty */ +#define ULSR_BI 0x10 /* Break detected */ +#define ULSR_FE 0x08 /* Framing error: bad stop bit */ +#define ULSR_PE 0x04 /* Parity error */ +#define ULSR_OE 0x02 /* Overrun, lost incoming byte */ +#define ULSR_RXRDY 0x01 /* Byte ready in Receive Buffer */ +#define ULSR_RCV_MASK 0x1f /* Mask for incoming data or error */ struct ucom_softc { - struct task sc_task; - - const struct ucom_callback *sc_callback; - struct tty *sc_tty; - struct mtx *sc_parent_mtx; - void *sc_parent; - - uint32_t sc_unit; - - u_int16_t sc_portno; - - u_int8_t sc_flag; -#define UCOM_FLAG_RTS_IFLOW 0x01 /* use RTS input flow control */ -#define UCOM_FLAG_GONE 0x02 /* the device is gone */ -#define UCOM_FLAG_ATTACHED 0x04 /* set if attached */ -#define UCOM_FLAG_READ_ON 0x08 /* set if read is enabled */ -#define UCOM_FLAG_WRITE_ON 0x10 /* set if write is enabled */ - - u_int8_t sc_lsr; - u_int8_t sc_msr; - u_int8_t sc_mcr; - u_int8_t sc_poll; - u_int8_t sc_last_status; + struct task sc_task; + const struct ucom_callback *sc_callback; + struct tty *sc_tty; + struct mtx *sc_parent_mtx; + void *sc_parent; + uint32_t sc_unit; + uint16_t sc_portno; + uint8_t sc_flag; +#define UCOM_FLAG_RTS_IFLOW 0x01 /* use RTS input flow control */ +#define UCOM_FLAG_GONE 0x02 /* the device is gone */ +#define UCOM_FLAG_ATTACHED 0x04 /* set if attached */ +#define UCOM_FLAG_READ_ON 0x08 /* set if read is enabled */ +#define UCOM_FLAG_WRITE_ON 0x10 /* set if write is enabled */ + uint8_t sc_lsr; + uint8_t sc_msr; + uint8_t sc_mcr; + uint8_t sc_poll; + uint8_t sc_last_status; }; -extern int -ucom_attach(struct ucom_softc *sc, uint32_t sub_units, void *parent, +int ucom_attach(struct ucom_softc *sc, uint32_t sub_units, void *parent, const struct ucom_callback *callback, struct mtx *p_mtx); -extern void -ucom_detach(struct ucom_softc *sc, uint32_t sub_units); - -extern void -ucom_status_change(struct ucom_softc *); - -extern u_int8_t -ucom_get_data(struct ucom_softc *sc, u_int8_t *buf, u_int32_t len, - u_int32_t *actlen); -extern void -ucom_put_data(struct ucom_softc *sc, u_int8_t *ptr, u_int16_t len); +void ucom_detach(struct ucom_softc *sc, uint32_t sub_units); +void ucom_status_change(struct ucom_softc *); +uint8_t ucom_get_data(struct ucom_softc *sc, uint8_t *buf, uint32_t len, + uint32_t *actlen); +void ucom_put_data(struct ucom_softc *sc, uint8_t *ptr, uint16_t len); From owner-p4-projects@FreeBSD.ORG Tue Oct 10 22:16:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7929D16A417; Tue, 10 Oct 2006 22:16:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 366AB16A40F for ; Tue, 10 Oct 2006 22:16:38 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6557D43D8D for ; Tue, 10 Oct 2006 22:16:08 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9AMG1ap054240 for ; Tue, 10 Oct 2006 22:16:01 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9AMFnZf054221 for perforce@freebsd.org; Tue, 10 Oct 2006 22:15:49 GMT (envelope-from piso@freebsd.org) Date: Tue, 10 Oct 2006 22:15:49 GMT Message-Id: <200610102215.k9AMFnZf054221@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 107635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Oct 2006 22:16:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=107635 Change 107635 by piso@piso_newluxor on 2006/10/10 22:15:06 IFC@107626 Affected files ... .. //depot/projects/soc2005/libalias/sys/conf/files#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/libalias.3#11 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/support.S#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/clock.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/elf.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/stdarg.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/cpufunc.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/fusu.S#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/identcpu.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_twi.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/if_ate.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/if_atereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/EP80219#1 branch .. //depot/projects/soc2006/intr_filter/arm/include/armreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/asm.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/clock.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/cpuconf.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/cpufunc.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/elf.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/stdarg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/vmparam.h#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2006/intr_filter/boot/Makefile#4 integrate .. //depot/projects/soc2006/intr_filter/boot/common/merge_help.awk#2 integrate .. //depot/projects/soc2006/intr_filter/boot/common/panic.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ficl/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/forth/loader.conf#4 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/Makefile.inc#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/loader/help.i386#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/soc2006/intr_filter/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/soc2006/intr_filter/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2006/intr_filter/bsm/audit.h#2 integrate .. //depot/projects/soc2006/intr_filter/bsm/audit_internal.h#2 integrate .. //depot/projects/soc2006/intr_filter/bsm/audit_kevents.h#3 integrate .. //depot/projects/soc2006/intr_filter/bsm/audit_record.h#3 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_periph.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2006/intr_filter/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_file.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#5 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_socket.c#4 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.sun4v#1 branch .. //depot/projects/soc2006/intr_filter/conf/NOTES#8 integrate .. //depot/projects/soc2006/intr_filter/conf/files#7 integrate .. //depot/projects/soc2006/intr_filter/conf/files.amd64#5 integrate .. //depot/projects/soc2006/intr_filter/conf/files.i386#5 integrate .. //depot/projects/soc2006/intr_filter/conf/files.powerpc#3 integrate .. //depot/projects/soc2006/intr_filter/conf/files.sun4v#1 branch .. //depot/projects/soc2006/intr_filter/conf/kern.pre.mk#4 integrate .. //depot/projects/soc2006/intr_filter/conf/options#6 integrate .. //depot/projects/soc2006/intr_filter/conf/options.arm#4 integrate .. //depot/projects/soc2006/intr_filter/conf/options.sun4v#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/freebsd/ah_if.m#2 delete .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/freebsd/ah_osdep.c#2 delete .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/freebsd/ah_osdep.h#2 delete .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/pf.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/crypto/sha2/sha2.c#2 integrate .. //depot/projects/soc2006/intr_filter/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_command.c#3 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_examine.c#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_output.c#3 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_output.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-all.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-dma.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-raid.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ah_osdep.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/ath/ah_osdep.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athvar.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cs/if_cs.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cs/if_csvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/if_dc.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/de/if_de.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/digi/digi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/drmP.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/drm_drv.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/i915_drm.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/i915_drv.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/i915_irq.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/radeon_state.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/en/if_en_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/en/midway.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/exca/exca.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/fb/creator.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/gem/if_gem.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ic/nec765.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iic.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_acpi.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_isa.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_kcs.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_smbus.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_smic.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_ssif.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ips/ips.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ips/ipsreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/lge/if_lge.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_debug.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfivar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/brgphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/miidevs#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/my/if_my.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/my/if_myreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/nge/if_nge.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_private.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcivar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/puc/pucdata.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_sk.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_skreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/smbus/smb.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/smbus/smb.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/smbus/smbconf.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/smbus/smbconf.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/smbus/smbus.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/smbus/smbus.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/driver.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/soc2006/intr_filter/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/soc2006/intr_filter/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/spicds.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pci/spicds.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/mixer.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ti/if_ti.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/txp/if_txp.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ehci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ehcivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/hid.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_aue.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_axe.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_cdce.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_cue.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_kue.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_rue.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_udav.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/kue_fw.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ohci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ohcivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/sl811hs.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ubsa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ubser.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ucom.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ucomvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/udbp.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ufm.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ufoma.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uftdi.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ugen.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhcivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhid.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhub.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ukbd.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ulpt.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/umass.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/umct.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/umodem.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ums.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uplcom.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/urio.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_mem.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_port.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#6 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdi.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdi.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uscanner.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uvisor.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uvscom.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/vge/if_vge.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/osta.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/cache/g_cache.c#1 branch .. //depot/projects/soc2006/intr_filter/geom/cache/g_cache.h#1 branch .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.c#4 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.h#3 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/gate/g_gate.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/gate/g_gate.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/geom.h#3 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_event.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/soc2006/intr_filter/geom/nop/g_nop.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/nop/g_nop.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3_ctl.c#4 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/i386/bios/apm.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#7 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/local_apic.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/nexus.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/support.s#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/include/clock.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/elf.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/intr_machdep.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/include/stdarg.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#7 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/pmtimer.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_proto.h#8 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/syscalls.master#8 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#5 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/clock.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/support.S#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/trap.c#4 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/clock.h#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/elf.h#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/stdarg.h#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/vmparam.h#2 integrate .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/bus_if.m#4 integrate .. //depot/projects/soc2006/intr_filter/kern/init_main.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/init_sysent.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_event.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exec.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exit.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_jail.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ktr.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_lock.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mac.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mbuf.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_proc.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_prot.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thr.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thread.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_time.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_4bsd.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_core.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_clock.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_prf.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_rman.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_rtc.c#1 branch .. //depot/projects/soc2006/intr_filter/kern/subr_witness.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_generic.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/syscalls.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/syscalls.master#6 integrate .. //depot/projects/soc2006/intr_filter/kern/systrace_args.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_msg.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_sem.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_shm.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/tty.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_pts.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_pty.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_tty.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mbuf.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_aio.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_cluster.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_default.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_export.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_lookup.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_mount.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#7 integrate .. //depot/projects/soc2006/intr_filter/modules/agp/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/ath/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ath_hal/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/digi/digi/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/if_tap/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ipfw/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ipmi/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/ispfw/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/kbdmux/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/libalias/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/libalias/libalias/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/Makefile.inc#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/irc/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/modules.inc#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/mfi/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/pf/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/procfs/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/sound/driver/Makefile#4 integrate .. //depot/projects/soc2006/intr_filter/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/soc2006/intr_filter/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/sound/sound/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/ukbd/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/vkbd/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/wlan/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/net/bpf.h#3 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if.c#6 integrate .. //depot/projects/soc2006/intr_filter/net/if.h#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#7 integrate .. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_loop.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_spppsubr.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_tap.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_tap.h#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_var.h#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_vlan.c#7 integrate .. //depot/projects/soc2006/intr_filter/net/if_vlan_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_input.c#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_output.c#4 integrate .. //depot/projects/soc2006/intr_filter/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_eiface.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_fec.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_vlan.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/if_ether.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/in.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_carp.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_output.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_dummy.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_mod.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_mod.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_old.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_pptp.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/libalias.3#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/raw_ip.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_output.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_subr.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_var.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_forward.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_node.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfsnode.h#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#5 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#3 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/pckbd.c#3 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/agp_amd64.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/agp_ati.c#2 integrate .. //depot/projects/soc2006/intr_filter/pci/agp_i810.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/alpm.c#2 integrate .. //depot/projects/soc2006/intr_filter/pci/amdpm.c#2 integrate .. //depot/projects/soc2006/intr_filter/pci/amdsmb.c#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_rl.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sf.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sfreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sis.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sisreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_ste.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_tl.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_tlreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_vr.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_vrreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_wb.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_wbreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_xl.c#6 integrate .. //depot/projects/soc2006/intr_filter/pci/if_xlreg.h#4 integrate .. //depot/projects/soc2006/intr_filter/pci/intpm.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/intpmreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/pci/nfsmb.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/viapm.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#5 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/clock.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/elf.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/gdb_machdep.h#1 branch .. //depot/projects/soc2006/intr_filter/powerpc/include/stdarg.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/vmparam.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/gdb_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.h#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_arg.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_bsm.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_pipe.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_private.h#2 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_worker.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_framework.h#1 branch .. //depot/projects/soc2006/intr_filter/security/mac/mac_inet.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_internal.h#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_net.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_pipe.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_process.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_socket.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_vfs.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#6 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/asi.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/clock.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/elf.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/stdarg.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/support.S#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/compile/.cvsignore#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/conf/MAC#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/conf/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/conf/NOTES#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/_bus.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/_inttypes.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/_limits.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/_stdint.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/_types.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/asi.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/asm.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/asmacros.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/atomic.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/bus.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/bus_common.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/bus_dma.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/bus_private.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/cache.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ccr.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/clock.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/cpu.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/cpufunc.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/db_machdep.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/elf.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/endian.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/exec.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/float.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/fp.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/frame.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/fsr.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/hviommu.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/idprom.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ieee.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ieeefp.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/in_cksum.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/instr.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/iommureg.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/iommuvar.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/kdb.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/kerneldump.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ktr.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/limits.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/lsu.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/md_var.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/memdev.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/metadata.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/mmu.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/mutex.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/nexusvar.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/param.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/pcb.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/pcpu.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/pmap.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/proc.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/profile.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/pstate.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ptrace.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/reg.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/reloc.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/resource.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/runq.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/setjmp.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/sf_buf.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/sigframe.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/signal.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/smp.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/stdarg.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/sysarch.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/tick.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/tlb.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/trap.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/tsb.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/tstate.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/tte.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/tte_hash.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ucontext.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/upa.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/utrap.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/varargs.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/ver.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/vmparam.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/watch.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/include/wstate.h#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/clock.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/counter.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/exception.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/genassym.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/locore.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mem.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/support.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tick.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/trap.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tte.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/soc2006/intr_filter/sys/_bus_dma.h#1 branch .. //depot/projects/soc2006/intr_filter/sys/_elf_solaris.h#1 branch .. //depot/projects/soc2006/intr_filter/sys/buf.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/bus.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/bus_dma.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/cdefs.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/clock.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/consio.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/copyright.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/digiio.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/elf.h#1 branch .. //depot/projects/soc2006/intr_filter/sys/elf32.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/elf64.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/elf_common.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/event.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/ioccom.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/ipmi.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/kbio.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/kernel.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/kobj.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/lockmgr.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/mac.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/mac_policy.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/mbuf.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/mount.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/msgbuf.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/pioctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/proc.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/rtprio.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/sched.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/signalvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/soundcard.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/sx.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/syscall.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/syscall.mk#5 integrate .. //depot/projects/soc2006/intr_filter/sys/sysctl.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/sysproto.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/systm.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/thr.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/time.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/ttycom.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/umtx.h#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/inode.h#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_contig.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.h#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageq.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/soc2005/libalias/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1149 2006/10/06 10:43:41 ru Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1150 2006/10/08 13:51:27 piso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/libalias.3#11 (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/netinet/libalias/libalias.3,v 1.56 2006/09/26 23:26:53 piso Exp $ +.\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.57 2006/10/08 13:53:45 piso Exp $ .\" .Dd October 1, 2006 .Dt LIBALIAS 3 ==== //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.31 2006/09/27 22:09:35 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -613,6 +613,22 @@ /* Send EOI first thing. */ lapic_eoi(); +#if defined(SMP) && !defined(SCHED_ULE) + /* + * Don't do any accounting for the disabled HTT cores, since it + * will provide misleading numbers for the userland. + * + * No locking is necessary here, since even if we loose the race + * when hlt_cpus_mask changes it is not a big deal, really. + * + * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask + * and unlike other schedulers it actually schedules threads to + * those CPUs. + */ + if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) + return; +#endif + /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; (*la->la_timer_count)++; @@ -782,6 +798,76 @@ } } } + +static void +dump_mask(const char *prefix, uint32_t v, int base) +{ + int i, first; + + first = 1; + for (i = 0; i < 32; i++) + if (v & (1 << i)) { + if (first) { + db_printf("%s:", prefix); + first = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 10 23:11:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1349616A47B; Tue, 10 Oct 2006 23:11:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C746416A416 for ; Tue, 10 Oct 2006 23:11:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD1C743D64 for ; Tue, 10 Oct 2006 23:11:17 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9ANBH6E087978 for ; Tue, 10 Oct 2006 23:11:17 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9ANBHZM087975 for perforce@freebsd.org; Tue, 10 Oct 2006 23:11:17 GMT (envelope-from piso@freebsd.org) Date: Tue, 10 Oct 2006 23:11:17 GMT Message-Id: <200610102311.k9ANBHZM087975@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 107648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Oct 2006 23:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=107648 Change 107648 by piso@piso_newluxor on 2006/10/10 23:11:00 Compilation Affected files ... .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#3 edit .. //depot/projects/soc2006/intr_filter/pci/intpm.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#3 (text) ==== @@ -850,7 +850,7 @@ if (sc->ipmi_irq_res != NULL && sc->ipmi_intr != NULL) { error = bus_setup_intr(dev, sc->ipmi_irq_res, INTR_TYPE_MISC, - sc->ipmi_intr, sc, &sc->ipmi_irq); + NULL, sc->ipmi_intr, sc, &sc->ipmi_irq); if (error) { device_printf(dev, "can't set up interrupt\n"); return (error); ==== //depot/projects/soc2006/intr_filter/pci/intpm.c#4 (text+ko) ==== @@ -746,8 +746,7 @@ device_printf(dev, "could not allocate irq"); return (ENOMEM); } - error = bus_setup_intr(dev, res, INTR_TYPE_MISC, intpm_intr, sc, &ih); - error=bus_setup_intr(dev, res, INTR_TYPE_MISC, NULL, (driver_intr_t *) intpm_intr,sciic, &ih); + error = bus_setup_intr(dev, res, INTR_TYPE_MISC, NULL, intpm_intr, sc, &ih); if (error) { device_printf(dev, "Failed to map intr\n"); return (error); From owner-p4-projects@FreeBSD.ORG Wed Oct 11 06:03:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F38DD16A47C; Wed, 11 Oct 2006 06:03:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FE7116A417 for ; Wed, 11 Oct 2006 06:03:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CAF943D70 for ; Wed, 11 Oct 2006 06:03:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9B63sbW008639 for ; Wed, 11 Oct 2006 06:03:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9B63sUb008635 for perforce@freebsd.org; Wed, 11 Oct 2006 06:03:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 11 Oct 2006 06:03:54 GMT Message-Id: <200610110603.k9B63sUb008635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 107657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 06:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=107657 Change 107657 by rwatson@rwatson_zoo on 2006/10/11 06:03:44 Clean up a number of priv(9) loose ends for VFS: make file system checks for utimes() NULL timestamp more consistent. Add privileges for dtrace. Affected files ... .. //depot/projects/trustedbsd/priv/sys/fs/hpfs/hpfs_vnops.c#3 edit .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#3 edit .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_vnops.c#3 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#4 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#5 edit .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#5 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/fs/hpfs/hpfs_vnops.c#3 (text+ko) ==== @@ -501,15 +501,12 @@ if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - /* - * XXXRW: Why not just rely on the VOP_ACCESS() check here - * instead of calling suser()? - */ - if (cred->cr_uid != hp->h_uid && - (error = suser_cred(cred, SUSER_ALLOWJAIL)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || - (error = VOP_ACCESS(vp, VWRITE, cred, td)))) - return (error); + if (vap->va_vaflags & VA_UTIMES_NULL) { + error = VOP_ACCESS(vp, VADMIN, cred, td); + if (error) + error = VOP_ACCESS(vp, VWRITE, cred, td); + } else + error = VOP_ACCESS(vp, VADMIN, cred, td); if (vap->va_atime.tv_sec != VNOVAL) hp->h_atime = vap->va_atime.tv_sec; if (vap->va_mtime.tv_sec != VNOVAL) ==== //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#3 (text+ko) ==== @@ -484,15 +484,13 @@ if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); - /* - * XXXRW: Isn't VOP_ACCESS() enough here? Why is suser() - * required? - */ - if (cred->cr_uid != pmp->pm_uid && - (error = suser_cred(cred, SUSER_ALLOWJAIL)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || - (error = VOP_ACCESS(ap->a_vp, VWRITE, cred, ap->a_td)))) - return (error); + if (vap->va_vaflags & VA_UTIMES_NULL) { + error = VOP_ACCESS(vp, VADMIN, cred, ap->a_td); + if (error) + error = VOP_ACCESS(vp, VWRITE, cred, + ap->a_td); + } else + error = VOP_ACCESS(vp, VADMIN, cred, ap->a_td); if (vp->v_type != VDIR) { if ((pmp->pm_flags & MSDOSFSMNT_NOWIN95) == 0 && vap->va_atime.tv_sec != VNOVAL) { ==== //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_vnops.c#3 (text+ko) ==== @@ -352,14 +352,13 @@ if (vap->va_atime.tv_sec != VNOVAL) atime = &vap->va_atime; if (mtime != atime) { - /* - * XXXRW: Isn't VOP_ACCESS() here sufficient? Why suser()? - */ - if (ap->a_cred->cr_uid != VTOSMBFS(vp)->sm_uid && - (error = suser_cred(ap->a_cred, SUSER_ALLOWJAIL)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || - (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, ap->a_td)))) - return (error); + if (vap->va_vaflags & VA_UTIMES_NULL) { + error = VOP_ACCESS(vp, VADMIN, ap->a_cred, ap->a_td); + if (error) + error = VOP_ACCESS(vp, VWRITE, ap->a_cred, + ap->a_td); + } else + error = VOP_ACCESS(vp, VADMIN, ap->a_cred, ap->a_td); #if 0 if (mtime == NULL) mtime = &np->n_mtime; ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#4 (text+ko) ==== @@ -825,12 +825,11 @@ } /* * Silently enforce MNT_NOSUID and MNT_USER for unprivileged users. - * - * XXXRW: Which privileges to map this to? Wouldn't it be better - * to see if they weren't already set and only then check privilege? */ - if (suser(td) != 0) - fsflags |= MNT_NOSUID | MNT_USER; + if ((fsflags & (MNT_NOSUID | MNT_USER)) != (MNT_NOSUID | MNT_USER)) { + if (priv_check(td, PRIV_VFS_MOUNT_NONUSER) != 0) + fsflags |= MNT_NOSUID | MNT_USER; + } /* Load KLDs before we lock the covered vnode to avoid reversals. */ vfsp = NULL; ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#5 (text+ko) ==== @@ -1184,9 +1184,14 @@ case S_IFBLK: error = priv_check(td, PRIV_VFS_MKNOD_DEV); break; + case S_IFMT: + error = priv_check(td, PRIV_VFS_MKNOD_BAD); + break; + case S_IFWHT: + error = priv_check(td, PRIV_VFS_MKNOD_WHT); + break; default: - /* XXXRW: Should do a full enumeration here. */ - error = suser_cred(td->td_ucred, SUSER_ALLOWJAIL); + error = EINVAL; break; } if (error) @@ -1231,8 +1236,7 @@ whiteout = 1; break; default: - error = EINVAL; - break; + panic("kern_mknod: invalid mode"); } } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { ==== //depot/projects/trustedbsd/priv/sys/sys/priv.h#5 (text+ko) ==== @@ -104,6 +104,9 @@ PRIV_DEBUG_DIFFCRED, /* Exempt debugging other users. */ PRIV_DEBUG_SUGID, /* Exempt debugging setuid proc. */ PRIV_DEBUG_UNPRIV, /* Exempt unprivileged debug limit. */ + PRIV_DTRACE_KERNEL, /* Allow use of DTrace on the kernel. */ + PRIV_DTRACE_USER, /* Allow process to submit DTrace events. */ + PRIV_DTRACE_PROC, /* Allow attaching DTrace to process. */ PRIV_FIRMWARE_LOAD, /* Can load firmware. */ PRIV_JAIL_ATTACH, /* Attach to a jail. */ PRIV_KENV_SET, /* Set kernel env. variables. */ @@ -167,12 +170,15 @@ PRIV_VFS_GENERATION, /* stat() returns generation number. */ PRIV_VFS_GETFH, /* Can retrieve file handles. */ PRIV_VFS_LINK, /* bsd.hardlink_check_uid */ - PRIV_VFS_MKNOD_DEV, /* Can create device nodes. */ + PRIV_VFS_MKNOD_BAD, /* Can use mknod() to mark bad inodes. */ + PRIV_VFS_MKNOD_DEV, /* Can use mknod() to create device nodes. */ + PRIV_VFS_MKNOD_WHT, /* Can use mknod() to create whiteout. */ PRIV_VFS_MOUNT, /* Can mount(). */ PRIV_VFS_MOUNT_OWNER, /* Override owner on user mounts. */ PRIV_VFS_MOUNT_EXPORTED, /* Can set MNT_EXPORTED on mount. */ PRIV_VFS_MOUNT_PERM, /* Override device node perms at mount. */ PRIV_VFS_MOUNT_SUIDDIR, /* Can set MNT_SUIDDIR on mount. */ + PRIV_VFS_MOUNT_NONUSER, /* Can perform a non-user mount. */ PRIV_VFS_SETGID, /* Can setgid if not in group. */ PRIV_VFS_STICKYFILE, /* Can set sticky bit on file. */ PRIV_VFS_SYSFLAGS, /* Can modify system flags. */ From owner-p4-projects@FreeBSD.ORG Wed Oct 11 07:10:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38B7116A415; Wed, 11 Oct 2006 07:10:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A807C16A412 for ; Wed, 11 Oct 2006 07:10:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53BFE43D55 for ; Wed, 11 Oct 2006 07:10:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9B7ALBj029945 for ; Wed, 11 Oct 2006 07:10:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9B7AKPm029923 for perforce@freebsd.org; Wed, 11 Oct 2006 07:10:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 11 Oct 2006 07:10:20 GMT Message-Id: <200610110710.k9B7AKPm029923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 107659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 07:10:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=107659 Change 107659 by rwatson@rwatson_zoo on 2006/10/11 07:09:45 More suser replacement in the network stack -- add/remove addresses. Handle broadcast/etc ioctls (obsolete) using similar checks, but we might want to move to explicit checks. Affected files ... .. //depot/projects/trustedbsd/priv/sys/netinet/in.c#2 edit .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#6 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/netinet/in.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -232,10 +233,25 @@ switch (cmd) { case SIOCALIFADDR: + if (td != NULL) { + error = priv_check(td, PRIV_NET_ADDIFADDR); + if (error) + return (error); + } + if (!ifp) + return EINVAL; + return in_lifaddr_ioctl(so, cmd, data, ifp, td); + case SIOCDLIFADDR: - if (td && (error = suser(td)) != 0) - return error; - /*fall through*/ + if (td != NULL) { + error = priv_check(td, PRIV_NET_DELIFADDR); + if (error) + return (error); + } + if (!ifp) + return EINVAL; + return in_lifaddr_ioctl(so, cmd, data, ifp, td); + case SIOCGLIFADDR: if (!ifp) return EINVAL; @@ -292,8 +308,11 @@ case SIOCSIFADDR: case SIOCSIFNETMASK: case SIOCSIFDSTADDR: - if (td && (error = suser(td)) != 0) - return error; + if (td != NULL) { + error = priv_check(td, PRIV_NET_ADDIFADDR); + if (error) + return (error); + } if (ifp == 0) return (EADDRNOTAVAIL); @@ -330,8 +349,11 @@ break; case SIOCSIFBRDADDR: - if (td && (error = suser(td)) != 0) - return error; + if (td != NULL) { + error = priv_check(td, PRIV_NET_ADDIFADDR); + if (error) + return (error); + } /* FALLTHROUGH */ case SIOCGIFADDR: ==== //depot/projects/trustedbsd/priv/sys/sys/priv.h#6 (text+ko) ==== @@ -212,6 +212,8 @@ PRIV_NET_DELIFGROUP, /* Delete interface group. */ PRIV_NET_IFCREATE, /* Create cloned interface. */ PRIV_NET_IFDESTROY, /* Destroy cloned interface. */ + PRIV_NET_ADDIFADDR, /* Add protocol address to interface. */ + PRIV_NET_DELIFADDR, /* Delete protocol address on interface. */ PRIV_NET80211_GETKEY, /* Query 802.11 keys. */ PRIV_NET80211_MANAGE, /* Administer 802.11. */ PRIV_NETATALK_RESERVEDPORT, /* Bind low port number. */ From owner-p4-projects@FreeBSD.ORG Wed Oct 11 12:57:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7215A16A47B; Wed, 11 Oct 2006 12:57:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31B3F16A407 for ; Wed, 11 Oct 2006 12:57:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDDDA43D69 for ; Wed, 11 Oct 2006 12:57:48 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BCvm8c092488 for ; Wed, 11 Oct 2006 12:57:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BCvm0R092482 for perforce@freebsd.org; Wed, 11 Oct 2006 12:57:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Oct 2006 12:57:48 GMT Message-Id: <200610111257.k9BCvm0R092482@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 107681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 12:57:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=107681 Change 107681 by hselasky@hselasky_mini_itx on 2006/10/11 12:57:37 Search endpoint descriptors from the beginning, and not the end. Add a definition for any endpoint, any direction and any type. New feature: Using ".type = UE_BULK_INTR" in "struct usbd_config" means that the config entry will match either a BULK or a INTERRUPT endpoint. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#7 (text+ko) ==== @@ -290,7 +290,9 @@ #define UE_SET_DIR(a,d) ((a) | (((d)&1) << 7)) #define UE_DIR_IN 0x80 #define UE_DIR_OUT 0x00 +#define UE_DIR_ANY 0xff /* for internal use only! */ #define UE_ADDR 0x0f +#define UE_ADDR_ANY 0xff /* for internal use only! */ #define UE_GET_ADDR(a) ((a) & UE_ADDR) uByte bmAttributes; #define UE_XFERTYPE 0x03 @@ -298,6 +300,8 @@ #define UE_ISOCHRONOUS 0x01 #define UE_BULK 0x02 #define UE_INTERRUPT 0x03 +#define UE_BULK_INTR 0xfe /* for internal use only! */ +#define UE_TYPE_ANY 0xff /* for internal use only! */ #define UE_GET_XFERTYPE(a) ((a) & UE_XFERTYPE) #define UE_ISO_TYPE 0x0c #define UE_ISO_ASYNC 0x04 ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#17 (text+ko) ==== @@ -156,38 +156,51 @@ const struct usbd_config *setup) { struct usbd_pipe *pipe; - u_int8_t index = setup->index; + uint8_t index = setup->index; + uint8_t ea; + uint8_t at; PRINTFN(8,("udev=%p iface_index=%d address=0x%x " "type=0x%x dir=0x%x index=%d\n", udev, iface_index, setup->endpoint, setup->type, setup->direction, setup->index)); - pipe = &udev->pipes_end[0]; - while(--pipe >= &udev->pipes[0]) - { - if((pipe->edesc) && - (pipe->iface_index == iface_index) && - (((pipe->edesc->bEndpointAddress & (UE_DIR_IN|UE_DIR_OUT)) == setup->direction) || (setup->direction == 0xff)) && - (((pipe->edesc->bEndpointAddress & UE_ADDR) == setup->endpoint) || (setup->endpoint == 0xff)) && - (((pipe->edesc->bmAttributes & UE_XFERTYPE) == setup->type) || (setup->type == 0xff)) - ) - { - if(!index--) - { - goto found; - } + /* NOTE: pipes should be searched from the beginning */ + + for (pipe = udev->pipes; + ((pipe >= udev->pipes) && + (pipe < udev->pipes_end)); + pipe++) { + + if ((pipe->edesc == NULL) || + (pipe->iface_index != iface_index)) { + continue; + } + + ea = pipe->edesc->bEndpointAddress; + at = pipe->edesc->bmAttributes; + + if (((setup->direction == (ea & (UE_DIR_IN|UE_DIR_OUT))) || + (setup->direction == UE_DIR_ANY)) && + ((setup->endpoint == (ea & UE_ADDR)) || + (setup->endpoint == UE_ADDR_ANY)) && + ((setup->type == (at & UE_XFERTYPE)) || + (setup->type == UE_TYPE_ANY) || + ((setup->type == UE_BULK_INTR) && (at & 2)))) { + + if(!index--) { + goto found; } + } } - /* match against default pipe last, so that "any pipe", + /* Match against default pipe last, so that "any pipe", * "any address" and "any direction" returns the first - * pipe of the interface + * pipe of the interface. "iface_index" and "direction" + * is ignored: */ if((setup->endpoint == 0) && - (setup->type == 0)) - /* "iface_index" and "direction" is ignored */ - { + (setup->type == 0)) { pipe = &udev->default_pipe; goto found; } From owner-p4-projects@FreeBSD.ORG Wed Oct 11 13:00:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A819016A47C; Wed, 11 Oct 2006 13:00:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50FF716A415 for ; Wed, 11 Oct 2006 13:00:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75FE943D76 for ; Wed, 11 Oct 2006 12:59:52 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BCxqqs093980 for ; Wed, 11 Oct 2006 12:59:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BCxpru093965 for perforce@freebsd.org; Wed, 11 Oct 2006 12:59:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Oct 2006 12:59:51 GMT Message-Id: <200610111259.k9BCxpru093965@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 107682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 13:00:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107682 Change 107682 by hselasky@hselasky_mini_itx on 2006/10/11 12:59:06 Ported if_zyd from OpenBSD to FreeBSD. The driver is not yet functional. Affected files ... .. //depot/projects/usb/src/sys/conf/files#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#1 add .. //depot/projects/usb/src/sys/dev/usb/if_zydfw.h#1 add .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#1 add .. //depot/projects/usb/src/sys/dev/usb/usbdevs#3 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#10 (text+ko) ==== @@ -1020,6 +1020,7 @@ dev/usb/if_ural.c optional ural dev/usb/if_rue.c optional rue dev/usb/if_udav.c optional udav +dev/usb/if_zyd.c optional zyd dev/usb/ohci.c optional ohci dev/usb/ohci_pci.c optional ohci pci dev/usb/sl811hs.c optional slhci ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -319,6 +319,7 @@ vendor LINKSYS 0x066b Linksys vendor ACERSA 0x066e Acer vendor SIGMATEL 0x066f Sigmatel +vendor DRAYTEK 0x0675 DrayTek vendor AIWA 0x0677 Aiwa vendor ACARD 0x0678 ACARD vendor PROLIFIC 0x067b Prolific @@ -359,6 +360,7 @@ vendor BRIMAX 0x078e Brimax vendor AXIS 0x0792 Axis vendor ABL 0x0794 ABL +vendor SAGEM 0x079b Sagem vendor SUNCOMM 0x079c Sun Communications vendor ALFADATA 0x079d Alfadata vendor NATIONALTECH 0x07a2 National Technical @@ -451,6 +453,7 @@ vendor BROADCOM 0x0a5c Broadcom vendor GREENHOUSE 0x0a6b GREENHOUSE vendor GEOCAST 0x0a79 Geocast +vendor ZYDAS 0x0ace ZyDAS Technology vendor NEODIO 0x0aec Neodio vendor VODAFONE 0x0af0 Vodafone vendor ASUS 0x0b05 ASUS @@ -479,6 +482,7 @@ vendor ACDC 0x0d7e ACDC vendor ABC 0x0d8c ABC vendor MSI 0x0db0 Micro Star International +vendor SITECOMEU 0x0df6 Sitecom Europe vendor HAWKING 0x0e66 Hawking vendor GMATE 0x0e7e G.Mate, Inc vendor OTI 0x0ea0 Ours @@ -501,16 +505,20 @@ vendor TSUNAMI 0x1241 Tsunami vendor CREATIVE2 0x1292 Creative Labs vendor BELKIN2 0x1293 Belkin +vendor CYBERTAN 0x129b CyberTAN Technology vendor AINCOMM 0x12fd Aincomm vendor MOBILITY 0x1342 Mobility vendor LINKSYS4 0x13b1 Linksys vendor SHARK 0x13d2 Shark +vendor WISTRONNEWEB 0x1435 Wistron NeWeb vendor SILICOM 0x1485 Silicom vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies vendor CONCEPTRONIC 0x14b2 Conceptronic +vendor PLANEX3 0x14ea Planex Communications vendor SILICONPORTALS 0x1527 Silicon Portals vendor PNY 0x154b PNY +vendor UMEDIA 0x157e U-MEDIA Communications vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX vendor INSIDEOUT 0x1608 Inside Out Networks @@ -518,6 +526,7 @@ vendor ACTIONTEC 0x1668 Actiontec vendor LINKSYS3 0x1915 Linksys vendor DLINK 0x2001 D-Link +vendor PLANEX2 0x2019 Planex Communications vendor ERICSSON 0x2282 Ericsson vendor MOTOROLA2 0x22b8 Motorola vendor TRIPPLITE 0x2478 Tripp-Lite @@ -534,9 +543,11 @@ vendor IRIVER 0x4102 iRiver vendor DELL 0x413c Dell vendor AVERATEC 0x50c2 Averatec +vendor SWEEX 0x5173 Sweex vendor ONSPEC2 0x55aa OnSpec vendor ZINWELL 0x5a57 Zinwell vendor SITECOM 0x6189 Sitecom +vendor 3COM2 0x6891 3Com vendor INTEL 0x8086 Intel vendor HP2 0xf003 Hewlett Packard @@ -558,6 +569,8 @@ product 3COMUSR HOMECONN 0x009d 3Com HomeConnect camera product 3COMUSR USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro +product 3COM2 3CRUSB10075 0xa727 3CRUSB10075 + /* AboCom products */ product ABOCOM XX1 0x110c XX1 product ABOCOM XX2 0x200c XX2 @@ -570,6 +583,7 @@ product ABOCOM XX7 0x400c XX7 product ABOCOM XX8 0x4102 XX8 product ABOCOM XX9 0x4104 XX9 +product ABOCOM WL54 0x6001 WL54 product ABOCOM XX10 0xabc1 XX10 /* Accton products */ @@ -674,6 +688,7 @@ /* ASUS products */ product ASUS WL167G 0x1707 WL-167g wireless adapter +product ASUS WL159G 0x170c WL-159g /* ATen products */ product ATEN UC1284 0x2001 Parallel printer @@ -703,6 +718,7 @@ product BELKIN F5U409 0x0409 F5U409 Serial product BELKIN F5U120 0x1203 F5U120-PC Hub product BELKIN F5D7050 0x7050 F5D7050 wireless adapter +product BELKIN F5D7050C 0x705c F5D705C 54g USB Network Adapter /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet @@ -783,6 +799,9 @@ /* CTX products */ product CTX EX1300 0x9999 Ex1300 hub +/* CyberTAN Technology */ +product CYBERTAN TG54USB 0x1666 TG54USB + /* Cypress Semiconductor products */ product CYPRESS MOUSE 0x0001 mouse product CYPRESS THERMO 0x0002 thermometer @@ -823,6 +842,9 @@ product DLINK DSB650TX2 0x4102 10/100 ethernet product DLINK DSB650 0xabc1 10/100 ethernet +/* DrayTek products */ +product DRAYTEK VIGOR550 0x0550 Vigor550 + /* EIZO products */ product EIZO HUB 0x0000 hub product EIZO MONITOR 0x0001 monitor @@ -1357,6 +1379,10 @@ /* P.I. Engineering products */ product PIENGINEERING PS2USB 0x020b PS2 to Mac USB Adapter +/* Planex Communications products */ +product PLANEX3 GWUS54MINI 0xab13 GW-US54Mini +product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL + /* Plextor Corp. */ product PLEXTOR 40_12_40U 0x0011 PlexWriter 40/12/40U @@ -1428,6 +1454,9 @@ /* RATOC Systems products */ product RATOC REXUSB60 0xb000 REX-USB60 +/* Sagem products */ +product SAGEM XG760A 0x004a XG-760A + /* Samsung products */ product SAMSUNG ML6060 0x3008 ML-6060 laser printer @@ -1491,6 +1520,9 @@ product SITECOM LN029 0x182d USB 2.0 Ethernet product SITECOM SERIAL 0x2068 USB to serial cable (v2) +/* Sitecom Europe products */ +product SITECOMEU WL113 0x9071 WL-113 + /* SmartBridges products */ product SMARTBRIDGES SMARTLINK 0x0001 SmartLink USB ethernet product SMARTBRIDGES SMARTNIC 0x0003 smartNIC 2 PnP ethernet @@ -1556,6 +1588,9 @@ product DIAMOND2 RIO600USB 0x5001 Rio 600 USB product DIAMOND2 RIO800USB 0x5002 Rio 800 USB +/* Sweex products */ +product SWEEX ZD1211 0x1809 ZD1211 + /* System TALKS, Inc. */ product SYSTEMTALKS SGCX2UL 0x1920 SGC-X2UL @@ -1572,6 +1607,10 @@ /* TEAC products */ product TEAC FD05PUB 0x0000 FD-05PUB floppy +/* Tekram Technology products */ +product TEKRAM QUICKWLAN 0x1630 QuickWLAN +product TEKRAM ZD1211 0x5630 ZD1211 + /* Telex Communications products */ product TELEX MIC1 0x0001 Enhanced USB Microphone @@ -1595,8 +1634,9 @@ /* Trumpion products */ product TRUMPION C3310 0x1100 Comotron C3310 MP3 player -/* TwinMOS */ +/* TwinMOS products */ product TWINMOS MDIV 0x1325 Memory Disk IV +product TWINMOS G240 0xa006 G240 /* Ultima products */ product ULTIMA 1200UBPLUS 0x4002 1200 UB Plus scanner @@ -1609,6 +1649,10 @@ product UMAX ASTRA2200U 0x0230 Astra 2200U Scanner product UMAX ASTRA3400 0x0060 Astra 3400 Scanner +/* U-MEDIA Communications products */ +product UMEDIA TEW429UB_A 0x300a TEW-429UB_A +product UMEDIA TEW429UB 0x300b TEW-429UB + /* Universal Access products */ product UNIACCESS PANACHE 0x0101 Panache Surf USB ISDN Adapter @@ -1647,6 +1691,9 @@ /* Windbond Electronics */ product WINBOND UH104 0x5518 4-port USB Hub +/* Wistron NeWeb products */ +product WISTRONNEWEB UR055G 0x0711 UR055G + /* Xirlink products */ product XIRLINK PCCAM 0x8080 IBM PC Camera @@ -1670,6 +1717,10 @@ /* Zoom Telephonics, Inc. products */ product ZOOM 2986L 0x9700 2986L Fax modem +/* ZyDAS Technology products */ +product ZYDAS ZD1211 0x1211 ZD1211 + /* ZyXEL Communication Co. products */ product ZYXEL OMNI56K 0x1500 Omni 56K Plus product ZYXEL 980N 0x2011 Scorpion-980N keyboard +product ZYXEL ZYAIRG220 0x3401 ZyAIR G-220 From owner-p4-projects@FreeBSD.ORG Wed Oct 11 13:38:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A66816A4A7; Wed, 11 Oct 2006 13:38:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 245EE16A40F for ; Wed, 11 Oct 2006 13:38:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 537B643E36 for ; Wed, 11 Oct 2006 13:36:56 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BDaf2S022726 for ; Wed, 11 Oct 2006 13:36:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BDaeEm022717 for perforce@freebsd.org; Wed, 11 Oct 2006 13:36:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Oct 2006 13:36:40 GMT Message-Id: <200610111336.k9BDaeEm022717@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 107684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 13:38:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=107684 Change 107684 by hselasky@hselasky_mini_itx on 2006/10/11 13:36:17 Update documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#10 (text+ko) ==== @@ -181,16 +181,17 @@ *------------------------------------------------------------------------*/ - The "type" field selects the USB pipe type. Valid values are: - UE_INTERRUPT, UE_CONTROL, UE_BULK, UE_ISOCHRONOUS. This field is - mandatory. + UE_INTERRUPT, UE_CONTROL, UE_BULK, UE_ISOCHRONOUS. The special + value UE_BULK_INTR will select BULK and INTERRUPT pipes. + This field is mandatory. - The "endpoint" field selects the USB endpoint number. A value of - 0xFF or "-1" will select the first matching endpoint. This field is - mandatory. + 0xFF, "-1" or "UE_ADDR_ANY" will select the first matching endpoint. + This field is mandatory. -- The "direction" field selects the USB endpoint direction. A value of 0xFF - or "-1" will select the first matching endpoint. Else valid values - are: "UE_DIR_IN" and "UE_DIR_OUT". This field is mandatory. +- The "direction" field selects the USB endpoint direction. A value of 0xFF, + "-1" or "UE_DIR_ANY" will select the first matching endpoint. Else valid + values are: "UE_DIR_IN" and "UE_DIR_OUT". This field is mandatory. - The "interval" field selects the interrupt interval, for "type" = UE_INTERRUPT. The "interval" is given in milliseconds. "0" selects the default @@ -261,3 +262,4 @@ panics. --HPS + From owner-p4-projects@FreeBSD.ORG Wed Oct 11 15:21:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C684416A40F for ; Wed, 11 Oct 2006 15:21:58 +0000 (UTC) (envelope-from streamsendbouncer@me21507.mailengine1.com) Received: from me21507.mailengine1.com (me21507.mailengine1.com [66.59.24.112]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1CD743D45 for ; Wed, 11 Oct 2006 15:21:52 +0000 (GMT) (envelope-from streamsendbouncer@me21507.mailengine1.com) Received: by me21507.mailengine1.com (PowerMTA(TM) v3.0r29) id h5k6100anbg1 for ; Wed, 11 Oct 2006 08:20:30 -0700 (envelope-from ) MIME-Version: 1.0 X-Mailer: StreamSend X-Streamsendid: 3326+5+511603+14+me21507.mailengine1.com Date: Wed, 11 Oct 2006 08:20:11 -0700 From: "The Second International Joint Conferences on Computer, Information, and Systems Sciences, and Engineering." To: p4-projects@freebsd.org Message-Id: <20061011152152.B1CD743D45@mx1.FreeBSD.org> Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: Paper Submission Deadline Extended to October 23, 2006 - CFP: CISSE 2006 Online International E-Conference. X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 15:21:59 -0000 Dear Colleagues, Due to numerous deadline extension requests from potential CISSE 2006 authors, the CISSE organizing committee has decided to extend the paper submission deadline to 10/23/2006. Please note that this is a hard deadline, so that the technical committees can perform their paper reviewing duties in a timely manner. It is our pleasure to invite you to submit your work to CISSE 2006 (http://www.cisse2006.org) The world's leading International Engineering/Computing and Systems Research Online E-Conference. CISSE 2005 was the first high-caliber Research Conference in the world to be completely conducted online in real-time via the internet. The conference received many submissions already and we would greatly appreciate it if you can submit your manuscripts as soon as possible to facilitate a timely reviewing process. We are looking forward to receiving your paper contributions. The conference flyers can be downloaded from the conference web site. Best Regards, ---------------------------- CISSE Management Team http://www.cisse2006.org info@cisse2006.org ---------------------------- If you received this email in error, please forward it to the appropriate department at your institution. If you wish to unsubscribe please follow the unsubscribe link at the bottom of the email. Please do not reply to this message, your reply will not be received. If you need to contact us please email us at info@cisse2006.org ********************************************************************* * The Second International Joint Conferences on Computer, * * Information, and Systems Sciences, and Engineering (CISSE 2006) * * * * * * * * http://www.cisse2006.org * * * * * * * ********************************************************************* December 4-14, 2006 Technically Co-Sponsored by: Institute of Electrical & Electronics Engineers (IEEE) University of Bridgeport Update: CISSE 2005 proceedings books now available from Springer. Book 1: http://www.cisse2006.org/flyer1.pdf Book 2: http://www.cisse2006.org/flyer2.pdf --------------------------------------------------------------------- CONFERENCE OVERVIEW --------------------------------------------------------------------- CISSE 2006 provides a virtual forum for presentation and discussion of the state-of the-art research on computers, information and systems sciences and engineering. CISSE 2006 is the second conference of the CISSE series of e-conferences. CISSE 2005 was the World's first International Engineering/Computing and Systems Research Online E-Conference. CISSE 2005 was the first high-caliber Research Conference in the world to be completely conducted online in real-time via the internet. The CISSE 2006 virtual conference will be conducted through the Internet using web-conferencing tools, made available by the conference. Authors will be presenting their PowerPoint and audio presentations using very simple web-conferencing tools without the need for travel. Conference sessions will be broadcast to all the conference participants, where session participants can interact with the presenter during the presentation and (or) during the Q&A slot that follows the presentation. This international conference will be held entirely on-line. The accepted and presented papers will be made available after the conference both on a CD and as a book publication. Springer, the official publisher for CISSE, published the 2005 proceedings in 2 books. Book 1: http://www.cisse2006.org/flyer1.pdf Book 2: http://www.cisse2006.org/flyer2.pdf Conference participants - authors, presenters and attendees - only need an internet connection and sound available on their computers in order to be able to contribute and participate in this international ground-breaking conference. The on-line structure of this high-quality event will allow academic professionals and industry participants to contribute work and attend world-class technical presentations based on rigorously refereed submissions, live, without the need for investing significant travel funds or time out of the office. Potential non-author conference attendees who cannot make the on-line conference dates are encouraged to register, as the entire joint conferences will be archived for future viewing. CISSE 2005 received 255 research paper submissions and the final program included 140 accepted papers, from more than 45 countries. The concept and format of CISSE 2005 were very exciting and ground-breaking. The PowerPoint presentations, final paper manuscripts and time schedule for live presentations over the web had been available for 3 weeks prior to the start of the conference for all registrants, so they could choose the presentations they want to attend and think about questions that they might want to ask. The live audio presentations were also recorded and were part of the permanent CISSE archive, which also included all power point presentations and papers. The schedule and papers presented in CISSE 2005 is available at: http://www.cisse2006.org/cisse2005.aspx The CISSE conference audio room provided superb audio even over low speed internet connections, the ability to display PowerPoint presentations, and cross-platform compatibility (the conferencing software runs on Windows, Mac, and any other operating system that supports Java). In addition, the conferencing system allowed for an unlimited number of participants, which in turn granted us the opportunity to allow all CISSE participants to attend all presentations, as opposed to limiting the number of available seats for each session. CISSE 2006 is composed of the following four conferences: International Conference on Industrial Electronics, Technology & Automation (IETA 06): http://www.cisse2006.org/ieta.aspx International Conference on Telecommunications and Networking (TeNe 06): http://www.cisse2006.org/tene.aspx International Conference on Systems, Computing Sciences and Software Engineering (SCSS 06): http://www.cisse2006.org/scss.aspx International Conference on Engineering Education, Instructional Technology, Assessment, and E-learning (EIAE 06): http://www.cisse2006.org/eiae.aspx For a detailed list of topics, please visit the individual web sites of the four conferences. Paper Submission ================= Prospective authors are invited to submit full papers electronically in Microsoft Word format through the website of the conference at http://www.cisse2006.org/author/submit.aspx Accepted papers must be presented in the virtual conference by one of the authors. To submit your paper, please visit http://www.cisse2006.org/author/submit.aspx *New* Paper submission Deadline: October 23rd, 2006 *New Date:* Notification of Acceptance: November 10th, 2006 Final Manuscript and Registration: November 24th, 2006 Click here on http://server1.streamsend.com/streamsend/unsubscribe.php?md=14&cd=3326&ud=1a837b6a9f3592909bae3f1e53174ce1 to update your profile or Unsubscribe From owner-p4-projects@FreeBSD.ORG Wed Oct 11 17:34:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD4CE16A522; Wed, 11 Oct 2006 17:34:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96BC116A51F for ; Wed, 11 Oct 2006 17:34:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE7CB44104 for ; Wed, 11 Oct 2006 17:26:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BHQVsf090659 for ; Wed, 11 Oct 2006 17:26:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BHQVGt090656 for perforce@freebsd.org; Wed, 11 Oct 2006 17:26:31 GMT (envelope-from millert@freebsd.org) Date: Wed, 11 Oct 2006 17:26:31 GMT Message-Id: <200610111726.k9BHQVGt090656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 17:34:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=107690 Change 107690 by millert@millert_macbook on 2006/10/11 17:25:46 Update from bugzilla. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/ERRATA#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/ERRATA#3 (text+ko) ==== @@ -43,3 +43,20 @@ to get/set this label. Security server methods that return a label handle or text label can use the port label for access control. + +316: vn_rdwr_64() calls mac_vnode_check_{read,write} (). In the case of + Apple Double Extended Attributes the VNODE may not be labeled, + causing problems with policies that expect a valid label. The + current work around involves a new ioflag (IO_NOAUTH) which bypasses + MAC checks. MAC mediation in vn_rdwr_64() needs to be evaluated. + +317: The framework uses the VL_LABELED flag to indicate that a vnode has + been labeled by the framework/policy. This flag is set regardless of + the success/failure of label association/creation. If a policy provides + consistency checking for xattr backed labels and fails to provide a valid + label, the vnode will not have a valid label. Policy and framework + interactions when bad labels is read from the file system needs to be + reviewed. + +321: Additional documentation is needed in mac_policy.h to specify if an + entrypoint may sleep. From owner-p4-projects@FreeBSD.ORG Wed Oct 11 17:34:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B79DC16A4C2; Wed, 11 Oct 2006 17:34:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95A1616A4A7 for ; Wed, 11 Oct 2006 17:34:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64E1E43DE6 for ; Wed, 11 Oct 2006 17:26:38 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BHQVCa090666 for ; Wed, 11 Oct 2006 17:26:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BHQViQ090663 for perforce@freebsd.org; Wed, 11 Oct 2006 17:26:31 GMT (envelope-from millert@freebsd.org) Date: Wed, 11 Oct 2006 17:26:31 GMT Message-Id: <200610111726.k9BHQViQ090663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 17:34:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=107691 Change 107691 by millert@millert_macbook on 2006/10/11 17:26:17 Move block of code so that labeling is only performed in the non error code path and while the vnode is protected by an IO reference (v_iocount). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#6 (text+ko) ==== @@ -3400,19 +3400,6 @@ vnode_unlock(vp); return(ENOENT); } -#ifdef MAC - if (vnode_mount(vp) != NULL && - vfs_flags(vnode_mount(vp)) & MNT_MULTILABEL) { - int error; - - error = vnode_label1(vp); - if (error) { - if (!locked) - vnode_unlock(vp); - return (error); - } - } -#endif /* * will return VL_DEAD ones */ @@ -3452,6 +3439,20 @@ vnode_list_remove(vp); } vp->v_iocount++; +#ifdef MAC + if (vnode_mount(vp) != NULL && + vfs_flags(vnode_mount(vp)) & MNT_MULTILABEL) { + int error; + + error = vnode_label1(vp); + if (error) { + vp->v_iocount--; + if (!locked) + vnode_unlock(vp); + return (error); + } + } +#endif #ifdef JOE_DEBUG record_vp(vp, 1); #endif From owner-p4-projects@FreeBSD.ORG Wed Oct 11 17:35:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82FEF16A4EB; Wed, 11 Oct 2006 17:35:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3057116A4CA for ; Wed, 11 Oct 2006 17:35:06 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8C2A43E49 for ; Wed, 11 Oct 2006 17:27:33 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BHRXrG090798 for ; Wed, 11 Oct 2006 17:27:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BHRXdB090795 for perforce@freebsd.org; Wed, 11 Oct 2006 17:27:33 GMT (envelope-from millert@freebsd.org) Date: Wed, 11 Oct 2006 17:27:33 GMT Message-Id: <200610111727.k9BHRXdB090795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 17:35:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=107692 Change 107692 by millert@millert_macbook on 2006/10/11 17:27:12 Add support for SELinux library python wrappers. Note that since selinuxswig_wrap.c and selinux.py require SWIG to generate, and they change rarely, we just check in the generated files. Emable building of audit2allow. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux.py#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig.i#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig_wrap.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#6 (text+ko) ==== @@ -26,15 +26,54 @@ RANLIB = ranlib INSTALL = install +LIBDIR = /usr/lib/ +PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') +PYINC ?= /usr/include/$(PYLIBVER) +PYLIB ?= /usr/lib/$(PYLIBVER) +#PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) +PYTHONLIBDIR ?= /System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/ + +SWIGIF= selinuxswig.i +SWIGCOUT= selinuxswig_wrap.c +SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT)) +SWIGSO=_selinux.so +SWIGFILES=$(SWIGSO) selinux.py +SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ + +GENERATED=$(SWIGCOUT) + + + all: lib$(LIB).a -install: all +pywrap: all $(SWIGSO) + +$(SWIGLOBJ): $(SWIGCOUT) + $(CC) $(CFLAGS) -I$(PYINC) -fPIC -dynamiclib -DSHARED -c -o $@ $< + +$(SWIGSO): $(SWIGLOBJ) + $(CC) $(LDFLAGS) -dynamiclib -o $@ $< -L. -lselinux -L../../../../darwin/libmac/ -lmac -L../../libsecompat -lsecompat -L../../libsepol/src -lsepol -L$(LIBDIR) -Wl,-flat_namespace -Wl,-undefined -Wl,suppress + +$(SWIGCOUT): $(SWIGIF) + $(SWIG) $^ + +swigify: $(SWIGIF) + $(SWIG) $^ + + +install: all install-pywrap $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \ $(DESTDIR)/usr/lib $(RANLIB) $(DESTDIR)/usr/lib/lib$(LIB).a +install-pywrap: pywrap + test -d $(DESTDIR)/$(PYTHONLIBDIR)/site-packages || install -m 755 -d $(DESTDIR)/$(PYTHONLIBDIR)/site-packages + install -m 755 $(SWIGFILES) $(DESTDIR)/$(PYTHONLIBDIR)/site-packages + + + clean: - rm -f lib$(LIB).a $(OBJS) + rm -f lib$(LIB).a $(OBJS) $(SWIGLOBJ) $(SWIGSO) lib$(LIB).a:: $(OBJS) rm -f lib$(LIB).a ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux.py#4 (text+ko) ==== @@ -49,13 +49,6 @@ getpidcon = _selinux.getpidcon getprevcon = _selinux.getprevcon getexeccon = _selinux.getexeccon -setexeccon = _selinux.setexeccon -getfscreatecon = _selinux.getfscreatecon -setfscreatecon = _selinux.setfscreatecon -getkeycreatecon = _selinux.getkeycreatecon -setkeycreatecon = _selinux.setkeycreatecon -getsockcreatecon = _selinux.getsockcreatecon -setsockcreatecon = _selinux.setsockcreatecon getfilecon = _selinux.getfilecon lgetfilecon = _selinux.lgetfilecon fgetfilecon = _selinux.fgetfilecon @@ -105,11 +98,9 @@ selinux_path = _selinux.selinux_path selinux_check_passwd_access = _selinux.selinux_check_passwd_access checkPasswdAccess = _selinux.checkPasswdAccess -rpm_execcon = _selinux.rpm_execcon is_context_customizable = _selinux.is_context_customizable selinux_trans_to_raw_context = _selinux.selinux_trans_to_raw_context selinux_raw_to_trans_context = _selinux.selinux_raw_to_trans_context -selinux_getpolicytype = _selinux.selinux_getpolicytype getseuserbyname = _selinux.getseuserbyname ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig.i#4 (text+ko) ==== @@ -49,13 +49,6 @@ extern int getpidcon(int pid, security_context_t *con); extern int getprevcon(security_context_t *con); extern int getexeccon(security_context_t *con); -extern int setexeccon(security_context_t con); -extern int getfscreatecon(security_context_t *con); -extern int setfscreatecon(security_context_t context); -extern int getkeycreatecon(security_context_t *con); -extern int setkeycreatecon(security_context_t context); -extern int getsockcreatecon(security_context_t *con); -extern int setsockcreatecon(security_context_t context); extern int getfilecon(const char *path, security_context_t *con); extern int lgetfilecon(const char *path, security_context_t *con); extern int fgetfilecon(int fd, security_context_t *con); @@ -115,10 +108,6 @@ extern const char *selinux_path(void); extern int selinux_check_passwd_access(access_vector_t requested); extern int checkPasswdAccess(access_vector_t requested); -extern int rpm_execcon(unsigned int verified, - const char *filename, - char *const argv[], char *const envp[]); - extern int is_context_customizable (security_context_t scontext); extern int selinux_trans_to_raw_context(char *trans, @@ -133,5 +122,5 @@ %typemap(argout) char ** { $result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1)); } -extern int selinux_getpolicytype(char **enforce); +/*extern int selinux_getpolicytype(char **enforce);*/ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig_wrap.c#4 (text+ko) ==== @@ -2958,156 +2958,6 @@ } -SWIGINTERN PyObject *_wrap_setexeccon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - security_context_t arg1 ; - int result; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:setexeccon",&obj0)) SWIG_fail; - { - arg1 = (security_context_t)PyString_AsString(obj0); - } - result = (int)setexeccon(arg1); - resultobj = SWIG_From_int((int)(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_getfscreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - security_context_t *arg1 = (security_context_t *) 0 ; - int result; - security_context_t temp1 ; - char *temp10 ; - - { - arg1 = &temp1; - } - if (!PyArg_ParseTuple(args,(char *)":getfscreatecon")) SWIG_fail; - result = (int)getfscreatecon(arg1); - resultobj = SWIG_From_int((int)(result)); - { - if (*arg1) - temp10 = *arg1; - else - temp10 = ""; - resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10)); - } - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_setfscreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - security_context_t arg1 ; - int result; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:setfscreatecon",&obj0)) SWIG_fail; - { - arg1 = (security_context_t)PyString_AsString(obj0); - } - result = (int)setfscreatecon(arg1); - resultobj = SWIG_From_int((int)(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_getkeycreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - security_context_t *arg1 = (security_context_t *) 0 ; - int result; - security_context_t temp1 ; - char *temp10 ; - - { - arg1 = &temp1; - } - if (!PyArg_ParseTuple(args,(char *)":getkeycreatecon")) SWIG_fail; - result = (int)getkeycreatecon(arg1); - resultobj = SWIG_From_int((int)(result)); - { - if (*arg1) - temp10 = *arg1; - else - temp10 = ""; - resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10)); - } - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_setkeycreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - security_context_t arg1 ; - int result; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:setkeycreatecon",&obj0)) SWIG_fail; - { - arg1 = (security_context_t)PyString_AsString(obj0); - } - result = (int)setkeycreatecon(arg1); - resultobj = SWIG_From_int((int)(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_getsockcreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - security_context_t *arg1 = (security_context_t *) 0 ; - int result; - security_context_t temp1 ; - char *temp10 ; - - { - arg1 = &temp1; - } - if (!PyArg_ParseTuple(args,(char *)":getsockcreatecon")) SWIG_fail; - result = (int)getsockcreatecon(arg1); - resultobj = SWIG_From_int((int)(result)); - { - if (*arg1) - temp10 = *arg1; - else - temp10 = ""; - resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10)); - } - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_setsockcreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - security_context_t arg1 ; - int result; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:setsockcreatecon",&obj0)) SWIG_fail; - { - arg1 = (security_context_t)PyString_AsString(obj0); - } - result = (int)setsockcreatecon(arg1); - resultobj = SWIG_From_int((int)(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_getfilecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -4134,58 +3984,6 @@ } -SWIGINTERN PyObject *_wrap_rpm_execcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - unsigned int arg1 ; - char *arg2 = (char *) 0 ; - char **arg3 ; - char **arg4 ; - int result; - unsigned int val1 ; - int ecode1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; - void *argp4 = 0 ; - int res4 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"OOOO:rpm_execcon",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; - ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1); - if (!SWIG_IsOK(ecode1)) { - SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "rpm_execcon" "', argument " "1"" of type '" "unsigned int""'"); - } - arg1 = (unsigned int)(val1); - res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "rpm_execcon" "', argument " "2"" of type '" "char const *""'"); - } - arg2 = buf2; - res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_char, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "rpm_execcon" "', argument " "3"" of type '" "char *const []""'"); - } - arg3 = (char **)(argp3); - res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_char, 0 | 0 ); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "rpm_execcon" "', argument " "4"" of type '" "char *const []""'"); - } - arg4 = (char **)(argp4); - result = (int)rpm_execcon(arg1,(char const *)arg2,(char *const (*))arg3,(char *const (*))arg4); - resultobj = SWIG_From_int((int)(result)); - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - return resultobj; -fail: - if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); - return NULL; -} - - SWIGINTERN PyObject *_wrap_is_context_customizable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; security_context_t arg1 ; @@ -4280,27 +4078,6 @@ } -SWIGINTERN PyObject *_wrap_selinux_getpolicytype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - char **arg1 = (char **) 0 ; - int result; - char *temp1 ; - - { - arg1 = &temp1; - } - if (!PyArg_ParseTuple(args,(char *)":selinux_getpolicytype")) SWIG_fail; - result = (int)selinux_getpolicytype(arg1); - resultobj = SWIG_From_int((int)(result)); - { - resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1)); - } - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_getseuserbyname(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -4350,13 +4127,6 @@ { (char *)"getpidcon", _wrap_getpidcon, METH_VARARGS, NULL}, { (char *)"getprevcon", _wrap_getprevcon, METH_VARARGS, NULL}, { (char *)"getexeccon", _wrap_getexeccon, METH_VARARGS, NULL}, - { (char *)"setexeccon", _wrap_setexeccon, METH_VARARGS, NULL}, - { (char *)"getfscreatecon", _wrap_getfscreatecon, METH_VARARGS, NULL}, - { (char *)"setfscreatecon", _wrap_setfscreatecon, METH_VARARGS, NULL}, - { (char *)"getkeycreatecon", _wrap_getkeycreatecon, METH_VARARGS, NULL}, - { (char *)"setkeycreatecon", _wrap_setkeycreatecon, METH_VARARGS, NULL}, - { (char *)"getsockcreatecon", _wrap_getsockcreatecon, METH_VARARGS, NULL}, - { (char *)"setsockcreatecon", _wrap_setsockcreatecon, METH_VARARGS, NULL}, { (char *)"getfilecon", _wrap_getfilecon, METH_VARARGS, NULL}, { (char *)"lgetfilecon", _wrap_lgetfilecon, METH_VARARGS, NULL}, { (char *)"fgetfilecon", _wrap_fgetfilecon, METH_VARARGS, NULL}, @@ -4404,11 +4174,9 @@ { (char *)"selinux_path", _wrap_selinux_path, METH_VARARGS, NULL}, { (char *)"selinux_check_passwd_access", _wrap_selinux_check_passwd_access, METH_VARARGS, NULL}, { (char *)"checkPasswdAccess", _wrap_checkPasswdAccess, METH_VARARGS, NULL}, - { (char *)"rpm_execcon", _wrap_rpm_execcon, METH_VARARGS, NULL}, { (char *)"is_context_customizable", _wrap_is_context_customizable, METH_VARARGS, NULL}, { (char *)"selinux_trans_to_raw_context", _wrap_selinux_trans_to_raw_context, METH_VARARGS, NULL}, { (char *)"selinux_raw_to_trans_context", _wrap_selinux_raw_to_trans_context, METH_VARARGS, NULL}, - { (char *)"selinux_getpolicytype", _wrap_selinux_getpolicytype, METH_VARARGS, NULL}, { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL}, { NULL, NULL, 0, NULL } }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po audit2allow all install relabel clean: @for subdir in $(SUBDIRS); do \ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#3 (text+ko) ==== @@ -1,11 +1,13 @@ +include ../../../../Makeconfig + # Installation directories. -PREFIX ?= ${DESTDIR}/usr -BINDIR ?= $(PREFIX)/bin -LIBDIR ?= $(PREFIX)/lib -MANDIR ?= $(PREFIX)/share/man +PREFIX = $(DESTDIR)/usr +BINDIR = $(PREFIX)/bin +LIBDIR = $(PREFIX)/lib +MANDIR = $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale -PYLIBVER ?= python2.4 -PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) +PYLIBVER ?= python2.3 +PYTHONLIBDIR ?= $(DESTDIR)/System/Library/Frameworks/Python.framework/Versions/2.3/lib/$(PYLIBVER) TARGETS=audit2allow From owner-p4-projects@FreeBSD.ORG Wed Oct 11 17:35:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A44B016A59A; Wed, 11 Oct 2006 17:35:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6151616A596 for ; Wed, 11 Oct 2006 17:35:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D41C6440D0 for ; Wed, 11 Oct 2006 17:28:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BHSZT6090859 for ; Wed, 11 Oct 2006 17:28:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BHSZro090856 for perforce@freebsd.org; Wed, 11 Oct 2006 17:28:35 GMT (envelope-from millert@freebsd.org) Date: Wed, 11 Oct 2006 17:28:35 GMT Message-Id: <200610111728.k9BHSZro090856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 17:35:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=107693 Change 107693 by millert@millert_macbook on 2006/10/11 17:28:17 Add markup to mac_policy.h and teach mac_parse.pl about it. Move the file label out of struct fileproc and back into struct fileglob. Replace the multiple framework functions uses by fdesc to label a vnode with a single one that calls one of several entry points depending on the type of the underlying object represented by the vnode. Redo labeling of /dev/fd. We now extract the label from the underlying object (vnode, socket, pipe, posix sem/shm). For kqueue and fsevent structures we just use the fileglob label. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/file_internal.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#11 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#14 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#14 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#24 edit .. //depot/projects/trustedbsd/sedarwin8/policies/stacktrace/module/mk_stubs.awk#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_parse.pl#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#4 (text+ko) ==== @@ -381,7 +381,8 @@ pop = &fdp->fd_ofileflags[fd]; #ifdef MAC - error = mac_file_check_fcntl(proc_ucred(p), fp, uap->cmd, uap->arg); + error = mac_file_check_fcntl(proc_ucred(p), fp->f_fglob, uap->cmd, + uap->arg); if (error) goto out; #endif @@ -402,7 +403,8 @@ case F_GETFD: #ifdef MAC - error = mac_file_check_get_ofileflags(proc_ucred(p), fp, *pop); + error = mac_file_check_get_ofileflags(proc_ucred(p), + fp->f_fglob, *pop); if (error == 0) #endif *retval = (*pop & UF_EXCLOSE)? 1 : 0; @@ -411,8 +413,8 @@ case F_SETFD: #ifdef MAC error = mac_file_check_change_ofileflags(proc_ucred(p), - fp, *pop, (*pop &~ UF_EXCLOSE) | - ((uap->arg & 1) ? UF_EXCLOSE : 0)); + fp->f_fglob, *pop, (*pop &~ UF_EXCLOSE) | + (uap->arg & 1 ? UF_EXCLOSE : 0)); if (error == 0) #endif *pop = (*pop &~ UF_EXCLOSE) | @@ -421,7 +423,8 @@ case F_GETFL: #ifdef MAC - error = mac_file_check_get_flags(proc_ucred(p), fp, fp->f_flag); + error = mac_file_check_get_flags(proc_ucred(p), fp->f_fglob, + fp->f_flag); if (error == 0) #endif *retval = OFLAGS(fp->f_flag); @@ -430,7 +433,7 @@ case F_SETFL: #ifdef MAC error = mac_file_check_change_flags(proc_ucred(p), - fp, fp->f_flag, (fp->f_flag & ~FCNTLFLAGS) | + fp->f_fglob, fp->f_flag, (fp->f_flag & ~FCNTLFLAGS) | (FFLAGS(CAST_DOWN(int, uap->arg)) & FCNTLFLAGS)); if (error) goto out; @@ -985,7 +988,7 @@ fg_ref(ofp); #ifdef MAC - error = mac_file_check_dup(proc_ucred(p), ofp, new); + error = mac_file_check_dup(proc_ucred(p), ofp->f_fglob, new); if (error) { fg_drop(ofp); _fdrelse(fdp, new); @@ -1003,10 +1006,6 @@ nfp->f_flags = ofp->f_flags; nfp->f_fglob = ofp->f_fglob; nfp->f_iocount = 0; -#ifdef MAC - mac_file_label_init(nfp); - mac_file_label_copy(ofp->f_label, nfp->f_label); -#endif fdp->fd_ofiles[new] = nfp; fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; @@ -1123,9 +1122,6 @@ if (!locked) proc_fdunlock(p); -#ifdef MAC - mac_file_label_destroy(fp); -#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); return(error); } @@ -1477,9 +1473,6 @@ fdp->fd_ofiles[fd] == NULL && !(fdp->fd_ofileflags[fd] & UF_RESERVED)) fdp->fd_lastfile--; -#ifdef MAC - mac_file_label_destroy(fp); -#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } @@ -1947,14 +1940,14 @@ fg->fg_count = 1; fp->f_fglob = fg; #ifdef MAC - mac_file_label_init(fp); + mac_file_label_init(fg); #endif proc_fdlock(p); fp->f_cred = kauth_cred_proc_ref(p); #ifdef MAC - mac_file_label_associate(fp->f_cred, fp); + mac_file_label_associate(fp->f_cred, fg); #endif lck_mtx_lock(file_flist_lock); @@ -2002,6 +1995,9 @@ } lck_mtx_destroy(&fg->fg_lock, file_lck_grp); +#ifdef MAC + mac_file_label_destroy(fg); +#endif FREE_ZONE(fg, sizeof *fg, M_FILEGLOB); } @@ -2023,7 +2019,7 @@ if ((*flags & UF_RESERVED) == 0 && ((*flags & UF_EXCLOSE) != 0 #ifdef MAC - || (fp && mac_file_check_inherit(proc_ucred(p), fp)) + || (fp && mac_file_check_inherit(proc_ucred(p), fp->f_fglob)) #endif )) { if (i < fdp->fd_knlistsize) @@ -2033,15 +2029,8 @@ if (i == fdp->fd_lastfile && i > 0) fdp->fd_lastfile--; closef_locked(fp, fp->f_fglob, p); -#ifdef MAC - mac_file_label_destroy(fp); -#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } -#ifdef MAC - else if ((*flags & UF_RESERVED) == 0 && fp != NULL) - mac_file_label_update(proc_ucred(p), fp); -#endif i--; fpp--; flags--; } @@ -2202,10 +2191,6 @@ fp->f_iocount = 0; fp->f_fglob = ofp->f_fglob; (void)fg_ref(fp); -#ifdef MAC - mac_file_label_init(fp); - mac_file_label_copy(ofp->f_label, fp->f_label); -#endif *fpp = fp; } else { *fpp = NULL; @@ -2261,9 +2246,6 @@ if (fp->f_flags & FP_WAITEVENT) (void)waitevent_close(p, fp); (void) closef_locked(fp, fp->f_fglob, p); -#ifdef MAC - mac_file_label_destroy(fp); -#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } } @@ -2443,9 +2425,6 @@ proc_fdunlock(p); fg_free(fp->f_fglob); -#ifdef MAC - mac_file_label_destroy(fp); -#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } @@ -2485,7 +2464,7 @@ if (how & LOCK_UN) { lf.l_type = F_UNLCK; #ifdef MAC - error = mac_file_check_change_flags(proc_ucred(p), fp, + error = mac_file_check_change_flags(proc_ucred(p), fp->f_fglob, fp->f_flag, fp->f_flag & ~FHASLOCK); if (error) goto out; @@ -2503,7 +2482,7 @@ goto out; } #ifdef MAC - error = mac_file_check_change_flags(proc_ucred(p), fp, + error = mac_file_check_change_flags(proc_ucred(p), fp->f_fglob, fp->f_flag, fp->f_flag | FHASLOCK); if (error) goto out; @@ -2581,7 +2560,7 @@ return (EBADF); } #ifdef MAC - myerror = mac_file_check_dup(proc_ucred(p), wfp, dfd); + myerror = mac_file_check_dup(proc_ucred(p), wfp->f_fglob, dfd); if (myerror) { proc_fdunlock(p); return (myerror); @@ -2638,9 +2617,6 @@ proc_fdunlock(p); -#ifdef MAC - mac_file_label_destroy(wfp); -#endif FREE_ZONE(wfp, sizeof *fp, M_FILEPROC); return (0); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#3 (text+ko) ==== @@ -739,7 +739,7 @@ } #ifdef MAC - error = mac_file_check_ioctl(proc_ucred(p), fp, uap->com, + error = mac_file_check_ioctl(proc_ucred(p), fp->f_fglob, uap->com, (void *)uap->data); if (error) goto out; @@ -771,7 +771,7 @@ case FIONCLEX: #ifdef MAC error = mac_file_check_change_ofileflags(proc_ucred(p), - fp, *fdflags(p, uap->fd), + fp->f_fglob, *fdflags(p, uap->fd), *fdflags(p, uap->fd) & ~UF_EXCLOSE); if (error == 0) #endif @@ -780,7 +780,7 @@ case FIOCLEX: #ifdef MAC error = mac_file_check_change_ofileflags(proc_ucred(p), - fp, *fdflags(p, uap->fd), + fp->f_fglob, *fdflags(p, uap->fd), *fdflags(p, uap->fd) | UF_EXCLOSE); if (error == 0) #endif @@ -849,7 +849,7 @@ case FIONBIO: #ifdef MAC - error = mac_file_check_change_flags(proc_ucred(p), fp, + error = mac_file_check_change_flags(proc_ucred(p), fp->f_fglob, fp->f_flag, *(int *)datap ? fp->f_flag | FNONBLOCK : fp->f_flag & ~FNONBLOCK); if (error) @@ -864,7 +864,7 @@ case FIOASYNC: #ifdef MAC - error = mac_file_check_change_flags(proc_ucred(p), fp, + error = mac_file_check_change_flags(proc_ucred(p), fp->f_fglob, fp->f_flag, *(int *)datap ? fp->f_flag | FASYNC : fp->f_flag & ~FASYNC); if (error) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#7 (text+ko) ==== @@ -129,8 +129,8 @@ static void unp_gc(void); static void unp_scan(struct mbuf *, void (*)(struct fileglob *)); static void unp_mark(struct fileglob *); -static void unp_discard(struct fileproc *); -static void unp_discard_fdlocked(struct fileproc *, struct proc *); +static void unp_discard(struct fileglob *); +static void unp_discard_fdlocked(struct fileglob *, struct proc *); static int unp_internalize(struct mbuf *, struct proc *); static int unp_listen(struct unpcb *, struct proc *); @@ -1059,8 +1059,9 @@ struct proc *p = current_proc(); /* XXX */ int i; struct cmsghdr *cm = mtod(rights, struct cmsghdr *); - struct fileproc **rp = (struct fileproc **)(cm + 1); + struct fileglob **rp = (struct fileglob **)(cm + 1); struct fileproc *fp; + struct fileglob *fg; int newfds = (cm->cmsg_len - sizeof(*cm)) / sizeof (int); int f; @@ -1071,8 +1072,8 @@ */ if (!fdavail(p, newfds)) { for (i = 0; i < newfds; i++) { - fp = *rp; - unp_discard_fdlocked(fp, p); + fg = *rp; + unp_discard_fdlocked(fg, p); *rp++ = 0; } proc_fdunlock(p); @@ -1086,26 +1087,27 @@ * XXX this assumes a pointer and int are the same size...! */ for (i = 0; i < newfds; i++) { - fp = *rp; #ifdef MAC /* * If receive access is denied, don't pass along * and error message, just discard the descriptor. */ - if (mac_file_check_receive(proc_ucred(p), fp)) { + if (mac_file_check_receive(p->p_ucred, *rp)) { + fg = *rp; *rp++ = 0; - unp_discard_fdlocked(fp, p); + unp_discard_fdlocked(fg, p); continue; } #endif if (fdalloc(p, 0, &f)) panic("unp_externalize"); + fg = *rp; + MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), M_FILEPROC, M_WAITOK); + bzero(fp, sizeof(struct fileproc)); fp->f_iocount = 0; -#ifdef MAC - mac_file_label_update(proc_ucred(p), fp); -#endif + fp->f_fglob = fg; p->p_fd->fd_ofiles[f] = fp; - fg_removeuipc(fp->f_fglob); + fg_removeuipc(fg); *fdflags(p, f) &= ~UF_RESERVED; unp_rights--; *(int *)rp++ = f; @@ -1150,8 +1152,8 @@ struct proc *p) { struct cmsghdr *cm = mtod(control, struct cmsghdr *); - struct fileproc **rp; - struct fileproc *fp, *ofp; + struct fileglob **rp; + struct fileproc *fp; register int i, error; int oldfds; int fdgetf_noref(proc_t, struct fileglob **, struct fileproc **); @@ -1163,28 +1165,20 @@ oldfds = (cm->cmsg_len - sizeof (*cm)) / sizeof (int); proc_fdlock(p); - rp = (struct fileproc **)(cm + 1); + rp = (struct fileglob **)(cm + 1); for (i = 0; i < oldfds; i++) { - if (error = fdgetf_noref(p, *(int *)rp++, (struct fileproc **)0)) { + if (error = fdgetf_noref(p, *(int *)rp++, (struct fileglob **)0)) { proc_fdunlock(p); return (error); } } - rp = (struct fileproc **)(cm + 1); + rp = (struct fileglob **)(cm + 1); for (i = 0; i < oldfds; i++) { - (void) fdgetf_noref(p, *(int *)rp, &ofp); - MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), - M_FILEPROC, M_WAITOK); - bzero(fp, sizeof(struct fileproc)); - fp->f_fglob = ofp->f_fglob; -#ifdef MAC - mac_file_label_init(fp); - mac_file_label_copy(ofp->f_label, fp->f_label); -#endif + (void) fdgetf_noref(p, *(int *)rp, &fp); fg_insertuipc(fp->f_fglob); - *rp++ = fp; + *rp++ = fp->f_fglob; unp_rights++; } proc_fdunlock(p); @@ -1393,7 +1387,7 @@ { if (m) { - unp_scan(m, (void (*)(struct fileglob *))unp_discard); + unp_scan(m, unp_discard); } } @@ -1458,27 +1452,23 @@ /* should run under kernel funnel */ static void -unp_discard(fp) - struct fileproc *fp; +unp_discard(fg) + struct fileglob *fg; { struct proc *p = current_proc(); /* XXX */ proc_fdlock(p); - unp_discard_fdlocked(fp, p); + unp_discard_fdlocked(fg, p); proc_fdunlock(p); } static void -unp_discard_fdlocked(fp, p) - struct fileproc *fp; +unp_discard_fdlocked(fg, p) + struct fileglob *fg; struct proc *p; { - fg_removeuipc(fp->f_fglob); + fg_removeuipc(fg); unp_rights--; - (void) closef_locked((struct fileproc *)0, fp->f_fglob, p); -#ifdef MAC - mac_file_label_destroy(fp); -#endif - FREE(fp, M_FILEPROC); + (void) closef_locked((struct fileproc *)0, fg, p); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#3 (text+ko) ==== @@ -226,10 +226,6 @@ struct componentname *cnp = ap->a_cnp; char *pname = cnp->cn_nameptr; struct proc *p = vfs_context_proc(ap->a_context); -#ifdef MAC - struct filedesc *fdp = p->p_fd; - struct fileproc *fp; -#endif int numfiles = p->p_fd->fd_nfiles; int fd; int error; @@ -327,9 +323,8 @@ goto bad; VTOFDESC(fvp)->fd_fd = fd; #ifdef MAC - fp = fdp->fd_ofiles[fd]; - mac_vnode_label_associate_file(vfs_context_ucred(ap->a_context), - fp, fvp); + mac_vnode_label_associate_file(proc_ucred(p), + p->p_fd->fd_ofiles[fd]->f_fglob, fvp); #endif *vpp = fvp; return (0); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/file_internal.h#4 (text+ko) ==== @@ -86,7 +86,6 @@ int32_t f_iocount; struct fileglob * f_fglob; void * f_waddr; - struct label *f_label; }; #define FILEPROC_NULL (struct fileproc *)0 @@ -140,6 +139,7 @@ int32_t fg_lflags; /* file global flags */ unsigned int fg_lockpc[4]; unsigned int fg_unlockpc[4]; + struct label *fg_label; }; /* file types */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#11 (text+ko) ==== @@ -1739,7 +1739,8 @@ type |= F_WAIT; #ifdef MAC error = mac_file_check_change_flags(vfs_context_ucred(ctx), - fp, fp->f_fglob->fg_flag, fp->f_fglob->fg_flag | FHASLOCK); + fp->f_fglob, fp->f_fglob->fg_flag, + fp->f_fglob->fg_flag | FHASLOCK); if (error) goto bad; #endif @@ -2473,10 +2474,10 @@ #ifdef MAC if (uap->whence == L_INCR && uap->offset == 0) error = mac_file_check_get_offset(vfs_context_ucred(&context), - fp); + fp->f_fglob); else error = mac_file_check_change_offset(vfs_context_ucred(&context), - fp); + fp->f_fglob); if (error) { file_drop(uap->fd); return (error); @@ -4492,7 +4493,7 @@ context.vc_ucred = fp->f_fglob->fg_cred; #ifdef MAC - error = mac_file_check_change_offset(kauth_cred_get(), fp); + error = mac_file_check_change_offset(kauth_cred_get(), fp->f_fglob); if (error) goto out; #endif @@ -4810,7 +4811,8 @@ context.vc_ucred = kauth_cred_get(); #ifdef MAC - error = mac_file_check_change_offset(vfs_context_ucred(&context), fp); + error = mac_file_check_change_offset(vfs_context_ucred(&context), + fp->f_fglob); if (error) goto out; #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#3 (text+ko) ==== @@ -64,10 +64,10 @@ } void -mac_file_label_init(struct fileproc *fp) +mac_file_label_init(struct fileglob *fg) { - fp->f_label = mac_file_label_alloc(); + fg->fg_label = mac_file_label_alloc(); } static void @@ -79,34 +79,20 @@ } void -mac_file_label_associate(struct ucred *cred, struct fileproc *fp) +mac_file_label_associate(struct ucred *cred, struct fileglob *fg) { - MAC_PERFORM(file_label_associate, cred, fp, fp->f_label); + MAC_PERFORM(file_label_associate, cred, fg, fg->fg_label); } void -mac_file_label_update(struct ucred *cred, struct fileproc *fp) +mac_file_label_destroy(struct fileglob *fg) { - MAC_PERFORM(file_label_update, cred, fp, fp->f_label); -} - -void -mac_file_label_copy(struct label *src, struct label *dest) -{ - - MAC_PERFORM(file_label_copy, src, dest); + mac_file_label_free(fg->fg_label); + fg->fg_label = NULL; } -void -mac_file_label_destroy(struct fileproc *fp) -{ - - mac_file_label_free(fp->f_label); - fp->f_label = NULL; -} - int mac_file_check_create(struct ucred *cred) { @@ -119,147 +105,147 @@ } int -mac_file_check_dup(struct ucred *cred, struct fileproc *fp, int newfd) +mac_file_check_dup(struct ucred *cred, struct fileglob *fg, int newfd) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_dup, cred, fp, fp->f_label, newfd); + MAC_CHECK(file_check_dup, cred, fg, fg->fg_label, newfd); return (error); } int -mac_file_check_fcntl(struct ucred *cred, struct fileproc *fp, int cmd, long arg) +mac_file_check_fcntl(struct ucred *cred, struct fileglob *fg, int cmd, long arg) { int error; - MAC_CHECK(file_check_fcntl, cred, fp, cmd, arg); + MAC_CHECK(file_check_fcntl, cred, fg, cmd, arg); return (error); } int -mac_file_check_ioctl(struct ucred *cred, struct fileproc *fp, u_long cmd, +mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, u_long cmd, void *data) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_ioctl, cred, fp, fp->f_label, cmd, data); + MAC_CHECK(file_check_ioctl, cred, fg, fg->fg_label, cmd, data); return (error); } int -mac_file_check_inherit(struct ucred *cred, struct fileproc *fp) +mac_file_check_inherit(struct ucred *cred, struct fileglob *fg) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_inherit, cred, fp, fp->f_label); + MAC_CHECK(file_check_inherit, cred, fg, fg->fg_label); return (error); } int -mac_file_check_receive(struct ucred *cred, struct fileproc *fp) +mac_file_check_receive(struct ucred *cred, struct fileglob *fg) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_receive, cred, fp, fp->f_label); + MAC_CHECK(file_check_receive, cred, fg, fg->fg_label); return (error); } int -mac_file_check_get_flags(struct ucred *cred, struct fileproc *fp, +mac_file_check_get_flags(struct ucred *cred, struct fileglob *fg, u_int flags) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_get_flags, cred, fp, fp->f_label, flags); + MAC_CHECK(file_check_get_flags, cred, fg, fg->fg_label, flags); return (error); } int -mac_file_check_get_ofileflags(struct ucred *cred, struct fileproc *fp, +mac_file_check_get_ofileflags(struct ucred *cred, struct fileglob *fg, char flags) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_get_ofileflags, cred, fp, fp->f_label, flags); + MAC_CHECK(file_check_get_ofileflags, cred, fg, fg->fg_label, flags); return (error); } int -mac_file_check_change_flags(struct ucred *cred, struct fileproc *fp, +mac_file_check_change_flags(struct ucred *cred, struct fileglob *fg, u_int oldflags, u_int newflags) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_change_flags, cred, fp, fp->f_label, oldflags, + MAC_CHECK(file_check_change_flags, cred, fg, fg->fg_label, oldflags, newflags); return (error); } int -mac_file_check_change_ofileflags(struct ucred *cred, struct fileproc *fp, +mac_file_check_change_ofileflags(struct ucred *cred, struct fileglob *fg, char oldflags, char newflags) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_change_ofileflags, cred, fp, fp->f_label, + MAC_CHECK(file_check_change_ofileflags, cred, fg, fg->fg_label, oldflags, newflags); return (error); } int -mac_file_check_get_offset(struct ucred *cred, struct fileproc *fp) +mac_file_check_get_offset(struct ucred *cred, struct fileglob *fg) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_get_offset, cred, fp, fp->f_label); + MAC_CHECK(file_check_get_offset, cred, fg, fg->fg_label); return (error); } int -mac_file_check_change_offset(struct ucred *cred, struct fileproc *fp) +mac_file_check_change_offset(struct ucred *cred, struct fileglob *fg) { int error; if (!mac_enforce_file) return (0); - MAC_CHECK(file_check_change_offset, cred, fp, fp->f_label); + MAC_CHECK(file_check_change_offset, cred, fg, fg->fg_label); return (error); } int -mac_file_check_get(struct ucred *cred, struct fileproc *fp, char *elements, +mac_file_check_get(struct ucred *cred, struct fileglob *fg, char *elements, int len) { int error; - MAC_CHECK(file_check_get, cred, fp, elements, len); + MAC_CHECK(file_check_get, cred, fg, elements, len); return (error); } int -mac_file_check_set(struct ucred *cred, struct fileproc *fp, char *buf, +mac_file_check_set(struct ucred *cred, struct fileglob *fg, char *buf, int buflen) { int error; - MAC_CHECK(file_check_set, cred, fp, buf, buflen); + MAC_CHECK(file_check_set, cred, fg, buf, buflen); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#8 (text+ko) ==== @@ -56,7 +56,7 @@ struct bpf_d; struct componentname; struct devnode; -struct fileproc; +struct fileglob; struct ifnet; struct lctx; struct mac; @@ -89,7 +89,7 @@ */ void mac_cred_label_init(struct ucred *); void mac_devfs_label_init(struct devnode *); -void mac_file_label_init(struct fileproc *fp); +void mac_file_label_init(struct fileglob *fg); int mac_mbuf_label_init(struct mbuf *, int); int mac_mbuf_tag_init(struct m_tag *, int); void mac_mount_label_init(struct mount *); @@ -105,15 +105,13 @@ void mac_vnode_label_init(struct vnode *vp); void mac_vnode_label_copy(struct label *, struct label *label); void mac_devfs_label_copy(struct label *, struct label *label); -void mac_file_label_copy(struct label *, struct label *label); void mac_mbuf_tag_copy(struct m_tag *, struct m_tag *); void mac_mbuf_label_copy(struct mbuf *m_from, struct mbuf *m_to); void mac_socket_label_copy(struct label *from, struct label *to); -void mac_file_label_associate(struct ucred *cred, struct fileproc *fp); -void mac_file_label_update(struct ucred *cred, struct fileproc *fp); +void mac_file_label_associate(struct ucred *cred, struct fileglob *fg); void mac_cred_label_destroy(struct ucred *); void mac_devfs_label_destroy(struct devnode *); -void mac_file_label_destroy(struct fileproc *fp); +void mac_file_label_destroy(struct fileglob *fg); void mac_mbuf_label_destroy(struct mbuf *); void mac_mbuf_tag_destroy(struct m_tag *); void mac_mount_label_destroy(struct mount *); @@ -150,10 +148,10 @@ struct vnode *vp); int mac_vnode_label_associate_extattr(struct mount *mp, struct vnode *vp); void mac_vnode_label_associate_singlelabel(struct mount *mp, struct vnode *vp); -void mac_vnode_label_associate_file(struct ucred *cred, struct fileproc *fp, +void mac_vnode_label_associate_file(struct ucred *cred, struct fileglob *fg, struct vnode *vp); -void mac_devfs_label_associate_device(struct ucred *cr, struct mount *mp, dev_t dev, - struct devnode *de, const char *fullpath); +void mac_devfs_label_associate_device(struct ucred *cr, struct mount *mp, + dev_t dev, struct devnode *de, const char *fullpath); void mac_devfs_label_associate_directory(struct mount *mp, char *dirname, int dirnamelen, struct devnode *de, const char *fullpath); int mac_vnode_notify_create(struct ucred *cred, struct mount *mp, @@ -292,27 +290,27 @@ int mac_sysvmsq_check_msqrcv(struct ucred *cred, struct msqid_kernel *msqptr); int mac_sysvsem_check_semctl(struct ucred *cred, struct semid_kernel *semakptr, int cmd); -int mac_file_check_fcntl(struct ucred *cred, struct fileproc *fp, int cmd, +int mac_file_check_fcntl(struct ucred *cred, struct fileglob *fg, int cmd, long arg); -int mac_file_check_get(struct ucred *cred, struct fileproc *fp, +int mac_file_check_get(struct ucred *cred, struct fileglob *fg, char *elements, int len); int mac_file_check_create(struct ucred *cred); -int mac_file_check_dup(struct ucred *cred, struct fileproc *fp, int newfd); -int mac_file_check_ioctl(struct ucred *cred, struct fileproc *fp, +int mac_file_check_dup(struct ucred *cred, struct fileglob *fg, int newfd); +int mac_file_check_ioctl(struct ucred *cred, struct fileglob *fg, u_long com, void *data); -int mac_file_check_inherit(struct ucred *cred, struct fileproc *fp); -int mac_file_check_receive(struct ucred *cred, struct fileproc *fp); -int mac_file_check_get_flags(struct ucred *cred, struct fileproc *fp, +int mac_file_check_inherit(struct ucred *cred, struct fileglob *fg); +int mac_file_check_receive(struct ucred *cred, struct fileglob *fg); +int mac_file_check_get_flags(struct ucred *cred, struct fileglob *fg, u_int flags); -int mac_file_check_get_ofileflags(struct ucred *cred, struct fileproc *fp, +int mac_file_check_get_ofileflags(struct ucred *cred, struct fileglob *fg, char flags); -int mac_file_check_change_flags(struct ucred *cred, struct fileproc *fp, +int mac_file_check_change_flags(struct ucred *cred, struct fileglob *fg, u_int oldflags, u_int newflags); int mac_file_check_change_ofileflags(struct ucred *cred, - struct fileproc *fp, char oldflags, char newflags); -int mac_file_check_get_offset(struct ucred *cred, struct fileproc *fp); -int mac_file_check_change_offset(struct ucred *cred, struct fileproc *fp); -int mac_file_check_set(struct ucred *cred, struct fileproc *fp, + struct fileglob *fg, char oldflags, char newflags); +int mac_file_check_get_offset(struct ucred *cred, struct fileglob *fg); +int mac_file_check_change_offset(struct ucred *cred, struct fileglob *fg); +int mac_file_check_set(struct ucred *cred, struct fileglob *fg, char *buf, int buflen); int mac_sysvsem_check_semget(struct ucred *cred, struct semid_kernel *semakptr); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#14 (text+ko) ==== @@ -59,7 +59,7 @@ struct attrlist; struct bpf_d; struct devnode; -struct fileproc; +struct fileglob; struct ifnet; struct ipq; struct label; @@ -68,6 +68,9 @@ struct mac_policy_conf; struct mbuf; struct mount; +struct pipe; +struct pseminfo; +struct pshminfo; struct sbuf; struct semid_kernel; struct shmid_kernel; @@ -540,24 +543,12 @@ /** @brief Create file label @param cred Subject credential - @param fp Fileproc structure - @param label Policy label for fp + @param fg Fileglob structure + @param label Policy label for fg */ typedef void mpo_file_label_associate_t( struct ucred *cred, - struct fileproc *fp, - struct label *label -); - -/** - @brief Update file label - @param cred Subject credential - @param fp Fileproc structure - @param label New policy label for fp -*/ -typedef void mpo_file_label_update_t( - struct ucred *cred, - struct fileproc *fp, + struct fileglob *fg, struct label *label ); @@ -991,19 +982,6 @@ ); /** - @brief Copy a file label - @param src Source file label - @param dest Destination file label - - Copy the file label information from src to dest. This is - used when duplicating, passing or inheriting file descriptors. -*/ -typedef void mpo_file_label_copy_t( - struct label *src, - struct label *dest -); - -/** @brief Externalize a user credential label @param label Label to be externalized @param element_name Name of the label namespace for which labels should be @@ -1377,21 +1355,101 @@ ); /** + @brief Associate a socket label with a vnode + @param cred User credential for the process that opened the socket + @param xso Socket structure + @param solabel Label associated with xso + @param vp Vnode to label + @param vlabel Label associated with vp + + Associate label information for the vnode, vp, with the label of + the open socket described by the socket structure so. + The label should be stored in the supplied vlabel parameter. +*/ +typedef void mpo_vnode_label_associate_socket_t( + struct ucred *cred, + struct xsocket *xso, + struct label *solabel, + struct vnode *vp, + struct label *vlabel +); + +/** + @brief Associate a POSIX shared memory label with a vnode + @param cred User credential for the process that created pshm + @param pshm POSIX shared memory structure + @param pshmlabel Label associated with pshm + @param vp Vnode to label + @param vlabel Label associated with vp + + Associate label information for the vnode, vp, with the label of + the POSIX shared memory region described by pshm. + The label should be stored in the supplied vlabel parameter. +*/ +typedef void mpo_vnode_label_associate_posixshm_t( + struct ucred *cred, + struct pshminfo *pshm, + struct label *pshmlabel, + struct vnode *vp, + struct label *vlabel +); + +/** + @brief Associate a POSIX semaphore label with a vnode + @param cred User credential for the process that create psem + @param psem POSIX semaphore structure + @param psemlabel Label associated with psem + @param vp Vnode to label + @param vlabel Label associated with vp + + Associate label information for the vnode, vp, with the label of + the POSIX semaphore described by psem. + The label should be stored in the supplied vlabel parameter. +*/ +typedef void mpo_vnode_label_associate_posixsem_t( + struct ucred *cred, + struct pseminfo *psem, + struct label *psemlabel, + struct vnode *vp, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 11 18:47:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3621416A4E5; Wed, 11 Oct 2006 18:47:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA2E416A4D2 for ; Wed, 11 Oct 2006 18:47:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 164E243DDF for ; Wed, 11 Oct 2006 18:46:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BIki8q009812 for ; Wed, 11 Oct 2006 18:46:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BIkMRj009801 for perforce@freebsd.org; Wed, 11 Oct 2006 18:46:22 GMT (envelope-from jhb@freebsd.org) Date: Wed, 11 Oct 2006 18:46:22 GMT Message-Id: <200610111846.k9BIkMRj009801@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 107696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 18:47:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=107696 Change 107696 by jhb@jhb_mutex on 2006/10/11 18:45:33 IFC @107689. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#57 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#38 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#34 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#51 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#35 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#15 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_sigtramp.S#4 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#13 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/elf.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#9 integrate .. //depot/projects/smpng/sys/amd64/include/stdarg.h#5 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#14 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic_vector.S#5 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#18 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#16 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#16 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#16 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#21 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#18 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/fusu.S#8 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#34 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#6 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#10 integrate .. //depot/projects/smpng/sys/arm/conf/EP80219#1 branch .. //depot/projects/smpng/sys/arm/include/armreg.h#4 integrate .. //depot/projects/smpng/sys/arm/include/asm.h#5 integrate .. //depot/projects/smpng/sys/arm/include/clock.h#3 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#6 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#9 integrate .. //depot/projects/smpng/sys/arm/include/elf.h#6 integrate .. //depot/projects/smpng/sys/arm/include/stdarg.h#4 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/smpng/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_intr.h#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#9 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321reg.h#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321var.h#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#20 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#12 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321reg.h#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/smpng/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/smpng/sys/boot/Makefile#23 integrate .. //depot/projects/smpng/sys/boot/arm/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/smpng/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/smpng/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/smpng/sys/boot/common/help.common#20 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#40 integrate .. //depot/projects/smpng/sys/boot/common/merge_help.awk#3 integrate .. //depot/projects/smpng/sys/boot/common/panic.c#4 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/smpng/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/smpng/sys/boot/forth/loader.conf#44 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile.inc#8 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biospci.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biossmap.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/elf64_freebsd.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#13 integrate .. //depot/projects/smpng/sys/boot/i386/loader/help.i386#7 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeboot.8#4 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeldr.S#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#12 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/smpng/sys/boot/pc98/boot2/inode.h#4 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#20 integrate .. //depot/projects/smpng/sys/bsm/audit.h#6 integrate .. //depot/projects/smpng/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#6 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#22 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#37 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#24 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#69 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#43 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#33 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#33 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#33 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#33 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#38 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_genassym.c#3 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#10 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#15 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#50 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#32 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#28 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#71 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#36 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#33 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#22 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#17 integrate .. //depot/projects/smpng/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/smpng/sys/conf/NOTES#127 integrate .. //depot/projects/smpng/sys/conf/files#187 integrate .. //depot/projects/smpng/sys/conf/files.amd64#47 integrate .. //depot/projects/smpng/sys/conf/files.i386#102 integrate .. //depot/projects/smpng/sys/conf/files.pc98#84 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#32 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#1 branch .. //depot/projects/smpng/sys/conf/kern.pre.mk#53 integrate .. //depot/projects/smpng/sys/conf/options#126 integrate .. //depot/projects/smpng/sys/conf/options.arm#11 integrate .. //depot/projects/smpng/sys/conf/options.sun4v#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_if.m#5 delete .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.c#9 delete .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.h#7 delete .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#22 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#16 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.h#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#11 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#15 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#11 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#10 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#23 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#20 integrate .. //depot/projects/smpng/sys/crypto/sha2/sha2.c#7 integrate .. //depot/projects/smpng/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#35 integrate .. //depot/projects/smpng/sys/ddb/db_examine.c#7 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#20 integrate .. //depot/projects/smpng/sys/ddb/db_output.h#6 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#95 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#38 integrate .. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#19 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#84 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#73 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#60 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#49 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#47 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#48 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ah_osdep.h#1 branch .. //depot/projects/smpng/sys/dev/ath/if_ath.c#44 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#26 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc.c#5 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#79 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#45 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#9 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.h#3 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#18 integrate .. //depot/projects/smpng/sys/dev/cs/if_csvar.h#7 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#9 integrate .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#3 integrate .. //depot/projects/smpng/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#35 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#15 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drm.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drm.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#16 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#13 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#15 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#16 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#73 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#35 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#30 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#20 integrate .. //depot/projects/smpng/sys/dev/fb/creator.c#10 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#25 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#75 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#29 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#18 integrate .. //depot/projects/smpng/sys/dev/ic/nec765.h#5 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#12 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#16 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#12 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicsmb.c#6 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi_acpi.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmi_isa.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmi_kcs.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi_smbus.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmi_smic.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmi_ssif.c#1 branch .. //depot/projects/smpng/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#16 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#14 integrate .. //depot/projects/smpng/sys/dev/ips/ipsreg.h#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#44 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#45 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#32 integrate .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#17 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#40 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#16 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#14 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#19 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#17 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#36 integrate .. //depot/projects/smpng/sys/dev/lge/if_lgereg.h#8 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#10 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_debug.c#1 branch .. //depot/projects/smpng/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/smpng/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#33 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#19 integrate .. //depot/projects/smpng/sys/dev/mk48txx/mk48txx.c#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#19 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#16 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#13 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#24 integrate .. //depot/projects/smpng/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/smpng/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/smpng/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#24 integrate .. //depot/projects/smpng/sys/dev/my/if_myreg.h#5 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#50 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#12 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#11 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#8 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#12 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#73 integrate .. //depot/projects/smpng/sys/dev/pci/pci_if.m#6 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#16 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#17 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#19 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#38 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#45 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#8 integrate .. //depot/projects/smpng/sys/dev/sk/if_skreg.h#5 integrate .. //depot/projects/smpng/sys/dev/smbus/smb.c#10 integrate .. //depot/projects/smpng/sys/dev/smbus/smb.h#3 integrate .. //depot/projects/smpng/sys/dev/smbus/smbconf.c#4 integrate .. //depot/projects/smpng/sys/dev/smbus/smbconf.h#3 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus.c#8 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus.h#3 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/driver.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/smpng/sys/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/spicds.c#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/spicds.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#33 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97_patch.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.h#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#37 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#38 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.h#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#34 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#27 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#14 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#14 integrate .. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#11 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#56 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#16 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#5 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_includes.h#4 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#5 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#34 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.c#8 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#12 integrate .. //depot/projects/smpng/sys/dev/usb/hid.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#43 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/if_cdce.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/if_uralvar.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/kue_fw.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#43 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#17 integrate .. //depot/projects/smpng/sys/dev/usb/sl811hs.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#37 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#42 integrate .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#15 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#57 integrate .. //depot/projects/smpng/sys/dev/usb/umct.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_port.h#27 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#37 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#94 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#18 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#17 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#35 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#19 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#16 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#10 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#19 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#23 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#29 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#58 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#12 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#48 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#33 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#25 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.c#9 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#24 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#20 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#13 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#36 integrate .. //depot/projects/smpng/sys/fs/udf/osta.h#3 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#30 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#24 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#29 integrate .. //depot/projects/smpng/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/smpng/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli.c#15 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.h#8 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_ctl.c#7 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#15 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.h#6 integrate .. //depot/projects/smpng/sys/geom/geom.h#48 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#33 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#49 integrate .. //depot/projects/smpng/sys/geom/label/g_label_msdosfs.c#5 integrate .. //depot/projects/smpng/sys/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ufs.c#8 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#34 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#10 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.h#5 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#35 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#15 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.h#7 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/smpng/sys/i386/acpica/Makefile#7 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#13 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#82 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#124 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#40 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#20 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#19 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#45 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#116 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#103 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#20 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#21 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#46 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#21 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#22 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#14 integrate .. //depot/projects/smpng/sys/i386/include/elf.h#8 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#11 integrate .. //depot/projects/smpng/sys/i386/include/stdarg.h#11 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#17 integrate .. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#13 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#49 integrate .. //depot/projects/smpng/sys/i386/isa/pmtimer.c#6 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#12 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#16 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#36 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#35 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#34 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#35 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#54 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#41 integrate .. //depot/projects/smpng/sys/i386/xbox/xbox.c#4 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#53 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_signal.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.S#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#90 integrate .. //depot/projects/smpng/sys/ia64/include/clock.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#12 integrate .. //depot/projects/smpng/sys/ia64/include/stdarg.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#11 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#42 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#13 integrate .. //depot/projects/smpng/sys/kern/init_main.c#61 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#76 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#118 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#86 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#98 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#126 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#94 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#26 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#60 integrate .. //depot/projects/smpng/sys/kern/sched_core.c#4 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#68 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#63 integrate .. //depot/projects/smpng/sys/kern/subr_clock.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_rtc.c#1 branch .. //depot/projects/smpng/sys/kern/subr_witness.c#154 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#46 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#55 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#76 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#83 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#3 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#30 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#43 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#35 integrate .. //depot/projects/smpng/sys/kern/tty.c#65 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#4 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#47 integrate .. //depot/projects/smpng/sys/kern/tty_tty.c#17 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#48 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#93 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#74 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#95 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#47 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#38 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#64 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#133 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#116 integrate .. //depot/projects/smpng/sys/modules/Makefile#128 integrate .. //depot/projects/smpng/sys/modules/agp/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/ath/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/ath_hal/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ath_rate_onoe/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/digi/digi/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#13 integrate .. //depot/projects/smpng/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/smpng/sys/modules/if_tap/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/ipfw/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ispfw/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/smpng/sys/modules/kbdmux/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/libalias/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/libalias/libalias/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/irc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/modules.inc#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/smpng/sys/modules/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/pf/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/procfs/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/smpng/sys/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/ukbd/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/vkbd/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/wlan/Makefile#6 integrate .. //depot/projects/smpng/sys/net/bpf.h#19 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#12 integrate .. //depot/projects/smpng/sys/net/if.c#86 integrate .. //depot/projects/smpng/sys/net/if.h#32 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#37 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#75 integrate .. //depot/projects/smpng/sys/net/if_loop.c#41 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#31 integrate .. //depot/projects/smpng/sys/net/if_tap.c#42 integrate .. //depot/projects/smpng/sys/net/if_tap.h#3 integrate .. //depot/projects/smpng/sys/net/if_var.h#46 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#54 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#32 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#29 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#27 integrate .. //depot/projects/smpng/sys/netgraph/atm/ccatm/ng_ccatm.c#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#19 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#18 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#15 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#13 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#45 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#25 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_vlan.c#4 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#50 integrate .. //depot/projects/smpng/sys/netinet/in.c#33 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#67 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#16 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#20 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#26 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#35 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#77 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#79 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#47 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#10 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#86 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#32 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_dummy.c#1 branch .. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_mod.c#1 branch .. //depot/projects/smpng/sys/netinet/libalias/alias_mod.h#1 branch .. //depot/projects/smpng/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_old.c#2 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_pptp.c#2 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_skinny.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_util.c#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/libalias.3#4 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#90 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#40 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#83 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#52 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#12 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#53 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#45 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#70 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#35 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#35 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.h#5 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#35 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#40 integrate .. //depot/projects/smpng/sys/netsmb/smb_crypt.c#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#15 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#15 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.h#5 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#17 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#21 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#33 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#24 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#46 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#29 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#56 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#61 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#18 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/smpng/sys/pc98/cbus/fdc.c#6 integrate .. //depot/projects/smpng/sys/pc98/cbus/pckbd.c#3 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#65 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#16 integrate .. //depot/projects/smpng/sys/pci/agp_amd64.c#10 integrate .. //depot/projects/smpng/sys/pci/agp_ati.c#3 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#24 integrate .. //depot/projects/smpng/sys/pci/alpm.c#11 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#18 integrate .. //depot/projects/smpng/sys/pci/amdsmb.c#3 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#65 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#44 integrate .. //depot/projects/smpng/sys/pci/if_sfreg.h#11 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#60 integrate .. //depot/projects/smpng/sys/pci/if_sisreg.h#18 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#45 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#34 integrate .. //depot/projects/smpng/sys/pci/if_tlreg.h#8 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#45 integrate .. //depot/projects/smpng/sys/pci/if_vrreg.h#13 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#39 integrate .. //depot/projects/smpng/sys/pci/if_wbreg.h#8 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#69 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#19 integrate .. //depot/projects/smpng/sys/pci/intpm.c#12 integrate .. //depot/projects/smpng/sys/pci/intpmreg.h#2 integrate .. //depot/projects/smpng/sys/pci/nfsmb.c#3 integrate .. //depot/projects/smpng/sys/pci/viapm.c#13 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#38 integrate .. //depot/projects/smpng/sys/powerpc/include/clock.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/elf.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/stdarg.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#19 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/gdb_machdep.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#59 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#46 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#5 integrate .. //depot/projects/smpng/sys/security/audit/audit.h#4 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/smpng/sys/security/audit/audit_ioctl.h#3 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/smpng/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#1 branch .. //depot/projects/smpng/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#14 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#13 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#41 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#30 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#36 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#8 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#73 integrate .. //depot/projects/smpng/sys/sparc64/include/asi.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/clock.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/stdarg.h#8 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_interface.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#37 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#29 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#68 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#24 integrate .. //depot/projects/smpng/sys/sun4v/compile/.cvsignore#1 branch .. //depot/projects/smpng/sys/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#1 branch .. //depot/projects/smpng/sys/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/smpng/sys/sun4v/conf/MAC#1 branch .. //depot/projects/smpng/sys/sun4v/conf/Makefile#1 branch .. //depot/projects/smpng/sys/sun4v/conf/NOTES#1 branch .. //depot/projects/smpng/sys/sun4v/include/_bus.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/_inttypes.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/_limits.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/_types.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/asi.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/asm.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/asmacros.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/atomic.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/bus.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/bus_common.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/bus_dma.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/bus_private.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/cache.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ccr.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/clock.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/cpu.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/cpufunc.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/db_machdep.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/elf.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/endian.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/exec.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/float.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/fp.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/frame.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/fsr.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/hviommu.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/idprom.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ieee.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ieeefp.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/in_cksum.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/instr.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/iommureg.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/iommuvar.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/kdb.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/kerneldump.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ktr.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/limits.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/lsu.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/md_var.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/memdev.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/metadata.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/mmu.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/mutex.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/nexusvar.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/param.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/pcb.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/pcpu.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/pmap.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/proc.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/profile.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/pstate.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ptrace.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/reg.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/reloc.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/resource.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/runq.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/setjmp.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/sf_buf.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/sigframe.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/signal.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/smp.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/stdarg.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/sysarch.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/tick.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/tlb.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/trap.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/tsb.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/tstate.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/tte.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/tte_hash.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ucontext.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/upa.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/utrap.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/varargs.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/ver.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/vmparam.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/watch.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/wstate.h#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/counter.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/exception.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/genassym.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/locore.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/mem.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/support.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/tick.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/tte.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/smpng/sys/sys/_bus_dma.h#1 branch .. //depot/projects/smpng/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/smpng/sys/sys/buf.h#44 integrate .. //depot/projects/smpng/sys/sys/bus.h#28 integrate .. //depot/projects/smpng/sys/sys/bus_dma.h#2 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#34 integrate .. //depot/projects/smpng/sys/sys/clock.h#3 integrate .. //depot/projects/smpng/sys/sys/consio.h#9 integrate .. //depot/projects/smpng/sys/sys/copyright.h#9 integrate .. //depot/projects/smpng/sys/sys/digiio.h#2 integrate .. //depot/projects/smpng/sys/sys/dirent.h#5 integrate .. //depot/projects/smpng/sys/sys/elf.h#1 branch .. //depot/projects/smpng/sys/sys/elf32.h#4 integrate .. //depot/projects/smpng/sys/sys/elf64.h#5 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#8 integrate .. //depot/projects/smpng/sys/sys/event.h#22 integrate .. //depot/projects/smpng/sys/sys/ioccom.h#7 integrate .. //depot/projects/smpng/sys/sys/ipmi.h#2 integrate .. //depot/projects/smpng/sys/sys/kbio.h#4 integrate .. //depot/projects/smpng/sys/sys/kernel.h#35 integrate .. //depot/projects/smpng/sys/sys/kobj.h#5 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#18 integrate .. //depot/projects/smpng/sys/sys/mac.h#36 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#38 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#64 integrate .. //depot/projects/smpng/sys/sys/mount.h#54 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#12 integrate .. //depot/projects/smpng/sys/sys/param.h#104 integrate .. //depot/projects/smpng/sys/sys/pioctl.h#7 integrate .. //depot/projects/smpng/sys/sys/proc.h#171 integrate .. //depot/projects/smpng/sys/sys/rtprio.h#5 integrate .. //depot/projects/smpng/sys/sys/sched.h#22 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#30 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#11 integrate .. //depot/projects/smpng/sys/sys/sx.h#22 integrate .. //depot/projects/smpng/sys/sys/syscall.h#75 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#75 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#42 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#79 integrate .. //depot/projects/smpng/sys/sys/systm.h#73 integrate .. //depot/projects/smpng/sys/sys/thr.h#10 integrate .. //depot/projects/smpng/sys/sys/time.h#22 integrate .. //depot/projects/smpng/sys/sys/ttycom.h#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 11 21:32:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A174816A407; Wed, 11 Oct 2006 21:32:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58CE616A40F for ; Wed, 11 Oct 2006 21:32:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EED0B43D55 for ; Wed, 11 Oct 2006 21:32:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BLWuOQ029527 for ; Wed, 11 Oct 2006 21:32:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BLWtx1029499 for perforce@freebsd.org; Wed, 11 Oct 2006 21:32:55 GMT (envelope-from jb@freebsd.org) Date: Wed, 11 Oct 2006 21:32:55 GMT Message-Id: <200610112132.k9BLWtx1029499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107701 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 21:32:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107701 Change 107701 by jb@jb_freebsd8 on 2006/10/11 21:32:21 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.dsl#4 integrate .. //depot/projects/dtrace/ports/LEGAL#11 integrate .. //depot/projects/dtrace/ports/MOVED#23 integrate .. //depot/projects/dtrace/ports/UPDATING#17 integrate .. //depot/projects/dtrace/src/bin/mkdir/mkdir.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/grep/grep.1#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/killpg.2#4 integrate .. //depot/projects/dtrace/src/lib/libutil/login.conf.5#6 integrate .. //depot/projects/dtrace/src/sbin/geom/class/mirror/geom_mirror.c#5 integrate .. //depot/projects/dtrace/src/sbin/geom/class/raid3/geom_raid3.c#5 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#8 integrate .. //depot/projects/dtrace/src/share/man/man4/tun.4#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/dtrace/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.c#8 integrate .. //depot/projects/dtrace/src/sys/ddb/db_output.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#15 integrate .. //depot/projects/dtrace/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/dtrace/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_vlan.c#11 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/libalias.3#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/db_interface.c#4 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/dtrace/src/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/db_interface.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/make/str.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/bthidd/bthidd.8#3 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/bthidd/hid.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/dtrace/src/usr.sbin/ndiscvt/ndiscvt.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pw/pw.8#4 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#6 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#5 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2228,9 +2228,7 @@ <filename>/etc/rc.conf</filename> Options - If you do not have IPFW compiled into your kernel you will - need to load it with the following statement in your - /etc/rc.conf: + Enable the firewall: firewall_enable="YES" ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -820,6 +820,9 @@ If you use a high resolution video mode, swap the 75 dpi and 100 dpi lines. + + + See ports for more cyrillic fonts. @@ -834,7 +837,9 @@ turned off (commented out) there. For grp:caps_toggle - the RUS/LAT switch will be CapsLock. + the RUS/LAT switch will be Right Alt, + for grp:ctrl_shift_toggle switch will be + CtrlShift. The old CapsLock function is still available via ShiftCapsLock (in LAT mode only). For grp:toggle ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2675,6 +2675,18 @@ for authentication so that it can properly change ownership for the forwarded credentials. + The rc.conf must also be modified + to contain the following configuration: + + kerberos5_server="/usr/local/sbin/krb5kdc" +kadmind5_server="/usr/local/sbin/kadmind" +kerberos5_server_enable="YES" +kadmind5_server_enable="YES" + + This is done because the applications for + MIT kerberos installs binaries in the + /usr/local + hierarchy. ==== //depot/projects/dtrace/doc/share/sgml/freebsd.dsl#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -333,6 +333,10 @@ ;; natively. ".png") + (define %callout-graphics-number-limit% + ;; Number of largest callout graphic + 15) + (define %callout-graphics-path% ;; Path to callout graphics "./imagelib/callouts/") ==== //depot/projects/dtrace/ports/LEGAL#11 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.505 2006/10/06 00:27:31 alepulver Exp $ +# $FreeBSD: ports/LEGAL,v 1.507 2006/10/10 06:01:49 ale Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -173,7 +173,7 @@ purposes only eawpats* audio/eawpats Some of the patches are not for commercial use -eClient-linux.run games/atitd Redistribution not allowed +eClient-linux-i686.run games/atitd Redistribution not allowed eclipse/jp.azzurri.clay.core_*.bin.dist.* java/eclipse-clay-core License agreement is required to download edith* editors/edith Redistribution not allowed @@ -662,8 +662,6 @@ except media and/or shipping cost zangband/* japanese/zangband Possible copyright infringement -ZendOptimizer-*.tar.gz devel/ZendOptimizer Redistribution of pre-compiled - binaries is not permitted zh-moettf/* chinese/moettf Contact Taiwan Ministry of Education for commercial use NTU*.TTF chinese/ntuttf No commercial use ==== //depot/projects/dtrace/ports/MOVED#23 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1161 2006/10/09 18:14:07 novel Exp $ +# $FreeBSD: ports/MOVED,v 1.1162 2006/10/10 21:16:21 joerg Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2481,7 +2481,6 @@ net/coda5_client||2006-10-05|Has expired: no longer available from mastersite net/coda5_doc||2006-10-05|Has expired: coda5 removed math/ufspase|math/suitespase|2006-10-05|portname has been changed -devel/avr-gcc|devel/avr-gcc-3|2006-10-05|retire AVR-GCC 3.x devel/avr-gcc-devel|devel/avr-gcc|2006-10-06|make AVR-GCC 4.x the default version astro/gdesklets-goodweather||2006-10-07|Expired: no longer downloadable deskutils/goats||2006-10-07|Expired: no longer downloadable ==== //depot/projects/dtrace/ports/UPDATING#17 (text+ko) ==== @@ -6,6 +6,51 @@ time you update your ports collection, before attempting any port upgrades. +20061010: + AFFECTS: users of devel/avr-gcc* + AUTHOR: joerg@FreeBSD.org + + The old avr-gcc port has been renamed into avr-gcc-3, and continues + support for GCC 3.x (for a while). + + The former avr-gcc-devel port has been moved into avr-gcc, so GCC + 4.x is now the default. + + There is an entry in MOVED for the latter change but not for the + former one, as the automated tools (e.g. portupgrade) got confused + otherwise. + + If you've previously been using avr-gcc-devel, these tools should + automatically take notice (based on the entry in MOVED), and change + the installed package to avr-gcc. + + If you've previously been using avr-gcc, and want to move on to the + new default GCC 4.x, this should be fully automatic, as the port + name just stays, and the version increases. + + If you've previously been using avr-gcc, and want to stay at GCC 3.x + for some reason, please manually perform a portupgrade to the new + name: + + portupgrade -o devel/avr-gcc-3 avr-gcc + +20061010: + AFFECTS: user of sysutils/flexbackup + AUTHOR: Marcus von Appen + + The port now respects PREFIX: + Before: + /etc/flexbackup.conf for PREFIX=whatever, WITH_PREFIX_CONF unset + Now: + PREFIX/etc/flexbackup.conf for PREFIX=whatever + +20061010: + AFFECTS: users of audio/gtkpod + AUTHOR: danfe@FreeBSD.org + + WITH_AAC knob has been renamed to WITH_MPEG4IP since it now covers + not only AAC, but H.264 support as well. + 20061009: AFFECTS: users of ports using ODBC (databases/libiodbc or databases/unixODBC) AUTHOR: ganael.laplanche@martymac.com @@ -75,7 +120,7 @@ release. 1.1 is now the stable branch, 1.0 branch has been obsoleted. Changes include: - - ~/.tmdarc configuration file has been obsoleted by ~/.tmda/ dir; + - ~/.tmdarc configuration file has been obsoleted by ~/.tmda/ dir; see ${PREFIX}/share/examples/dot-tmda for sample configuration - only minimal set of HTML documentation is now installed; please see http://wiki.tmda.net/ for full documentation @@ -90,10 +135,10 @@ Its functionality has been split into several modules that are now installed into ${PREFIX}/libexec/mailfront. Various *front-* commands are now merely shell script wrappers around the newly introduced - mailfront command and its new modules. + mailfront command and its new modules. - The smtpfront-reject command has been removed completely, - being deprecated in favor of using a plugin. + The smtpfront-reject command has been removed completely, + being deprecated in favor of using a plugin. Please refer to http://untroubled.org/mailfront/NEWS for further details. @@ -112,11 +157,11 @@ Revision of Samba 3.0.23c port had changed location of the directory, where Samba stores it's smbpasswd files from $PREFIX/private to a more common $PREFIX/etc/samba. - - You need to move *.tdb files from an old to new location and remove old + + You need to move *.tdb files from an old to new location and remove old directory if you use tdbsam backend for Samba user authentication. - - Starting with the 3.0.23c release, the officially supported passdb + + Starting with the 3.0.23c release, the officially supported passdb backends (smbpasswd, tdbsam, and ldapsam) now operate identically with regards to the historical RID algorithm for unmapped users and groups (i.e. accounts not in the passdb or group mapping table). The resulting @@ -125,9 +170,9 @@ domain. Previously, when using the smbpasswd passdb, such users and groups would resolve to an algorithmic SID in the machine's own domain (S-1-5-XX-XX-XX). However, the smbpasswd backend still utilizes the RID - algorithm when creating new user accounts or allocating a RID for a new + algorithm when creating new user accounts or allocating a RID for a new group mapping entry. - + With the changes in the 3.0.23c release, it is now possible to resolve a uid/gid, name, or SID in any direction and always obtain a symmetric mapping. This is important so that values for smb.conf parameters such @@ -150,7 +195,7 @@ AFFECTS: users of net-p2p/linuxdcpp AUTHOR: mezz@FreeBSD.org - The name of binary, datadir and docsdir have been renamed from ldcpp to + The name of binary, datadir, and docsdir have been renamed from ldcpp to linuxdcpp by the linuxdcpp developer. 20060831: @@ -243,16 +288,16 @@ AFFECTS: users of net/samba3 AUTHOR: timur@gnu.org - Since Samba 3.0.8, it has been recommended that all domain accounts - listed in smb.conf on a member server be fully qualified with the - domain name. This is now a requirement. All unqualified names are - assumed to be local to the Unix host, either as part of the server's - local passdb or in the local system list of accounts (e.g. /etc/passwd + Since Samba 3.0.8, it has been recommended that all domain accounts + listed in smb.conf on a member server be fully qualified with the + domain name. This is now a requirement. All unqualified names are + assumed to be local to the Unix host, either as part of the server's + local passdb or in the local system list of accounts (e.g. /etc/passwd or /etc/group). - If the member server is not running winbindd at all, domain + If the member server is not running winbindd at all, domain accounts will be implicitly mapped to local accounts and their - tokens will be modified appropriately to reflect the local + tokens will be modified appropriately to reflect the local SID and group membership. 20060804: @@ -285,7 +330,7 @@ libtunepimp has been updated to 0.5. But it breaks some ports depend on it such as audio/juk and audio/amarok. To fix this kind of problem, - try to install audio/libtunepimp-old, which is previous version of + try to install audio/libtunepimp-old, which is previous version of audio/libtunepimp. 20060731: @@ -400,7 +445,7 @@ The default mapping entries for groups such as "Domain Admins" are no longer created when using an smbpasswd file or a tdbsam passdb - backend. Use 'net groupmap add' rather than 'net groupmap modify' + backend. Use 'net groupmap add' rather than 'net groupmap modify' to set these entries. A substring matching rule has been added to the sambaSID attribute @@ -466,12 +511,12 @@ - run 'pkgdb -fu' *before* upgrading and take a look on the output. You can see database format there as: format:XXX, where XXX is your current database format. - - Go to portupgrade port directory and configure the port with + - Go to portupgrade port directory and configure the port with `make config' command. If you have bdb_* format, then turn on the BDB4 option. If you have bdb1_* format, then turn off BDB4 and turn on the BDB1 option. If you have dbd_hash format, then turn off all options. - Upgrade portupgrade. - + Note: if you change database format with changing port options, you should remove the ruby-bdb* port that you don't need anymore. Alternatively, you can hard code database format in your pkgtools.conf. @@ -504,8 +549,8 @@ AUTHOR: alex@foxybanana.com The default database directory has been changed to /var/db/mt-daapd. The - default mp3 dir has been changed to ${PREFIX}/share/mt-daapd. Old - configuration files will be maintained, if present, so no updating should + default mp3 dir has been changed to ${PREFIX}/share/mt-daapd. Old + configuration files will be maintained, if present, so no updating should be required. 20060624: @@ -712,7 +757,7 @@ tinyproxy now installs a rc.d script. To enable tinyproxy at boot time, set the following in rc.conf(5): tinyproxy_enable="YES" - The confiration file for tinyproxy has been moved to + The configuration file for tinyproxy has been moved to ${PREFIX}/etc/tinyproxy.conf. Any old configuration files will need to be migrated over to the new location. @@ -763,7 +808,7 @@ AUTHOR: ale@FreeBSD.org The old PHP slave ports (phpN-cli, phpN-cgi and mod_phpN) were removed - in favour of unified PHP ports that allow building any combination of + in favor of unified PHP ports that allow building any combination of PHP SAPIs (cli, cgi and apache module). The PHP CGI binary was renamed to php-cgi, so you should update the path in your script. To simplify the update process, *only* for @@ -782,9 +827,9 @@ incompatible with the version 5.0, which is used in a number of applications, most notable in the Kile and Kate editors (the latter being part of a base KDE installation). - + If you're having troubles running those, such as error dialogs saying "Check - your KDE installation", make sure to downgrade your lua installation back + your KDE installation", make sure to downgrade your lua installation back to 5.0: portupgrade -f -o lang/lua50 lua-5.1 @@ -959,14 +1004,14 @@ config file. If you want to install the ports into $LOCALBASE (/usr/local, the old - behaviour), you can still do so by setting PREFIX manually. But you + behavior), you can still do so by setting PREFIX manually. But you will have to take care of conflicting ports yourself. 20060330: AFFECTS: users of x11/kdebase3 AUTHOR: kde@freebsd.org - The genkdmconf.sh rc-script has been removed in favour of a kdm wrapper + The genkdmconf.sh rc-script has been removed in favor of a kdm wrapper script, which now handles both launching kdm and automatically updating or generating kdm's configuration files. The actual kdm binaries have been renamed to 'kdm-bin', 'kdm-bin_config' and 'kdm-bin_greet' respectively. @@ -983,7 +1028,7 @@ the ups daemon 'upsd'. The ups monitor 'upsmon' and the ups logger 'upslog' are now handled by - seperate scripts to get more control over the different services. + separate scripts to get more control over the different services. Please take a look into the nut, nut_upslog and nut_upsmon scripts installed in ${PREFIX}/etc/rc.d/ for possible rc.conf values and their defaults. @@ -1012,7 +1057,7 @@ AUTHOR: delphij@FreeBSD.org docproj now installs a set of CJK (Chinese, Japanese, Korean) - related stuff in case that you have choosen to install the + related stuff in case that you have chosen to install the jadetex feature. Because the CJK part could be potentially large for those who do not want it, this feature can be disabled by defining WITHOUT_CJK=yes. @@ -1165,7 +1210,7 @@ enlightenment 0.16 change binary name from 'enlightenment' to 'e16'. you should change it on your .xinit file. - + 20060212: AFFECTS: users of mail/dcc-dccd AUTHOR: ehaupt@FreeBSD.org @@ -1185,7 +1230,7 @@ dccifd and dccm man pages. 20060207: - AFFECTS: users of www/jakarta-tomcat4, www/jakarta-tomcat41, + AFFECTS: users of www/jakarta-tomcat4, www/jakarta-tomcat41, www/jakarta-tomcat5, www/jakarta-tomcat55, and www/tomcat55 AUTHOR: lawrance@FreeBSD.org @@ -1224,7 +1269,7 @@ AFFECTS: users of x11/tilda AUTHOR: barner@FreeBSD.org - The configuration file syntax has changed. Users of x11/tilda must + The configuration file syntax has changed. Users of x11/tilda must delete their old ones and re-create them. 20060131: @@ -4223,4 +4268,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.405 2006/10/09 18:52:27 alepulver Exp $ +$FreeBSD: ports/UPDATING,v 1.409 2006/10/10 21:16:21 joerg Exp $ ==== //depot/projects/dtrace/src/bin/mkdir/mkdir.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.33 2006/10/10 20:18:20 ru Exp $"); #include #include @@ -99,19 +99,19 @@ } for (exitval = 0; *argv != NULL; ++argv) { - success = 1; if (pflag) { - if (build(*argv, omode)) - success = 0; + success = build(*argv, omode); } else if (mkdir(*argv, omode) < 0) { if (errno == ENOTDIR || errno == ENOENT) warn("%s", dirname(*argv)); else warn("%s", *argv); success = 0; - } else if (vflag) - (void)printf("%s\n", *argv); - + } else { + success = 1; + if (vflag) + (void)printf("%s\n", *argv); + } if (!success) exitval = 1; /* @@ -119,9 +119,10 @@ * nine bits, so if you try to set a mode including the * sticky, setuid, setgid bits you lose them. Don't do * this unless the user has specifically requested a mode, - * as chmod will (obviously) ignore the umask. + * as chmod will (obviously) ignore the umask. Do this + * on newly created directories only. */ - if (success && mode != NULL && chmod(*argv, omode) == -1) { + if (success == 1 && mode != NULL && chmod(*argv, omode) == -1) { warn("%s", *argv); exitval = 1; } @@ -129,6 +130,11 @@ exit(exitval); } + +/* + * Returns 1 if a directory has been created, + * 2 if it already existed, and 0 on failure. + */ int build(char *path, mode_t omode) { @@ -139,7 +145,7 @@ p = path; oumask = 0; - retval = 0; + retval = 1; if (p[0] == '/') /* Skip leading '/'. */ ++p; for (first = 1, last = 0; !last ; ++p) { @@ -154,7 +160,7 @@ /* * POSIX 1003.2: * For each dir operand that does not name an existing - * directory, effects equivalent to those cased by the + * directory, effects equivalent to those caused by the * following command shall occcur: * * mkdir -p -m $(umask -S),u+wx $(dirname dir) && @@ -174,7 +180,7 @@ if (errno == EEXIST || errno == EISDIR) { if (stat(path, &sb) < 0) { warn("%s", path); - retval = 1; + retval = 0; break; } else if (!S_ISDIR(sb.st_mode)) { if (last) @@ -182,12 +188,14 @@ else errno = ENOTDIR; warn("%s", path); - retval = 1; + retval = 0; break; } + if (last) + retval = 2; } else { warn("%s", path); - retval = 1; + retval = 0; break; } } else if (vflag) ==== //depot/projects/dtrace/src/gnu/usr.bin/grep/grep.1#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" grep man page -.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.28 2005/12/18 12:09:23 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.29 2006/10/10 01:57:25 trhodes Exp $ .if !\n(.g \{\ . if !\w|\*(lq| \{\ . ds lq `` @@ -202,11 +202,6 @@ as a list of fixed strings, separated by newlines, any of which is to be matched. .TP -.BR \-P ", " \-\^\-perl-regexp -Interpret -.I PATTERN -as a Perl regular expression. -.TP .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE Obtain patterns from .IR FILE , ==== //depot/projects/dtrace/src/lib/libc/compat-43/killpg.2#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)killpg.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.12 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.13 2006/10/10 11:37:41 maxim Exp $ .\" -.Dd June 2, 1993 +.Dd October 10, 2006 .Dt KILLPG 2 .Os .Sh NAME @@ -66,7 +66,7 @@ have the same effective user ID, or the sender must be the super-user. As a single special case the continue signal SIGCONT may be sent -to any process that is a descendant of the current process. +to any process with the same session ID as the caller. .Sh RETURN VALUES .Rv -std killpg .Sh ERRORS ==== //depot/projects/dtrace/src/lib/libutil/login.conf.5#6 (text+ko) ==== @@ -17,9 +17,9 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.58 2006/08/23 09:54:46 yar Exp $ +.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.60 2006/10/10 08:15:08 ru Exp $ .\" -.Dd August 23, 2006 +.Dd October 9, 2006 .Dt LOGIN.CONF 5 .Os .Sh NAME @@ -74,6 +74,13 @@ the last name may contain upper case characters and blanks for readability. .Pp +Note that since a colon +.Pq Ql :\& +is used to separate capability entries, a +.Ql \ec +escape sequence must be used to embed a literal colon in the +value or name of a capability. +.Pp The default .Pa /etc/login.conf shipped with ==== //depot/projects/dtrace/src/sbin/geom/class/mirror/geom_mirror.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.14 2006/09/30 14:40:49 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.15 2006/10/10 15:00:32 pjd Exp $"); #include #include @@ -215,6 +215,7 @@ } md.md_mediasize = mediasize; md.md_sectorsize = sectorsize; + md.md_mediasize -= (md.md_mediasize % md.md_sectorsize); /* * Clear last sector first, to spoil all components if device exists. ==== //depot/projects/dtrace/src/sbin/geom/class/raid3/geom_raid3.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.16 2006/09/30 14:40:50 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.18 2006/10/10 15:00:32 pjd Exp $"); #include #include @@ -205,6 +205,7 @@ } md.md_mediasize = mediasize * (nargs - 2); md.md_sectorsize = sectorsize * (nargs - 2); + md.md_mediasize -= (md.md_mediasize % md.md_sectorsize); /* * Clear last sector first, to spoil all components if device exists. ==== //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#7 (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.122 2006/10/02 08:55:54 schweikh Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.124 2006/10/10 09:44:08 ru Exp $ .\" -.Dd September 6, 2006 +.Dd October 9, 2006 .Dt IFCONFIG 8 .Os .Sh NAME @@ -744,6 +744,9 @@ .It Cm list scan Display the access points and/or ad-hoc neighbors located in the vicinity. +The +.Fl v +flag may be used to display long SSIDs. This information may be updated automatically by the adaptor and/or with a .Cm scan @@ -923,6 +926,10 @@ .Cm list scan request can be used to show recent scan results without initiating a new scan. +.Pp +The +.Fl v +flag may be used to prevent the shortening of long SSIDs. .It Cm stationname Ar name Set the name of this station. It appears that the station name is not really part of the IEEE 802.11 ==== //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#10 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.196 2006/10/04 19:29:05 keramida Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.197 2006/10/09 22:12:08 trhodes Exp $ .\" .Dd July 25, 2006 .Dt IPFW 8 @@ -2516,3 +2516,7 @@ Rules which use uid, gid or jail based matching should be used only if debug.mpsafenet=0 to avoid possible deadlocks due to layering violations in its implementation. +.Pp +Rule syntax is subject to the command line environment and some patterns +may need to be escaped with the backslash character +or quoted appropriately. ==== //depot/projects/dtrace/src/share/man/man4/ddb.4#8 (text+ko) ==== @@ -57,8 +57,9 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.35 2006/10/09 02:27:55 bde Exp $ -.Dd October 9, 2006 +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.39 2006/10/10 23:40:47 bde Exp $ +.\" +.Dd October 10, 2006 .Dt DDB 4 .Os .Sh NAME @@ -74,7 +75,8 @@ .Sh DESCRIPTION The .Nm -kernel debugger has most of the features of the old kdb, +kernel debugger has most of the features of the old +.Nm kdb , but with a more rational syntax inspired by .Xr gdb 1 . @@ -94,27 +96,47 @@ .Dv KDB_UNATTENDED option is specified. .Pp -The current location is called `dot'. -The `dot' is displayed with +The current location is called +.Va dot . +The +.Va dot +is displayed with a hexadecimal format at a prompt. -Examine and write commands update `dot' to the address of the last line -examined or the last location modified, and set `next' to the address of +The commands +.Ic examine +and +.Ic write +update +.Va dot +to the address of the last line +examined or the last location modified, and set +.Va next +to the address of the next location to be examined or changed. -Other commands do not change `dot', and set `next' to be the same as `dot'. +Other commands do not change +.Va dot , +and set +.Va next +to be the same as +.Va dot . .Pp The general command syntax is: -.Cm command Ns Op Li \&/ Ns Ar modifier +.Ar command Ns Op Li / Ns Ar modifier .Ar address Ns Op Li , Ns Ar count .Pp -A blank line repeats the previous command from the address `next' with +A blank line repeats the previous command from the address +.Va next +with count 1 and no modifiers. Specifying .Ar address -sets `dot' to the -address. +sets +.Va dot +to the address. Omitting .Ar address -uses `dot'. +uses +.Va dot . A missing .Ar count is taken @@ -122,14 +144,14 @@ .Pp The .Nm -debugger has a feature like the +debugger has a pager feature (like the .Xr more 1 -command +command) for the output. If an output line exceeds the number set in the -.Li \&$lines +.Va lines variable, it displays -.Dq Em --db_more-- +.Dq Li --db_more-- and waits for a response. The valid responses for it are: .Pp @@ -145,56 +167,63 @@ Finally, .Nm provides a small (currently 10 items) command history, and offers -simple emacs-style command line editing capabilities. +simple +.Nm emacs Ns -style +command line editing capabilities. In addition to -the emacs control keys, the usual ANSI arrow keys might be used to +the +.Nm emacs +control keys, the usual +.Tn ANSI +arrow keys might be used to browse through the history buffer, and move the cursor within the current line. .Sh COMMANDS .Bl -tag -width indent -compact -.It Cm examine -.It Cm x +.It Ic examine +.It Ic x Display the addressed locations according to the formats in the modifier. Multiple modifier formats display multiple locations. -If no format is specified, the last formats specified for this command +If no format is specified, the last format specified for this command is used. .Pp The format characters are: .Bl -tag -compact -width indent -.It Li b +.It Cm b look at by bytes (8 bits) -.It Li h +.It Cm h look at by half words (16 bits) -.It Li l +.It Cm l look at by long words (32 bits) -.It Li a +.It Cm a print the location being displayed -.It Li A +.It Cm A print the location with a line number if possible -.It Li x +.It Cm x display in unsigned hex -.It Li z +.It Cm z display in signed hex -.It Li o +.It Cm o display in unsigned octal -.It Li d +.It Cm d display in signed decimal -.It Li u +.It Cm u display in unsigned decimal -.It Li r +.It Cm r display in current radix, signed -.It Li c +.It Cm c display low 8 bits as a character. -Non-printing characters are displayed as an octal escape code (e.g., `\e000'). -.It Li s +Non-printing characters are displayed as an octal escape code (e.g., +.Ql \e000 ) . +.It Cm s display the null-terminated string at the location. Non-printing characters are displayed as octal escapes. -.It Li m +.It Cm m display in unsigned hex with character dump at the end of each line. The location is also displayed in hex at the beginning of each line. -.It Li i +.It Cm i display as an instruction -.It Li I +.It Cm I display as an instruction with possible alternate formats depending on the machine: .Bl -tag -width ".Tn powerpc" -compact @@ -213,39 +242,38 @@ .El .El .Pp -.It Cm xf +.It Ic xf Examine forward: -Execute an examine command with the last specified parameters to it +execute an +.Ic examine +command with the last specified parameters to it except that the next address displayed by it is used as the start address. .Pp -.It Cm xb +.It Ic xb Examine backward: -Execute an examine command with the last specified parameters to it +execute an +.Ic examine +command with the last specified parameters to it except that the last start address subtracted by the size displayed by it is used as the start address. .Pp -.It Cm print Ns Op Cm /acdoruxz -.It Cm p Ns Op Cm /acdoruxz +.It Ic print Ns Op Li / Ns Cm acdoruxz >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 11 21:38:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA34E16A4EF; Wed, 11 Oct 2006 21:38:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 872E716A40F for ; Wed, 11 Oct 2006 21:38:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D250643D62 for ; Wed, 11 Oct 2006 21:38:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BLc3Pu032575 for ; Wed, 11 Oct 2006 21:38:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BLc3bb032572 for perforce@freebsd.org; Wed, 11 Oct 2006 21:38:03 GMT (envelope-from jb@freebsd.org) Date: Wed, 11 Oct 2006 21:38:03 GMT Message-Id: <200610112138.k9BLc3bb032572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107702 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 21:38:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107702 Change 107702 by jb@jb_freebsd8 on 2006/10/11 21:37:42 Revert the previous change. It was back-to-front. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#10 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#10 (text+ko) ==== @@ -12,13 +12,13 @@ ctf.c \ ctfconvert.c \ dwarf.c \ + fixup_tdescs.c \ hash.c \ iidesc.c \ input.c \ list.c \ merge.c \ output.c \ - st_bugs.c \ st_parse.c \ stabs.c \ stack.c \ From owner-p4-projects@FreeBSD.ORG Wed Oct 11 22:17:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62C7316A417; Wed, 11 Oct 2006 22:17:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3886416A40F for ; Wed, 11 Oct 2006 22:17:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A56B143D67 for ; Wed, 11 Oct 2006 22:16:54 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9BMGs4h060248 for ; Wed, 11 Oct 2006 22:16:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9BMGsAO060245 for perforce@freebsd.org; Wed, 11 Oct 2006 22:16:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Oct 2006 22:16:54 GMT Message-Id: <200610112216.k9BMGsAO060245@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 107706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 22:17:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=107706 Change 107706 by hselasky@hselasky_mini_itx on 2006/10/11 22:16:44 Maximum length of usb-string-descriptor is 255 bytes. Add missing byte. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#8 (text+ko) ==== @@ -317,6 +317,7 @@ uByte bLength; uByte bDescriptorType; uWord bString[126]; + uByte bUnused; } UPACKED usb_string_descriptor_t; #define USB_MAX_STRING_LEN 128 #define USB_LANGUAGE_TABLE 0 /* # of the string language id table */ From owner-p4-projects@FreeBSD.ORG Wed Oct 11 22:26:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD23E16A416; Wed, 11 Oct 2006 22:26:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9663F16A40F; Wed, 11 Oct 2006 22:26:53 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe07.swip.net [212.247.154.193]) by mx1.FreeBSD.org (Postfix) with ESMTP id D809043D46; Wed, 11 Oct 2006 22:26:52 +0000 (GMT) (envelope-from hselasky@c2i.net) X-T2-Posting-ID: gvlK0tOCzrqh9CPROFOFPw== X-Cloudmark-Score: 0.000000 [] Received: from [193.216.120.97] (HELO [10.0.0.249]) by mailfe07.swip.net (CommuniGate Pro SMTP 5.0.8) with ESMTP id 299447037; Thu, 12 Oct 2006 00:26:50 +0200 From: Hans Petter Selasky To: Warner Losh Date: Thu, 12 Oct 2006 00:27:09 +0200 User-Agent: KMail/1.7 References: <200610080546.k985k2Eb052621@repoman.freebsd.org> In-Reply-To: <200610080546.k985k2Eb052621@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200610120027.10842.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 107486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 22:26:54 -0000 On Sunday 08 October 2006 07:46, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=107486 > > Change 107486 by imp@imp_paco-paco on 2006/10/08 05:45:21 > > compile > > Affected files ... > > .. //depot/projects/usb/src/sys/dev/usb/udbp.h#5 edit > > Differences ... > > ==== //depot/projects/usb/src/sys/dev/usb/udbp.h#5 (text+ko) ==== > > @@ -60,8 +60,8 @@ > > /* This structure is returned by the NGM_UDBP_GET_STATUS command */ > struct ngudbpstat { > - uint packets_in; /* packets in from downstream */ > - uint packets_out; /* packets out towards downstream */ > + int packets_in; /* packets in from downstream */ > + int packets_out; /* packets out towards downstream */ > }; Are you sure that this shouldn't be "uint32_t" ? --HPS From owner-p4-projects@FreeBSD.ORG Wed Oct 11 23:19:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9E3616A492; Wed, 11 Oct 2006 23:19:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63FD816A407 for ; Wed, 11 Oct 2006 23:19:38 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEE9943D58 for ; Wed, 11 Oct 2006 23:19:37 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k9BNGZL5046099; Wed, 11 Oct 2006 17:16:36 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Wed, 11 Oct 2006 17:15:47 -0600 (MDT) Message-Id: <20061011.171547.1291029425.imp@bsdimp.com> To: hselasky@c2i.net From: "M. Warner Losh" In-Reply-To: <200610120027.10842.hselasky@c2i.net> References: <200610080546.k985k2Eb052621@repoman.freebsd.org> <200610120027.10842.hselasky@c2i.net> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Wed, 11 Oct 2006 17:16:37 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 107486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2006 23:19:39 -0000 In message: <200610120027.10842.hselasky@c2i.net> Hans Petter Selasky writes: : On Sunday 08 October 2006 07:46, Warner Losh wrote: : > http://perforce.freebsd.org/chv.cgi?CH=107486 : > : > Change 107486 by imp@imp_paco-paco on 2006/10/08 05:45:21 : > : > compile : > : > Affected files ... : > : > .. //depot/projects/usb/src/sys/dev/usb/udbp.h#5 edit : > : > Differences ... : > : > ==== //depot/projects/usb/src/sys/dev/usb/udbp.h#5 (text+ko) ==== : > : > @@ -60,8 +60,8 @@ : > : > /* This structure is returned by the NGM_UDBP_GET_STATUS command */ : > struct ngudbpstat { : > - uint packets_in; /* packets in from downstream */ : > - uint packets_out; /* packets out towards downstream */ : > + int packets_in; /* packets in from downstream */ : > + int packets_out; /* packets out towards downstream */ : > }; : : Are you sure that this shouldn't be "uint32_t" ? I'm not sure what it should be. I just made it int to compile. Feel free to change it to a better type. Warner From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:00:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC9116A47B; Thu, 12 Oct 2006 03:00:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A5DA16A40F for ; Thu, 12 Oct 2006 03:00:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0E4A43D5A for ; Thu, 12 Oct 2006 03:00:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C30pd6070374 for ; Thu, 12 Oct 2006 03:00:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C30pQq070368 for perforce@freebsd.org; Thu, 12 Oct 2006 03:00:51 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:00:51 GMT Message-Id: <200610120300.k9C30pQq070368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=107718 Change 107718 by jb@jb_freebsd8 on 2006/10/12 03:00:48 Remove the sun4v simulator definitions. Affected files ... .. //depot/projects/dtrace/src/sys/ufs/ffs/fs.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/ufs/ffs/fs.h#4 (text+ko) ==== @@ -32,9 +32,7 @@ #ifndef _UFS_FFS_FS_H_ #define _UFS_FFS_FS_H_ -#ifdef SUN4V -#include "opt_simulator.h" -#endif + /* * Each disk drive contains some number of filesystems. * A filesystem consists of a number of cylinder groups. @@ -248,11 +246,6 @@ int64_t cs_spare[3]; /* future expansion */ }; -#ifdef SIMULATOR -typedef struct _quad { int val[2]; } squad_t; -#endif - - /* * Super block for an FFS filesystem. */ @@ -349,19 +342,11 @@ int32_t fs_maxsymlinklen; /* max length of an internal symlink */ int32_t fs_old_inodefmt; /* format of on-disk inodes */ u_int64_t fs_maxfilesize; /* maximum representable file size */ -#ifdef SIMULATOR - uint32_t junk; - squad_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ - squad_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ -#else int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ -#endif int32_t fs_state; /* validate fs_clean field */ int32_t fs_old_postblformat; /* format of positional layout tables */ -#ifndef SIMULATOR int32_t fs_old_nrpos; /* number of rotational positions */ -#endif int32_t fs_spare5[2]; /* old fs_postbloff */ /* old fs_rotbloff */ int32_t fs_magic; /* magic number */ @@ -561,17 +546,10 @@ * quantities by using shifts and masks in place of divisions * modulos and multiplications. */ -#ifdef SIMULATOR -#define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \ - ((loc) & ((fs)->fs_qbmask.val[0] | (fs)->fs_qbmask.val[1])) -#define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ - ((loc) & ((fs)->fs_qfmask.val[0] | (fs)->fs_qfmask.val[1])) -#else #define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \ ((loc) & (fs)->fs_qbmask) #define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ ((loc) & (fs)->fs_qfmask) -#endif #define lfragtosize(fs, frag) /* calculates ((off_t)frag * fs->fs_fsize) */ \ (((off_t)(frag)) << (fs)->fs_fshift) #define lblktosize(fs, blk) /* calculates ((off_t)blk * fs->fs_bsize) */ \ @@ -583,17 +561,10 @@ ((loc) >> (fs)->fs_bshift) #define numfrags(fs, loc) /* calculates (loc / fs->fs_fsize) */ \ ((loc) >> (fs)->fs_fshift) -#ifdef SIMULATOR #define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \ - (((size) + ((fs)->fs_qbmask.val[0] | (fs)->fs_qbmask.val[1])) & (fs)->fs_bmask) -#define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \ - (((size) + ((fs)->fs_qfmask.val[0] | (fs)->fs_qfmask.val[1])) & (fs)->fs_fmask) -#else -#define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \ (((size) + (fs)->fs_qbmask) & (fs)->fs_bmask) #define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \ (((size) + (fs)->fs_qfmask) & (fs)->fs_fmask) -#endif #define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \ ((frags) >> (fs)->fs_fragshift) #define blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \ From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:03:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C867D16A416; Thu, 12 Oct 2006 03:03:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8597716A40F for ; Thu, 12 Oct 2006 03:03:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2139443D55 for ; Thu, 12 Oct 2006 03:03:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C33tdK074492 for ; Thu, 12 Oct 2006 03:03:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C33t40074483 for perforce@freebsd.org; Thu, 12 Oct 2006 03:03:55 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:03:55 GMT Message-Id: <200610120303.k9C33t40074483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107719 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:03:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107719 Change 107719 by jb@jb_freebsd8 on 2006/10/12 03:02:58 Reset this file to match current. Affected files ... .. //depot/projects/dtrace/src/sys/sys/elf.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/elf.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$ + * $FreeBSD: src/sys/sys/elf.h,v 1.1 2006/10/04 07:23:31 jb Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:05:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03E0F16A4A7; Thu, 12 Oct 2006 03:05:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2D3516A494 for ; Thu, 12 Oct 2006 03:04:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B46043D45 for ; Thu, 12 Oct 2006 03:04:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C34wm5075106 for ; Thu, 12 Oct 2006 03:04:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C34v0G075103 for perforce@freebsd.org; Thu, 12 Oct 2006 03:04:57 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:04:57 GMT Message-Id: <200610120304.k9C34v0G075103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=107720 Change 107720 by jb@jb_freebsd8 on 2006/10/12 03:04:40 Reset this file to match current. Affected files ... .. //depot/projects/dtrace/src/sys/sys/_elf_solaris.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/_elf_solaris.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD$ + * $FreeBSD: src/sys/sys/_elf_solaris.h,v 1.1 2006/10/04 07:19:39 jb Exp $ * * ELF compatibility definitions for OpenSolaris source. * From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:08:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B91F16A4CA; Thu, 12 Oct 2006 03:08:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12AED16A492 for ; Thu, 12 Oct 2006 03:08:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9334B43D4C for ; Thu, 12 Oct 2006 03:08:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C382nM077288 for ; Thu, 12 Oct 2006 03:08:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C382OC077281 for perforce@freebsd.org; Thu, 12 Oct 2006 03:08:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:08:02 GMT Message-Id: <200610120308.k9C382OC077281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107721 Change 107721 by jb@jb_freebsd8 on 2006/10/12 03:07:04 Remove my experimental threads-in-libc. It just muddies the waters at the moment. Affected files ... .. //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#6 edit .. //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#6 edit .. //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#6 edit .. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/tools/regression/tls/ttls4/Makefile#6 (text+ko) ==== @@ -1,14 +1,8 @@ # $FreeBSD: src/tools/regression/tls/ttls4/Makefile,v 1.1 2005/04/23 23:47:58 davidxu Exp $ -.include - PROG= ttls4 -MK_MAN= no +LDADD+= -lpthread +NO_MAN= DEBUG_FLAGS= -g -.if ${MK_LIBC_THREADS} == "no" -DPADD+= ${LIBPTHREAD} -LDADD+= -lpthread -.endif - .include ==== //depot/projects/dtrace/src/tools/tools/netrate/http/Makefile#6 (text+ko) ==== @@ -1,14 +1,9 @@ # $FreeBSD: src/tools/tools/netrate/http/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $ -.include - PROG= http WARNS= 3 -MK_MAN= no - -.if ${MK_LIBC_THREADS} == "no" +NO_MAN= DPADD= ${LIBPTHREAD} LDADD= -lpthread -.endif .include ==== //depot/projects/dtrace/src/tools/tools/netrate/httpd/Makefile#6 (text+ko) ==== @@ -1,14 +1,9 @@ # $FreeBSD: src/tools/tools/netrate/httpd/Makefile,v 1.1 2005/10/06 08:41:08 rwatson Exp $ -.include - PROG= httpd WARNS= 3 -MK_MAN= no - -.if ${MK_LIBC_THREADS} == "no" +NO_MAN= DPADD= ${LIBPTHREAD} LDADD= -lpthread -.endif .include ==== //depot/projects/dtrace/src/usr.sbin/cached/Makefile#4 (text) ==== @@ -1,7 +1,5 @@ # $FreeBSD: src/usr.sbin/cached/Makefile,v 1.1 2006/04/28 12:03:37 ume Exp $ -.include - PROG=cached PROGNAME=cached MAN=cached.conf.5 cached.8 @@ -11,14 +9,8 @@ config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \ parser.c CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" -DPADD+=${LIBM} ${LIBUTIL} -LDADD+=${LIBM} ${LIBUTIL} - -.if ${MK_LIBC_THREADS} == "no" -DPADD+=${LIBPTHREAD} -LDADD+=${LIBPTHREAD} -.endif - +DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} +LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} LDFLAGS+= -Xlinker --export-dynamic .PATH: ${.CURDIR}/agents From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:08:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7192216A548; Thu, 12 Oct 2006 03:08:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1ABED16A494 for ; Thu, 12 Oct 2006 03:08:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54AC143D5C for ; Thu, 12 Oct 2006 03:08:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C383eH077311 for ; Thu, 12 Oct 2006 03:08:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C382BU077305 for perforce@freebsd.org; Thu, 12 Oct 2006 03:08:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:08:02 GMT Message-Id: <200610120308.k9C382BU077305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107723 Change 107723 by jb@jb_freebsd8 on 2006/10/12 03:07:43 Remove optional KSE now that it's going on another branch. Affected files ... .. //depot/projects/dtrace/src/sys/sys/rtprio.h#6 edit .. //depot/projects/dtrace/src/sys/sys/sched.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/rtprio.h#6 (text+ko) ==== @@ -75,15 +75,9 @@ }; #ifdef _KERNEL -#ifdef KSE struct ksegrp; int rtp_to_pri(struct rtprio *, struct ksegrp *); void pri_to_rtp(struct ksegrp *, struct rtprio *); -#else -struct thread; -int rtp_to_pri(struct rtprio *, struct thread *); -void pri_to_rtp(struct thread *, struct rtprio *); -#endif #endif #endif ==== //depot/projects/dtrace/src/sys/sys/sched.h#7 (text+ko) ==== @@ -52,35 +52,27 @@ * KSE Groups contain scheduling priority information. They record the * behavior of groups of KSEs and threads. */ -#ifdef KSE void sched_class(struct ksegrp *kg, int class); void sched_exit_ksegrp(struct ksegrp *kg, struct thread *childtd); void sched_fork_ksegrp(struct thread *td, struct ksegrp *child); -#else -void sched_class(struct thread *td, int class); -#endif void sched_nice(struct proc *p, int nice); /* * Threads are switched in and out, block on resources, have temporary * priorities inherited from their ksegs, and use up cpu time. */ -#ifdef KSE void sched_exit_thread(struct thread *td, struct thread *child); void sched_fork_thread(struct thread *td, struct thread *child); void sched_lend_prio(struct thread *td, u_char prio); void sched_lend_user_prio(struct thread *td, u_char pri); -#endif fixpt_t sched_pctcpu(struct thread *td); void sched_prio(struct thread *td, u_char prio); void sched_sleep(struct thread *td); void sched_switch(struct thread *td, struct thread *newtd, int flags); void sched_unlend_prio(struct thread *td, u_char prio); -#ifdef KSE void sched_unlend_user_prio(struct thread *td, u_char pri); void sched_user_prio(struct ksegrp *kg, u_char prio); void sched_userret(struct thread *td); -#endif void sched_wakeup(struct thread *td); /* @@ -91,9 +83,6 @@ void sched_rem(struct thread *td); void sched_tick(void); void sched_relinquish(struct thread *td); -#ifndef KSE -void sched_run_ithread(struct thread *td); -#endif /* * Binding makes cpu affinity permanent while pinning is used to temporarily @@ -109,9 +98,7 @@ * These procedures tell the process data structure allocation code how * many bytes to actually allocate. */ -#ifdef KSE int sched_sizeof_ksegrp(void); -#endif int sched_sizeof_proc(void); int sched_sizeof_thread(void); @@ -129,15 +116,11 @@ /* temporarily here */ void schedinit(void); -#ifdef KSE void sched_init_concurrency(struct ksegrp *kg); void sched_set_concurrency(struct ksegrp *kg, int cuncurrency); -#endif void sched_schedinit(void); -#ifdef KSE void sched_newproc(struct proc *p, struct ksegrp *kg, struct thread *td); void sched_thread_exit(struct thread *td); -#endif void sched_newthread(struct thread *td); #endif /* !_SYS_SCHED_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:10:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A79516A4A7; Thu, 12 Oct 2006 03:10:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34F3216A49E for ; Thu, 12 Oct 2006 03:10:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FD4E43D6B for ; Thu, 12 Oct 2006 03:10:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3A6s5079039 for ; Thu, 12 Oct 2006 03:10:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3A6mW079030 for perforce@freebsd.org; Thu, 12 Oct 2006 03:10:06 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:10:06 GMT Message-Id: <200610120310.k9C3A6mW079030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:10:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107724 Change 107724 by jb@jb_freebsd8 on 2006/10/12 03:09:36 Remove my experimental threads-in-libc. Affected files ... .. //depot/projects/dtrace/src/contrib/gcc/config/freebsd-spec.h#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/gcc/config/freebsd-spec.h#5 (text+ko) ==== @@ -156,30 +156,11 @@ %{pthread:-lc_r_p}} \ }" #else -#ifdef FBSD_LIBC_THREADS -/* Leave the -pthread option defined, but link libc no matter what. */ #define FBSD_LIB_SPEC " \ %{!shared: \ - %{!pg: \ - %{!pthread:-lc} \ - %{pthread:-lc}} \ - %{pg: \ - %{!pthread:-lc_p} \ - %{pthread:-lc_p}} \ - }" -#else -#define FBSD_LIB_SPEC " \ - %{!shared: \ %{!pg: %{pthread:-lpthread} -lc} \ %{pg: %{pthread:-lpthread_p} -lc_p} \ }" -#else -#define FBSD_LIB_SPEC " \ - %{!shared: \ - %{!pg: %{pthread:-lpthread} -lc} \ - %{pg: %{pthread:-lpthread_p} -lc_p} \ - }" -#endif #endif #endif From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:11:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F1EA16A47B; Thu, 12 Oct 2006 03:11:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DE8616A416 for ; Thu, 12 Oct 2006 03:11:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3995343D49 for ; Thu, 12 Oct 2006 03:11:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3B8eu079888 for ; Thu, 12 Oct 2006 03:11:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3B7FM079878 for perforce@freebsd.org; Thu, 12 Oct 2006 03:11:07 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:11:07 GMT Message-Id: <200610120311.k9C3B7FM079878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:11:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107725 Change 107725 by jb@jb_freebsd8 on 2006/10/12 03:10:43 Reset this file to match current. Affected files ... .. //depot/projects/dtrace/src/contrib/gcc/config/sparc/sparc.h#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/gcc/config/sparc/sparc.h#5 (text+ko) ==== @@ -797,7 +797,7 @@ /* ALIGN FRAMES on double word boundaries */ #define SPARC_STACK_ALIGN(LOC) \ - (TARGET_ARCH64 ? (((LOC)+63) & ~63) : (((LOC)+7) & ~7)) + (TARGET_ARCH64 ? (((LOC)+15) & ~15) : (((LOC)+7) & ~7)) /* Allocation boundary (in *bits*) for the code of a function. */ #define FUNCTION_BOUNDARY 32 From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:20:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A95E16A416; Thu, 12 Oct 2006 03:20:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF3FF16A407 for ; Thu, 12 Oct 2006 03:20:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F56B43D46 for ; Thu, 12 Oct 2006 03:20:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3KKre085583 for ; Thu, 12 Oct 2006 03:20:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3KKRO085580 for perforce@freebsd.org; Thu, 12 Oct 2006 03:20:20 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:20:20 GMT Message-Id: <200610120320.k9C3KKRO085580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:20:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=107726 Change 107726 by jb@jb_freebsd8 on 2006/10/12 03:20:00 Reset these files to match current. Affected files ... .. //depot/projects/dtrace/src/contrib/openbsm/LICENSE#4 edit .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_uevents.h#4 edit .. //depot/projects/dtrace/src/contrib/openbsm/etc/audit_warn#4 edit .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_class.3#4 edit .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_io.3#4 edit .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_class.c#4 edit .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_flags.c#4 edit .. //depot/projects/dtrace/src/contrib/openbsm/man/audit.2#4 edit .. //depot/projects/dtrace/src/contrib/openpam/configure.ac#4 edit .. //depot/projects/dtrace/src/contrib/openpam/configure.in#4 edit .. //depot/projects/dtrace/src/contrib/openpam/doc/man/pam.conf.5#4 edit .. //depot/projects/dtrace/src/contrib/openpam/lib/openpam_free_envlist.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/openbsm/LICENSE#4 (text) ==== @@ -30,4 +30,4 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. -$P4$ +$P4: //depot/projects/trustedbsd/openbsm/LICENSE#4 $ ==== //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_uevents.h#4 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4$ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#7 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ ==== //depot/projects/dtrace/src/contrib/openbsm/etc/audit_warn#4 (text) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4$ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $ # $FreeBSD: src/contrib/openbsm/etc/audit_warn,v 1.2 2006/03/26 01:44:35 rwatson Exp $ # logger -p security.warning "audit warning: $@" ==== //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_class.3#4 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#3 $ .\" .Dd April 19, 2005 .Dt AU_CLASS 3 ==== //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_io.3#4 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#2 $ .\" .Dd April 19, 2005 .Dt AU_IO 3 ==== //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_class.c#4 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4$ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#11 $ */ #include ==== //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_flags.c#4 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4$ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#13 $ */ #include ==== //depot/projects/dtrace/src/contrib/openbsm/man/audit.2#4 (text) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#6 $ .\" .Dd April 19, 2005 .Dt AUDIT 2 ==== //depot/projects/dtrace/src/contrib/openpam/configure.ac#4 (text) ==== @@ -1,4 +1,4 @@ -dnl $P4$ +dnl $P4: //depot/projects/openpam/configure.ac#2 $ AC_PREREQ(2.53) AC_INIT([OpenPAM],[20050201],[des@freebsd.org],[openpam]) ==== //depot/projects/dtrace/src/contrib/openpam/configure.in#4 (text) ==== @@ -1,4 +1,4 @@ -dnl $P4$ +dnl $P4: //depot/projects/openpam/configure.in#3 $ AC_PREREQ(2.53) AC_INIT([OpenPAM],[20040210],[des@freebsd.org]) ==== //depot/projects/dtrace/src/contrib/openpam/doc/man/pam.conf.5#4 (text) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4$ +.\" $P4: //depot/projects/openpam/doc/man/pam.conf.5#2 $ .\" .Dd June 16, 2005 .Dt PAM.CONF 5 ==== //depot/projects/dtrace/src/contrib/openpam/lib/openpam_free_envlist.c#4 (text) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4$ + * $P4: //depot/projects/openpam/lib/openpam_free_envlist.c#2 $ */ #include From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:25:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 413EE16A494; Thu, 12 Oct 2006 03:25:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE9B116A51F for ; Thu, 12 Oct 2006 03:25:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F45543D58 for ; Thu, 12 Oct 2006 03:25:27 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3PROw089558 for ; Thu, 12 Oct 2006 03:25:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3PR14089552 for perforce@freebsd.org; Thu, 12 Oct 2006 03:25:27 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:25:27 GMT Message-Id: <200610120325.k9C3PR14089552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:25:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=107727 Change 107727 by jb@jb_freebsd8 on 2006/10/12 03:25:25 Remove my experimental threads-in-libc code. Reset these files to current (and back to the old NO_MAN style). Affected files ... .. //depot/projects/dtrace/src/gnu/usr.bin/cc/Makefile.inc#6 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/c++/Makefile#5 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/c++filt/Makefile#5 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1/Makefile#5 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1obj/Makefile#5 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1plus/Makefile#5 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/Makefile#6 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/f771/Makefile#5 edit .. //depot/projects/dtrace/src/gnu/usr.bin/cc/protoize/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/Makefile.inc#6 (text+ko) ==== @@ -8,7 +8,6 @@ GCCDIR= ${.CURDIR}/../../../../contrib/gcc -.include .include "Makefile.tgt" # Machine description. @@ -23,10 +22,6 @@ CFLAGS+= -DPREFIX=\"${TOOLS_PREFIX}/usr\" #CFLAGS+= -DWANT_COMPILER_INVARIANTS -.if ${MK_LIBC_THREADS} != "no" -CFLAGS+= -DFBSD_LIBC_THREADS -.endif - # If building 64-bit longs for the i386, "_LARGE_LONG" should also be defined # to get the proper sizes in limits.h .if defined(LONG_TYPE_SIZE) ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/c++/Makefile#5 (text+ko) ==== @@ -9,7 +9,7 @@ SRCS= gcc.c g++spec.c LINKS= ${BINDIR}/c++ ${BINDIR}/g++ LINKS+= ${BINDIR}/c++ ${BINDIR}/CC -MK_MAN=no +NO_MAN= DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/c++filt/Makefile#5 (text+ko) ==== @@ -6,7 +6,7 @@ PROG= c++filt SRCS= cp-demangle.c -MK_MAN=no +NO_MAN= CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1/Makefile#5 (text+ko) ==== @@ -7,7 +7,7 @@ PROG= cc1 SRCS= main.c c-parse+%DIKED.c c-lang.c stub-objc.c BINDIR= /usr/libexec -MK_MAN=no +NO_MAN= NO_SHARED?=yes CFLAGS+= -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1obj/Makefile#5 (text+ko) ==== @@ -7,7 +7,7 @@ PROG= cc1obj SRCS= main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c BINDIR= /usr/libexec -MK_MAN=no +NO_MAN= NO_SHARED?=yes CFLAGS+= -I${GCCDIR}/objc -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc1plus/Makefile#5 (text+ko) ==== @@ -12,7 +12,7 @@ search.c semantics.c tree.c typeck.c typeck2.c optimize.c BINDIR= /usr/libexec -MK_MAN=no +NO_MAN= NO_SHARED?=yes CFLAGS+= -I${GCCDIR}/cp -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/Makefile#6 (text+ko) ==== @@ -22,10 +22,6 @@ CFLAGS+= -DGENERATOR_FILE -.if ${MK_LIBC_THREADS} != "no" -CFLAGS+= -DFBSD_LIBC_THREADS -.endif - # #----------------------------------------------------------------------- # Build 'pocket' libiberty exclusively for build tools use. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/f771/Makefile#5 (text+ko) ==== @@ -10,7 +10,7 @@ stb.c stc.c std.c ste.c storag.c stp.c str.c sts.c stt.c stu.c stv.c \ stw.c symbol.c target.c top.c type.c where.c main.c BINDIR= /usr/libexec -MK_MAN=no +NO_MAN= CFLAGS+= -I${GCCDIR}/f -I. ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/protoize/Makefile#5 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/../cc_tools ${GCCDIR} PROG= protoize -MK_MAN=no +NO_MAN= # things are rather hard-coded, we work around that here CFLAGS+= -DDEFAULT_TARGET_VERSION=\"\" From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:28:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D783D16A416; Thu, 12 Oct 2006 03:28:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B307D16A407 for ; Thu, 12 Oct 2006 03:28:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D15A43D49 for ; Thu, 12 Oct 2006 03:28:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3SWoa091325 for ; Thu, 12 Oct 2006 03:28:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3SWgl091322 for perforce@freebsd.org; Thu, 12 Oct 2006 03:28:32 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:28:32 GMT Message-Id: <200610120328.k9C3SWgl091322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107728 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=107728 Change 107728 by jb@jb_freebsd8 on 2006/10/12 03:27:50 Reset this file to match current. Affected files ... .. //depot/projects/dtrace/src/lib/libc_r/Makefile#8 edit Differences ... ==== //depot/projects/dtrace/src/lib/libc_r/Makefile#8 (text+ko) ==== @@ -1,5 +1,4 @@ # $FreeBSD: src/lib/libc_r/Makefile,v 1.45 2006/08/22 07:51:07 ru Exp $ - # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:31:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBAA616A40F; Thu, 12 Oct 2006 03:31:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60E3416A403 for ; Thu, 12 Oct 2006 03:31:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF81B43D49 for ; Thu, 12 Oct 2006 03:31:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3Vb8d093846 for ; Thu, 12 Oct 2006 03:31:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3VbeT093840 for perforce@freebsd.org; Thu, 12 Oct 2006 03:31:37 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:31:37 GMT Message-Id: <200610120331.k9C3VbeT093840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:31:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=107729 Change 107729 by jb@jb_freebsd8 on 2006/10/12 03:31:11 Remove my experimental threads-in-libc. Affected files ... .. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#7 edit .. //depot/projects/dtrace/src/lib/libthr/thread/Makefile.inc#6 edit .. //depot/projects/dtrace/src/lib/libthr/thread/pthread_create.c#3 delete .. //depot/projects/dtrace/src/lib/libthr/thread/pthread_exit.c#2 delete .. //depot/projects/dtrace/src/lib/libthr/thread/pthread_kill.c#2 delete .. //depot/projects/dtrace/src/lib/libthr/thread/pthread_self.c#2 delete .. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#10 edit Differences ... ==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#7 (text+ko) ==== @@ -4,7 +4,7 @@ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen -SRCS+= __xuname.c _rand48.c _thread_init.c \ +SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ clock.c closedir.c confstr.c \ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ @@ -33,10 +33,6 @@ usleep.c utime.c valloc.c vis.c wait.c wait3.c waitpid.c \ wordexp.c -.if ${MK_LIBC_THREADS} == "no" -SRCS+= _pthread_stubs.c _spinlock_stub.c -.endif - SYM_MAPS+=${.CURDIR}/gen/Symbol.map # machine-dependent gen sources ==== //depot/projects/dtrace/src/lib/libthr/thread/Makefile.inc#6 (text+ko) ==== @@ -4,10 +4,6 @@ .PATH: ${.CURDIR}/thread SRCS+= \ - pthread_create.c \ - pthread_exit.c \ - pthread_kill.c \ - pthread_self.c \ thr_attr.c \ thr_barrier.c \ thr_barrierattr.c \ @@ -16,9 +12,11 @@ thr_concurrency.c \ thr_cond.c \ thr_condattr.c \ + thr_create.c \ thr_detach.c \ thr_equal.c \ thr_event.c \ + thr_exit.c \ thr_fork.c \ thr_getprio.c \ thr_getschedparam.c \ @@ -27,6 +25,7 @@ thr_join.c \ thr_list.c \ thr_kern.c \ + thr_kill.c \ thr_main_np.c \ thr_multi_np.c \ thr_mutex.c \ @@ -38,6 +37,7 @@ thr_rtld.c \ thr_rwlock.c \ thr_rwlockattr.c \ + thr_self.c \ thr_sem.c \ thr_setprio.c \ thr_setschedparam.c \ ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#10 (text+ko) ==== @@ -120,7 +120,6 @@ static void init_private(void); static void init_main_thread(struct pthread *thread); -#ifndef LIBC_THREADS /* * All weak references used within libc should be in this table. * This is so that static libraries will work. @@ -248,7 +247,6 @@ {DUAL_ENTRY(_pthread_sigmask)}, /* PJT_SIGMASK */ {DUAL_ENTRY(_pthread_testcancel)} /* PJT_TESTCANCEL */ }; -#endif static int init_once = 0; @@ -295,7 +293,6 @@ /* Only initialize the threaded application once. */ return; -#ifndef LIBC_THREADS /* * Check the size of the jump table to make sure it is preset * with the correct number of entries. @@ -303,7 +300,6 @@ if (sizeof(jmp_table) != (sizeof(pthread_func_t) * PJT_MAX * 2)) PANIC("Thread jump table not properly initialized"); memcpy(__thr_jtable, jmp_table, sizeof(jmp_table)); -#endif /* * Check for the special case of this process running as From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:38:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4524616A5A2; Thu, 12 Oct 2006 03:38:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C2D016A58F for ; Thu, 12 Oct 2006 03:38:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC16943D4C for ; Thu, 12 Oct 2006 03:38:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3cl5S098825 for ; Thu, 12 Oct 2006 03:38:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3claK098822 for perforce@freebsd.org; Thu, 12 Oct 2006 03:38:47 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:38:47 GMT Message-Id: <200610120338.k9C3claK098822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:38:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=107731 Change 107731 by jb@jb_freebsd8 on 2006/10/12 03:38:38 Remove optional KSE now it's being done on a different branch. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#11 edit .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#10 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -1118,11 +1118,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); -#else - proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#10 (text+ko) ==== @@ -299,10 +299,8 @@ case T_PAGEFLT: /* page fault */ addr = frame.tf_addr; -#ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); -#endif i = trap_pfault(&frame, TRUE); if (i == -1) goto userout; @@ -759,10 +757,8 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); -#ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); -#endif params = (caddr_t)frame.tf_rsp + sizeof(register_t); code = frame.tf_rax; orig_tf_rflags = frame.tf_rflags; From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:39:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31AF716A415; Thu, 12 Oct 2006 03:39:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 108DA16A40F for ; Thu, 12 Oct 2006 03:39:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1DBD43D4C for ; Thu, 12 Oct 2006 03:39:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3dngk099420 for ; Thu, 12 Oct 2006 03:39:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3dn0s099411 for perforce@freebsd.org; Thu, 12 Oct 2006 03:39:49 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:39:49 GMT Message-Id: <200610120339.k9C3dn0s099411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:39:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=107733 Change 107733 by jb@jb_freebsd8 on 2006/10/12 03:39:00 Remove more of my experimental threads-in-libc. Affected files ... .. //depot/projects/dtrace/src/sbin/ggate/ggated/Makefile#6 edit .. //depot/projects/dtrace/src/share/mk/bsd.libnames.mk#6 edit Differences ... ==== //depot/projects/dtrace/src/sbin/ggate/ggated/Makefile#6 (text+ko) ==== @@ -1,17 +1,13 @@ # $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.5 2005/07/10 21:10:20 pjd Exp $ -.include - .PATH: ${.CURDIR}/../shared PROG= ggated MAN= ggated.8 SRCS= ggated.c ggate.c -.if ${MK_LIBC_THREADS} == "no" DPADD= ${LIBPTHREAD} LDADD= -lpthread -.endif CFLAGS+= -I${.CURDIR}/../shared ==== //depot/projects/dtrace/src/share/mk/bsd.libnames.mk#6 (text+ko) ==== @@ -118,11 +118,7 @@ LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a -.if ${MK_LIBC_THREADS} != "no" -LIBPTHREAD?= -.else LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a -.endif LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:41:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BE3816A40F; Thu, 12 Oct 2006 03:41:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B8A116A403 for ; Thu, 12 Oct 2006 03:41:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA69F43D45 for ; Thu, 12 Oct 2006 03:41:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3fr4R001379 for ; Thu, 12 Oct 2006 03:41:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3frwH001376 for perforce@freebsd.org; Thu, 12 Oct 2006 03:41:53 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:41:53 GMT Message-Id: <200610120341.k9C3frwH001376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:41:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107736 Change 107736 by jb@jb_freebsd8 on 2006/10/12 03:41:52 Remove more optional KSE. Affected files ... .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#12 edit Differences ... ==== //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#12 (text) ==== @@ -454,11 +454,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE proc_linkup(&proc0, &ksegrp0, &thread0); -#else - proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:44:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AAF816A415; Thu, 12 Oct 2006 03:44:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 252CD16A407 for ; Thu, 12 Oct 2006 03:44:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C6FF43D4C for ; Thu, 12 Oct 2006 03:44:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3iwrn003649 for ; Thu, 12 Oct 2006 03:44:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3iwsO003637 for perforce@freebsd.org; Thu, 12 Oct 2006 03:44:58 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:44:58 GMT Message-Id: <200610120344.k9C3iwsO003637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107737 Change 107737 by jb@jb_freebsd8 on 2006/10/12 03:44:02 Reset this file to match current. Affected files ... .. //depot/projects/dtrace/src/sys/conf/Makefile.sun4v#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/Makefile.sun4v#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.38 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $ # # Makefile for FreeBSD # From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:53:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0099616A417; Thu, 12 Oct 2006 03:53:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD09716A403 for ; Thu, 12 Oct 2006 03:53:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A55443D49 for ; Thu, 12 Oct 2006 03:53:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C3r9sF009254 for ; Thu, 12 Oct 2006 03:53:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3r86W009250 for perforce@freebsd.org; Thu, 12 Oct 2006 03:53:08 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:53:08 GMT Message-Id: <200610120353.k9C3r86W009250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 03:53:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107738 Change 107738 by jb@jb_freebsd8 on 2006/10/12 03:52:34 IFC Affected files ... .. //depot/projects/dtrace/ports/MOVED#24 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/sparc64/loader/hcall.S#2 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/dtrace/www/en/cgi/query-pr.cgi#4 integrate Differences ... ==== //depot/projects/dtrace/ports/MOVED#24 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1162 2006/10/10 21:16:21 joerg Exp $ +# $FreeBSD: ports/MOVED,v 1.1163 2006/10/12 00:44:14 maho Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2480,7 +2480,7 @@ net/coda5_server||2006-10-05|Has expired: no longer available from mastersite net/coda5_client||2006-10-05|Has expired: no longer available from mastersite net/coda5_doc||2006-10-05|Has expired: coda5 removed -math/ufspase|math/suitespase|2006-10-05|portname has been changed +math/ufsparse|math/suitesparse|2006-10-05|portname has been changed devel/avr-gcc-devel|devel/avr-gcc|2006-10-06|make AVR-GCC 4.x the default version astro/gdesklets-goodweather||2006-10-07|Expired: no longer downloadable deskutils/goats||2006-10-07|Expired: no longer downloadable ==== //depot/projects/dtrace/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/boot/sparc64/loader/hcall.S#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.40 2006/04/21 19:35:03 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.41 2006/10/12 03:05:45 imp Exp $"); /* * PCI:PCI bridge support. @@ -148,10 +148,10 @@ if (sc->command & PCIM_CMD_MEMEN) { sc->membase = PCI_PPBMEMBASE(0, pci_read_config(dev, PCIR_MEMBASE_1, 2)); sc->memlimit = PCI_PPBMEMLIMIT(0, pci_read_config(dev, PCIR_MEMLIMIT_1, 2)); - sc->pmembase = PCI_PPBMEMBASE((pci_addr_t)pci_read_config(dev, PCIR_PMBASEH_1, 4), - pci_read_config(dev, PCIR_PMBASEL_1, 2)); - sc->pmemlimit = PCI_PPBMEMLIMIT((pci_addr_t)pci_read_config(dev, PCIR_PMLIMITH_1, 4), - pci_read_config(dev, PCIR_PMLIMITL_1, 2)); + sc->pmembase = PCI_PPBMEMBASE(pci_read_config(dev, PCIR_PMBASEH_1, 4), + pci_read_config(dev, PCIR_PMBASEL_1, 2)); + sc->pmemlimit = PCI_PPBMEMLIMIT(pci_read_config(dev, PCIR_PMLIMITH_1, 4), + pci_read_config(dev, PCIR_PMLIMITL_1, 2)); } /* ==== //depot/projects/dtrace/www/en/cgi/query-pr.cgi#4 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.55 2006/09/23 14:02:27 simon Exp $ +# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.56 2006/10/11 21:02:58 danger Exp $ # use strict; @@ -198,7 +198,7 @@ EOF $fmt{'query_form'} = < +
@@ -215,7 +215,7 @@ $fmt{'break'} = "
\n"; # From cgi-style.pl -$main::t_style = ""; +$main::t_style = ""; #----------------------------------------------------------------------- @@ -226,7 +226,8 @@ foreach (split(/&/, $ENV{'QUERY_STRING'})) { my ($key, $val) = split /=/; $f = $val if ($key eq "f"); - $PR = $val if ($key eq "pr"); + $PR = $val if ($key eq "pr" or $key eq "q"); + $PR = $key if ($key =~ /^(?:$valid_category\/)?$valid_pr$/); $category = $val if ($key eq "cat"); $getpatch = $val if ($key eq "getpatch"); } @@ -243,7 +244,7 @@ if ($category && $category !~ /^$valid_category$/); if ($PR < 0 || $PR !~ /^$valid_pr$/) { - print html_header("Query PR Database", 0); + print html_header("Query PR Database"); sprint('query_form'); print html_footer(); exit; @@ -261,7 +262,8 @@ } if (!@query) { - print html_header("No PRs Matched Query", 0); + print html_header("No PRs Matched Query"); + sprint('query_form'); print html_footer(); exit; } @@ -706,7 +708,7 @@ #----------------------------------------------------------------------- -# Func: htmlclean() +# Func: htmlparse() # Desc: Perform any fancy formatting on the message (e.g. HTML-ify # URLs) and return the result. #----------------------------------------------------------------------- @@ -716,7 +718,7 @@ my $v = shift; return "" if (!$v); - $v =~ s/((?:https?|ftps?):\/\/[^\s\/]+\/[][A-Za-z0-9=_.\~\?\&\/\%;-]*)/$1<\/a>/g; + $v =~ s/((?:https?|ftps?):\/\/[^\s\/]+\/[][\w=.,\'\(\)\~\?\!\&\/\%:;@#+-]*)/$1<\/a>/g; $v =~ s/^RCS file: (\/home\/[A-Za-z0-9]+\/(.*?)),v$/RCS file: $1<\/a>,v/; return $v; } From owner-p4-projects@FreeBSD.ORG Thu Oct 12 06:57:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5802A16A47E; Thu, 12 Oct 2006 06:57:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3110F16A403 for ; Thu, 12 Oct 2006 06:57:00 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C187643D49 for ; Thu, 12 Oct 2006 06:56:59 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C6uxcY022909 for ; Thu, 12 Oct 2006 06:56:59 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C6uvMu022906 for perforce@freebsd.org; Thu, 12 Oct 2006 06:56:57 GMT (envelope-from bushman@freebsd.org) Date: Thu, 12 Oct 2006 06:56:57 GMT Message-Id: <200610120656.k9C6uvMu022906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 06:57:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=107744 Change 107744 by bushman@bushman_nss_ldap_cached on 2006/10/12 06:56:43 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/libalias.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mixer#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#7 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/elf.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#9 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtonum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/abort2.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.info.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/sys.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/adduser/adduser.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.4#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/asf/asf.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/asf/asf.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.8#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.c#7 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.conf.5#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/mkmakefile.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/crunch/examples/really-big.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/devinfo/devinfo.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/iostat/iostat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ipfwpcap/ipfwpcap.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kbdcontrol/kbdcontrol.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mailwrapper/mailwrapper.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/LICENSE#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/RELEASE#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/VERSION#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/callout.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/cfparse.y#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/common/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/config.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/defs.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/dvmrp.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/icmp.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/igmp.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/igmpv2.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/inet.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/ipip.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/kern.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/main.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/map-mbone.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/map-mbone/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mapper.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrinfo.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrinfo.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrinfo/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrouted.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrouted.conf#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mrouted/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/mtrace/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/pathnames.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/prune.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/prune.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/route.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/route.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/rsrr.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/rsrr.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/rsrr_var.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/testrsrr/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/testrsrr/testrsrr.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/vif.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mrouted/vif.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntp-keygen.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntp.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntpdc.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntpq.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/nvram/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/nvram/nvram.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/create/main.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/quot/quot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/syslogd/syslogd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/watchdogd/watchdog.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/watchdogd/watchdogd.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/wpa/hostapd/hostapd.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.562 2006/10/09 04:58:44 kmacy Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -107,7 +107,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -1012,56 +1012,58 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#8 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.296 2006/09/20 19:48:31 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.298 2006/10/06 23:22:12 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -297,7 +297,11 @@ router_enable="NO" # Set to YES to enable a routing daemon. router="/sbin/routed" # Name of routing daemon to use if enabled. router_flags="-q" # Flags for routing daemon. -mrouted_enable="NO" # Do multicast routing (see /etc/mrouted.conf). +mrouted_enable="NO" # Do IPv4 multicast routing. +mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast + # routing daemon. You need to + # install it from package or + # port. mrouted_flags="" # Flags for multicast routing daemon. ipxgateway_enable="NO" # Set to YES to enable IPX routing. ipxrouted_enable="NO" # Set to YES to run the IPX routing daemon. @@ -531,6 +535,7 @@ # ruleset file. newsyslog_enable="YES" # Run newsyslog at startup. newsyslog_flags="-CN" # Newsyslog flags to create marked files +mixer_enable="YES" # Run the sound mixer. ############################################################## ### Jail Configuration ####################################### ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/libalias.conf#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/etc/libalias.conf,v 1.1 2006/09/26 23:26:48 piso Exp $ -/usr/lib/libalias_cuseeme.so -/usr/lib/libalias_ftp.so -/usr/lib/libalias_irc.so -/usr/lib/libalias_nbt.so -/usr/lib/libalias_pptp.so -/usr/lib/libalias_skinny.so -/usr/lib/libalias_smedia.so +# $FreeBSD: src/etc/libalias.conf,v 1.2 2006/10/08 14:01:58 piso Exp $ +/lib/libalias_cuseeme.so +/lib/libalias_ftp.so +/lib/libalias_irc.so +/lib/libalias_nbt.so +/lib/libalias_pptp.so +/lib/libalias_skinny.so +/lib/libalias_smedia.so ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -100,6 +100,8 @@ .. .. geom + cache + .. concat .. eli ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.local.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.119 2006/08/02 17:22:30 marcel Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.120 2006/10/02 00:23:13 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -725,6 +725,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.320 2006/09/02 20:58:37 marcel Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.322 2006/10/02 00:23:14 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -549,6 +549,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 @@ -677,6 +679,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -712,6 +716,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -786,6 +792,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -1007,6 +1015,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.173 2006/09/21 01:44:52 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $ # # ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.77 2006/10/07 15:45:56 ume Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 auditd \ + apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ # # PROVIDE: dhclient @@ -53,6 +53,7 @@ ifn="$2" load_rc_config $name +load_rc_config network if ! dhcpif $ifn; then return 1 ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mixer#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mixer,v 1.7 2006/10/06 23:22:13 flz Exp $ # # PROVIDE: mixer @@ -34,6 +34,7 @@ . /etc/rc.subr name="mixer" +rcvar="mixer_enable" stop_cmd="mixer_stop" start_cmd="mixer_start" reload_cmd="mixer_start" ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mrouted#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.9 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.10 2006/09/29 15:45:10 bms Exp $ # # PROVIDE: mrouted @@ -12,7 +12,7 @@ name="mrouted" rcvar=`set_rcvar` -command="/usr/sbin/${name}" +command="/usr/local/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" extra_commands="reload" ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.68 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.69 2006/10/02 08:20:37 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -1008,7 +1008,7 @@ case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) if [ -x /usr/bin/logger ]; then - logger "$0: INFO: $*" + logger "$0: DEBUG: $*" fi echo 1>&2 "$0: DEBUG: $*" ;; ==== //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.263 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -45,8 +45,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \ - geom/raid3 geom/shsec geom/stripe \ + geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \ + geom/nop geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/soc2006/nss_ldap_cached/src/include/elf.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/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $ + * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $ */ /* @@ -38,4 +38,8 @@ #include #include +#ifdef _SOLARIS_C_SOURCE +#include +#endif + #endif /* !_ELF_H_ */ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.217 2006/08/22 07:51:06 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.218 2006/09/30 11:32:46 ru Exp $ .include @@ -31,7 +31,7 @@ libnssutil nss_compat nss_dns nss_files nss_icmp ${_nss_nis}\ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ - libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ + libbegemot ${_libbluetooth} libbsnmp libbz2 libc \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi libipsec \ @@ -80,11 +80,6 @@ _libsmb= libsmb .endif -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "powerpc" && ${MK_LIBC_R} != "no" -_libc_r= -.endif - .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)killpg.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.12 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.13 2006/10/10 11:37:41 maxim Exp $ .\" -.Dd June 2, 1993 +.Dd October 10, 2006 .Dt KILLPG 2 .Os .Sh NAME @@ -66,7 +66,7 @@ have the same effective user ID, or the sender must be the super-user. As a single special case the continue signal SIGCONT may be sent -to any process that is a descendant of the current process. +to any process with the same session ID as the caller. .Sh RETURN VALUES .Rv -std killpg .Sh ERRORS ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/arc4random.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.11 2006/10/04 01:17:23 ache Exp $"); #include "namespace.h" #include @@ -61,6 +61,7 @@ static struct arc4_stream rs; static int rs_initialized; static int rs_stired; +static int arc4_count; static inline u_int8_t arc4_getbyte(struct arc4_stream *); static void arc4_stir(struct arc4_stream *); @@ -127,7 +128,8 @@ * by Ilya Mironov. */ for (n = 0; n < 1024; n++) - arc4_getbyte(as); + (void) arc4_getbyte(as); + arc4_count = 400000; } static inline u_int8_t @@ -172,7 +174,7 @@ static void arc4_check_stir(void) { - if (!rs_stired) { + if (!rs_stired || --arc4_count == 0) { arc4_stir(&rs); rs_stired = 1; } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)err.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.20 2004/10/04 14:04:37 jkoshy Exp $ +.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.21 2006/09/29 22:57:22 ru Exp $ .\" .Dd March 6, 1999 .Dt ERR 3 @@ -98,7 +98,7 @@ If the .Fa fmt argument is not NULL, the -.Xr printf 3 +.Xr printf 3 Ns -like formatted error message is output. The output is terminated by a newline character. .Pp ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.10 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getobjformat.3,v 1.11 2006/10/07 21:27:20 trhodes Exp $ .\" .Dd September 7, 1998 .Dt GETOBJFORMAT 3 @@ -116,7 +116,8 @@ If the environment variable .Ev OBJFORMAT is set, it overrides the default object file format. -.Ev OBJFORMAT takes precedence over +.Ev OBJFORMAT +takes precedence over .Pa /etc/objformat . .El .Sh FILES ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.12 2006/09/01 17:35:48 marcel Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.13 2006/10/08 02:50:33 kmacy Exp $ */ /* @@ -58,6 +58,15 @@ void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign); void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign); +#if defined(__ia64__) || defined(__amd64__) +#define TLS_TCB_ALIGN 16 +#elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \ + defined(__sparc64__) +#define TLS_TCB_ALIGN sizeof(void *) +#else +#error TLS_TCB_ALIGN undefined for target architecture +#endif + #if defined(__ia64__) || defined(__powerpc__) #define TLS_VARIANT_I #endif @@ -299,7 +308,7 @@ } } - tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, 1); + tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); _set_tp(tls); #endif ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/posix1e/mac_is_present.3#2 (text+ko) ==== @@ -28,10 +28,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present.3,v 1.8 2006/07/07 14:02:17 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present.3,v 1.9 2006/09/30 10:29:43 ru Exp $ .\" -.Dd January 9, 2002 -.Dt MAC_IS_PRESENT_NP 3 +.Dd July 7, 2006 +.Dt MAC_IS_PRESENT 3 .Os .Sh NAME .Nm mac_is_present @@ -50,7 +50,7 @@ If .Fa policyname is -.No non- Ns Dv NULL , +.Pf non- Dv NULL , the presence of the named policy (e.g.\& .Dq Li biba , ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/_set_tp.c#2 (text+ko) ==== @@ -23,13 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/sparc64/gen/_set_tp.c,v 1.1 2004/08/15 16:18:03 dfr Exp $ + * $FreeBSD: src/lib/libc/sparc64/gen/_set_tp.c,v 1.2 2006/10/08 02:50:33 kmacy Exp $ */ void _set_tp(void *tpval) { - register void* tp __asm__("%g7"); - tp = tpval; + __asm __volatile("mov %0, %%g7" : : "r" (tpval)); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/a64l.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/stdlib/a64l.3,v 1.2 2006/02/26 23:01:11 wkoszek Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/a64l.3,v 1.3 2006/09/30 10:29:43 ru Exp $ .\" .Dd November 20, 2005 .Dt A64L 3 @@ -67,32 +67,26 @@ are .Ql .\& for 0, -.Ql /\& +.Ql / for 1, -.Ql 0\& -.Fl -.Ql 9\& -for 2 -.Fl -11, -.Ql A\& -.Fl -.Ql Z\& -for 12 -.Fl -37, and -.Ql a\& -.Fl -.Ql z\& -for 38 -.Fl -63. +.Ql 0 +- +.Ql 9 +for 2 - 11, +.Ql A +- +.Ql Z +for 12 - 37, and +.Ql a +- +.Ql z +for 38 - 63. .Pp The .Fn a64l function takes a pointer to a radix-64 representation, in which the first digit is the least significant, and returns a corresponding -.Ft long +.Vt long value. If the string pointed to by .Fa s @@ -120,7 +114,9 @@ .Pp The .Fn l64a -function takes a long argument and returns a pointer to the corresponding +function takes a +.Vt long +argument and returns a pointer to the corresponding radix-64 representation. The behavior of .Fn l64a @@ -141,19 +137,23 @@ .Fa buffer , consuming at most .Fa buflen -characters including the terminating NUL character. +characters including the terminating +.Dv NUL +character. .Sh RETURN VALUES On successful completion, .Fn a64l returns the -.Ft long +.Vt long value resulting from conversion of the input string. -If a string pointed to by s is an empty string, +If a string pointed to by +.Fa s +is an empty string, .Fn a64l returns 0. .Pp The -l64a +.Fn l64a function returns a pointer to the radix-64 representation. If value is 0, .Fn l64a @@ -169,7 +169,7 @@ functions are derived from .Nx with modifications. -They were added to +They appeared in .Fx 6.1 . .Sh AUTHORS The @@ -177,6 +177,7 @@ .Fn l64a , and .Fn l64a_r +functions were added to .Fx by ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.17 2005/01/20 09:17:04 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $ .\" .Dd December 11, 1993 .Dt GETENV 3 @@ -90,8 +90,7 @@ .Fa overwrite is tested; if .Fa overwrite -is -zero, the +is zero, the variable is not reset, otherwise it is reset to the given .Fa value . ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/posix_memalign.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" 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/libc/stdlib/posix_memalign.3,v 1.1 2006/01/12 07:28:20 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/posix_memalign.3,v 1.2 2006/09/30 10:29:43 ru Exp $ .\" .Dd January 11, 2006 .Dt POSIX_MEMALIGN 3 @@ -51,7 +51,8 @@ .Pp The requested .Fa alignment -must be a power of 2 at least as large as sizeof(void *). +must be a power of 2 at least as large as +.Fn sizeof "void *" . .Pp Memory that is allocated via .Fn posix_memalign @@ -72,16 +73,17 @@ .It Bq Er EINVAL The .Fa alignment -parameter is not a power of 2 at least as large as sizeof(void *). +parameter is not a power of 2 at least as large as +.Fn sizeof "void *" . .It Bq Er ENOMEM Memory allocation error. .El .Sh SEE ALSO +.Xr free 3 , .Xr malloc 3 , -.Xr valloc 3 , .Xr realloc 3 , .Xr reallocf 3 , -.Xr free 3 +.Xr valloc 3 .Sh STANDARDS The .Fn posix_memalign ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtonum.3#2 (text) ==== @@ -13,7 +13,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" $OpenBSD: strtonum.3,v 1.12 2005/10/26 11:37:58 jmc Exp $ -.\" $FreeBSD: src/lib/libc/stdlib/strtonum.3,v 1.4 2006/03/15 14:45:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/strtonum.3,v 1.5 2006/09/30 10:29:43 ru Exp $ .\" .Dd April 29, 2004 .Dt STRTONUM 3 @@ -22,8 +22,8 @@ .Nm strtonum .Nd "reliably convert string value to an integer" .Sh SYNOPSIS -.Fd #include -.Fd #include +.In stdlib.h +.In limits.h .Ft long long .Fo strtonum .Fa "const char *nptr" @@ -37,7 +37,7 @@ function converts the string in .Fa nptr to a -.Li long long +.Vt "long long" value. The .Fn strtonum @@ -58,7 +58,7 @@ sign. .Pp The remainder of the string is converted to a -.Li long long +.Vt "long long" value according to base 10. .Pp The value obtained is then checked against the provided @@ -83,10 +83,10 @@ is set, and .Fa errstr will point to an error message. +On success, .Fa *errstr will be set to -.Dv NULL -on success; +.Dv NULL ; this fact can be used to differentiate a successful return of 0 from an error. .Sh EXAMPLES @@ -111,21 +111,22 @@ .It Bq Er EINVAL The given string did not consist solely of digit characters. .It Bq Er EINVAL -.Ar minval >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 12 07:46:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 100A716A415; Thu, 12 Oct 2006 07:46:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5DC316A407 for ; Thu, 12 Oct 2006 07:46:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1CC143D46 for ; Thu, 12 Oct 2006 07:46:01 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C7k1oi055566 for ; Thu, 12 Oct 2006 07:46:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C7k1K5055557 for perforce@freebsd.org; Thu, 12 Oct 2006 07:46:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 12 Oct 2006 07:46:01 GMT Message-Id: <200610120746.k9C7k1K5055557@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 107746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 07:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=107746 Change 107746 by hselasky@hselasky_mini_itx on 2006/10/12 07:45:59 Keep packet counters unsigned in udbp.h. Compile fixes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucomvar.h#9 (text+ko) ==== @@ -80,7 +80,7 @@ void (*ucom_set_rts)(struct ucom_softc *, uint8_t); void (*ucom_set_break)(struct ucom_softc *, uint8_t); int (*ucom_param)(struct ucom_softc *, struct termios *); - int (*ucom_ioctl)(struct ucom_softc *, ulong, caddr_t, int, + int (*ucom_ioctl)(struct ucom_softc *, uint32_t, caddr_t, int, struct thread *); int (*ucom_open)(struct ucom_softc *); void (*ucom_close)(struct ucom_softc *); ==== //depot/projects/usb/src/sys/dev/usb/udbp.h#6 (text+ko) ==== @@ -60,8 +60,8 @@ /* This structure is returned by the NGM_UDBP_GET_STATUS command */ struct ngudbpstat { - int packets_in; /* packets in from downstream */ - int packets_out; /* packets out towards downstream */ + uint32_t packets_in; /* packets in from downstream */ + uint32_t packets_out; /* packets out towards downstream */ }; /* ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#13 (text+ko) ==== @@ -191,7 +191,7 @@ umodem_param(struct ucom_softc *ucom, struct termios *t); static int -umodem_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, +umodem_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, struct thread *td); static void umodem_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); @@ -669,13 +669,13 @@ } static int -umodem_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, +umodem_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, struct thread *td) { struct umodem_softc *sc = ucom->sc_parent; int error = 0; - DPRINTF(0, "cmd=0x%08lx\n", cmd); + DPRINTF(0, "cmd=0x%08x\n", cmd); switch (cmd) { case USB_GET_CM_OVER_DATA: ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#12 (text+ko) ==== @@ -217,7 +217,7 @@ uplcom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); static int -uplcom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag, +uplcom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, struct thread *td); static void uplcom_set_line_state_callback(struct usbd_xfer *xfer); @@ -843,14 +843,14 @@ } static int -uplcom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag, +uplcom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, struct thread *td) { int error = ENOTTY; /* TODO: */ - DPRINTF(0, "cmd = 0x%08lx\n", cmd); + DPRINTF(0, "cmd = 0x%08x\n", cmd); switch (cmd) { case TIOCNOTTY: ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#14 (text+ko) ==== @@ -246,7 +246,7 @@ uvscom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); static int -uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int fflag, +uvscom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int fflag, struct thread *td); static const struct usbd_config uvscom_config[UVSCOM_N_TRANSFER] = { @@ -1046,12 +1046,12 @@ } static int -uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int fflag, +uvscom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int fflag, struct thread *td) { int error = ENOTTY; - DPRINTF(0, "cmd = 0x%08lx\n", cmd); + DPRINTF(0, "cmd = 0x%08x\n", cmd); switch (cmd) { case TIOCNOTTY: From owner-p4-projects@FreeBSD.ORG Thu Oct 12 08:33:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3F7716A4B3; Thu, 12 Oct 2006 08:33:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5D1C16A49E for ; Thu, 12 Oct 2006 08:33:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8074743D46 for ; Thu, 12 Oct 2006 08:33:00 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C8X0wf085433 for ; Thu, 12 Oct 2006 08:33:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C8X0JX085422 for perforce@freebsd.org; Thu, 12 Oct 2006 08:33:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 12 Oct 2006 08:33:00 GMT Message-Id: <200610120833.k9C8X0JX085422@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 107748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 08:33:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107748 Change 107748 by hselasky@hselasky_mini_itx on 2006/10/12 08:32:37 Compile fixes for FreeBSD 6.x Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/ucom.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#15 (text+ko) ==== @@ -942,7 +942,9 @@ ic->ic_reset = &ural_reset_cb; /* enable SW bmiss handling in sta mode */ +#if (defined(IEEE80211_FEXT_SWBMISS) || (__FreeBSD_version >= 700022)) ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS; +#endif /* override state transition machine */ sc->sc_newstate = ic->ic_newstate; ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#12 (text+ko) ==== @@ -323,7 +323,7 @@ DPRINTF(0, "tp = %p, unit = %d\n", tp, sc->sc_unit); -#ifndef TS_CALLOUT +#if !(defined(TS_CALLOUT) || (__FreeBSD_version >= 700022)) #define TS_CALLOUT NULL, sc->sc_unit, MINOR_CALLOUT /* compile fix for FreeBSD 6.x */ #endif error = ttycreate(tp, TS_CALLOUT, "U%d", sc->sc_unit); From owner-p4-projects@FreeBSD.ORG Thu Oct 12 08:41:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B802216A412; Thu, 12 Oct 2006 08:41:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71D9F16A407 for ; Thu, 12 Oct 2006 08:41:16 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6202743D6A for ; Thu, 12 Oct 2006 08:41:14 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C8fBkS088914 for ; Thu, 12 Oct 2006 08:41:11 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C8fAhn088839 for perforce@freebsd.org; Thu, 12 Oct 2006 08:41:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 12 Oct 2006 08:41:10 GMT Message-Id: <200610120841.k9C8fAhn088839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 08:41:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=107749 Change 107749 by rdivacky@rdivacky_witten on 2006/10/12 08:40:29 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_output.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/libalias.3#4 integrate .. //depot/projects/linuxolator/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/fpemu.c#2 delete .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_contig.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.21 2006/10/10 23:23:11 jhb Exp $ */ /* @@ -37,6 +37,7 @@ * that source. */ +#include "opt_atpic.h" #include "opt_ddb.h" #include @@ -62,6 +63,7 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +static STAILQ_HEAD(, pic) pics; #ifdef SMP static int assign_cpu; @@ -70,11 +72,46 @@ #endif static void intr_init(void *__dummy); +static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); static void intrcnt_register(struct intsrc *is); +static int +intr_pic_registered(struct pic *pic) +{ + struct pic *p; + + STAILQ_FOREACH(p, &pics, pics) { + if (p == pic) + return (1); + } + return (0); +} + /* + * Register a new interrupt controller (PIC). This is to support suspend + * and resume where we suspend/resume controllers rather than individual + * sources. This also allows controllers with no active sources (such as + * 8259As in a system using the APICs) to participate in suspend and resume. + */ +int +intr_register_pic(struct pic *pic) +{ + int error; + + mtx_lock_spin(&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); + return (error); +} + +/* * Register a new interrupt source with the global interrupt system. * The global interrupts need to be disabled when this function is * called. @@ -84,6 +121,7 @@ { int error, vector; + KASSERT(intr_pic_registered(isrc->is_pic), ("unregistered PIC")); vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); @@ -255,26 +293,29 @@ void intr_resume(void) { - struct intsrc **isrc; - int i; + struct pic *pic; +#ifndef DEV_ATPIC + atpic_reset(); +#endif mtx_lock_spin(&intr_table_lock); - for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++) - if (*isrc != NULL && (*isrc)->is_pic->pic_resume != NULL) - (*isrc)->is_pic->pic_resume(*isrc); + STAILQ_FOREACH(pic, &pics, pics) { + if (pic->pic_resume != NULL) + pic->pic_resume(pic); + } mtx_unlock_spin(&intr_table_lock); } void intr_suspend(void) { - struct intsrc **isrc; - int i; + struct pic *pic; mtx_lock_spin(&intr_table_lock); - for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++) - if (*isrc != NULL && (*isrc)->is_pic->pic_suspend != NULL) - (*isrc)->is_pic->pic_suspend(*isrc); + STAILQ_FOREACH(pic, &pics, pics) { + if (pic->pic_suspend != NULL) + pic->pic_suspend(pic); + } mtx_unlock_spin(&intr_table_lock); } @@ -327,10 +368,33 @@ intrcnt_setname("???", 0); intrcnt_index = 1; + STAILQ_INIT(&pics); mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) +#ifndef DEV_ATPIC +/* Initialize the two 8259A's to a known-good shutdown state. */ +void +atpic_reset(void) +{ + + outb(IO_ICU1, ICW1_RESET | ICW1_IC4); + outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS); + outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2); + outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086); + outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff); + outb(IO_ICU1, OCW3_SEL | OCW3_RR); + + outb(IO_ICU2, ICW1_RESET | ICW1_IC4); + outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8); + outb(IO_ICU2 + ICU_IMR_OFFSET, 2); + outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086); + outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff); + outb(IO_ICU2, OCW3_SEL | OCW3_RR); +} +#endif + #ifdef DDB /* * Dump data about interrupt handlers ==== //depot/projects/linuxolator/src/sys/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -28,9 +28,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.25 2006/10/10 23:23:11 jhb Exp $"); -#include "opt_atpic.h" #include "opt_isa.h" #include @@ -61,8 +60,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define TODO printf("%s: not implemented!\n", __func__) - static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); /* @@ -115,8 +112,7 @@ static int ioapic_source_pending(struct intsrc *isrc); static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static void ioapic_suspend(struct intsrc *isrc); -static void ioapic_resume(struct intsrc *isrc); +static void ioapic_resume(struct pic *pic); static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); @@ -124,7 +120,7 @@ struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source, ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, - ioapic_suspend, ioapic_resume, + NULL, ioapic_resume, ioapic_config_intr, ioapic_assign_cpu }; static int next_ioapic_base; @@ -419,17 +415,13 @@ } static void -ioapic_suspend(struct intsrc *isrc) +ioapic_resume(struct pic *pic) { + struct ioapic *io = (struct ioapic *)pic; + int i; - TODO; -} - -static void -ioapic_resume(struct intsrc *isrc) -{ - - ioapic_program_intpin((struct ioapic_intsrc *)isrc); + for (i = 0; i < io->io_numintr; i++) + ioapic_program_intpin(&io->io_pins[i]); } /* @@ -727,6 +719,7 @@ io->io_intbase + io->io_numintr - 1); /* Register valid pins as interrupt sources. */ + intr_register_pic(&io->io_pic); for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.31 2006/09/27 22:09:35 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.32 2006/10/10 23:23:11 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -151,12 +151,15 @@ static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; static void lapic_enable(void); +static void lapic_resume(struct pic *pic); static void lapic_timer_enable_intr(void); static void lapic_timer_oneshot(u_int count); static void lapic_timer_periodic(u_int count); static void lapic_timer_set_divisor(u_int divisor); static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value); +struct pic lapic_pic = { .pic_resume = lapic_resume }; + static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value) { @@ -277,7 +280,7 @@ } void -lapic_setup(void) +lapic_setup(int boot) { struct lapic *la; u_int32_t maxlvt; @@ -306,9 +309,13 @@ /* Program timer LVT and setup handler. */ lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); - snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid)); - intrcnt_add(buf, &la->la_timer_count); - if (PCPU_GET(cpuid) != 0) { + if (boot) { + snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid)); + intrcnt_add(buf, &la->la_timer_count); + } + + /* We don't setup the timer during boot on the BSP until later. */ + if (!(boot && PCPU_GET(cpuid) == 0)) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", lapic_id())); lapic_timer_set_divisor(lapic_timer_divisor); @@ -398,6 +405,14 @@ lapic->svr = value; } +/* Reset the local APIC on the BSP during resume. */ +static void +lapic_resume(struct pic *pic) +{ + + lapic_setup(0); +} + int lapic_id(void) { @@ -983,7 +998,8 @@ * Finish setting up the local APIC on the BSP once we know how to * properly program the LINT pins. */ - lapic_setup(); + lapic_setup(1); + intr_register_pic(&lapic_pic); if (bootverbose) lapic_dump("BSP"); } ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.655 2006/10/10 23:23:11 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1212,19 +1212,7 @@ atpic_startup(); #else /* Reset and mask the atpics and leave them shut down. */ - outb(IO_ICU1, ICW1_RESET | ICW1_IC4); - outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS); - outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2); - outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086); - outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff); - outb(IO_ICU1, OCW3_SEL | OCW3_RR); - - outb(IO_ICU2, ICW1_RESET | ICW1_IC4); - outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8); - outb(IO_ICU2 + ICU_IMR_OFFSET, 2); - outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086); - outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff); - outb(IO_ICU2, OCW3_SEL | OCW3_RR); + atpic_reset(); /* * Point the ICU spurious interrupt vectors at the APIC spurious ==== //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.277 2006/09/11 20:10:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -543,7 +543,7 @@ mtx_lock_spin(&ap_boot_mtx); /* Init local apic for irq's */ - lapic_setup(); + lapic_setup(1); /* Set memory range attributes for this CPU to match the BSP */ mem_range_AP_init(); ==== //depot/projects/linuxolator/src/sys/amd64/include/apicvar.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.18 2006/05/01 21:36:47 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.19 2006/10/10 23:23:11 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -211,7 +211,7 @@ int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, enum intr_trigger trigger); void lapic_set_tpr(u_int vector); -void lapic_setup(void); +void lapic_setup(int boot); int lapic_setup_clock(void); #endif /* !LOCORE */ ==== //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.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/amd64/include/intr_machdep.h,v 1.9 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.11 2006/10/10 23:23:11 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -56,9 +56,9 @@ * - 7 counters for each CPU for IPI counters for SMP. */ #ifdef SMP +#define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) +#else #define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + 1) -#else -#define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) #endif #ifndef LOCORE @@ -81,11 +81,12 @@ void (*pic_enable_intr)(struct intsrc *); int (*pic_vector)(struct intsrc *); int (*pic_source_pending)(struct intsrc *); - void (*pic_suspend)(struct intsrc *); - void (*pic_resume)(struct intsrc *); + void (*pic_suspend)(struct pic *); + void (*pic_resume)(struct pic *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); + STAILQ_ENTRY(pic) pics; }; /* Flags for pic_disable_source() */ @@ -114,6 +115,9 @@ extern struct mtx icu_lock; extern int elcr_found; +#ifndef DEV_ATPIC +void atpic_reset(void); +#endif /* XXX: The elcr_* prototypes probably belong somewhere else. */ int elcr_probe(void); enum intr_trigger elcr_read_trigger(u_int irq); @@ -130,6 +134,7 @@ enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); struct intsrc *intr_lookup_source(int vector); +int intr_register_pic(struct pic *pic); int intr_register_source(struct intsrc *isrc); int intr_remove_handler(void *cookie); void intr_resume(void); ==== //depot/projects/linuxolator/src/sys/amd64/isa/atpic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.19 2006/02/28 22:24:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.20 2006/10/10 23:23:11 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -138,7 +138,7 @@ static void atpic_eoi_slave(struct intsrc *isrc); static void atpic_enable_intr(struct intsrc *isrc); static int atpic_vector(struct intsrc *isrc); -static void atpic_resume(struct intsrc *isrc); +static void atpic_resume(struct pic *pic); static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); @@ -285,16 +285,13 @@ } static void -atpic_resume(struct intsrc *isrc) +atpic_resume(struct pic *pic) { - struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc; - struct atpic *ap = (struct atpic *)isrc->is_pic; + struct atpic *ap = (struct atpic *)pic; - if (ai->at_irq == 0) { - i8259_init(ap, ap == &atpics[SLAVE]); - if (ap == &atpics[SLAVE] && elcr_found) - elcr_resume(); - } + i8259_init(ap, ap == &atpics[SLAVE]); + if (ap == &atpics[SLAVE] && elcr_found) + elcr_resume(); } static int @@ -465,6 +462,14 @@ int i; /* + * Register our PICs, even if we aren't going to use any of their + * pins so that they are suspended and resumed. + */ + if (intr_register_pic(&atpics[0].at_pic) != 0 || + intr_register_pic(&atpics[1].at_pic) != 0) + panic("Unable to register ATPICs"); + + /* * If any of the ISA IRQs have an interrupt source already, then * assume that the APICs are being used and don't register any * of our interrupt sources. This makes sure we don't accidentally ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.98 2006/10/08 16:55:27 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.99 2006/10/11 20:32:46 keramida Exp $"); #include #include @@ -925,7 +925,7 @@ } /* - * Filler function for proc/pid_max + * Filler function for proc/sys/kernel/pid_max */ static int linprocfs_dopid_max(PFS_FILL_ARGS) ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.48 2006/07/08 19:51:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.51 2006/10/10 22:46:50 jhb Exp $"); #include #include @@ -465,7 +465,7 @@ } */ bsd_args; bsd_args.semid = args->semid; - bsd_args.sops = (struct sembuf *)PTRIN(args->tsops); + bsd_args.sops = PTRIN(args->tsops); bsd_args.nsops = args->nsops; return semop(td, &bsd_args); } @@ -520,7 +520,7 @@ case LINUX_IPC_SET: cmd = IPC_SET; error = linux_semid_pullup(args->cmd & LINUX_IPC_64, - &linux_semid, (caddr_t)PTRIN(args->arg.buf)); + &linux_semid, PTRIN(args->arg.buf)); if (error) return (error); linux_to_bsd_semid_ds(&linux_semid, &semid); @@ -540,7 +540,7 @@ return (error); bsd_to_linux_semid_ds(&semid, &linux_semid); error = linux_semid_pushdown(args->cmd & LINUX_IPC_64, - &linux_semid, (caddr_t)PTRIN(args->arg.buf)); + &linux_semid, PTRIN(args->arg.buf)); if (error == 0) td->td_retval[0] = (cmd == SEM_STAT) ? rval : 0; return (error); @@ -628,13 +628,14 @@ struct l_msqid_ds linux_msqid; struct msqid_ds bsd_msqid; - error = linux_msqid_pullup(args->cmd & LINUX_IPC_64, - &linux_msqid, (caddr_t)PTRIN(args->buf)); - if (error != 0) - return (error); bsd_cmd = args->cmd & ~LINUX_IPC_64; - if (bsd_cmd == LINUX_IPC_SET) + if (bsd_cmd == LINUX_IPC_SET) { + error = linux_msqid_pullup(args->cmd & LINUX_IPC_64, + &linux_msqid, PTRIN(args->buf)); + if (error) + return (error); linux_to_bsd_msqid_ds(&linux_msqid, &bsd_msqid); + } error = kern_msgctl(td, args->msqid, bsd_cmd, &bsd_msqid); if (error != 0) @@ -644,7 +645,7 @@ if (bsd_cmd == LINUX_IPC_STAT) { bsd_to_linux_msqid_ds(&bsd_msqid, &linux_msqid); return (linux_msqid_pushdown(args->cmd & LINUX_IPC_64, - &linux_msqid, (caddr_t)PTRIN(args->buf))); + &linux_msqid, PTRIN(args->buf))); } return (0); @@ -710,7 +711,6 @@ struct l_shminfo linux_shminfo; struct l_shm_info linux_shm_info; struct shmid_ds bsd_shmid; - size_t bufsz; int error; switch (args->cmd & ~LINUX_IPC_64) { @@ -720,14 +720,14 @@ /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_INFO, - (void *)&bsd_shminfo, &bufsz); + (void *)&bsd_shminfo, NULL); if (error) return error; bsd_to_linux_shminfo(&bsd_shminfo, &linux_shminfo); return (linux_shminfo_pushdown(args->cmd & LINUX_IPC_64, - &linux_shminfo, (caddr_t)PTRIN(args->buf))); + &linux_shminfo, PTRIN(args->buf))); } case LINUX_SHM_INFO: { @@ -735,43 +735,43 @@ /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, SHM_INFO, - (void *)&bsd_shm_info, &bufsz); + (void *)&bsd_shm_info, NULL); if (error) return error; bsd_to_linux_shm_info(&bsd_shm_info, &linux_shm_info); - return copyout(&linux_shm_info, (caddr_t)PTRIN(args->buf), + return copyout(&linux_shm_info, PTRIN(args->buf), sizeof(struct l_shm_info)); } case LINUX_IPC_STAT: /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, - (void *)&bsd_shmid, &bufsz); + (void *)&bsd_shmid, NULL); if (error) return error; bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)PTRIN(args->buf))); + &linux_shmid, PTRIN(args->buf))); case LINUX_SHM_STAT: /* Perform shmctl wanting removed segments lookup */ error = kern_shmctl(td, args->shmid, IPC_STAT, - (void *)&bsd_shmid, &bufsz); + (void *)&bsd_shmid, NULL); if (error) return error; bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); return (linux_shmid_pushdown(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)PTRIN(args->buf))); + &linux_shmid, PTRIN(args->buf))); case LINUX_IPC_SET: error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)PTRIN(args->buf)); + &linux_shmid, PTRIN(args->buf)); if (error) return error; @@ -779,7 +779,7 @@ /* Perform shmctl wanting removed segments lookup */ return kern_shmctl(td, args->shmid, IPC_SET, - (void *)&bsd_shmid, &bufsz); + (void *)&bsd_shmid, NULL); case LINUX_IPC_RMID: { void *buf; @@ -788,13 +788,13 @@ buf = NULL; else { error = linux_shmid_pullup(args->cmd & LINUX_IPC_64, - &linux_shmid, (caddr_t)PTRIN(args->buf)); + &linux_shmid, PTRIN(args->buf)); if (error) return error; linux_to_bsd_shmid_ds(&linux_shmid, &bsd_shmid); buf = (void *)&bsd_shmid; } - return kern_shmctl(td, args->shmid, IPC_RMID, buf, &bufsz); + return kern_shmctl(td, args->shmid, IPC_RMID, buf, NULL); } case LINUX_SHM_LOCK: ==== //depot/projects/linuxolator/src/sys/ddb/db_command.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.70 2006/10/08 18:37:00 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.71 2006/10/10 07:26:53 bde Exp $"); #include #include @@ -68,6 +68,7 @@ static db_cmdfcn_t db_fncall; static db_cmdfcn_t db_gdb; +static db_cmdfcn_t db_halt; static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; static db_cmdfcn_t db_stack_trace; @@ -134,7 +135,8 @@ { "show", 0, 0, &db_show_table }, { "ps", db_ps, 0, 0 }, { "gdb", db_gdb, 0, 0 }, - { "registers", db_show_regs, 0, 0 }, + { "halt", db_halt, 0, 0 }, + { "reboot", db_reset, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { "watchdog", db_watchdog, 0, 0 }, @@ -538,6 +540,13 @@ } static void +db_halt(db_expr_t dummy, boolean_t dummy2, db_expr_t dummy3, char *dummy4) +{ + + cpu_halt(); +} + +static void db_kill(dummy1, dummy2, dummy3, dummy4) db_expr_t dummy1; boolean_t dummy2; ==== //depot/projects/linuxolator/src/sys/ddb/db_output.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.36 2006/10/08 18:15:08 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.37 2006/10/10 06:36:01 bde Exp $"); #include #include @@ -142,7 +142,6 @@ } else if (c == '\n') { /* Newline */ - db_force_whitespace(); cnputc(c); db_output_position = 0; db_last_non_space = 0; @@ -155,7 +154,6 @@ } else if (c == '\r') { /* Return */ - db_force_whitespace(); cnputc(c); db_output_position = 0; db_last_non_space = 0; @@ -247,7 +245,9 @@ #endif } } - db_printf(" \r"); + db_printf(" "); + db_force_whitespace(); + db_printf("\r"); db_newlines = 0; } ==== //depot/projects/linuxolator/src/sys/dev/ath/if_athvar.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.53 2006/09/18 16:26:19 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.54 2006/10/09 23:45:26 sam Exp $ */ /* @@ -418,7 +418,7 @@ ((*(_ah)->ah_getDiagState)((_ah), (_id), \ (_indata), (_insize), (_outdata), (_outsize))) #define ath_hal_getfatalstate(_ah, _outdata, _outsize) \ - ath_hal_getdiagstate(_ah, 27, NULL, 0, (void **)(_outdata), _outsize) + ath_hal_getdiagstate(_ah, 29, NULL, 0, (void **)(_outdata), _outsize) #define ath_hal_setuptxqueue(_ah, _type, _irq) \ ((*(_ah)->ah_setupTxQueue)((_ah), (_type), (_irq))) #define ath_hal_resettxqueue(_ah, _q) \ ==== //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.39 2006/07/26 03:09:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.40 2006/10/10 18:02:22 mlaier Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2699,7 +2699,7 @@ struct ieee80211com *ic = &sc->sc_ic; const struct ieee80211_channel *c; struct iwi_scan_ext scan; - int i, ix, start, scan_type; + int i, ix, start, scan_type, error; memset(&scan, 0, sizeof scan); @@ -2710,8 +2710,22 @@ scan.full_scan_index = htole32(ic->ic_scan.nt_scangen); - scan_type = (ic->ic_des_esslen != 0) ? IWI_SCAN_TYPE_BDIRECTED : - IWI_SCAN_TYPE_BROADCAST; + if (ic->ic_des_esslen != 0) { + scan_type = IWI_SCAN_TYPE_BDIRECTED; +#ifdef IWI_DEBUG + if (iwi_debug > 0) { + printf("Setting desired ESSID to "); + ieee80211_print_essid(ic->ic_des_essid, + ic->ic_des_esslen); + printf("\n"); + } +#endif + error = iwi_cmd(sc, IWI_CMD_SET_ESSID, ic->ic_des_essid, + ic->ic_des_esslen); + if (error != 0) + return error; + } else + scan_type = IWI_SCAN_TYPE_BROADCAST; ix = 0; if (ic->ic_modecaps & IEEE80211_MODE_5GHZ) { ==== //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.16 2006/10/09 04:45:17 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/openfirm.c,v 1.17 2006/10/11 02:52:46 kmacy Exp $"); /*- * Copyright (C) 2000 Benno Rice. * All rights reserved. @@ -842,8 +842,8 @@ 0, }; - args.tba_addr = p1275_ptr2cell(tba_addr); - args.mmfsa_ra = p1275_ptr2cell(mmfsa_ra); + args.tba_addr = (cell_t)tba_addr; + args.mmfsa_ra = (cell_t)mmfsa_ra; openfirmware(&args); } ==== //depot/projects/linuxolator/src/sys/dev/pci/pci.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.314 2006/09/20 06:47:14 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.315 2006/10/09 16:15:55 jmg Exp $"); #include "opt_bus.h" @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include @@ -90,6 +90,13 @@ static void pci_hdrtypedata(device_t pcib, int b, int s, int f, pcicfgregs *cfg); static void pci_read_extcap(device_t pcib, pcicfgregs *cfg); +static uint32_t pci_read_vpd_reg(device_t pcib, pcicfgregs *cfg, + int reg); +#if 0 +static void pci_write_vpd_reg(device_t pcib, pcicfgregs *cfg, + int reg, uint32_t data); +#endif +static void pci_read_vpd(device_t pcib, pcicfgregs *cfg); static device_method_t pci_methods[] = { /* Device interface */ @@ -127,6 +134,8 @@ DEVMETHOD(pci_disable_busmaster, pci_disable_busmaster_method), DEVMETHOD(pci_enable_io, pci_enable_io_method), DEVMETHOD(pci_disable_io, pci_disable_io_method), + DEVMETHOD(pci_get_vpd_ident, pci_get_vpd_ident_method), + DEVMETHOD(pci_get_vpd_readonly, pci_get_vpd_readonly_method), DEVMETHOD(pci_get_powerstate, pci_get_powerstate_method), DEVMETHOD(pci_set_powerstate, pci_set_powerstate_method), DEVMETHOD(pci_assign_interrupt, pci_assign_interrupt_method), @@ -344,7 +353,6 @@ } /* read configuration header into pcicfgregs structure */ - struct pci_devinfo * pci_read_device(device_t pcib, int b, int s, int f, size_t size) { @@ -428,7 +436,7 @@ ptrptr = PCIR_CAP_PTR; break; case 2: - ptrptr = PCIR_CAP_PTR_2; + ptrptr = PCIR_CAP_PTR_2; /* cardbus capabilities ptr */ break; default: return; /* no extended capabilities support */ @@ -468,13 +476,304 @@ cfg->msi.msi_data = PCIR_MSI_DATA; cfg->msi.msi_msgnum = 1 << ((cfg->msi.msi_ctrl & PCIM_MSICTRL_MMC_MASK)>>1); + break; + case PCIY_VPD: /* PCI Vital Product Data */ + cfg->vpd.vpd_reg = ptr; + pci_read_vpd(pcib, cfg); + break; + default: + break; + } + } +/* REG use carry through to next functions */ +} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 12 08:48:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 594B016A40F; Thu, 12 Oct 2006 08:48:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1091816A407 for ; Thu, 12 Oct 2006 08:48:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAA3843D45 for ; Thu, 12 Oct 2006 08:48:21 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C8mLkq001018 for ; Thu, 12 Oct 2006 08:48:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C8mLTN001015 for perforce@freebsd.org; Thu, 12 Oct 2006 08:48:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 12 Oct 2006 08:48:21 GMT Message-Id: <200610120848.k9C8mLTN001015@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 107750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 08:48:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=107750 Change 107750 by hselasky@hselasky_mini_itx on 2006/10/12 08:48:12 Updated documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#11 (text+ko) ==== @@ -105,10 +105,7 @@ /sys/dev/usb/ugen.c /sys/dev/usb/ulpt.c /sys/dev/usb/uhid.c - -http://www.turbocat.net/~hselasky/isdn4bsd/sources/src/sys/i4b/layer1/ihfc2/i4b_regdata.h -http://www.turbocat.net/~hselasky/isdn4bsd/sources/src/sys/i4b/layer1/ihfc2/i4b_wibusb.h - +/sys/dev/usb/... QUICK REFERENCE =============== From owner-p4-projects@FreeBSD.ORG Thu Oct 12 11:45:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E83C16A522; Thu, 12 Oct 2006 11:45:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A70516A51F for ; Thu, 12 Oct 2006 11:45:07 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A929643D49 for ; Thu, 12 Oct 2006 11:45:07 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CBj760002409 for ; Thu, 12 Oct 2006 11:45:07 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CBj7Go002406 for perforce@freebsd.org; Thu, 12 Oct 2006 11:45:07 GMT (envelope-from bushman@freebsd.org) Date: Thu, 12 Oct 2006 11:45:07 GMT Message-Id: <200610121145.k9CBj7Go002406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 11:45:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107758 Change 107758 by bushman@bushman_nss_ldap_cached on 2006/10/12 11:44:58 nss_ldap_fixes: + fork() syscall is now properly handled by checking PID + bind_policy_soft now properly supported + hard_open and hard_init bind policies are now just aliases for "hard" bind policy some type-errors fixed in nss_compat and nss_group (caused by previous merge) Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_group.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_group.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#12 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_group.c#6 (text+ko) ==== @@ -309,7 +309,7 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; - else if (rv == NS_RETRN && *errnop == ERANGE st->fp != MILL)) + else if (rv == NS_RETURN && *errnop == ERANGE && st->fp != NULL) fseeko(st->fp, pos, SEEK_SET); return (rv); #undef set_lookup_type ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_group.c#7 (text+ko) ==== @@ -177,7 +177,7 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; - else if (rv == NS_RETURN && *errnop == ERANGE && st->fp != NULL)) + else if (rv == NS_RETURN && *errnop == ERANGE && st->fp != NULL) fseeko(st->fp, pos, SEEK_SET); return (rv); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#11 (text+ko) ==== @@ -163,7 +163,7 @@ conf->max_reconnect_conntries = 2; conf->deref = NSS_LDAP_DEREF_NEVER; conf->scope = NSS_LDAP_SCOPE_SUB; - conf->bind_policy = NSS_LDAP_BIND_POLICY_HARD_OPEN; + conf->bind_policy = NSS_LDAP_BIND_POLICY_HARD; conf->connect_policy = NSS_LDAP_CONNECT_POLICY_PERSIST_PERTHREAD; conf->restart = 0; conf->debug = 0; @@ -242,13 +242,18 @@ } } else if (strcmp(fields[0], "bind_policy") == 0) { if (field_count == 2) { - if (strcmp(fields[1], "hard_open") == 0) { + /* + * "hard_init" and "hard_open" keywords are + * supported only for compatibility with + * PADL's nss_ldap. We only have "hard" and + * "soft" policies. + */ + if ((strcmp(fields[1], "hard") == 0) || + (strcmp(fields[1], "hard_open") == 0) || + (strcmp(fields[1], "hard_init") == 0)) + { conf->bind_policy = - NSS_LDAP_BIND_POLICY_HARD_OPEN; - continue; - } else if (strcmp(fields[1], "hard_init") == 0) { - conf->bind_policy = - NSS_LDAP_BIND_POLICY_HARD_INIT; + NSS_LDAP_BIND_POLICY_HARD; continue; } else if (strcmp(fields[1], "soft") == 0) { conf->bind_policy = ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#11 (text+ko) ==== @@ -50,9 +50,8 @@ #define NSS_LDAP_PROTO_VERSION_2 2 #define NSS_LDAP_PROTO_VERSION_3 3 -#define NSS_LDAP_BIND_POLICY_HARD_OPEN 0 -#define NSS_LDAP_BIND_POLICY_HARD_INIT 1 -#define NSS_LDAP_BIND_POLICY_SOFT 2 +#define NSS_LDAP_BIND_POLICY_HARD 0 +#define NSS_LDAP_BIND_POLICY_SOFT 1 #define NSS_LDAP_CONNECT_POLICY_PERSIST_PERTHREAD 0 #define NSS_LDAP_CONNECT_POLICY_PERSIST_PERPROCESS 1 ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#11 (text+ko) ==== @@ -132,11 +132,16 @@ struct nss_ldap_configuration *conf, struct nss_ldap_connection_error *conn_err) { + struct nss_ldap_connection_error conn_err_; int rv; if (check_connection_socket(conn) != 0) { rv = close_lost_connection(conn); return (NSS_LDAP_CONNECTION_ERROR); + } else if (conn->last_pid != getpid()) { + (void)__nss_ldap_disconnect(&__nss_ldap_conf->connection_method, + conn, __nss_ldap_conf, &conn_err_); + return (NSS_LDAP_CONNECTION_ERROR); } else return (NSS_LDAP_SUCCESS); } @@ -385,6 +390,9 @@ return (NULL); } + /* Remember last pid value to correctly handle fork() calls */ + conn->last_pid = getpid(); + switch (conf->proto_version) { case NSS_LDAP_PROTO_VERSION_2: opt = LDAP_VERSION2; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#12 (text+ko) ==== @@ -58,6 +58,7 @@ char sockname[NSS_LDAP_SOCK_NAME_SIZE]; char peername[NSS_LDAP_SOCK_NAME_SIZE]; int sock_fd; + pid_t last_pid; }; struct nss_ldap_connection_error ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#12 (text+ko) ==== @@ -332,7 +332,7 @@ NSS_LDAP_LL_ERR_INT, "init_connection_with_reconnect: " "__nss_ldap_auth failed "); -\ + memset(&l_conn_err, 0, sizeof(l_conn_err)); rv = __nss_ldap_disconnect( @@ -367,12 +367,15 @@ goto fin; } + if (__nss_ldap_conf->bind_policy == NSS_LDAP_BIND_POLICY_SOFT) + break; + if (sleep_time < __nss_ldap_conf->max_reconnect_sleeptime) { - sleep_time *= 2; __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, "init_connection_with_reconnect: sleeping for" " %d secs", sleep_time); sleep(sleep_time); + sleep_time *= 2; } } @@ -404,7 +407,7 @@ if ((*conn != NULL) && (__nss_ldap_check_close_connection( connection_method, *conn, __nss_ldap_conf, conn_error) - == NSS_LDAP_CONNECTION_ERROR)) { + != NSS_LDAP_SUCCESS)) { *conn = NULL; From owner-p4-projects@FreeBSD.ORG Thu Oct 12 12:30:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1965216A47C; Thu, 12 Oct 2006 12:30:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5DD316A416 for ; Thu, 12 Oct 2006 12:30:04 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60F5543D64 for ; Thu, 12 Oct 2006 12:30:04 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CCU4Du030826 for ; Thu, 12 Oct 2006 12:30:04 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CCU3Bx030823 for perforce@freebsd.org; Thu, 12 Oct 2006 12:30:03 GMT (envelope-from bushman@freebsd.org) Date: Thu, 12 Oct 2006 12:30:03 GMT Message-Id: <200610121230.k9CCU3Bx030823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 12:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107759 Change 107759 by bushman@bushman_nss_ldap_cached on 2006/10/12 12:29:34 + don't abort on unknown config-file keywords - allows using the same configuration file for OpenLDAP, nss_ldap, pam_ldap, etc... Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#12 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#12 (text+ko) ==== @@ -604,7 +604,11 @@ break; } - res = NSS_LDAP_PARSE_ERROR; + /* + * NOTE: uncomment this to abort on unknown config-file + * keywords: + * res = NSS_LDAP_PARSE_ERROR; + */ } fclose(fin); From owner-p4-projects@FreeBSD.ORG Thu Oct 12 14:31:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D28016A4D4; Thu, 12 Oct 2006 14:31:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EA9B16A4C2 for ; Thu, 12 Oct 2006 14:31:47 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC61C43D4C for ; Thu, 12 Oct 2006 14:30:36 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CEUaLw090082 for ; Thu, 12 Oct 2006 14:30:36 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CEUaR8090078 for perforce@freebsd.org; Thu, 12 Oct 2006 14:30:36 GMT (envelope-from bushman@freebsd.org) Date: Thu, 12 Oct 2006 14:30:36 GMT Message-Id: <200610121430.k9CEUaR8090078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 14:31:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=107762 Change 107762 by bushman@bushman_nss_ldap_cached on 2006/10/12 14:30:24 + support for krb5_ccname added (requires proper testing) Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#13 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#12 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#12 (text+ko) ==== @@ -927,6 +927,10 @@ struct nss_ldap_configuration *conf, struct nss_ldap_connection_error *err) { +#ifdef NSS_LDAP_USE_KRB5_CCNAME + char tempbuf[256]; + char *ccname, *ccfile, *old_ccname; +#endif char *pw, *dn, *err_str; int rv; @@ -946,7 +950,7 @@ (void *)&err_str) != LDAP_SUCCESS) err_str = NULL; snprintf(err->description, NSS_LDAP_MAX_ERR_DESC_SIZE, - "ldap_sasl_interactive_bind_s() error: %s; %s\n", + "ldap_get_option() error: %s; %s\n", ldap_err2string(err->err_num), err_str == NULL ? "" : err_str); @@ -955,9 +959,55 @@ return (NSS_LDAP_CONNECTION_ERROR); } } + +#ifdef NSS_LDAP_USE_KRB5_CCNAME + ccname = __nss_ldap_conf->krb5_ccname; + if (ccname != NULL) { + /* + * If krb5_ccname points to a file, we should check it is exists - + * this idea was suggested by Howard Wilkinson. This check, for + * example, allows the caching daemon to use the specified + * credentials cache, whenever all other unpriviledged applications + * will use their own credentials cache. + */ + if ((strncasecmp(ccname, "FILE:", sizeof("FILE:") - 1) == 0) + || (strncasecmp(ccname, "WRFILE:", sizeof("WRFILE:") - 1) + == 0)) { + char *ccfile; + ccfile = strchr(ccname, ':') + 1; + if (access(ccfile, R_OK) != 0) { + __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, + "ccache file (%s) is inaccessible, " + "krb5_ccname is \"%s\"", ccname); + ccname = NULL; + } + } + + if (ccname != NULL) { + old_ccname = getenv("KRB5CCNAME"); + strncpy(tempbuf, old_ccname, sizeof(old_tempbuf) - 1); + + if (setenv("KRB5CCNAME", + __nss_ldap_conf->krb5_ccname, 1) != 0) { + ccname = NULL; + __nss_ldap_log(NSS_LDAP_LL_WARN, + "setenv(\"KRB5CCNAME\", ...) failed"); + } + } + } +#endif /* NSS_LDAP_USE_KRB5_CCNAME */ rv = ldap_sasl_interactive_bind_s(conn->ld, dn, "GSSAPI", NULL, NULL, LDAP_SASL_QUIET, nss_ldap_sasl_interact, pw); + +#ifdef NSS_LDAP_USE_KRB5_CCNAME + if (ccname != NULL) + if (setenv("KRB5CCNAME", tempbuf, 1) != 0) + __nss_ldap_log(NSS_LDAP_LL_WARN, + "setenv(\"KRB5CCNAME\", ...) failed while restoring " + "original value"); +#endif /* NSS_LDAP_USE_KRB5_CCNAME */ + if (rv != LDAP_SUCCESS) { err->err_num = rv; if (ldap_get_option(conn->ld, LDAP_OPT_ERROR_STRING, ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#13 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Oct 12 16:11:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3526916A4F8; Thu, 12 Oct 2006 16:11:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DC2D16A4EE for ; Thu, 12 Oct 2006 16:11:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19C2443E5F for ; Thu, 12 Oct 2006 16:09:44 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CG9hvL017314 for ; Thu, 12 Oct 2006 16:09:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CG9h7c017293 for perforce@freebsd.org; Thu, 12 Oct 2006 16:09:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 12 Oct 2006 16:09:43 GMT Message-Id: <200610121609.k9CG9h7c017293@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 107765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 16:11:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107765 Change 107765 by hselasky@hselasky_mini_itx on 2006/10/12 16:09:11 Remove the compatibility layer for the old USB drivers, hence no USB device drivers in the tree are using it. If you have a driver that still uses the old USB API I recommend that you update your code. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#24 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#11 (text+ko) ==== @@ -224,11 +224,6 @@ SYSCTL_DECL(_hw_usb); #endif -#if 0 -/* enable support for the old USB interface: */ -#define USB_COMPAT_OLD -#endif - /* force debugging until further */ #ifndef USB_DEBUG #define USB_DEBUG @@ -295,163 +290,4 @@ */ #define msleep(i,m,p,w,t) msleep(i,(((m) == &Giant) ? NULL : (m)),p,w,t) -#ifdef USB_COMPAT_OLD - -/* - * NOTE: All macros in this section - * should be expanded in new drivers. - * One day USB_COMPAT_OLD will - * be undefined! - */ - -typedef struct thread *usb_proc_ptr; - -#define device_ptr_t device_t -#define USBBASEDEVICE device_t -#define USBDEV(bdev) (bdev) -#define USBDEVNAME(bdev) device_get_nameunit(bdev) -#define USBDEVPTRNAME(bdev) device_get_nameunit(bdev) -#define USBDEVUNIT(bdev) device_get_unit(bdev) -#define USBGETSOFTC(bdev) device_get_softc(bdev) -#define USB_DNAME(dname) dname - -typedef struct __callout usb_callout_t; -#define usb_callout_init(h) __callout_init_mtx(&(h), &Giant, 0) -#define usb_callout(h, t, f, d) __callout_reset(&(h), (t), (f), (d)) -#define usb_uncallout(h, f, d) __callout_stop(&(h)) -#define usb_uncallout_drain(h, f, d) __callout_stop(&(h)) - -#define USB_DECLARE_DRIVER_INIT(dname, init...) \ - Static device_probe_t __CONCAT(dname,_match); \ - Static device_attach_t __CONCAT(dname,_attach); \ - Static device_detach_t __CONCAT(dname,_detach); \ - \ - Static devclass_t __CONCAT(dname,_devclass); \ - \ - Static device_method_t __CONCAT(dname,_methods)[] = { \ - DEVMETHOD(device_probe, __CONCAT(dname,_match)), \ - DEVMETHOD(device_attach, __CONCAT(dname,_attach)), \ - DEVMETHOD(device_detach, __CONCAT(dname,_detach)), \ - init, \ - {0,0} \ - }; \ - \ - Static driver_t __CONCAT(dname,_driver) = { \ - #dname, \ - __CONCAT(dname,_methods), \ - sizeof(struct __CONCAT(dname,_softc)) \ - }; \ - MODULE_DEPEND(dname, usb, 1, 1, 1) - -#define METHODS_NONE \ - {0,0} - -#define USB_DECLARE_DRIVER(dname) \ - USB_DECLARE_DRIVER_INIT(dname, METHODS_NONE) - -#define USB_MATCH(dname) \ - Static int \ - __CONCAT(dname,_match)(device_t self) - -#define USB_MATCH_START(dname, uaa) \ - struct usb_attach_arg *uaa = device_get_ivars(self) - -#define USB_MATCH_SETUP \ - sc->sc_dev = self - -#define USB_ATTACH(dname) \ - Static int \ - __CONCAT(dname,_attach)(device_t self) - -#define USB_ATTACH_START(dname, sc, uaa) \ - struct __CONCAT(dname,_softc) *sc = device_get_softc(self); \ - struct usb_attach_arg *uaa = device_get_ivars(self) - -#define USB_ATTACH_SETUP \ - sc->sc_dev = self; \ - device_set_desc_copy(self, devinfo) - -#define USB_ATTACH_ERROR_RETURN \ - return ENXIO - -#define USB_ATTACH_SUCCESS_RETURN \ - return 0 - -#define USB_DETACH(dname) \ - Static int \ - __CONCAT(dname,_detach)(device_t self) - -#define USB_DETACH_START(dname, sc) \ - struct __CONCAT(dname,_softc) *sc = device_get_softc(self) - -#define USB_GET_SC_OPEN(dname, unit, sc) \ - (sc) = devclass_get_softc(__CONCAT(dname,_devclass), unit); \ - if ((sc) == NULL) \ - return (ENXIO) - -#define USB_GET_SC(dname, unit, sc) \ - (sc) = devclass_get_softc(__CONCAT(dname,_devclass), unit) - -#define USBD_IN_PROGRESS USBD_NORMAL_COMPLETION -#define USBD_NO_COPY 0 -#define USBD_EXCLUSIVE_USE 0 -#define USBD_SHOW_INTERFACE_CLASS 0 -#define splusb splbio -#define usb_find_desc(udev, type, subtype) usbd_find_descriptor(usbd_get_config_descriptor(udev), type, subtype) -#define usbd_get_desc usbreq_get_desc -#define usbd_get_string(udev, si, ptr) usbreq_get_string_any(udev, si, ptr, USB_MAX_STRING_LEN) -#define usbd_get_string_desc usbreq_get_string_desc -#define usbd_get_config_desc usbreq_get_config_desc -#define usbd_get_config_desc_full usbreq_get_config_desc_full -#define usbd_get_device_desc usbreq_get_device_desc -#define usbd_get_interface(iface,args...) usbreq_get_interface((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_set_interface(iface,args...) usbreq_set_interface((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_get_device_status usbreq_get_device_status -#define usbd_get_hub_descriptor usbreq_get_hub_descriptor -#define usbd_get_hub_status usbreq_get_hub_status -#define usbd_set_address usbreq_set_address -#define usbd_get_port_status usbreq_get_port_status -#define usbd_clear_hub_feature usbreq_clear_hub_feature -#define usbd_set_hub_feature usbreq_set_hub_feature -#define usbd_clear_port_feature usbreq_clear_port_feature -#define usbd_set_port_feature usbreq_set_port_feature -#define usbd_set_protocol(iface,args...) usbreq_set_protocol((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_set_report(iface,args...) usbreq_set_report((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_set_report_async(iface,args...) usbreq_set_report_async((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_get_report(iface,args...) usbreq_get_report((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_set_idle(iface,args...) usbreq_set_idle((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_get_report_descriptor usbreq_get_report_descriptor -#define usbd_read_report_desc(iface,args...) usbreq_read_report_desc((iface)->udev, (iface) - &(iface)->udev->ifaces[0], args) -#define usbd_set_config usbreq_set_config -#define usbd_get_config usbreq_get_config -#define usbd_dopoll(iface) usbd_do_poll((iface)->udev) -#define ifaceno iface_index /* umass.c */ -#define usbd_do_request_async(udev, req, data) \ -usbd_do_request_flags(udev, req, data, USBD_USE_POLLING, 0, 500 /* ms */) - -/* - * depreciated Giant locked task-queue - * (only used by if_udav.c) - */ -struct usb_task { - -#ifdef __FreeBSD__ - struct task task; -#endif - void (*func)(void *); - void *arg; -}; - -void -usb_call_task(void *arg, int count); - -#define usb_init_task(_task, _func, _arg) \ -{ (_task)->func = (_func); (_task)->arg = (_arg); \ - TASK_INIT(&(_task)->task, 0, &usb_call_task, (_task)); } -#define usb_add_task(udev, _task) \ -taskqueue_enqueue(taskqueue_swi_giant, &(_task)->task) -#define usb_rem_task(udev, _task) \ -taskqueue_drain(taskqueue_swi_giant, &(_task)->task) - -#endif /* USB_COMPAT_OLD */ #endif /* _USB_PORT_H */ ==== //depot/projects/usb/src/sys/dev/usb/usb_requests.c#4 (text+ko) ==== @@ -477,40 +477,6 @@ return (usbd_do_request(udev, &req, 0)); } -#ifdef USB_COMPAT_OLD -usbd_status -usbreq_set_report_async(struct usbd_device *udev, u_int8_t iface_index, - u_int8_t type, u_int8_t id, void *data, int len) -{ - struct usbd_interface *iface = usbd_get_iface(udev,iface_index); - usb_device_request_t req; - - if((iface == NULL) || (iface->idesc == NULL)) - { - return (USBD_INVAL); - } - /* this function call should be replaced by an allocated - * transfer that is started when a transfer is needed, and - * stopped when the device is detached. This implementation - * use polling because it may be called from an interrupt - * context. - */ - - PRINTF(("this function is depreceated")); - - PRINTFN(4, ("len=%d\n", len)); - - req.bmRequestType = UT_WRITE_CLASS_INTERFACE; - req.bRequest = UR_SET_REPORT; - USETW2(req.wValue, type, id); - USETW(req.wIndex, iface->idesc->bInterfaceNumber); - USETW(req.wLength, len); - - return (usbd_do_request_flags - (udev, &req, data, USBD_USE_POLLING, 0, 500 /* ms */)); -} -#endif - usbd_status usbreq_set_report(struct usbd_device *udev, u_int8_t iface_index, u_int8_t type, u_int8_t id, void *data, int len) ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#20 (text+ko) ==== @@ -402,9 +402,7 @@ usb_endpoint_descriptor_t *edesc, struct usbd_pipe *pipe) { bzero(pipe, sizeof(*pipe)); -#ifdef USB_COMPAT_OLD - pipe->udev = udev; -#endif + pipe->edesc = edesc; pipe->iface_index = iface_index; LIST_INIT(&pipe->list_head); @@ -481,9 +479,6 @@ { return (USBD_INVAL); } -#ifdef USB_COMPAT_OLD - iface->udev = udev; -#endif iface->idesc = id; iface->alt_index = alt_index; @@ -990,17 +985,7 @@ uaa.configno = udev->cdesc->bConfigurationValue; uaa.ifaces_start = &udev->ifaces[0]; uaa.ifaces_end = &udev->ifaces[udev->cdesc->bNumInterface]; -#ifdef USB_COMPAT_OLD - uaa.nifaces = udev->cdesc->bNumInterface; - for(i = 0; i < uaa.nifaces; i++) - { - if(USBD_GET_IFACE_NO_PROBE(udev, i)) - uaa.ifaces[i] = NULL; - else - uaa.ifaces[i] = &udev->ifaces[i]; - } -#endif for(iface = uaa.ifaces_start; iface < uaa.ifaces_end; iface++) @@ -1015,9 +1000,7 @@ "Too many subdevices\n"); break; } -#ifdef USB_COMPAT_OLD - if(uaa.ifaces[i]) -#endif + if((USBD_GET_IFACE_NO_PROBE(udev, i) == 0) && (udev->subdevs[i] == NULL) && (device_probe_and_attach(bdev) == 0)) @@ -1045,20 +1028,6 @@ if(udev->probed == USBD_PROBED_IFACE_AND_FOUND) { -#ifdef USB_COMPAT_OLD - uaa.nifaces = udev->cdesc->bNumInterface; - - for(i = 0; i < uaa.nifaces; i++) - { - /* mark ifaces that should - * not be probed - */ - if(uaa.ifaces[i] == NULL) - { - USBD_SET_IFACE_NO_PROBE(udev, i); - } - } -#endif break; } } ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#24 (text+ko) ==== @@ -86,14 +86,6 @@ typedef u_int8_t usbd_status; typedef void (*usbd_callback_t)(struct usbd_xfer *); -#ifdef USB_COMPAT_OLD -typedef void (*usbd_callback)(struct usbd_xfer *, void *, usbd_status); -typedef struct usbd_xfer *usbd_xfer_handle; -typedef struct usbd_device *usbd_device_handle; -typedef struct usbd_pipe *usbd_pipe_handle; -typedef struct usbd_interface *usbd_interface_handle; -typedef void *usbd_private_handle; -#endif struct usbd_bus_methods { void (*pipe_init)(struct usbd_device *udev, @@ -203,9 +195,6 @@ }; struct usbd_interface { -#ifdef USB_COMPAT_OLD - struct usbd_device *udev; -#endif usb_interface_descriptor_t *idesc; u_int8_t alt_index; }; @@ -214,10 +203,6 @@ (pipe)->clearstall = 0; (pipe)->toggle_next = 0; } struct usbd_pipe { -#ifdef USB_COMPAT_OLD - struct usbd_device * udev; - struct usbd_xfer * alloc_xfer; -#endif usb_endpoint_descriptor_t *edesc; LIST_HEAD(, usbd_xfer) list_head; u_int16_t isoc_next; @@ -315,12 +300,10 @@ * flag is also exported by usb.h */ #endif -#if (defined(USB_COMPAT_OLD) || 1) #define USBD_CUSTOM_CLEARSTALL 0x0008 /* used to disable automatic clear-stall * when a device reset request is needed * in addition to the clear stall request */ -#endif #define USBD_DEV_OPEN 0x0010 #define USBD_DEV_RECURSED_1 0x0020 #define USBD_DEV_RECURSED_2 0x0040 @@ -407,22 +390,6 @@ void *td_transfer_first; void *td_transfer_last; void *td_transfer_cache; - -#ifdef USB_COMPAT_OLD - struct usbd_xfer * alloc_xfer; /* the real transfer */ - void * alloc_ptr; - u_int32_t alloc_len; - void * d_copy_ptr; - void * d_copy_src; - void * d_copy_dst; - u_int32_t d_copy_len; - usbd_callback d_callback; - - void * f_copy_ptr; - void * f_copy_src; - void * f_copy_dst; - u_int32_t f_copy_len; -#endif }; struct usbd_memory_info { @@ -570,10 +537,6 @@ int usegeneric; struct usbd_interface *ifaces_start; /* all interfaces */ struct usbd_interface *ifaces_end; /* exclusive */ -#ifdef USB_COMPAT_OLD - int nifaces; - struct usbd_interface * ifaces[USB_MAX_ENDPOINTS]; -#endif }; /* return values for device_probe() method: */ @@ -936,101 +899,6 @@ int usbd_driver_load(struct module *mod, int what, void *arg); -#ifdef USB_COMPAT_OLD -usbd_status -usbd_transfer(struct usbd_xfer *xfer); - -usbd_status -usbd_sync_transfer(struct usbd_xfer *xfer); - -void * -usbd_alloc_buffer(struct usbd_xfer *xfer, u_int32_t size); - -void -usbd_free_buffer(struct usbd_xfer *xfer); - -void -usbd_get_xfer_status(struct usbd_xfer *xfer, void **priv, - void **buffer, u_int32_t *count, usbd_status *status); - -struct usbd_xfer * -usbd_alloc_xfer(struct usbd_device *dev); - -usbd_status -usbd_free_xfer(struct usbd_xfer *xfer); - -usbd_status -usbd_open_pipe(struct usbd_interface *iface, u_int8_t address, - u_int8_t flags, struct usbd_pipe **pipe); - -usbd_status -usbd_open_pipe_intr(struct usbd_interface *iface, u_int8_t address, - u_int8_t flags, struct usbd_pipe **pipe, - void *priv, void *buffer, u_int32_t len, - usbd_callback callback, int ival); - -usbd_status -usbd_setup_xfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe, - void *priv, void *buffer, u_int32_t length, - u_int32_t flags, u_int32_t timeout, - usbd_callback callback); - -usbd_status -usbd_setup_default_xfer(struct usbd_xfer *xfer, struct usbd_device *dev, - void *priv, u_int32_t timeout, - usb_device_request_t *req, void *buffer, - u_int32_t length, u_int16_t flags, - usbd_callback callback); - -usbd_status -usbd_setup_isoc_xfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe, - void *priv, u_int16_t *frlengths, u_int32_t nframes, - u_int16_t flags, usbd_callback callback); - -usbd_status -usbd_bulk_transfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe, - u_int16_t flags, u_int32_t timeout, void *buf, - u_int32_t *size, char *lbl); - -#define usbd_intr_transfer usbd_bulk_transfer - -usbd_status -usbd_abort_pipe(struct usbd_pipe *pipe); - -usbd_status -usbd_abort_default_pipe(struct usbd_device *udev); - -usbd_status -usbd_close_pipe(struct usbd_pipe *pipe); - -usbd_status -usbd_clear_endpoint_stall(struct usbd_pipe *pipe); - -usbd_status -usbd_clear_endpoint_stall_async(struct usbd_pipe *pipe); - -usbd_status -usbd_endpoint_count(struct usbd_interface *iface, u_int8_t *count); - -void -usbd_interface2device_handle(struct usbd_interface *iface, - struct usbd_device **udev); - -struct usbd_device * -usbd_pipe2device_handle(struct usbd_pipe *pipe); - -usbd_status -usbd_device2interface_handle(struct usbd_device *udev, - u_int8_t iface_index, struct usbd_interface **iface); - -usb_endpoint_descriptor_t * -usbd_interface2endpoint_descriptor(struct usbd_interface *iface, u_int8_t index); - -usb_endpoint_descriptor_t * -usbd_get_endpoint_descriptor(struct usbd_interface *iface, u_int8_t address); - -#endif /* USB_COMPAT_OLD */ - /* routines from usb_requests.c */ usbd_status @@ -1096,12 +964,6 @@ usbreq_set_protocol(struct usbd_device *udev, u_int8_t iface_index, u_int16_t report); -#ifdef USB_COMPAT_OLD -usbd_status -usbreq_set_report_async(struct usbd_device *udev, u_int8_t iface_index, - u_int8_t type, u_int8_t id, void *data, int len); -#endif - usbd_status usbreq_set_report(struct usbd_device *udev, u_int8_t iface_index, u_int8_t type, u_int8_t id, void *data, int len); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#18 (text+ko) ==== @@ -680,18 +680,6 @@ } else { -#ifdef USB_COMPAT_OLD - if(xfer->d_copy_src) - { - bcopy(xfer->d_copy_src, xfer->d_copy_ptr, - xfer->d_copy_len); - } - if(xfer->f_copy_src) - { - bcopy(xfer->f_copy_src, xfer->f_copy_ptr, - xfer->f_copy_len); - } -#endif if(!(xfer->flags & USBD_USE_DMA)) { /* copy in data */ (xfer->pipe->methods->copy_in)(xfer); @@ -1111,33 +1099,6 @@ { wakeup(xfer); } - -#ifdef USB_COMPAT_OLD - - if(xfer->d_copy_dst) - { - bcopy(xfer->d_copy_ptr, xfer->d_copy_dst, xfer->d_copy_len); - } - - if(xfer->f_copy_dst) - { - bcopy(xfer->f_copy_ptr, xfer->f_copy_dst, xfer->f_copy_len); - } - - if(xfer->d_callback) - { - PRINTFN(3,("xfer=%p, error=0x%x(%s)\n", xfer, - xfer->error, usbd_errstr(xfer->error))); - - (xfer->d_callback)(xfer->priv_fifo, xfer->priv_sc, xfer->error); - - if(((void *)(xfer->pipe->alloc_xfer)) == xfer->priv_fifo) - { - /* restart transfer */ - usbd_start_hardware(xfer); - } - } -#endif return; } @@ -1447,597 +1408,3 @@ return (0); } - -#ifdef USB_COMPAT_OLD - -/***************************************************************************** - * compatibility layer for the old USB drivers - *****************************************************************************/ - -usbd_status -usbd_transfer(struct usbd_xfer *xfer) -{ - if(xfer->alloc_xfer) - { - usbd_transfer_start_safe(xfer->alloc_xfer); - return USBD_NORMAL_COMPLETION; - } - else - { - return USBD_NOMEM; - } -} - -usbd_status -usbd_sync_transfer(struct usbd_xfer *xfer) -{ - if(xfer->alloc_xfer) - { - /* XXX USBD_SYNCHRONOUS should be set in struct usbd_config - * passed to usbd_transfer_setup (!) - */ - xfer->alloc_xfer->flags |= USBD_SYNCHRONOUS; - } - return usbd_transfer(xfer); -} - -void * -usbd_alloc_buffer(struct usbd_xfer *xfer, u_int32_t size) -{ - if(xfer->alloc_ptr) - { - printf("%s: buffer already " - "allocated\n", __FUNCTION__); - return NULL; - } - - xfer->alloc_ptr = malloc(size, M_USBDEV, M_NOWAIT); - xfer->alloc_len = size; - - return xfer->alloc_ptr; -} - -void -usbd_free_buffer(struct usbd_xfer *xfer) -{ - if(xfer->alloc_ptr) - { - free(xfer->alloc_ptr, M_USBDEV); - xfer->alloc_ptr = NULL; - } - return; -} - -void -usbd_get_xfer_status(struct usbd_xfer *xfer, void **priv, - void **buffer, u_int32_t *count, usbd_status *status) -{ - PRINTFN(8, ("\n")); - - if(xfer->alloc_xfer) - { - if(priv != NULL) - *priv = xfer->alloc_xfer->priv_sc; - if(buffer != NULL) - *buffer = xfer->alloc_xfer->buffer; - if(count != NULL) - *count = xfer->alloc_xfer->actlen; - if(status != NULL) - *status = xfer->alloc_xfer->error; - } - else - { - if(priv != NULL) - *priv = xfer->priv_sc; - if(buffer != NULL) - *buffer = xfer->buffer; - if(count != NULL) - *count = xfer->actlen; - if(status != NULL) - *status = xfer->error; - } - return; -} - -struct usbd_xfer * -usbd_alloc_xfer(struct usbd_device *dev) -{ - struct usbd_xfer *xfer; - - xfer = malloc(sizeof(*xfer), M_USBDEV, M_NOWAIT); - - if(xfer) - { - bzero(xfer, sizeof(*xfer)); - } - return xfer; -} - -static void -__usbd_free_xfer(struct usbd_xfer *xfer) -{ - if(xfer) - { - if(xfer->clearstall_xfer) - { - usbd_transfer_unsetup(&xfer->clearstall_xfer, 1); - } - usbd_transfer_unsetup(&xfer, 1); - } - return; -} - -usbd_status -usbd_free_xfer(struct usbd_xfer *xfer) -{ - if(xfer) - { - usbd_free_buffer(xfer); - - __usbd_free_xfer(xfer->alloc_xfer); - - free(xfer, M_USBDEV); - } - return USBD_NORMAL_COMPLETION; -} - -usbd_status -usbd_open_pipe(struct usbd_interface *iface, u_int8_t address, - u_int8_t flags, struct usbd_pipe **pp) -{ - u_int8_t iface_index = iface - &iface->udev->ifaces[0]; - struct usbd_pipe *pipe = &iface->udev->pipes[0]; - struct usbd_pipe *pipe_end = &iface->udev->pipes_end[0]; - - while(pipe < pipe_end) - { - if((pipe->iface_index == iface_index) && - (pipe->edesc) && - (pipe->edesc->bEndpointAddress == address)) - { - (*pp) = pipe; - return USBD_NORMAL_COMPLETION; - } - pipe++; - } - (*pp) = NULL; - return USBD_INVAL; -} - -usbd_status -usbd_open_pipe_intr(struct usbd_interface *iface, u_int8_t address, - u_int8_t flags, struct usbd_pipe **pipe, - void *priv, void *buffer, u_int32_t len, - usbd_callback callback, int ival) -{ - usbd_status error; - - if(usbd_open_pipe(iface, address, 0, pipe)) - { - return USBD_INVAL; - } - - if((*pipe)->alloc_xfer) - { - printf("%s: warning: pipe already opened\n", - __FUNCTION__); - } - - (*pipe)->alloc_xfer = usbd_alloc_xfer(NULL); - - if(!(*pipe)->alloc_xfer) - { - return USBD_NOMEM; - } - - error = usbd_setup_xfer((*pipe)->alloc_xfer, *pipe, priv, buffer, len, flags, - USBD_NO_TIMEOUT, callback); - if(error == 0) - { - error = usbd_transfer((*pipe)->alloc_xfer); - } - if(error) - { - usbd_free_xfer((*pipe)->alloc_xfer); - (*pipe)->alloc_xfer = 0; - *pipe = NULL; - } - return error; -} - -usbd_status -usbd_setup_xfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe, - void *priv, void *buffer, u_int32_t length, - u_int32_t flags, u_int32_t timeout, - usbd_callback callback) -{ - struct usbd_config usbd_config[2] = { /* zero */ }; - struct usbd_xfer *__xfer[2]; - - /* free current transfer, if any */ - if(xfer->alloc_xfer) - { - if(xfer->alloc_xfer->flags & USBD_DEV_TRANSFERRING) - { - /* transfer is in progress */ - PRINTFN(3,("transfer is already in progress\n")); - return USBD_NORMAL_COMPLETION; - } - - __usbd_free_xfer(xfer->alloc_xfer); - xfer->alloc_xfer = NULL; - } - - usbd_config[1].type = UE_CONTROL; - usbd_config[1].endpoint = 0; - usbd_config[1].direction = -1; - usbd_config[1].timeout = USBD_DEFAULT_TIMEOUT; - usbd_config[1].flags = USBD_SELF_DESTRUCT; - usbd_config[1].bufsize = sizeof(usb_device_request_t); - usbd_config[1].callback = &usbd_clearstall_callback; - - usbd_config[0].type = pipe->edesc->bmAttributes & UE_XFERTYPE; - usbd_config[0].endpoint = pipe->edesc->bEndpointAddress & UE_ADDR; - usbd_config[0].direction = pipe->edesc->bEndpointAddress & (UE_DIR_IN|UE_DIR_OUT); - usbd_config[0].callback = usbd_default_callback; - usbd_config[0].interval = USBD_DEFAULT_INTERVAL; - usbd_config[0].timeout = timeout; - usbd_config[0].flags = flags|USBD_SELF_DESTRUCT; - usbd_config[0].bufsize = length; - - if(usbd_transfer_setup(pipe->udev, pipe->iface_index, - &__xfer[0], &usbd_config[0], - (flags & USBD_CUSTOM_CLEARSTALL) ? 1 : 2, - priv, NULL)) - { - PRINTFN(3,("USBD_NOMEM\n")); - return USBD_NOMEM; - } - - xfer->alloc_xfer = __xfer[0]; - - /* automatic clear-stall */ - xfer->alloc_xfer->clearstall_xfer = - (flags & USBD_CUSTOM_CLEARSTALL) ? NULL : __xfer[1]; - - xfer->alloc_xfer->priv_fifo = xfer; /* used by callback */ - xfer->alloc_xfer->d_copy_ptr = xfer->alloc_xfer->buffer; - xfer->alloc_xfer->d_copy_len = length; - xfer->alloc_xfer->d_callback = callback; - - if(length && buffer) - { - if(usbd_config[0].direction == UE_DIR_IN) - { - xfer->alloc_xfer->d_copy_dst = buffer; - } - else - { - xfer->alloc_xfer->d_copy_src = buffer; - } - } - return USBD_NORMAL_COMPLETION; -} - -usbd_status -usbd_setup_default_xfer(struct usbd_xfer *xfer, struct usbd_device *udev, - void *priv, u_int32_t timeout, - usb_device_request_t *req, void *buffer, - u_int32_t length, u_int16_t flags, - usbd_callback callback) -{ - struct usbd_config usbd_config[1] = { /* zero */ }; - - /* free current transfer, if any */ - if(xfer->alloc_xfer) - { - if(xfer->alloc_xfer->flags & USBD_DEV_TRANSFERRING) - { - /* transfer is in progress */ - PRINTFN(3,("transfer is already in progress\n")); - return USBD_NORMAL_COMPLETION; - } - - __usbd_free_xfer(xfer->alloc_xfer); - xfer->alloc_xfer = NULL; - } - - usbd_config[0].type = UE_CONTROL; - usbd_config[0].endpoint = 0; - usbd_config[0].direction = -1; - usbd_config[0].timeout = timeout; - usbd_config[0].flags = flags|USBD_SELF_DESTRUCT; - usbd_config[0].bufsize = sizeof(usb_device_request_t) + length; - usbd_config[0].callback = usbd_default_callback; - - if(usbd_transfer_setup(udev, 0, - &xfer->alloc_xfer, &usbd_config[0], 1, - priv, NULL)) - { - PRINTFN(3,("USBD_NOMEM\n")); - return USBD_NOMEM; - } - - bcopy(req, xfer->alloc_xfer->buffer, sizeof(*req)); - - xfer->alloc_xfer->priv_fifo = xfer; /* used by callback */ - xfer->alloc_xfer->d_copy_ptr = ((u_int8_t *)(xfer->alloc_xfer->buffer)) + sizeof(*req); - xfer->alloc_xfer->d_copy_len = length; - xfer->alloc_xfer->d_callback = callback; - - if(length && buffer) - { - if(req->bmRequestType & UT_READ) - { - xfer->alloc_xfer->d_copy_dst = buffer; - } - else - { - xfer->alloc_xfer->d_copy_src = buffer; - } - } - return USBD_NORMAL_COMPLETION; -} - -usbd_status -usbd_setup_isoc_xfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe, - void *priv, u_int16_t *frlengths, u_int32_t nframes, - u_int16_t flags, usbd_callback callback) -{ - struct usbd_config usbd_config[1] = { /* zero */ }; - - /* free current transfer, if any */ - if(xfer->alloc_xfer) - { - if(xfer->alloc_xfer->flags & USBD_DEV_TRANSFERRING) - { - /* transfer is in progress */ - PRINTFN(3,("transfer is already in progress\n")); - return USBD_NORMAL_COMPLETION; - } - __usbd_free_xfer(xfer->alloc_xfer); - xfer->alloc_xfer = NULL; - } - - if(xfer->alloc_ptr == NULL) - { - /* no data-buffer allocated */ - return USBD_NOMEM; - } - - usbd_config[0].type = pipe->edesc->bmAttributes & UE_XFERTYPE; - usbd_config[0].endpoint = pipe->edesc->bEndpointAddress & UE_ADDR; - usbd_config[0].direction = pipe->edesc->bEndpointAddress & (UE_DIR_IN|UE_DIR_OUT); - usbd_config[0].callback = usbd_default_callback; - usbd_config[0].interval = USBD_DEFAULT_INTERVAL; - usbd_config[0].flags = flags|USBD_SELF_DESTRUCT; - usbd_config[0].bufsize = xfer->alloc_len; - usbd_config[0].frames = nframes; - - if(usbd_transfer_setup(pipe->udev, pipe->iface_index, - &xfer->alloc_xfer, &usbd_config[0], 1, - priv, NULL)) - { - return USBD_NOMEM; - } - - xfer->alloc_xfer->priv_fifo = xfer; /* used by callback */ - xfer->alloc_xfer->d_copy_ptr = xfer->alloc_xfer->buffer; - xfer->alloc_xfer->d_copy_len = xfer->alloc_len; - xfer->alloc_xfer->f_copy_ptr = &xfer->alloc_xfer->frlengths[0]; - xfer->alloc_xfer->f_copy_len = nframes*sizeof(xfer->alloc_xfer->frlengths[0]); - xfer->alloc_xfer->d_callback = callback; - - xfer->alloc_xfer->f_copy_src = frlengths; - xfer->alloc_xfer->f_copy_dst = frlengths; - - if(usbd_config[0].direction == UE_DIR_IN) - { - xfer->alloc_xfer->d_copy_dst = xfer->alloc_ptr; - } - else - { - xfer->alloc_xfer->d_copy_src = xfer->alloc_ptr; - } - return USBD_NORMAL_COMPLETION; -} - -usbd_status -usbd_bulk_transfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe, - u_int16_t flags, u_int32_t timeout, void *buf, - u_int32_t *size, char *lbl) -{ - usbd_status err; - - if(usbd_setup_xfer(xfer, pipe, 0, buf, *size, - flags|USBD_SYNCHRONOUS, timeout, NULL)) - { - return USBD_NOMEM; - } - - if(usbd_transfer(xfer)) - { - return USBD_NOMEM; - } - - usbd_get_xfer_status(xfer, NULL, NULL, size, &err); - return (err); -} - -usbd_status -usbd_abort_pipe(struct usbd_pipe *pipe) -{ - enum { FINISH_LIST_MAX = 16 }; - - struct usbd_xfer * finish_list[FINISH_LIST_MAX]; - struct usbd_xfer **ptr; - - ptr = &finish_list[0]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 12 16:24:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3408F16A4C8; Thu, 12 Oct 2006 16:24:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1F0E16A534 for ; Thu, 12 Oct 2006 16:24:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D458843D68 for ; Thu, 12 Oct 2006 16:24:04 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CGO2Gq027297 for ; Thu, 12 Oct 2006 16:24:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CGO12O027294 for perforce@freebsd.org; Thu, 12 Oct 2006 16:24:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 12 Oct 2006 16:24:01 GMT Message-Id: <200610121624.k9CGO12O027294@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 107766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 16:24:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=107766 Change 107766 by hselasky@hselasky_mini_itx on 2006/10/12 16:23:04 Remove USBD_SELF_DESTRUCT. The flag is broken, and currently not used. Calling "usbd_transfer_unsetup()" from the callback of a USB transfer is depreciated. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#12 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#25 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#12 (text+ko) ==== @@ -148,6 +148,8 @@ should be unsetup NOTE: This function can sleep, waiting for active mutexes to become unlocked! +NOTE: It is not allowed to call "usbd_transfer_unsetup" from the callback + of a USB transfer. /*------------------------------------------------------------------------* * void @@ -229,10 +231,6 @@ without exiting any mutexes, until the transfer is finished or has timed out. - USBD_SELF_DESTRUCT - This flag allows one to free a transfer from its - callback function. - USBD_USE_DMA This flag will cause the USB host controller driver to not allocate a second data buffer, "xfer->buffer". Instead of ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#25 (text+ko) ==== @@ -312,7 +312,7 @@ #define USBD_USE_POLLING 0x0200 /* used to make synchronous transfers * use polling instead of sleep/wakeup */ -#define USBD_SELF_DESTRUCT 0x0400 /* set if callback is allowed to unsetup itself */ +#define USBD_UNUSED_3 0x0400 #define USBD_USE_DMA 0x0800 #define USBD_UNUSED_4 0x1000 #define USBD_UNUSED_5 0x2000 ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#19 (text+ko) ==== @@ -286,7 +286,6 @@ USBD_SHORT_XFER_OK| USBD_CUSTOM_CLEARSTALL| USBD_USE_POLLING| - USBD_SELF_DESTRUCT| USBD_USE_DMA))) { error = USBD_BAD_FLAG; @@ -740,17 +739,6 @@ */ if(!(xfer->flags & (USBD_DEV_TRANSFERRING))) { - if(xfer->flags & USBD_SELF_DESTRUCT) - { - /* increment refcount - * in case the callback - * frees itself: - */ - mtx_lock(xfer->usb_mtx); - xfer->usb_root->memory_refcount++; - mtx_unlock(xfer->usb_mtx); - } - /* call callback */ __usbd_callback(xfer); @@ -800,10 +788,6 @@ } } } - if(xfer->flags & USBD_SELF_DESTRUCT) - { - usbd_drop_refcount(xfer->usb_root); - } } return; } @@ -839,17 +823,6 @@ /* always set error */ xfer->error = USBD_CANCELLED; - if(xfer->flags & USBD_SELF_DESTRUCT) - { - /* increment refcount - * in case the callback - * frees itself: - */ - mtx_lock(xfer->usb_mtx); - xfer->usb_root->memory_refcount++; - mtx_unlock(xfer->usb_mtx); - } - if(xfer->flags & USBD_DEV_TRANSFERRING) { /* increment refcount so that scheduled @@ -864,11 +837,6 @@ __usbd_callback(xfer); } mtx_unlock(xfer->usb_mtx); - - if(xfer->flags & USBD_SELF_DESTRUCT) - { - usbd_drop_refcount(xfer->usb_root); - } } return; } From owner-p4-projects@FreeBSD.ORG Thu Oct 12 18:47:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D55416A4C2; Thu, 12 Oct 2006 18:47:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2637E16A47E for ; Thu, 12 Oct 2006 18:47:33 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BB3043D90 for ; Thu, 12 Oct 2006 18:47:03 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CIl31C034176 for ; Thu, 12 Oct 2006 18:47:03 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CIl1Y6034138 for perforce@freebsd.org; Thu, 12 Oct 2006 18:47:01 GMT (envelope-from piso@freebsd.org) Date: Thu, 12 Oct 2006 18:47:01 GMT Message-Id: <200610121847.k9CIl1Y6034138@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 107768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 18:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=107768 Change 107768 by piso@piso_newluxor on 2006/10/12 18:46:21 IFC@107767 Affected files ... .. //depot/projects/soc2005/libalias/Makefile.inc1#7 integrate .. //depot/projects/soc2005/libalias/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/Makefile#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/grep/grep.1#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libdisk/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libkvm/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libkvm/kvm_sparc64.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libutil/login.conf.5#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/tun.4#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/soc2005/libalias/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.sun4v#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_command.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_examine.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_output.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_output.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#10 integrate .. //depot/projects/soc2005/libalias/sys/net/if_vlan.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/libalias.3#12 integrate .. //depot/projects/soc2005/libalias/sys/pci/agp_amd64.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/fpemu.c#2 delete .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/t1_copy.S#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_contig.c#4 integrate .. //depot/projects/soc2005/libalias/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/soc2005/libalias/tools/regression/execve/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/execve/execve.t#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/find/find.1#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/str.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/disks.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.562 2006/10/09 04:58:44 kmacy Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -107,7 +107,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else ==== //depot/projects/soc2005/libalias/bin/mkdir/mkdir.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.33 2006/10/10 20:18:20 ru Exp $"); #include #include @@ -99,19 +99,19 @@ } for (exitval = 0; *argv != NULL; ++argv) { - success = 1; if (pflag) { - if (build(*argv, omode)) - success = 0; + success = build(*argv, omode); } else if (mkdir(*argv, omode) < 0) { if (errno == ENOTDIR || errno == ENOENT) warn("%s", dirname(*argv)); else warn("%s", *argv); success = 0; - } else if (vflag) - (void)printf("%s\n", *argv); - + } else { + success = 1; + if (vflag) + (void)printf("%s\n", *argv); + } if (!success) exitval = 1; /* @@ -119,9 +119,10 @@ * nine bits, so if you try to set a mode including the * sticky, setuid, setgid bits you lose them. Don't do * this unless the user has specifically requested a mode, - * as chmod will (obviously) ignore the umask. + * as chmod will (obviously) ignore the umask. Do this + * on newly created directories only. */ - if (success && mode != NULL && chmod(*argv, omode) == -1) { + if (success == 1 && mode != NULL && chmod(*argv, omode) == -1) { warn("%s", *argv); exitval = 1; } @@ -129,6 +130,11 @@ exit(exitval); } + +/* + * Returns 1 if a directory has been created, + * 2 if it already existed, and 0 on failure. + */ int build(char *path, mode_t omode) { @@ -139,7 +145,7 @@ p = path; oumask = 0; - retval = 0; + retval = 1; if (p[0] == '/') /* Skip leading '/'. */ ++p; for (first = 1, last = 0; !last ; ++p) { @@ -154,7 +160,7 @@ /* * POSIX 1003.2: * For each dir operand that does not name an existing - * directory, effects equivalent to those cased by the + * directory, effects equivalent to those caused by the * following command shall occcur: * * mkdir -p -m $(umask -S),u+wx $(dirname dir) && @@ -174,7 +180,7 @@ if (errno == EEXIST || errno == EISDIR) { if (stat(path, &sb) < 0) { warn("%s", path); - retval = 1; + retval = 0; break; } else if (!S_ISDIR(sb.st_mode)) { if (last) @@ -182,12 +188,14 @@ else errno = ENOTDIR; warn("%s", path); - retval = 1; + retval = 0; break; } + if (last) + retval = 2; } else { warn("%s", path); - retval = 1; + retval = 0; break; } } else if (vflag) ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.40 2005/08/06 18:13:30 krion Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.41 2006/10/09 04:11:34 chinsan Exp $ % Having trouble using fetch through a firewall? Try setting the environment variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. @@ -499,3 +499,7 @@ man -t grep > grep.ps # Save the PostScript version to a file or man -t printf | lp # Send the PostScript directly to printer +% +Want to strip UTF-8 BOM(Byte Order Mark) from given files? + + sed -e '1s/^\xef\xbb\xbf//' < bomfile > newfile ==== //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.17 2006/09/11 18:07:09 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.18 2006/10/09 04:52:14 kmacy Exp $ # BINDIR @@ -25,7 +25,8 @@ .elif ${TARGET_ARCH} == "powerpc" SRCS+= tc-ppc.c .elif ${TARGET_ARCH} == "sparc64" -SRCS+= tc-sparc.c +# change back to tc-sparc.c when new binutils is imported +SRCS+= tc-sparc-fixed.c .else SRCS+= tc-${TARGET_ARCH}.c .endif ==== //depot/projects/soc2005/libalias/gnu/usr.bin/grep/grep.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" grep man page -.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.28 2005/12/18 12:09:23 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.29 2006/10/10 01:57:25 trhodes Exp $ .if !\n(.g \{\ . if !\w|\*(lq| \{\ . ds lq `` @@ -202,11 +202,6 @@ as a list of fixed strings, separated by newlines, any of which is to be matched. .TP -.BR \-P ", " \-\^\-perl-regexp -Interpret -.I PATTERN -as a Perl regular expression. -.TP .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE Obtain patterns from .IR FILE , ==== //depot/projects/soc2005/libalias/lib/libc/compat-43/killpg.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)killpg.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.12 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.13 2006/10/10 11:37:41 maxim Exp $ .\" -.Dd June 2, 1993 +.Dd October 10, 2006 .Dt KILLPG 2 .Os .Sh NAME @@ -66,7 +66,7 @@ have the same effective user ID, or the sender must be the super-user. As a single special case the continue signal SIGCONT may be sent -to any process that is a descendant of the current process. +to any process with the same session ID as the caller. .Sh RETURN VALUES .Rv -std killpg .Sh ERRORS ==== //depot/projects/soc2005/libalias/lib/libdisk/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libdisk/Makefile,v 1.46 2006/01/27 16:32:13 harti Exp $ +# $FreeBSD: src/lib/libdisk/Makefile,v 1.48 2006/10/09 05:12:54 kmacy Exp $ .if ${MACHINE_ARCH} == "ia64" _open_disk= open_ia64_disk.c @@ -9,7 +9,13 @@ LIB= disk SRCS= blocks.c ${_change} chunk.c create_chunk.c disk.c ${_open_disk} \ - rules.c write_disk.c write_${MACHINE}_disk.c + rules.c write_disk.c +.if ${MACHINE} == "sun4v" +SRCS+= write_sparc64_disk.c +.else +SRCS+= write_${MACHINE}_disk.c +.endif + INCS= libdisk.h WARNS?= 2 ==== //depot/projects/soc2005/libalias/lib/libkvm/Makefile#2 (text+ko) ==== @@ -1,9 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libkvm/Makefile,v 1.15 2006/04/21 04:32:51 peter Exp $ +# $FreeBSD: src/lib/libkvm/Makefile,v 1.17 2006/10/09 05:12:54 kmacy Exp $ LIB= kvm SHLIBDIR?= /lib CFLAGS+=-DLIBC_SCCS -I${.CURDIR} + +.if ${MACHINE} == "sun4v" +CFLAGS+=-DSUN4V +.endif + SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \ kvm_getswapinfo.c kvm_proc.c .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" ==== //depot/projects/soc2005/libalias/lib/libkvm/kvm_sparc64.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.7 2005/06/29 22:39:41 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.8 2006/10/09 04:58:45 kmacy Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -194,7 +194,9 @@ _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) { struct vmstate *vm; +#if !defined(SUN4V) struct tte tte; +#endif off_t tte_off, pa_off; u_long pg_off, vpn; int rest; @@ -202,6 +204,7 @@ pg_off = va & PAGE_MASK; if (va >= VM_MIN_DIRECT_ADDRESS) pa_off = TLB_DIRECT_TO_PHYS(va) & ~PAGE_MASK; +#if !defined(SUN4V) else { vpn = btop(va); tte_off = kd->vmst->vm_tsb_off + @@ -212,6 +215,7 @@ goto invalid; pa_off = TTE_GET_PA(&tte); } +#endif rest = PAGE_SIZE - pg_off; pa_off = _kvm_find_off(kd->vmst, pa_off, rest); if (pa_off == KVM_OFF_NOTFOUND) ==== //depot/projects/soc2005/libalias/lib/libutil/login.conf.5#3 (text+ko) ==== @@ -17,9 +17,9 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.58 2006/08/23 09:54:46 yar Exp $ +.\" $FreeBSD: src/lib/libutil/login.conf.5,v 1.60 2006/10/10 08:15:08 ru Exp $ .\" -.Dd August 23, 2006 +.Dd October 9, 2006 .Dt LOGIN.CONF 5 .Os .Sh NAME @@ -74,6 +74,13 @@ the last name may contain upper case characters and blanks for readability. .Pp +Note that since a colon +.Pq Ql :\& +is used to separate capability entries, a +.Ql \ec +escape sequence must be used to embed a literal colon in the +value or name of a capability. +.Pp The default .Pa /etc/login.conf shipped with ==== //depot/projects/soc2005/libalias/sbin/geom/class/mirror/geom_mirror.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.14 2006/09/30 14:40:49 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.15 2006/10/10 15:00:32 pjd Exp $"); #include #include @@ -215,6 +215,7 @@ } md.md_mediasize = mediasize; md.md_sectorsize = sectorsize; + md.md_mediasize -= (md.md_mediasize % md.md_sectorsize); /* * Clear last sector first, to spoil all components if device exists. ==== //depot/projects/soc2005/libalias/sbin/geom/class/raid3/geom_raid3.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.16 2006/09/30 14:40:50 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.18 2006/10/10 15:00:32 pjd Exp $"); #include #include @@ -205,6 +205,7 @@ } md.md_mediasize = mediasize * (nargs - 2); md.md_sectorsize = sectorsize * (nargs - 2); + md.md_mediasize -= (md.md_mediasize % md.md_sectorsize); /* * Clear last sector first, to spoil all components if device exists. ==== //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#6 (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.122 2006/10/02 08:55:54 schweikh Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.124 2006/10/10 09:44:08 ru Exp $ .\" -.Dd September 6, 2006 +.Dd October 9, 2006 .Dt IFCONFIG 8 .Os .Sh NAME @@ -744,6 +744,9 @@ .It Cm list scan Display the access points and/or ad-hoc neighbors located in the vicinity. +The +.Fl v +flag may be used to display long SSIDs. This information may be updated automatically by the adaptor and/or with a .Cm scan @@ -923,6 +926,10 @@ .Cm list scan request can be used to show recent scan results without initiating a new scan. +.Pp +The +.Fl v +flag may be used to prevent the shortening of long SSIDs. .It Cm stationname Ar name Set the name of this station. It appears that the station name is not really part of the IEEE 802.11 ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#7 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.196 2006/10/04 19:29:05 keramida Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.197 2006/10/09 22:12:08 trhodes Exp $ .\" .Dd July 25, 2006 .Dt IPFW 8 @@ -2662,3 +2662,7 @@ Rules which use uid, gid or jail based matching should be used only if debug.mpsafenet=0 to avoid possible deadlocks due to layering violations in its implementation. +.Pp +Rule syntax is subject to the command line environment and some patterns +may need to be escaped with the backslash character +or quoted appropriately. ==== //depot/projects/soc2005/libalias/share/man/man4/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.364 2006/10/01 11:16:31 joel Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.365 2006/10/08 17:05:15 ceri Exp $ MAN= aac.4 \ acpi.4 \ @@ -90,6 +90,7 @@ gem.4 \ geom.4 \ geom_fox.4 \ + geom_uzip.4 \ gif.4 \ gre.4 \ harp.4 \ ==== //depot/projects/soc2005/libalias/share/man/man4/ddb.4#5 (text+ko) ==== @@ -57,8 +57,9 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.34 2006/10/03 21:06:19 ru Exp $ -.Dd September 15, 2006 +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.39 2006/10/10 23:40:47 bde Exp $ +.\" +.Dd October 10, 2006 .Dt DDB 4 .Os .Sh NAME @@ -74,7 +75,8 @@ .Sh DESCRIPTION The .Nm -kernel debugger has most of the features of the old kdb, +kernel debugger has most of the features of the old +.Nm kdb , but with a more rational syntax inspired by .Xr gdb 1 . @@ -94,27 +96,47 @@ .Dv KDB_UNATTENDED option is specified. .Pp -The current location is called `dot'. -The `dot' is displayed with +The current location is called +.Va dot . +The +.Va dot +is displayed with a hexadecimal format at a prompt. -Examine and write commands update `dot' to the address of the last line -examined or the last location modified, and set `next' to the address of +The commands +.Ic examine +and +.Ic write +update +.Va dot +to the address of the last line +examined or the last location modified, and set +.Va next +to the address of the next location to be examined or changed. -Other commands do not change `dot', and set `next' to be the same as `dot'. +Other commands do not change +.Va dot , +and set +.Va next +to be the same as +.Va dot . .Pp The general command syntax is: -.Cm command Ns Op Li \&/ Ns Ar modifier +.Ar command Ns Op Li / Ns Ar modifier .Ar address Ns Op Li , Ns Ar count .Pp -A blank line repeats the previous command from the address `next' with +A blank line repeats the previous command from the address +.Va next +with count 1 and no modifiers. Specifying .Ar address -sets `dot' to the -address. +sets +.Va dot +to the address. Omitting .Ar address -uses `dot'. +uses +.Va dot . A missing .Ar count is taken @@ -122,14 +144,14 @@ .Pp The .Nm -debugger has a feature like the +debugger has a pager feature (like the .Xr more 1 -command +command) for the output. If an output line exceeds the number set in the -.Li \&$lines +.Va lines variable, it displays -.Dq Em --db_more-- +.Dq Li --db_more-- and waits for a response. The valid responses for it are: .Pp @@ -145,56 +167,63 @@ Finally, .Nm provides a small (currently 10 items) command history, and offers -simple emacs-style command line editing capabilities. +simple +.Nm emacs Ns -style +command line editing capabilities. In addition to -the emacs control keys, the usual ANSI arrow keys might be used to +the +.Nm emacs +control keys, the usual +.Tn ANSI +arrow keys might be used to browse through the history buffer, and move the cursor within the current line. .Sh COMMANDS .Bl -tag -width indent -compact -.It Cm examine -.It Cm x +.It Ic examine +.It Ic x Display the addressed locations according to the formats in the modifier. Multiple modifier formats display multiple locations. -If no format is specified, the last formats specified for this command +If no format is specified, the last format specified for this command is used. .Pp The format characters are: .Bl -tag -compact -width indent -.It Li b +.It Cm b look at by bytes (8 bits) -.It Li h +.It Cm h look at by half words (16 bits) -.It Li l +.It Cm l look at by long words (32 bits) -.It Li a +.It Cm a print the location being displayed -.It Li A +.It Cm A print the location with a line number if possible -.It Li x +.It Cm x display in unsigned hex -.It Li z +.It Cm z display in signed hex -.It Li o +.It Cm o display in unsigned octal -.It Li d +.It Cm d display in signed decimal -.It Li u +.It Cm u display in unsigned decimal -.It Li r +.It Cm r display in current radix, signed -.It Li c +.It Cm c display low 8 bits as a character. -Non-printing characters are displayed as an octal escape code (e.g., `\e000'). -.It Li s +Non-printing characters are displayed as an octal escape code (e.g., +.Ql \e000 ) . +.It Cm s display the null-terminated string at the location. Non-printing characters are displayed as octal escapes. -.It Li m +.It Cm m display in unsigned hex with character dump at the end of each line. The location is also displayed in hex at the beginning of each line. -.It Li i +.It Cm i display as an instruction -.It Li I +.It Cm I display as an instruction with possible alternate formats depending on the machine: .Bl -tag -width ".Tn powerpc" -compact @@ -213,38 +242,38 @@ .El .El .Pp -.It Cm xf +.It Ic xf Examine forward: -Execute an examine command with the last specified parameters to it +execute an +.Ic examine +command with the last specified parameters to it except that the next address displayed by it is used as the start address. .Pp -.It Cm xb +.It Ic xb Examine backward: -Execute an examine command with the last specified parameters to it +execute an +.Ic examine +command with the last specified parameters to it except that the last start address subtracted by the size displayed by it is used as the start address. .Pp -.It Cm print Ns Op Cm /acdoruxz +.It Ic print Ns Op Li / Ns Cm acdoruxz +.It Ic p Ns Op Li / Ns Cm acdoruxz Print .Ar addr Ns s according to the modifier character (as described above for -.Li examine ) . +.Cm examine ) . Valid formats are: -.Li a , -.Li x , -.Li z , -.Li o , -.Li d , -.Li u , -.Li r , +.Cm a , x , z , o , d , u , r , and -.Li c . +.Cm c . If no modifier is specified, the last one specified to it is used. +The argument .Ar addr can be a string, in which case it is printed as it is. For example: .Bd -literal -offset indent -print/x \&"eax = \&" $eax \&"\enecx = \&" $ecx \&"\en\&" +print/x "eax = " $eax "\enecx = " $ecx "\en" .Ed .Pp will print like: @@ -254,19 +283,23 @@ .Ed .Pp .It Xo -.Cm write Ns Op Cm /bhl -.Ar addr Ar expr1 Op Ar "expr2 ..." +.Ic write Ns Op Li / Ns Cm bhl +.Ar addr expr1 Op Ar expr2 ... +.Xc +.It Xo +.Ic w Ns Op Li / Ns Cm bhl +.Ar addr expr1 Op Ar expr2 ... .Xc Write the expressions specified after .Ar addr on the command line at succeeding locations starting with -.Ar addr +.Ar addr . The write unit size can be specified in the modifier with a letter -.Li b +.Cm b (byte), -.Li h +.Cm h (half word) or -.Li l +.Cm l (long word) respectively. If omitted, long word is assumed. @@ -276,37 +309,33 @@ things may happen. It is best to enclose each expression in parentheses. .Pp -.It Xo -.Cm set -.Li \&$ Ns Ar variable -.Op Li = -.Ar expr -.Xc +.It Ic set Li $ Ns Ar variable Oo Li = Oc Ar expr Set the named variable or register with the value of .Ar expr . Valid variable names are described below. .Pp -.It Cm break Ns Op Cm /u +.It Ic break Ns Op Li / Ns Cm u +.It Ic b Ns Op Li / Ns Cm u Set a break point at .Ar addr . If .Ar count is supplied, continues .Ar count -- 1 times before stopping at the +\- 1 times before stopping at the break point. If the break point is set, a break point number is printed with -.Sq Li \&# . +.Ql # . This number can be used in deleting the break point or adding conditions to it. .Pp If the -.Li u +.Cm u modifier is specified, this command sets a break point in user space address. Without the -.Li u +.Cm u option, the address is considered in the kernel space, and wrong space address is rejected with an error message. This modifier can be used only if it is supported by machine dependent @@ -318,24 +347,60 @@ Setting a break point at the low-level code paths may also cause strange behavior. .Pp -.It Cm delete Ar addr -.It Cm delete Li \&# Ns Ar number +.It Ic delete Ar addr +.It Ic d Ar addr +.It Ic delete Li # Ns Ar number +.It Ic d Li # Ns Ar number Delete the break point. The target break point can be specified by a break point number with -.Li # , +.Ql # , or by using the same .Ar addr specified in the original -.Cm break +.Ic break command. .Pp -.It Cm step Ns Op Cm /p +.It Ic watch Ar addr Ns Li , Ns Ar size +Set a watchpoint for a region. +Execution stops when an attempt to modify the region occurs. +The +.Ar size +argument defaults to 4. +If you specify a wrong space address, the request is rejected +with an error message. +.Pp +.Sy Warning : +Attempts to watch wired kernel memory +may cause unrecoverable error in some systems such as i386. +Watchpoints on user addresses work best. +.Pp +.It Ic hwatch Ar addr Ns Li , Ns Ar size +Set a hardware watchpoint for a region if supported by the +architecture. +Execution stops when an attempt to modify the region occurs. +The +.Ar size +argument defaults to 4. +.Pp +.Sy Warning : +The hardware debug facilities do not have a concept of separate +address spaces like the watch command does. +Use +.Ic hwatch +for setting watchpoints on kernel address locations only, and avoid +its use on user mode address spaces. +.Pp +.It Ic dhwatch Ar addr Ns Li , Ns Ar size +Delete specified hardware watchpoint. +.Pp +.It Ic step Ns Op Li / Ns Cm p +.It Ic s Ns Op Li / Ns Cm p Single step .Ar count times (the comma is a mandatory part of the syntax). If the -.Li p +.Cm p modifier is specified, print each instruction at each step. Otherwise, only print the last instruction. .Pp @@ -346,10 +411,11 @@ stepping through code executed by interrupt handlers will probably do the wrong thing. .Pp -.It Cm continue Ns Op Cm /c +.It Ic continue Ns Op Li / Ns Cm c +.It Ic c Ns Op Li / Ns Cm c Continue execution until a breakpoint or watchpoint. If the -.Li c +.Cm c modifier is specified, count instructions while executing. Some machines (e.g., pmax) also count loads and stores. .Pp @@ -358,36 +424,52 @@ This means that single-stepping on low-level code may cause strange behavior. .Pp -.It Cm until Ns Op Cm /p +.It Ic until Ns Op Li / Ns Cm p Stop at the next call or return instruction. If the -.Li p +.Cm p modifier is specified, print the call nesting depth and the cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. .Pp -.It Cm next Ns Op Cm /p -.It Cm match Ns Op Cm /p +.It Ic next Ns Op Li / Ns Cm p +.It Ic match Ns Op Li / Ns Cm p Stop at the matching return instruction. If the -.Li p +.Cm p modifier is specified, print the call nesting depth and the cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. .Pp .It Xo -.Cm trace Ns Op Cm /u +.Ic trace Ns Op Li / Ns Cm u +.Op Ar frame +.Op Li , Ns Ar count +.Xc +.It Xo +.Ic t Ns Op Li / Ns Cm u +.Op Ar frame +.Op Li , Ns Ar count +.Xc +.It Xo +.Ic where Ns Op Li / Ns Cm u +.Op Ar frame +.Op Li , Ns Ar count +.Xc +.It Xo +.Ic bt Ns Op Li / Ns Cm u .Op Ar frame -.Op , Ns Ar count +.Op Li , Ns Ar count .Xc Stack trace. The -.Li u >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 12 19:15:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ECF116A494; Thu, 12 Oct 2006 19:15:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 428BE16A416 for ; Thu, 12 Oct 2006 19:15:40 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA06743DA2 for ; Thu, 12 Oct 2006 19:14:38 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CJEcPS055392 for ; Thu, 12 Oct 2006 19:14:38 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CJEb55055389 for perforce@freebsd.org; Thu, 12 Oct 2006 19:14:37 GMT (envelope-from piso@freebsd.org) Date: Thu, 12 Oct 2006 19:14:37 GMT Message-Id: <200610121914.k9CJEb55055389@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 107769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 19:15:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=107769 Change 107769 by piso@piso_newluxor on 2006/10/12 19:13:57 These weren't integrated correctly @ 107767 Affected files ... .. //depot/projects/soc2005/libalias/etc/libalias.conf#4 integrate .. //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#4 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#8 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#7 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#10 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#6 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/cuseeme/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/dummy/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/ftp/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/irc/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/modules.inc#7 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/nbt/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/pptp/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/skinny/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/smedia/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#24 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#23 integrate Differences ... ==== //depot/projects/soc2005/libalias/etc/libalias.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/libalias.conf,v 1.1 2006/09/26 23:26:48 piso Exp $ +# $FreeBSD: src/etc/libalias.conf,v 1.2 2006/10/08 14:01:58 piso Exp $ /lib/libalias_cuseeme.so /lib/libalias_ftp.so /lib/libalias_irc.so ==== //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#7 (text+ko) ==== ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/Makefile.inc,v 1.2 2006/09/27 12:30:27 ru Exp $ +# $FreeBSD: src/lib/libalias/modules/Makefile.inc,v 1.3 2006/10/08 14:01:59 piso Exp $ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias ==== //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= cuseeme SRCS= alias_cuseeme.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= dummy SRCS= alias_dummy.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= ftp SRCS= alias_ftp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= irc SRCS= alias_irc.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= nbt SRCS= alias_nbt.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $ NAME= pptp SRCS= alias_pptp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $ NAME= skinny SRCS= alias_skinny.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $ NAME= smedia SRCS= alias_smedia.c ==== //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#10 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#6 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile.inc#5 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/cuseeme/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/dummy/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/ftp/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/irc/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/modules.inc#7 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/nbt/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/pptp/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/skinny/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/smedia/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#14 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#24 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#23 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Oct 12 19:27:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 092B916A40F; Thu, 12 Oct 2006 19:27:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D908016A403 for ; Thu, 12 Oct 2006 19:27:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FE9B43D64 for ; Thu, 12 Oct 2006 19:27:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CJRtaG063784 for ; Thu, 12 Oct 2006 19:27:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CJRt5U063781 for perforce@freebsd.org; Thu, 12 Oct 2006 19:27:55 GMT (envelope-from millert@freebsd.org) Date: Thu, 12 Oct 2006 19:27:55 GMT Message-Id: <200610121927.k9CJRt5U063781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 19:27:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=107770 Change 107770 by millert@millert_macbook on 2006/10/12 19:27:35 Remove extraneous mac_prepare() that was leaking memory; mac_from_text() does a prepare for us. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fsetfilecon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lsetfilecon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setcon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setfilecon.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fsetfilecon.c#3 (text+ko) ==== @@ -13,15 +13,10 @@ char tmp[strlen(context) + strlen("sebsd/0")]; int r; - if (mac_prepare(&mac, "sebsd")) - return -1; - strcpy(tmp, "sebsd/"); strcat(tmp, context); - if (mac_from_text(&mac, tmp)) { - mac_free(mac); + if (mac_from_text(&mac, tmp)) return -1; - } r = mac_set_fd(fd, mac); mac_free(mac); return r; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lsetfilecon.c#3 (text+ko) ==== @@ -12,15 +12,10 @@ char tmp[strlen(context) + strlen("sebsd/0")]; int r; - if (mac_prepare(&mac, "sebsd")) - return -1; - strcpy(tmp, "sebsd/"); strcat(tmp, context); - if (mac_from_text(&mac, tmp)) { - mac_free(mac); + if (mac_from_text(&mac, tmp)) return -1; - } r = mac_set_link(path, mac); mac_free(mac); return r; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setcon.c#3 (text+ko) ==== @@ -15,14 +15,9 @@ mac_t label; int error; - error = mac_prepare(&label, "sebsd"); + error = mac_from_text(&label, context); if (error) return -1; - error = mac_from_text(&label, context); - if (error) { - mac_free(label); - return -1; - } error = mac_set_proc(label); mac_free(label); if (error) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setfilecon.c#3 (text+ko) ==== @@ -12,15 +12,10 @@ char tmp[strlen(context) + strlen("sebsd/0")]; int ret; - if (mac_prepare(&mac, "sebsd")) - return -1; - strcpy(tmp, "sebsd/"); strcat(tmp, context); - if (mac_from_text(&mac, tmp)) { - mac_free(mac); + if (mac_from_text(&mac, tmp)) return -1; - } ret = mac_set_file(path, mac); mac_free(mac); return ret; From owner-p4-projects@FreeBSD.ORG Thu Oct 12 19:29:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02A7C16A47E; Thu, 12 Oct 2006 19:29:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA93416A47B for ; Thu, 12 Oct 2006 19:29:02 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42C6E43D81 for ; Thu, 12 Oct 2006 19:28:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CJSv2f064465 for ; Thu, 12 Oct 2006 19:28:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CJSvmM064459 for perforce@freebsd.org; Thu, 12 Oct 2006 19:28:57 GMT (envelope-from millert@freebsd.org) Date: Thu, 12 Oct 2006 19:28:57 GMT Message-Id: <200610121928.k9CJSvmM064459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 19:29:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=107771 Change 107771 by millert@millert_macbook on 2006/10/12 19:28:35 Always load migscs data if it is available. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#3 (text+ko) ==== @@ -19,14 +19,14 @@ void usage(char *progname) { - fprintf(stderr, _("usage: %s [-m migscs_file] [-bq]\n"), progname); + fprintf(stderr, _("usage: %s [-bq]\n"), progname); exit(1); } int main(int argc, char **argv) { int ret, opt, quiet = 0, preservebools = 1, nargs; - char *migscs = NULL; + char *migscs; #ifdef USE_NLS setlocale(LC_ALL, ""); @@ -34,14 +34,11 @@ textdomain(PACKAGE); #endif - while ((opt = getopt(argc, argv, "bmq")) > 0) { + while ((opt = getopt(argc, argv, "bq")) > 0) { switch (opt) { case 'b': preservebools = 0; break; - case 'm': - migscs = optarg; - break; case 'q': quiet = 1; sepol_debug(0); @@ -65,6 +62,7 @@ argv[0], argv[optind++]); } + migscs = selinux_migscs_path(); if (migscs != NULL) { ret = selinux_load_migscs(migscs); if (ret) { From owner-p4-projects@FreeBSD.ORG Thu Oct 12 19:34:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DB2F16A51E; Thu, 12 Oct 2006 19:34:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F274F16A51B for ; Thu, 12 Oct 2006 19:34:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B7FF43D79 for ; Thu, 12 Oct 2006 19:34:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CJY4tg067781 for ; Thu, 12 Oct 2006 19:34:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CJY3T0067768 for perforce@freebsd.org; Thu, 12 Oct 2006 19:34:03 GMT (envelope-from millert@freebsd.org) Date: Thu, 12 Oct 2006 19:34:03 GMT Message-Id: <200610121934.k9CJY3T0067768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 19:34:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107772 Change 107772 by millert@millert_macbook on 2006/10/12 19:33:59 Fix handling of migscs data. We now install sebsd_migscs in the policy dir alongside the binary policy file which makes it possible to reload it via load_policy. Fix path to load_policy so "make reload" can work. Trim leading underscores from MiG class method names since checkpolicy requires names to start with a letter. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.monolithic#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/migscs.pl#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/update_plist#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#3 (text+ko) ==== @@ -76,7 +76,7 @@ SEMOD_PKG ?= $(BINDIR)/semodule_package SEMOD_LNK ?= $(BINDIR)/semodule_link SEMOD_EXP ?= $(BINDIR)/semodule_expand -LOADPOLICY ?= $(BINDIR)/load_policy +LOADPOLICY ?= $(SBINDIR)/load_policy SETFILES ?= $(BINDIR)/setfiles MIG ?= $(BINDIR)/mig endif @@ -624,21 +624,18 @@ endif endif -all: default sebsd_migscs +all: default $(mig_msgids): $(MIG_DEFS) echo > $@ for i in $(MIG_DEFS); do $(MIG) -user /dev/null -server /dev/null -header /dev/null -sheader /dev/null -flasksc `basename $$i .defs`.flask $$i; cat `basename $$i .defs`.flask >> $@; done $(mig_avs): $(mig_msgids) - cat $< | awk '{print $$1, $$2}' > $@ + cat $< | awk '{sub("^_*", "", $$1); print $$1, $$2}' > $@ $(mig_secclass): $(mig_avs) grep '^class' $< > $@ -sebsd_migscs: $(secclass) $(mig_msgids) - cat $(secclass) $(mig_msgids) | perl migscs.pl - .PHONY: install-src install-appconfig generate xml conf html bare tags .SUFFIXES: .SUFFIXES: .c ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.monolithic#4 (text+ko) ==== @@ -17,6 +17,7 @@ policy_conf = $(builddir)policy.conf fc = $(builddir)file_contexts polver = $(builddir)policy.$(pv) +migscs = $(builddir)sebsd_migscs homedir_template = $(builddir)homedir_template M4PARAM += -D self_contained_policy @@ -24,6 +25,7 @@ # install paths policypath = $(installdir)/policy loadpath = $(policypath)/$(notdir $(polver)) +migscs_loadpath = $(policypath)/sebsd_migscs homedirpath = $(contextpath)/files/homedir_template appfiles += $(installdir)/booleans $(userpath)/local.users @@ -51,14 +53,14 @@ # default: policy -policy: $(polver) +policy: $(polver) $(migscs) ifeq ($(SEDARWIN_BUILD),1) -install: install-src $(loadpath) $(fcpath) $(ncpath) $(appfiles) - ./update_plist --policy=$(loadpath) --migscs=sebsd_migscs --install-dir=/etc/sedarwin/$(strip $(NAME))/policy ../sedarwin/mac_sedarwin.kext/Contents/Info.plist && make -C ../sedarwin mac_sedarwin.kext.tar install +install: install-src $(loadpath) $(migscs_loadpath) $(fcpath) $(ncpath) $(appfiles) + ./update_plist --policy=$(loadpath) --migscs=$(migscs_loadpath) --install-dir=/etc/sedarwin/$(strip $(NAME))/policy ../sedarwin/mac_sedarwin.kext/Contents/Info.plist && make -C ../sedarwin mac_sedarwin.kext.tar install else -install: $(loadpath) $(fcpath) $(ncpath) $(appfiles) - ./update_plist --policy=$(loadpath) /System/Library/Extensions/mac_sedarwin.kext/Contents/Info.plist +install: $(loadpath) $(migscs_loadpath) $(fcpath) $(ncpath) $(appfiles) + ./update_plist --policy=$(loadpath) --migscs=$(migscs_loadpath) /System/Library/Extensions/mac_sedarwin.kext/Contents/Info.plist rm -f /System/Library/Extensions.kextcache /System/Library/Extensions.mkext endif @@ -82,6 +84,9 @@ endif $(verbose) $(CHECKPOLICY) -o $@ $^ +$(migscs): $(secclass) $(mig_msgids) + cat $(secclass) $(mig_msgids) | perl migscs.pl > $@ + ######################################## # # Install a binary policy @@ -94,15 +99,18 @@ @echo "WARNING: Policy version mismatch! Is your OUTPUT_POLICY set correctly?" @echo endif - $(verbose) $(CHECKPOLICY) -o $@ $^ + $(verbose) $(CHECKPOLICY) -o $@ $< + +$(migscs_loadpath): $(secclass) $(mig_msgids) + cat $(secclass) $(mig_msgids) | perl migscs.pl > $@ ######################################## # # Load the binary policy # -reload $(tmpdir)/load: $(loadpath) $(fcpath) $(ncpath) $(appfiles) - @echo "Loading $(NAME) $(loadpath)" - $(verbose) $(LOADPOLICY) -q $(loadpath) +reload $(tmpdir)/load: $(loadpath) $(migscs_loadpath) $(fcpath) $(ncpath) $(appfiles) + @echo "Loading $(NAME) $(shell sysctl -n security.mac.sebsd.policypath)" + $(verbose) $(LOADPOLICY) -q @touch $(tmpdir)/load ######################################## @@ -260,6 +268,10 @@ clean: rm -f $(policy_conf) rm -f $(polver) + rm -f $(migscs) + rm -f $(poldir)/mig_classes + rm -f $(poldir)/mig_access_vectors + rm -f $(poldir)/mig_msgids rm -f $(fc) rm -f $(homedir_template) rm -f $(net_contexts) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/migscs.pl#2 (text+ko) ==== @@ -1,6 +1,5 @@ #!/usr/bin/perl -open (OUT, "> sebsd_migscs") || die ("cant open sebsd_migscs"); my %scs; my $curclass = 0; @@ -16,7 +15,7 @@ elsif (/^class/) { $curclass++; } } -print "$curclass classes\n"; +warn "$curclass classes\n"; my $out; foreach my $c (keys %scs) { @@ -25,6 +24,4 @@ foreach my $c (@ca) { $out .= pack ('I', $c); } } -print OUT $out; -close (OUT); - +print $out; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/update_plist#4 (xtext) ==== @@ -25,7 +25,8 @@ $status = GetOptions("policy=s" => \$policy_file, "migscs=s" => \$migscs_file, "enforce!" => \$enforcing_mode, "install-dir=s" => \$install_dir); &usage() unless $status && $#ARGV == 0; -die "$0: install dir must be fully-qualified\n" unless $install_dir =~ /^\//; +die "$0: install dir must be fully-qualified\n" unless + !defined($install_dir) || $install_dir =~ /^\//; $plist_file = $ARGV[0]; my $data = Mac::PropertyList::parse_plist_file($plist_file) || From owner-p4-projects@FreeBSD.ORG Thu Oct 12 19:47:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7E6C16A412; Thu, 12 Oct 2006 19:47:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74FA316A403 for ; Thu, 12 Oct 2006 19:47:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE8E143D7B for ; Thu, 12 Oct 2006 19:47:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CJlLKG076322 for ; Thu, 12 Oct 2006 19:47:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CJlLCv076313 for perforce@freebsd.org; Thu, 12 Oct 2006 19:47:21 GMT (envelope-from millert@freebsd.org) Date: Thu, 12 Oct 2006 19:47:21 GMT Message-Id: <200610121947.k9CJlLCv076313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 19:47:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107773 Change 107773 by millert@millert_macbook on 2006/10/12 19:46:30 Update to use init_allow_ipc() Updated WindowServer Policy Updated DirectoryService policy; now allows Mach messaging Add memberd_allow_ipc() Update to use new init_allow_ipc() rather than init_mach_ipc() Add configd_allow_ipc() Add lookupd_allow_ipc() Rename init_mach_ipc to init_allow_ipc Add notifyd_allow_ipc() Add loginwindow_allow_send() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.if#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.if#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/unconfined.te#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#2 (text+ko) ==== @@ -34,3 +34,41 @@ allow DirectoryService_t DirectoryService_var_log_t:sock_file create_file_perms; allow DirectoryService_t DirectoryService_var_log_t:dir { rw_dir_perms setattr }; logging_log_filetrans(DirectoryService_t,DirectoryService_var_log_t,{ sock_file file dir }) + +# file descriptors and sockets +allow DirectoryService_t self:fd use; +allow DirectoryService_t self:socket { bind connect read write }; +allow DirectoryService_t self:tcp_socket create; +allow DirectoryService_t self:udp_socket create; + +# Misc other +allow DirectoryService_t mnt_t:dir search; +allow DirectoryService_t nfs_t:lnk_file read; +allow DirectoryService_t random_device_t:chr_file read; +allow DirectoryService_t sbin_t:dir { getattr search read }; +allow DirectoryService_t port_t:tcp_socket name_connect; + + +# Allow Mach IP with self +mach_allow_message(DirectoryService_t, DirectoryService_t) + +# Allow communication with bootstrap server +init_allow_bootstrap(DirectoryService_t) + +# Allow communication with notification server +notifyd_allow_ipc(DirectoryService_t) + +# Allow sending to loginwindow +loginwindow_allow_send(DirectoryService_t) + +# Allow communicaion with configd +configd_allow_ipc(DirectoryService_t) + +# Allow communication with launchd +init_allow_ipc(DirectoryService_t) + +# Allow communication with memberd +memberd_allow_ipc(DirectoryService_t) + +# Allow communication with securityd +securityd_allow_ipc(DirectoryService_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.if#2 (text+ko) ==== @@ -54,3 +54,19 @@ allow $1 WindowServer_t:fifo_file rw_file_perms; allow $1 WindowServer_t:process sigchld; ') + +######################################## +## +## Allow Mach IP with WindowServer +## +## +## +## Type to be used as a domain. +## +## +# +interface(`WindowServer_allow_ipc',` + + # Allow bidirectional comminication with WindowServer + mach_allow_ipc(WindowServer_t, $1) +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#2 (text+ko) ==== @@ -24,3 +24,33 @@ ## internal communication is often done using fifo and unix sockets. allow WindowServer_t self:fifo_file { read write }; allow WindowServer_t self:unix_stream_socket create_stream_socket_perms; + +# Allow WindowServer to re-exec itself +allow WindowServer_t WindowServer_exec_t:file execute_no_trans; + +# Allow WindowServer to talk to itself +mach_allow_message(WindowServer_t, WindowServer_t) + +# FDs and sockets and consoles oh my! +allow WindowServer_t self:fd use; +allow WindowServer_t self:udp_socket create; +allow WindowServer_t console_device_t:chr_file setattr; + +# Allow WindowServer to talk to launchd +init_allow_ipc(WindowServer_t) +init_allow_bootstrap(WindowServer_t) + +# Allow WindowServer to talk to notifyd +notifyd_allow_ipc(WindowServer_t) + +# Allow WindowServer to talk to securityd +securityd_allow_ipc(WindowServer_t) + +# Allow shared memory access +allow WindowServer_t init_t:shm { read write }; + +# Misc +allow WindowServer_t nfs_t:filesystem getattr; +allow WindowServer_t nfs_t:lnk_file read; +allow WindowServer_t mnt_t:dir search; + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.if#3 (text+ko) ==== @@ -65,7 +65,7 @@ ## ## # -interface(`configd_mach_ipc',` +interface(`configd_allow_ipc',` #gen_require(` #class mach_port all_mach_port_perms; #)' ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#3 (text+ko) ==== @@ -9,6 +9,8 @@ type configd_exec_t; domain_type(configd_t) init_domain(configd_t, configd_exec_t) +# Allow Mach IP w/ init_t (launchd) +init_allow_ipc(configd_t) # pid files type configd_var_run_t; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#3 (text+ko) ==== @@ -9,7 +9,7 @@ type coreaudiod_exec_t; domain_type(coreaudiod_t) init_domain(coreaudiod_t, coreaudiod_exec_t) -init_mach_ipc(coreaudiod_t) +init_allow_ipc(coreaudiod_t) ######################################## # ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#3 (text+ko) ==== @@ -35,6 +35,8 @@ allow diskarbitrationd_t diskarbitrationd_var_run_t:dir rw_dir_perms; files_pid_filetrans(diskarbitrationd_t,diskarbitrationd_var_run_t, { file sock_file }) +# Allow Mach IPC with self +mach_allow_message(diskarbitrationd_t, diskarbitrationd_t) + # Allow Mach IPC with configd -configd_mach_ipc(diskarbitrationd_t) - +configd_allow_ipc(diskarbitrationd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.if#2 (text+ko) ==== @@ -20,3 +20,19 @@ allow loginwindow_t:$1:fifo_file rw_file_perms; allow loginwindow_t $1:process sigchld; ') + +######################################## +## +## Allow sending of mach messages to loginwindow +## +## +## Domain allowed to send. +## +# +interface(`loginwindow_allow_send',` + + # Note. I believe that this is too permissive. Specified domain + # Needs only to use the hold_send_once move_send_once send rights. + mach_allow_message($1, loginwindow_t) + +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.if#2 (text+ko) ==== @@ -20,3 +20,22 @@ allow lookupd_t:$1:fifo_file rw_file_perms; allow lookupd_t $1:process sigchld; ') + +######################################## +## +## Allow Mach IP with lookupd +## +## +## +## Type to be used as a domain. +## +## +# +interface(`lookupd_allow_ipc',` + #gen_require(` + #class mach_port all_mach_port_perms; + #)' + + # Allow bidirectional comminication with lookupd + mach_allow_ipc(lookupd_t, $1) +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.if#2 (text+ko) ==== @@ -20,3 +20,19 @@ allow memberd_t:$1:fifo_file rw_file_perms; allow memberd_t $1:process sigchld; ') + +######################################## +## +## Allow Mach IP with memberd +## +## +## +## Type to be used as a domain. +## +## +# +interface(`memberd_allow_ipc',` + + # Allow bidirectional comminication with memberd + mach_allow_ipc(memberd_t, $1) +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.if#2 (text+ko) ==== @@ -20,3 +20,21 @@ allow notifyd_t:$1:fifo_file rw_file_perms; allow notifyd_t $1:process sigchld; ') + +######################################## +## +## Allow conversation with the system notification server (notifyd) +## +## +## +## Type to be used as a domain. +## +## +# +interface(`notifyd_allow_ipc',` + + # Allow communication with notification server + allow $1 init_t:mi_notify_ipc { notify_server_cancel notify_server_get_state notify_server_monitor_file notify_server_register_check notify_server_register_plain }; + +') + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.if#2 (text+ko) ==== @@ -20,3 +20,19 @@ allow securityd_t:$1:fifo_file rw_file_perms; allow securityd_t $1:process sigchld; ') + +######################################## +## +## Allow Mach IP with securityd +## +## +## +## Type to be used as a domain. +## +## +# +interface(`securityd_allow_ipc',` + + # Allow bidirectional comminication with securityd + mach_allow_ipc(securityd_t, $1) +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.if#4 (text+ko) ==== @@ -1105,8 +1105,24 @@ ## ## # -interface(`init_mach_ipc',` +interface(`init_allow_ipc',` - # Allow bidirectional comminication with configd + # Allow bidirectional comminication with launchd mach_allow_ipc(init_t, $1) ') + +######################################## +## +## Allow conversation with the bootstrap namespace server (launchd) +## +## +## +## Type to be used as a domain.o## +## +# +interface(`init_allow_bootstrap',` + + # Allow communication with bootstrap server + allow $1 init_t:mi_bootstrap { bootstrap_check_in bootstrap_status bootstrap_unprivileged }; + +') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/unconfined.te#3 (text+ko) ==== @@ -14,6 +14,12 @@ type unconfined_exec_t; init_system_domain(unconfined_t,unconfined_exec_t) +# Allow Mach IPC w/ lookupd +lookupd_allow_ipc(unconfined_t) + +# Allow Mach IPC w/ WindowServer +WindowServer_allow_ipc(unconfined_t) + ifdef(`targeted_policy',` type unconfined_execmem_t; type unconfined_execmem_exec_t; From owner-p4-projects@FreeBSD.ORG Thu Oct 12 19:49:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E9F216A416; Thu, 12 Oct 2006 19:49:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D725916A407 for ; Thu, 12 Oct 2006 19:49:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 735BF43D45 for ; Thu, 12 Oct 2006 19:49:25 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CJnPVJ077387 for ; Thu, 12 Oct 2006 19:49:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CJnO8P077381 for perforce@freebsd.org; Thu, 12 Oct 2006 19:49:24 GMT (envelope-from millert@freebsd.org) Date: Thu, 12 Oct 2006 19:49:24 GMT Message-Id: <200610121949.k9CJnO8P077381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2006 19:49:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=107775 Change 107775 by millert@millert_macbook on 2006/10/12 19:48:49 Validate migscs input so we don't crash from corrupt data. Change how the message id to class (migscs) data is stored so we can free it properly when reloading. We now store the array of msgids associated with for each class in the classinfo struct itself. This means that to free the classinfo structs we just apply a function to each datum and free the datum when a reference count hits zero. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#4 (text+ko) ==== @@ -46,7 +46,8 @@ struct msgid_classinfo { - int baseid; + int nmsgids; + int *msgids; int nclasses; int classes[0]; /* actually larger */ }; @@ -55,6 +56,16 @@ lck_mtx_t *migscs_load_lock; +static int +msgid_destroy(void *key, void *datum, void *arg) +{ + struct msgid_classinfo *cinfo = datum; + + if (--cinfo->nmsgids == 0) + sebsd_free(cinfo, M_SEBSD); + return (0); +} + /* * Read the table mapping mach message ids to security classes. * The permissions in those classes are expected to be relative to the @@ -63,53 +74,72 @@ int sebsd_load_migscs(void *tdata, size_t tsize) { + struct msgid_classinfo *cinfo; struct hashtab *ht, *oht; - int error, *p, *ep; + int error, entries, i, msgid, nclasses, size; + int *p, *ep; ht = hashtab_create(msgid_hash, msgid_cmp, 31337); if (ht == NULL) return (-1); - printf("security class to subsystem table: %d classes\n", - tsize / sizeof(int)); - + error = 0; p = (int *)tdata; ep = (int *)((char *)tdata + tsize); - while (p < ep) { - int msgid = *p++; - int nclasses = *p++; - int size = *p++; - int i; - struct msgid_classinfo *c; + for (entries = 0; p < ep; entries++) { + if (p + 3 > ep) + goto bad; + msgid = *p++; + nclasses = *p++; + size = *p++; + if (msgid <= 0 || nclasses <= 0 || size <= 0 || + p + nclasses > ep) + goto bad; - c = sebsd_malloc(sizeof(int) * nclasses + sizeof(*c), M_SEBSD, - M_WAITOK); - c->baseid = msgid; - c->nclasses = nclasses; + /* + * We store the key in the data object it references + * so we can free things up with a map operation later. + */ + cinfo = sebsd_malloc(sizeof(*cinfo) + + (nclasses + size) * sizeof(int), M_SEBSD, M_WAITOK); + cinfo->nclasses = nclasses; for (i = 0; i < nclasses; i++) - c->classes[i] = *p++; - for (i = msgid; i < msgid + size; i++) { - int *ip = sebsd_malloc(sizeof(int), M_SEBSD, M_WAITOK); - *ip = i; - error = hashtab_insert(ht, ip, c); - if (error) { - hashtab_destroy(ht); - return (-1); - } + cinfo->classes[i] = *p++; + + cinfo->nmsgids = size; + cinfo->msgids = &cinfo->classes[nclasses]; + for (i = 0; i < size; i++) { + cinfo->msgids[i] = msgid + i; + error = hashtab_insert(ht, &cinfo->msgids[i], cinfo); + if (error) + goto bad; } } + printf("security class to subsystem table: %d classes\n", entries); + /* * Swap the old message id to class mapping with the new one * and free the old. - * XXX - does this leak memory? */ + /* XXX - need rwlock for msgid2class */ lck_mtx_lock(migscs_load_lock); oht = msgid2class; msgid2class = ht; lck_mtx_unlock(migscs_load_lock); - hashtab_destroy(oht); + if (oht != NULL) { + hashtab_map(oht, msgid_destroy, NULL); + hashtab_destroy(oht); + } return (0); +bad: + if (error) + printf("%s: hashtab_insert() error %d\n", __func__, error); + else + printf("%s: migscs data corrupted, ignoring\n", __func__); + hashtab_map(ht, msgid_destroy, NULL); + hashtab_destroy(ht); + return (-1); } void @@ -118,7 +148,6 @@ size_t tsize; void *tdata; - /* XXX - should also lookup & store migscs_path */ if (sebsd_find_data("migscs_data", &tdata, &tsize) != 0 || sebsd_load_migscs(tdata, tsize) != 0) msgid2class = hashtab_create(msgid_hash, msgid_cmp, 3); @@ -137,11 +166,12 @@ * Instead, we probably should make a check against a * new permission to be added to mach_port for this purpose. */ + /* XXX - need rwlock for msgid2class */ mcl = hashtab_search(msgid2class, &msgid); if (mcl == NULL) return 0; - cl = (msgid - mcl->baseid) / (8 * sizeof(u32)); + cl = (msgid - mcl->msgids[0]) / (8 * sizeof(u32)); if (cl >= mcl->nclasses) { /* bad message */ if (selinux_enforcing) @@ -150,6 +180,6 @@ return (0); } - perms = (u32)1 << (msgid - mcl->baseid - (cl * 8 * sizeof(u32))); + perms = (u32)1 << (msgid - mcl->msgids[0] - (cl * 8 * sizeof(u32))); return avc_has_perm(subj, obj, mcl->classes[cl], perms, NULL); } From owner-p4-projects@FreeBSD.ORG Fri Oct 13 06:41:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADE5C16A4B3; Fri, 13 Oct 2006 06:41:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C56516A494 for ; Fri, 13 Oct 2006 06:41:49 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F073F43D7D for ; Fri, 13 Oct 2006 06:41:34 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9D6fYoM050399 for ; Fri, 13 Oct 2006 06:41:34 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9D6fUR1050332 for perforce@freebsd.org; Fri, 13 Oct 2006 06:41:30 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 13 Oct 2006 06:41:30 GMT Message-Id: <200610130641.k9D6fUR1050332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 107799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 06:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=107799 Change 107799 by mjacob@newisp on 2006/10/13 06:40:33 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/newisp/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/newisp/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/newisp/amd64/amd64/machdep.c#4 integrate .. //depot/projects/newisp/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/newisp/amd64/conf/GENERIC#3 integrate .. //depot/projects/newisp/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/newisp/amd64/include/apicvar.h#2 integrate .. //depot/projects/newisp/amd64/include/elf.h#2 integrate .. //depot/projects/newisp/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/newisp/amd64/isa/atpic.c#2 integrate .. //depot/projects/newisp/arm/include/elf.h#2 integrate .. //depot/projects/newisp/boot/Makefile#2 integrate .. //depot/projects/newisp/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/newisp/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/newisp/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/newisp/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/newisp/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/newisp/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/newisp/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/newisp/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/newisp/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/newisp/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/newisp/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/newisp/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/newisp/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/newisp/compat/linux/linux_emul.c#4 integrate .. //depot/projects/newisp/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/newisp/compat/linux/linux_misc.c#3 integrate .. //depot/projects/newisp/conf/Makefile.sun4v#1 branch .. //depot/projects/newisp/conf/NOTES#7 integrate .. //depot/projects/newisp/conf/files#6 integrate .. //depot/projects/newisp/conf/files.sun4v#1 branch .. //depot/projects/newisp/conf/options#4 integrate .. //depot/projects/newisp/conf/options.sun4v#1 branch .. //depot/projects/newisp/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/newisp/ddb/db_command.c#2 integrate .. //depot/projects/newisp/ddb/db_examine.c#2 integrate .. //depot/projects/newisp/ddb/db_output.c#2 integrate .. //depot/projects/newisp/ddb/db_output.h#2 integrate .. //depot/projects/newisp/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/newisp/dev/ath/if_athvar.h#3 integrate .. //depot/projects/newisp/dev/bce/if_bce.c#4 integrate .. //depot/projects/newisp/dev/bge/if_bge.c#8 edit .. //depot/projects/newisp/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/newisp/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/newisp/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/newisp/dev/ips/ips.c#2 integrate .. //depot/projects/newisp/dev/ips/ipsreg.h#2 integrate .. //depot/projects/newisp/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/newisp/dev/ofw/openfirm.c#2 integrate .. //depot/projects/newisp/dev/ofw/openfirm.h#2 integrate .. //depot/projects/newisp/dev/pci/pci.c#3 integrate .. //depot/projects/newisp/dev/pci/pci_if.m#2 integrate .. //depot/projects/newisp/dev/pci/pci_pci.c#2 integrate .. //depot/projects/newisp/dev/pci/pci_private.h#2 integrate .. //depot/projects/newisp/dev/pci/pci_user.c#2 integrate .. //depot/projects/newisp/dev/pci/pcivar.h#2 integrate .. //depot/projects/newisp/dev/sk/if_sk.c#2 integrate .. //depot/projects/newisp/dev/sk/if_skreg.h#2 integrate .. //depot/projects/newisp/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/newisp/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/newisp/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/newisp/dev/usb/if_aue.c#3 integrate .. //depot/projects/newisp/dev/usb/if_cdce.c#4 integrate .. //depot/projects/newisp/dev/usb/if_kue.c#3 integrate .. //depot/projects/newisp/dev/usb/if_ural.c#3 integrate .. //depot/projects/newisp/dev/usb/umass.c#3 integrate .. //depot/projects/newisp/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/newisp/dev/usb/usbdevs#2 integrate .. //depot/projects/newisp/dev/usb/uscanner.c#3 integrate .. //depot/projects/newisp/geom/cache/g_cache.c#1 branch .. //depot/projects/newisp/geom/cache/g_cache.h#1 branch .. //depot/projects/newisp/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/newisp/i386/conf/GENERIC#3 integrate .. //depot/projects/newisp/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/newisp/i386/i386/io_apic.c#2 integrate .. //depot/projects/newisp/i386/i386/local_apic.c#6 integrate .. //depot/projects/newisp/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/newisp/i386/include/apicvar.h#2 integrate .. //depot/projects/newisp/i386/include/elf.h#2 integrate .. //depot/projects/newisp/i386/include/intr_machdep.h#2 integrate .. //depot/projects/newisp/i386/isa/atpic.c#2 integrate .. //depot/projects/newisp/ia64/conf/GENERIC#3 integrate .. //depot/projects/newisp/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/newisp/ia64/include/elf.h#2 integrate .. //depot/projects/newisp/kern/kern_sig.c#2 integrate .. //depot/projects/newisp/kern/kern_timeout.c#2 integrate .. //depot/projects/newisp/kern/kern_umtx.c#7 integrate .. //depot/projects/newisp/kern/tty_pty.c#4 integrate .. //depot/projects/newisp/modules/geom/Makefile#2 integrate .. //depot/projects/newisp/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/newisp/net/if_bridge.c#4 integrate .. //depot/projects/newisp/net/if_vlan.c#3 integrate .. //depot/projects/newisp/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/newisp/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/newisp/netgraph/ng_base.c#2 integrate .. //depot/projects/newisp/netinet/if_ether.c#3 integrate .. //depot/projects/newisp/netinet/ip_carp.c#3 integrate .. //depot/projects/newisp/netinet/ip_fw2.c#4 integrate .. //depot/projects/newisp/netinet/libalias/libalias.3#3 integrate .. //depot/projects/newisp/pc98/conf/GENERIC#3 integrate .. //depot/projects/newisp/pci/agp_amd64.c#2 integrate .. //depot/projects/newisp/powerpc/conf/GENERIC#3 integrate .. //depot/projects/newisp/powerpc/include/elf.h#2 integrate .. //depot/projects/newisp/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/newisp/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/newisp/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/newisp/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/newisp/sparc64/conf/GENERIC#3 integrate .. //depot/projects/newisp/sparc64/include/asi.h#2 integrate .. //depot/projects/newisp/sparc64/include/elf.h#2 integrate .. //depot/projects/newisp/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/newisp/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/newisp/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/newisp/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/newisp/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/newisp/sun4v/compile/.cvsignore#1 branch .. //depot/projects/newisp/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/newisp/sun4v/conf/GENERIC#1 branch .. //depot/projects/newisp/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/newisp/sun4v/conf/MAC#1 branch .. //depot/projects/newisp/sun4v/conf/Makefile#1 branch .. //depot/projects/newisp/sun4v/conf/NOTES#1 branch .. //depot/projects/newisp/sun4v/include/_bus.h#1 branch .. //depot/projects/newisp/sun4v/include/_inttypes.h#1 branch .. //depot/projects/newisp/sun4v/include/_limits.h#1 branch .. //depot/projects/newisp/sun4v/include/_stdint.h#1 branch .. //depot/projects/newisp/sun4v/include/_types.h#1 branch .. //depot/projects/newisp/sun4v/include/asi.h#1 branch .. //depot/projects/newisp/sun4v/include/asm.h#1 branch .. //depot/projects/newisp/sun4v/include/asmacros.h#1 branch .. //depot/projects/newisp/sun4v/include/atomic.h#1 branch .. //depot/projects/newisp/sun4v/include/bus.h#1 branch .. //depot/projects/newisp/sun4v/include/bus_common.h#1 branch .. //depot/projects/newisp/sun4v/include/bus_dma.h#1 branch .. //depot/projects/newisp/sun4v/include/bus_private.h#1 branch .. //depot/projects/newisp/sun4v/include/cache.h#1 branch .. //depot/projects/newisp/sun4v/include/ccr.h#1 branch .. //depot/projects/newisp/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/newisp/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/newisp/sun4v/include/clock.h#1 branch .. //depot/projects/newisp/sun4v/include/cpu.h#1 branch .. //depot/projects/newisp/sun4v/include/cpufunc.h#1 branch .. //depot/projects/newisp/sun4v/include/db_machdep.h#1 branch .. //depot/projects/newisp/sun4v/include/elf.h#1 branch .. //depot/projects/newisp/sun4v/include/endian.h#1 branch .. //depot/projects/newisp/sun4v/include/exec.h#1 branch .. //depot/projects/newisp/sun4v/include/float.h#1 branch .. //depot/projects/newisp/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/newisp/sun4v/include/fp.h#1 branch .. //depot/projects/newisp/sun4v/include/frame.h#1 branch .. //depot/projects/newisp/sun4v/include/fsr.h#1 branch .. //depot/projects/newisp/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/newisp/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/newisp/sun4v/include/hviommu.h#1 branch .. //depot/projects/newisp/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/newisp/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/newisp/sun4v/include/idprom.h#1 branch .. //depot/projects/newisp/sun4v/include/ieee.h#1 branch .. //depot/projects/newisp/sun4v/include/ieeefp.h#1 branch .. //depot/projects/newisp/sun4v/include/in_cksum.h#1 branch .. //depot/projects/newisp/sun4v/include/instr.h#1 branch .. //depot/projects/newisp/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/newisp/sun4v/include/iommureg.h#1 branch .. //depot/projects/newisp/sun4v/include/iommuvar.h#1 branch .. //depot/projects/newisp/sun4v/include/kdb.h#1 branch .. //depot/projects/newisp/sun4v/include/kerneldump.h#1 branch .. //depot/projects/newisp/sun4v/include/ktr.h#1 branch .. //depot/projects/newisp/sun4v/include/limits.h#1 branch .. //depot/projects/newisp/sun4v/include/lsu.h#1 branch .. //depot/projects/newisp/sun4v/include/md_var.h#1 branch .. //depot/projects/newisp/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/newisp/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/newisp/sun4v/include/memdev.h#1 branch .. //depot/projects/newisp/sun4v/include/metadata.h#1 branch .. //depot/projects/newisp/sun4v/include/mmu.h#1 branch .. //depot/projects/newisp/sun4v/include/mutex.h#1 branch .. //depot/projects/newisp/sun4v/include/nexusvar.h#1 branch .. //depot/projects/newisp/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/newisp/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/newisp/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/newisp/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/newisp/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/newisp/sun4v/include/param.h#1 branch .. //depot/projects/newisp/sun4v/include/pcb.h#1 branch .. //depot/projects/newisp/sun4v/include/pcpu.h#1 branch .. //depot/projects/newisp/sun4v/include/pmap.h#1 branch .. //depot/projects/newisp/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/newisp/sun4v/include/proc.h#1 branch .. //depot/projects/newisp/sun4v/include/profile.h#1 branch .. //depot/projects/newisp/sun4v/include/pstate.h#1 branch .. //depot/projects/newisp/sun4v/include/ptrace.h#1 branch .. //depot/projects/newisp/sun4v/include/reg.h#1 branch .. //depot/projects/newisp/sun4v/include/reloc.h#1 branch .. //depot/projects/newisp/sun4v/include/resource.h#1 branch .. //depot/projects/newisp/sun4v/include/runq.h#1 branch .. //depot/projects/newisp/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/newisp/sun4v/include/setjmp.h#1 branch .. //depot/projects/newisp/sun4v/include/sf_buf.h#1 branch .. //depot/projects/newisp/sun4v/include/sigframe.h#1 branch .. //depot/projects/newisp/sun4v/include/signal.h#1 branch .. //depot/projects/newisp/sun4v/include/smp.h#1 branch .. //depot/projects/newisp/sun4v/include/stdarg.h#1 branch .. //depot/projects/newisp/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/newisp/sun4v/include/sysarch.h#1 branch .. //depot/projects/newisp/sun4v/include/tick.h#1 branch .. //depot/projects/newisp/sun4v/include/tlb.h#1 branch .. //depot/projects/newisp/sun4v/include/trap.h#1 branch .. //depot/projects/newisp/sun4v/include/tsb.h#1 branch .. //depot/projects/newisp/sun4v/include/tstate.h#1 branch .. //depot/projects/newisp/sun4v/include/tte.h#1 branch .. //depot/projects/newisp/sun4v/include/tte_hash.h#1 branch .. //depot/projects/newisp/sun4v/include/ucontext.h#1 branch .. //depot/projects/newisp/sun4v/include/upa.h#1 branch .. //depot/projects/newisp/sun4v/include/utrap.h#1 branch .. //depot/projects/newisp/sun4v/include/varargs.h#1 branch .. //depot/projects/newisp/sun4v/include/ver.h#1 branch .. //depot/projects/newisp/sun4v/include/vmparam.h#1 branch .. //depot/projects/newisp/sun4v/include/watch.h#1 branch .. //depot/projects/newisp/sun4v/include/wstate.h#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/newisp/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/clock.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/counter.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/exception.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/genassym.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/locore.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/mem.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/support.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/tick.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/trap.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/newisp/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/tte.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/newisp/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/newisp/sys/_elf_solaris.h#1 branch .. //depot/projects/newisp/sys/elf.h#1 branch .. //depot/projects/newisp/sys/elf32.h#2 integrate .. //depot/projects/newisp/sys/elf64.h#2 integrate .. //depot/projects/newisp/sys/elf_common.h#2 integrate .. //depot/projects/newisp/sys/signalvar.h#2 integrate .. //depot/projects/newisp/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/newisp/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/newisp/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/newisp/ufs/ufs/inode.h#3 integrate .. //depot/projects/newisp/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/newisp/vm/vm_contig.c#3 integrate .. //depot/projects/newisp/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.23 2006/10/13 04:53:22 jb Exp $ */ /* @@ -37,6 +37,7 @@ * that source. */ +#include "opt_atpic.h" #include "opt_ddb.h" #include @@ -51,10 +52,17 @@ #include #include #include +#include +#include #ifdef DDB #include #endif +#ifndef DEV_ATPIC +#include +#include +#endif + #define MAX_STRAY_LOG 5 typedef void (*mask_fn)(void *); @@ -62,6 +70,7 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +static STAILQ_HEAD(, pic) pics; #ifdef SMP static int assign_cpu; @@ -70,11 +79,46 @@ #endif static void intr_init(void *__dummy); +static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); static void intrcnt_register(struct intsrc *is); +static int +intr_pic_registered(struct pic *pic) +{ + struct pic *p; + + STAILQ_FOREACH(p, &pics, pics) { + if (p == pic) + return (1); + } + return (0); +} + /* + * Register a new interrupt controller (PIC). This is to support suspend + * and resume where we suspend/resume controllers rather than individual + * sources. This also allows controllers with no active sources (such as + * 8259As in a system using the APICs) to participate in suspend and resume. + */ +int +intr_register_pic(struct pic *pic) +{ + int error; + + mtx_lock_spin(&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); + return (error); +} + +/* * Register a new interrupt source with the global interrupt system. * The global interrupts need to be disabled when this function is * called. @@ -84,6 +128,7 @@ { int error, vector; + KASSERT(intr_pic_registered(isrc->is_pic), ("unregistered PIC")); vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); @@ -255,26 +300,29 @@ void intr_resume(void) { - struct intsrc **isrc; - int i; + struct pic *pic; +#ifndef DEV_ATPIC + atpic_reset(); +#endif mtx_lock_spin(&intr_table_lock); - for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++) - if (*isrc != NULL && (*isrc)->is_pic->pic_resume != NULL) - (*isrc)->is_pic->pic_resume(*isrc); + STAILQ_FOREACH(pic, &pics, pics) { + if (pic->pic_resume != NULL) + pic->pic_resume(pic); + } mtx_unlock_spin(&intr_table_lock); } void intr_suspend(void) { - struct intsrc **isrc; - int i; + struct pic *pic; mtx_lock_spin(&intr_table_lock); - for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++) - if (*isrc != NULL && (*isrc)->is_pic->pic_suspend != NULL) - (*isrc)->is_pic->pic_suspend(*isrc); + STAILQ_FOREACH(pic, &pics, pics) { + if (pic->pic_suspend != NULL) + pic->pic_suspend(pic); + } mtx_unlock_spin(&intr_table_lock); } @@ -327,10 +375,33 @@ intrcnt_setname("???", 0); intrcnt_index = 1; + STAILQ_INIT(&pics); mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) +#ifndef DEV_ATPIC +/* Initialize the two 8259A's to a known-good shutdown state. */ +void +atpic_reset(void) +{ + + outb(IO_ICU1, ICW1_RESET | ICW1_IC4); + outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS); + outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2); + outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086); + outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff); + outb(IO_ICU1, OCW3_SEL | OCW3_RR); + + outb(IO_ICU2, ICW1_RESET | ICW1_IC4); + outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8); + outb(IO_ICU2 + ICU_IMR_OFFSET, 2); + outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086); + outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff); + outb(IO_ICU2, OCW3_SEL | OCW3_RR); +} +#endif + #ifdef DDB /* * Dump data about interrupt handlers ==== //depot/projects/newisp/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -28,9 +28,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.25 2006/10/10 23:23:11 jhb Exp $"); -#include "opt_atpic.h" #include "opt_isa.h" #include @@ -61,8 +60,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define TODO printf("%s: not implemented!\n", __func__) - static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); /* @@ -115,8 +112,7 @@ static int ioapic_source_pending(struct intsrc *isrc); static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static void ioapic_suspend(struct intsrc *isrc); -static void ioapic_resume(struct intsrc *isrc); +static void ioapic_resume(struct pic *pic); static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); @@ -124,7 +120,7 @@ struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source, ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, - ioapic_suspend, ioapic_resume, + NULL, ioapic_resume, ioapic_config_intr, ioapic_assign_cpu }; static int next_ioapic_base; @@ -419,17 +415,13 @@ } static void -ioapic_suspend(struct intsrc *isrc) +ioapic_resume(struct pic *pic) { + struct ioapic *io = (struct ioapic *)pic; + int i; - TODO; -} - -static void -ioapic_resume(struct intsrc *isrc) -{ - - ioapic_program_intpin((struct ioapic_intsrc *)isrc); + for (i = 0; i < io->io_numintr; i++) + ioapic_program_intpin(&io->io_pins[i]); } /* @@ -727,6 +719,7 @@ io->io_intbase + io->io_numintr - 1); /* Register valid pins as interrupt sources. */ + intr_register_pic(&io->io_pic); for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); ==== //depot/projects/newisp/amd64/amd64/local_apic.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.31 2006/09/27 22:09:35 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.32 2006/10/10 23:23:11 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -151,12 +151,15 @@ static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; static void lapic_enable(void); +static void lapic_resume(struct pic *pic); static void lapic_timer_enable_intr(void); static void lapic_timer_oneshot(u_int count); static void lapic_timer_periodic(u_int count); static void lapic_timer_set_divisor(u_int divisor); static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value); +struct pic lapic_pic = { .pic_resume = lapic_resume }; + static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value) { @@ -277,7 +280,7 @@ } void -lapic_setup(void) +lapic_setup(int boot) { struct lapic *la; u_int32_t maxlvt; @@ -306,9 +309,13 @@ /* Program timer LVT and setup handler. */ lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); - snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid)); - intrcnt_add(buf, &la->la_timer_count); - if (PCPU_GET(cpuid) != 0) { + if (boot) { + snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid)); + intrcnt_add(buf, &la->la_timer_count); + } + + /* We don't setup the timer during boot on the BSP until later. */ + if (!(boot && PCPU_GET(cpuid) == 0)) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", lapic_id())); lapic_timer_set_divisor(lapic_timer_divisor); @@ -398,6 +405,14 @@ lapic->svr = value; } +/* Reset the local APIC on the BSP during resume. */ +static void +lapic_resume(struct pic *pic) +{ + + lapic_setup(0); +} + int lapic_id(void) { @@ -983,7 +998,8 @@ * Finish setting up the local APIC on the BSP once we know how to * properly program the LINT pins. */ - lapic_setup(); + lapic_setup(1); + intr_register_pic(&lapic_pic); if (bootverbose) lapic_dump("BSP"); } ==== //depot/projects/newisp/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.656 2006/10/12 12:48:21 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -125,9 +125,11 @@ #include #endif -#include +#ifdef DEV_ATPIC #include +#else #include +#endif #include #include @@ -1212,19 +1214,7 @@ atpic_startup(); #else /* Reset and mask the atpics and leave them shut down. */ - outb(IO_ICU1, ICW1_RESET | ICW1_IC4); - outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS); - outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2); - outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086); - outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff); - outb(IO_ICU1, OCW3_SEL | OCW3_RR); - - outb(IO_ICU2, ICW1_RESET | ICW1_IC4); - outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8); - outb(IO_ICU2 + ICU_IMR_OFFSET, 2); - outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086); - outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff); - outb(IO_ICU2, OCW3_SEL | OCW3_RR); + atpic_reset(); /* * Point the ICU spurious interrupt vectors at the APIC spurious ==== //depot/projects/newisp/amd64/amd64/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.277 2006/09/11 20:10:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -543,7 +543,7 @@ mtx_lock_spin(&ap_boot_mtx); /* Init local apic for irq's */ - lapic_setup(); + lapic_setup(1); /* Set memory range attributes for this CPU to match the BSP */ mem_range_AP_init(); ==== //depot/projects/newisp/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.465 2006/09/26 12:36:33 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.466 2006/10/05 20:31:57 simon Exp $ cpu HAMMER ident GENERIC @@ -26,7 +26,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -#options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking ==== //depot/projects/newisp/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -67,6 +67,7 @@ #include #include +#include #include #include #include @@ -298,7 +299,7 @@ freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -308,7 +309,7 @@ td = curthread; p = td->td_proc; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); PROC_LOCK_ASSERT(p, MA_OWNED); sig = siginfo.si_signo; @@ -407,7 +408,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -416,7 +417,7 @@ int oonstack; int sig; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); @@ -741,20 +742,3 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } - -void -siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst) -{ - dst->si_signo = src->si_signo; - dst->si_errno = src->si_errno; - dst->si_code = src->si_code; - dst->si_pid = src->si_pid; - dst->si_uid = src->si_uid; - dst->si_status = src->si_status; - dst->si_addr = dst->si_addr; - dst->si_value.sigval_int = src->si_value.sival_int; - dst->si_band = src->si_band; - dst->si_trapno = src->si_trapno; - dst->si_timerid = src->si_timerid; - dst->si_overrun = src->si_overrun; -} ==== //depot/projects/newisp/amd64/include/apicvar.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.18 2006/05/01 21:36:47 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.19 2006/10/10 23:23:11 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -211,7 +211,7 @@ int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, enum intr_trigger trigger); void lapic_set_tpr(u_int vector); -void lapic_setup(void); +void lapic_setup(int boot); int lapic_setup_clock(void); #endif /* !LOCORE */ ==== //depot/projects/newisp/amd64/include/elf.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/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -108,31 +108,6 @@ * Relocation types. */ -#define R_X86_64_NONE 0 /* No relocation. */ -#define R_X86_64_64 1 /* Add 64 bit symbol value. */ -#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ -#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ -#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ -#define R_X86_64_COPY 5 /* Copy data from shared object. */ -#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ -#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ -#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ -#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ -#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ -#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ -#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ -#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ -#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ -#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ -#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ -#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ -#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ -#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ -#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ -#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ - #define R_X86_64_COUNT 24 /* Count of defined relocation types. */ /* Define "machine" characteristics */ ==== //depot/projects/newisp/amd64/include/intr_machdep.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/amd64/include/intr_machdep.h,v 1.9 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.11 2006/10/10 23:23:11 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -56,9 +56,9 @@ * - 7 counters for each CPU for IPI counters for SMP. */ #ifdef SMP +#define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) +#else #define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + 1) -#else -#define INTRCNT_COUNT (1 + NUM_IO_INTS * 2 + (1 + 7) * MAXCPU) #endif #ifndef LOCORE @@ -81,11 +81,12 @@ void (*pic_enable_intr)(struct intsrc *); int (*pic_vector)(struct intsrc *); int (*pic_source_pending)(struct intsrc *); - void (*pic_suspend)(struct intsrc *); - void (*pic_resume)(struct intsrc *); + void (*pic_suspend)(struct pic *); + void (*pic_resume)(struct pic *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); + STAILQ_ENTRY(pic) pics; }; /* Flags for pic_disable_source() */ @@ -114,6 +115,9 @@ extern struct mtx icu_lock; extern int elcr_found; +#ifndef DEV_ATPIC +void atpic_reset(void); +#endif /* XXX: The elcr_* prototypes probably belong somewhere else. */ int elcr_probe(void); enum intr_trigger elcr_read_trigger(u_int irq); @@ -130,6 +134,7 @@ enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); struct intsrc *intr_lookup_source(int vector); +int intr_register_pic(struct pic *pic); int intr_register_source(struct intsrc *isrc); int intr_remove_handler(void *cookie); void intr_resume(void); ==== //depot/projects/newisp/amd64/isa/atpic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.19 2006/02/28 22:24:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.20 2006/10/10 23:23:11 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -138,7 +138,7 @@ static void atpic_eoi_slave(struct intsrc *isrc); static void atpic_enable_intr(struct intsrc *isrc); static int atpic_vector(struct intsrc *isrc); -static void atpic_resume(struct intsrc *isrc); +static void atpic_resume(struct pic *pic); static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); @@ -285,16 +285,13 @@ } static void -atpic_resume(struct intsrc *isrc) +atpic_resume(struct pic *pic) { - struct atpic_intsrc *ai = (struct atpic_intsrc *)isrc; - struct atpic *ap = (struct atpic *)isrc->is_pic; + struct atpic *ap = (struct atpic *)pic; - if (ai->at_irq == 0) { - i8259_init(ap, ap == &atpics[SLAVE]); - if (ap == &atpics[SLAVE] && elcr_found) - elcr_resume(); - } + i8259_init(ap, ap == &atpics[SLAVE]); + if (ap == &atpics[SLAVE] && elcr_found) + elcr_resume(); } static int @@ -465,6 +462,14 @@ int i; /* + * Register our PICs, even if we aren't going to use any of their + * pins so that they are suspended and resumed. + */ + if (intr_register_pic(&atpics[0].at_pic) != 0 || + intr_register_pic(&atpics[1].at_pic) != 0) + panic("Unable to register ATPICs"); + + /* * If any of the ISA IRQs have an interrupt source already, then * assume that the APICs are being used and don't register any * of our interrupt sources. This makes sure we don't accidentally ==== //depot/projects/newisp/arm/include/elf.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.7 2006/08/24 23:00:03 cognet Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 13 10:57:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C17816A415; Fri, 13 Oct 2006 10:57:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20C6A16A40F for ; Fri, 13 Oct 2006 10:57:13 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6D9043D66 for ; Fri, 13 Oct 2006 10:57:12 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DAvC1R087162 for ; Fri, 13 Oct 2006 10:57:12 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DAvC6e087159 for perforce@freebsd.org; Fri, 13 Oct 2006 10:57:12 GMT (envelope-from piso@freebsd.org) Date: Fri, 13 Oct 2006 10:57:12 GMT Message-Id: <200610131057.k9DAvC6e087159@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 107811 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 10:57:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=107811 Change 107811 by piso@piso_newluxor on 2006/10/13 10:56:17 Fixes compilation on amd64, and while here add "options INTR_FILTER" to all the GENERICs. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#8 edit .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#6 edit .. //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#6 edit .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#6 edit .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#6 edit .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#7 edit .. //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#8 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#6 (text+ko) ==== @@ -285,3 +285,5 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) + +options INTR_FILTER ==== //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#6 (text+ko) ==== @@ -151,3 +151,5 @@ # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter + +options INTR_FILTER ==== //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#6 (text+ko) ==== @@ -261,3 +261,5 @@ #device firewire # FireWire bus code #device sbp # SCSI over FireWire (Requires scbus and da) #device fwe # Ethernet over FireWire (non-standard!) + +options INTR_FILTER ==== //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#6 (text+ko) ==== @@ -152,3 +152,5 @@ options KTR_COMPILE=0xffffffff #options KTR_MASK=KTR_SIG options KTR_VERBOSE + +options INTR_FILTER ==== //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#7 (text+ko) ==== @@ -236,3 +236,5 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) + +options INTR_FILTER ==== //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#2 (text+ko) ==== @@ -217,3 +217,4 @@ # its choice was not adequately researched options HZ=100 +options INTR_FILTER From owner-p4-projects@FreeBSD.ORG Fri Oct 13 11:10:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 801EB16A4EE; Fri, 13 Oct 2006 11:10:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4046516A4E8 for ; Fri, 13 Oct 2006 11:10:54 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F164543D5A for ; Fri, 13 Oct 2006 11:10:40 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DBAV3b090103 for ; Fri, 13 Oct 2006 11:10:31 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DBAUob090100 for perforce@freebsd.org; Fri, 13 Oct 2006 11:10:30 GMT (envelope-from piso@freebsd.org) Date: Fri, 13 Oct 2006 11:10:30 GMT Message-Id: <200610131110.k9DBAUob090100@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 107813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 11:10:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107813 Change 107813 by piso@piso_newluxor on 2006/10/13 11:10:15 Missing newlines... Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#7 edit .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#8 edit .. //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#7 edit .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#7 edit .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#7 edit .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#8 edit .. //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#7 (text+ko) ==== @@ -286,4 +286,5 @@ device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) -options INTR_FILTER+options INTR_FILTER + ==== //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#8 (text+ko) ==== @@ -296,3 +296,4 @@ device fwe # Ethernet over FireWire (non-standard!) options INTR_FILTER # use interrupt filters when available + ==== //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#7 (text+ko) ==== @@ -153,3 +153,4 @@ device bpf # Berkeley packet filter options INTR_FILTER + ==== //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#7 (text+ko) ==== @@ -262,4 +262,5 @@ #device sbp # SCSI over FireWire (Requires scbus and da) #device fwe # Ethernet over FireWire (non-standard!) -options INTR_FILTER+options INTR_FILTER + ==== //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#7 (text+ko) ==== @@ -153,4 +153,5 @@ #options KTR_MASK=KTR_SIG options KTR_VERBOSE -options INTR_FILTER+options INTR_FILTER + ==== //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#8 (text+ko) ==== @@ -237,4 +237,5 @@ device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) -options INTR_FILTER+options INTR_FILTER + ==== //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#3 (text+ko) ==== @@ -217,4 +217,5 @@ # its choice was not adequately researched options HZ=100 -options INTR_FILTER+options INTR_FILTER + From owner-p4-projects@FreeBSD.ORG Fri Oct 13 12:00:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E51516A596; Fri, 13 Oct 2006 12:00:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 800A616A4B3 for ; Fri, 13 Oct 2006 12:00:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CC0C43D53 for ; Fri, 13 Oct 2006 12:00:36 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DC0aqs097827 for ; Fri, 13 Oct 2006 12:00:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DC0ajd097822 for perforce@freebsd.org; Fri, 13 Oct 2006 12:00:36 GMT (envelope-from piso@freebsd.org) Date: Fri, 13 Oct 2006 12:00:36 GMT Message-Id: <200610131200.k9DC0ajd097822@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 107815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 12:00:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=107815 Change 107815 by piso@piso_newluxor on 2006/10/13 12:00:35 Fixes compilation of GENERIC on amd64. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#6 (text+ko) ==== @@ -758,7 +758,7 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, clkintr, NULL, NULL, + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) @@ -792,7 +792,7 @@ /* Enable periodic interrupts from the RTC. */ rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, rtcintr, NULL, NULL, + intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, INTR_TYPE_CLK, NULL); writertc(RTC_STATUSB, rtc_statusb); From owner-p4-projects@FreeBSD.ORG Fri Oct 13 13:50:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBB2216A417; Fri, 13 Oct 2006 13:50:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E9A216A412 for ; Fri, 13 Oct 2006 13:50:57 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1303B43D62 for ; Fri, 13 Oct 2006 13:50:57 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DDouOg025711 for ; Fri, 13 Oct 2006 13:50:56 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DDouVX025707 for perforce@freebsd.org; Fri, 13 Oct 2006 13:50:56 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 13 Oct 2006 13:50:56 GMT Message-Id: <200610131350.k9DDouVX025707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 13:50:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=107819 Change 107819 by gonzo@gonzo_hq on 2006/10/13 13:49:55 o Set KSTACK_GUARD_PAGES to zero o Use 3 pages for KSTACK. We're going to wire stack on thread switch using TLB#0, so we need even-aligned virtual page number. Because there is no possibility to specify kstack alignment we request 3 pages and use lowest even VPN. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/param.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/param.h#3 (text+ko) ==== @@ -117,9 +117,9 @@ #define IOPAGES 2 /* pages of i/o permission bitmap */ #ifndef KSTACK_PAGES -#define KSTACK_PAGES 4 /* pages of kstack (with pcb) */ +#define KSTACK_PAGES 3 /* pages of kstack (with pcb) */ #endif -#define KSTACK_GUARD_PAGES 1 /* pages of kstack guard; 0 disables */ +#define KSTACK_GUARD_PAGES 0 /* pages of kstack guard; 0 disables */ /* * Ceiling on amount of swblock kva space, can be changed via From owner-p4-projects@FreeBSD.ORG Fri Oct 13 14:07:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9A3A16A4E5; Fri, 13 Oct 2006 14:07:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EE1E16A4D8 for ; Fri, 13 Oct 2006 14:07:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E429443DC0 for ; Fri, 13 Oct 2006 14:07:26 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DE7Ixc029893 for ; Fri, 13 Oct 2006 14:07:18 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DE7H8v029890 for perforce@freebsd.org; Fri, 13 Oct 2006 14:07:17 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 13 Oct 2006 14:07:17 GMT Message-Id: <200610131407.k9DE7H8v029890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 14:07:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=107821 Change 107821 by gonzo@gonzo_hq on 2006/10/13 14:07:10 o Map user address space using a two level structure where virtual address bits 30..22 are used to index into a segment table which points to a page worth of PTEs (4096 page can hold 1024 PTEs). Bits 21..12 are then used to index a PTE which describes a page within a segment. The idea came from NetBSD MIPS pmap module. For kernel address space we still use direct-mapped memory map. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/pmap.h#5 edit .. //depot/projects/mips2/src/sys/mips/include/vmparam.h#8 edit .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#12 edit .. //depot/projects/mips2/src/sys/mips/mips/trap.c#9 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/pmap.h#5 (text+ko) ==== @@ -26,6 +26,81 @@ * $FreeBSD$ */ +/* $NetBSD: pmap.h,v 1.50 2006/02/16 20:17:14 perry Exp $ */ + +/* + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Ralph Campbell. + * + * 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. 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. + * + * @(#)pmap.h 8.1 (Berkeley) 6/10/93 + */ + +/* + * Copyright (c) 1987 Carnegie-Mellon University + * + * This code is derived from software contributed to Berkeley by + * Ralph Campbell. + * + * 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 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. + * + * @(#)pmap.h 8.1 (Berkeley) 6/10/93 + */ + + + #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ @@ -38,12 +113,44 @@ struct pv_entry; +/* + * The user address space is 2Gb (0x0 - 0x80000000). + * User programs are laid out in memory as follows: + * address + * USRTEXT 0x00001000 + * USRDATA USRTEXT + text_size + * USRSTACK 0x7FFFFFFF + * + * The user address space is mapped using a two level structure where + * virtual address bits 30..22 are used to index into a segment table which + * points to a page worth of PTEs (4096 page can hold 1024 PTEs). + * Bits 21..12 are then used to index a PTE which describes a page within + * a segment. + * + * We use wired TLB entry #0 to keep thread's stack + * + */ + +#define MIPS_PMAP_SEGTABSIZE 512 +#define MIPS_PMAP_SEGSIZE 1024 + +struct segtab { + pt_entry_t *seg_tab[MIPS_PMAP_SEGTABSIZE]; +}; + +extern struct segtab *segbase; /* current segtab base */ + typedef struct pmap { struct pmap_statistics pm_stats; int pm_asid; int pm_asidgen; int pm_active; - pt_entry_t *pm_lev1; /* KVA of lev0map */ + union { + /* pointers to pages of PTEs */ + struct segtab *pm_segtab; + /* pointer to directly-mapped table of PTEs */ + pt_entry_t *pm_direct_map; + } pm_private; vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ struct vm_page *pm_ptphint; /* pmap ptp hint */ @@ -73,6 +180,7 @@ #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) +extern struct segtab * segtab_active; extern pmap_t kernel_pmap; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; @@ -91,7 +199,4 @@ #endif /*!LOCORE*/ -#define NUSERLEV2MAPS (NPTEPG/2) -#define NUSERLEV3MAPS (NUSERLEV2MAPS << MIPS_PTSHIFT) - #endif /* !_MACHINE_PMAP_H_ */ ==== //depot/projects/mips2/src/sys/mips/include/vmparam.h#8 (text+ko) ==== @@ -113,6 +113,8 @@ /* virtual sizes (bytes) for various kernel submaps */ #define VM_KMEM_SIZE (16*1024*1024) /* XXX ??? */ - +#define NBSEG 0x400000 /* bytes/segment */ +#define SEGOFSET (NBSEG-1) /* byte offset into segment */ +#define SEGSHIFT 22 /* LOG2(NBSEG) */ #endif /* _MACHINE_VMPARAM_H_ */ ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * Copyright (c) 1994 John S. Dyson @@ -156,7 +156,7 @@ /* * Extract level 1, 2 and 3 page table indices from a va */ -#define PTMASK ((1 << MIPS_PTSHIFT) - 1) +#define PTMASK ((1 << PAGE_SHIFT) - 1) /* * Statically allocated kernel pmap @@ -177,6 +177,11 @@ void pmap_kremove(vm_offset_t); /* + * Active segtab. + */ +struct segtab * segtab_active; + +/* * Data for the ASID allocator */ static int pmap_maxasid; @@ -209,18 +214,20 @@ pmap_pte(pmap_t pmap, vm_offset_t va) { pt_entry_t *pte = NULL; - unsigned long lev1; - if (pmap != kernel_pmap && pmap) { + if (va < MIPS_KSEG0_START) { /* XXX Try to avoid TLB refills */ +#if 0 + unsigned long lev1; lev1 = (unsigned long)pmap->pm_lev1; lev1 = (unsigned long)tlb_pte_find(kptmap, lev1); lev1 = (unsigned long)MIPS_PTE_TO_PA(*(pt_entry_t *)lev1); - pte = tlb_pte_find( (pt_entry_t *)MIPS_PHYS_TO_KSEG0((pt_entry_t *)lev1), va); +#endif + panic("XXXMIPS: %s to implement", __func__); } else - pte = tlb_pte_find(kptmap, va); + pte = tlb_kern_pte_find(kptmap, va); return pte; } @@ -321,7 +328,7 @@ /* * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap->pm_lev1 = kptmap; + kernel_pmap->pm_private.pm_direct_map = kptmap; kernel_pmap->pm_active = ~0; kernel_pmap->pm_asid = 0; kernel_pmap->pm_asidgen = 1; @@ -698,7 +705,7 @@ struct pmap *pmap; { - pmap->pm_lev1 = kptmap; + pmap->pm_private.pm_direct_map = kptmap; pmap->pm_ptphint = NULL; pmap->pm_active = 0; pmap->pm_asid = 0; @@ -717,21 +724,18 @@ pmap_pinit(pmap) register struct pmap *pmap; { -#ifdef notyet vm_page_t lev1pg; - int i; /* * allocate object for the ptes */ if (pmap->pm_pteobj == NULL) - pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, NUSERLEV3MAPS + NUSERLEV2MAPS + 1); + pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, + MIPS_PMAP_SEGTABSIZE * MIPS_PMAP_SEGSIZE + 1); + VM_OBJECT_LOCK(pmap->pm_pteobj); - /* - * allocate the page directory page - */ - VM_OBJECT_LOCK(pmap->pm_pteobj); - lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, + lev1pg = vm_page_grab(pmap->pm_pteobj, + MIPS_PMAP_SEGTABSIZE + MIPS_PMAP_SEGSIZE, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); vm_page_lock_queues(); @@ -740,22 +744,9 @@ vm_page_unlock_queues(); VM_OBJECT_UNLOCK(pmap->pm_pteobj); - pmap->pm_lev1 = (pt_entry_t*) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(lev1pg)); - - /* install self-referential address mapping entry (not PG_ASM) */ - pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) - | PG_V | PG_KRE | PG_KWE; -#else - char *lev1pg; - - /* XXX */ - lev1pg = malloc(2097152, M_TEMP, M_WAITOK); - if (lev1pg == NULL) - panic("no lev1pg\n"); + pmap->pm_private.pm_segtab = + (struct segtab*) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(lev1pg)); - pmap->pm_lev1 = (pt_entry_t*) lev1pg; -#endif - pmap->pm_ptphint = NULL; pmap->pm_active = 0; /* XXXMIPS: put proper asid generation here */ @@ -766,9 +757,6 @@ mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); -#ifdef notyet - bcopy(PTlev1 + K1SEGLEV1I, pmap->pm_lev1 + K1SEGLEV1I, nklev2 * PTESIZE); -#endif } /* @@ -809,29 +797,27 @@ for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { n = TAILQ_NEXT(p, listq); panic("release p from pmap (%p, %p)", p, pmap); -#if 0 /* XXX */ - if (p->pindex >= NUSERLEV3MAPS) { + if (p->pindex >= MIPS_PMAP_SEGTABSIZE + MIPS_PMAP_SEGSIZE) { continue; } -#endif while (1) { - if (/*!pmap_release_free_page(pmap, p) &&*/ + if (/*!pmap_release_free_page(pmap, p) && */ (object->generation != curgeneration)) goto retry; } } for (p = TAILQ_FIRST(&object->memq); p != NULL; p = n) { n = TAILQ_NEXT(p, listq); -#if 0 /* XXX */ - if (p->pindex < NUSERLEV3MAPS) { + if (p->pindex < MIPS_PMAP_SEGTABSIZE + MIPS_PMAP_SEGSIZE) { /* can this happen? maybe panic */ goto retry; } - if (p->pindex >= NUSERLEV3MAPS + NUSERLEV2MAPS) { + + if (p->pindex >= MIPS_PMAP_SEGTABSIZE + MIPS_PMAP_SEGSIZE) { lev1pg = p; continue; } -#endif + while (1) { if (/*!pmap_release_free_page(pmap, p) &&*/ (object->generation != curgeneration)) @@ -1163,6 +1149,7 @@ return; va &= ~PAGE_MASK; + #ifdef PMAP_DIAGNOSTIC if (va > VM_MAX_KERNEL_ADDRESS) panic("pmap_enter: toobig"); @@ -1762,6 +1749,7 @@ atomic_clear_int(&pmap_active->pm_active, PCPU_GET(cpumask)); pmap_active = 0; + segtab_active = 0; } if (pmap->pm_asidgen != PCPU_GET(current_asidgen)) @@ -1770,6 +1758,7 @@ mips_wr_entryhi(pmap->pm_asid); pmap_active = pmap; + segtab_active = pmap->pm_private.pm_segtab; atomic_set_int(&pmap->pm_active, PCPU_GET(cpumask)); critical_exit(); ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#9 (text+ko) ==== @@ -136,7 +136,8 @@ if (va >= KERNBASE) { pt_entry_t *pte; - pte = tlb_pte_find(kernel_pmap->pm_lev1, va); + pte = tlb_kern_pte_find( + kernel_pmap->pm_private.pm_direct_map, va); if (!pte_valid(pte)) { map = kernel_map; From owner-p4-projects@FreeBSD.ORG Fri Oct 13 14:26:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E60E16A417; Fri, 13 Oct 2006 14:26:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43DAE16A415 for ; Fri, 13 Oct 2006 14:26:47 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E166543D91 for ; Fri, 13 Oct 2006 14:26:43 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DEQhvf032968 for ; Fri, 13 Oct 2006 14:26:43 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DEQhsW032965 for perforce@freebsd.org; Fri, 13 Oct 2006 14:26:43 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 13 Oct 2006 14:26:43 GMT Message-Id: <200610131426.k9DEQhsW032965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 14:26:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=107822 Change 107822 by gonzo@gonzo_hq on 2006/10/13 14:25:55 o Keep realstack pointer and pte0, pte1 for this pointer in machine-dependant fields of thread struct for further use. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/proc.h#4 edit .. //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#9 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/proc.h#4 (text+ko) ==== @@ -33,14 +33,18 @@ #ifndef _MACHINE_PROC_H_ #define _MACHINE_PROC_H_ +#include + /* * Machine-dependent part of the proc structure for AMD64. */ struct mdthread { - int md_flags; /* machine-dependent flags */ - void *md_regs; /* registers on current frame */ - __register_t md_saved_sr; /* critical section saved SR */ - int md_spinlock_count; + int md_flags; /* machine-dependent flags */ + void *md_regs; /* registers on current frame */ + __register_t md_saved_sr; /* critical section saved SR */ + vm_offset_t md_realstack; + pt_entry_t md_stack_pte[2]; + int md_spinlock_count; }; struct mdproc { ==== //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#9 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -178,8 +179,31 @@ void cpu_thread_setup(struct thread *td) { + pt_entry_t *pte; + /* + * To use wired TLB we should have even-aligned virtual address + * Since there is no way to specify alignment for td_kstack we + * drop KSTACK_GUARD support and request 3 pages for kstack. + * And use first even-aligned page number. + */ + if(td->td_kstack & (1 << PAGE_SHIFT)) + td->td_md.md_realstack = td->td_kstack + PAGE_SIZE; + else + td->td_md.md_realstack = td->td_kstack; + + /* + * Fill out PTEs to be wired then + */ + pte = tlb_kern_pte_find(kptmap, td->td_md.md_realstack); + td->td_md.md_stack_pte[0] = *pte; + + pte = tlb_kern_pte_find(kptmap, td->td_md.md_realstack + PAGE_SIZE); + td->td_md.md_stack_pte[1] = *pte; + + td->td_pcb = - (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + (struct pcb *)(td->td_md.md_realstack \ + + (KSTACK_PAGES - 1) * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)td->td_pcb - 1; /* From owner-p4-projects@FreeBSD.ORG Fri Oct 13 14:29:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DAF516A416; Fri, 13 Oct 2006 14:29:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68AF316A412 for ; Fri, 13 Oct 2006 14:29:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 533EA43D46 for ; Fri, 13 Oct 2006 14:29:48 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DETmOL033118 for ; Fri, 13 Oct 2006 14:29:48 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DETmux033115 for perforce@freebsd.org; Fri, 13 Oct 2006 14:29:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 13 Oct 2006 14:29:48 GMT Message-Id: <200610131429.k9DETmux033115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 14:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=107823 Change 107823 by gonzo@gonzo_hq on 2006/10/13 14:29:01 o More symbols in genassym.c for assembler routines: - PTE for realstack - realstack address - segments boundaries o Wire realstack pages to prevent exceptions in TLBMiss'es generated by userland pages access. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/genassym.c#3 edit .. //depot/projects/mips2/src/sys/mips/mips/swtch.S#5 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/genassym.c#3 (text+ko) ==== @@ -59,15 +59,14 @@ #include #include #include -#include -#include -#include -#include #include #include #include +ASSYM(MIPS_KSEG0_START, MIPS_KSEG0_START); +ASSYM(MIPS_KSSEG_START, MIPS_KSSEG_START); +ASSYM(MIPS_PG_G, PG_G); ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); @@ -84,6 +83,9 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_MD_REGS, offsetof(struct thread, td_md.md_regs)); +ASSYM(TD_MD_REALSTACK, offsetof(struct thread, td_md.md_realstack)); +ASSYM(TD_MD_PTE0, offsetof(struct thread, td_md.md_stack_pte[0])); +ASSYM(TD_MD_PTE1, offsetof(struct thread, td_md.md_stack_pte[1])); ASSYM(FRAME_SIZ, sizeof(struct frame)); ASSYM(FRAME_ZERO, offsetof(struct frame, f_regs[ZERO])); ==== //depot/projects/mips2/src/sys/mips/mips/swtch.S#5 (text+ko) ==== @@ -45,6 +45,66 @@ nop lw t3, 0(sp) addu sp, 8 + + lw t1, TD_MD_PTE0(a1) # a1 = stack_pte[0] + lw t2, TD_MD_PTE1(a1) # a2 = stack_pte[1] + lw v0, TD_MD_REALSTACK(a1) # va = md_realstack + li s0, MIPS_KSSEG_START + blt v0, s0, resume + nop + + and s0, v0, 0x1000 + beq s0, zero, entry0 + nop + + break + +entry0: + mtc0 v0, MIPS_COP_0_TLB_HI # VPN = va + COP0_SYNC + nop + nop + tlbp # probe VPN + COP0_SYNC + nop + nop + mfc0 s0, MIPS_COP_0_TLB_INDEX + nop + bltz s0, entry0set + sll s0, s0, 13 # PAGE_SHIFT + 1 + la s0, MIPS_KSEG0_START(s0) + mtc0 s0, MIPS_COP_0_TLB_HI + COP0_SYNC + mtc0 zero, MIPS_COP_0_TLB_LO0 + COP0_SYNC + mtc0 zero, MIPS_COP_0_TLB_LO1 + COP0_SYNC + nop + nop + tlbwi + COP0_SYNC + nop + nop + mtc0 v0, MIPS_COP_0_TLB_HI # set VPN again + COP0_SYNC +entry0set: + mtc0 zero, MIPS_COP_0_TLB_INDEX # TLB entry #0 + COP0_SYNC + or t1, MIPS_PG_G + mtc0 t1, MIPS_COP_0_TLB_LO0 # upte[0] | PG_G + COP0_SYNC + or t2, MIPS_PG_G + mtc0 t2, MIPS_COP_0_TLB_LO1 # upte[1] | PG_G + COP0_SYNC + nop + nop + tlbwi # set TLB entry #0 + COP0_SYNC + nop + nop +resume: + + .set at lw t2, pcpup .set noat From owner-p4-projects@FreeBSD.ORG Fri Oct 13 14:44:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C58716A4C2; Fri, 13 Oct 2006 14:44:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 137A816A4B3 for ; Fri, 13 Oct 2006 14:44:21 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2028643D79 for ; Fri, 13 Oct 2006 14:44:08 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DEi7j0035966 for ; Fri, 13 Oct 2006 14:44:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DEi74J035961 for perforce@freebsd.org; Fri, 13 Oct 2006 14:44:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 13 Oct 2006 14:44:07 GMT Message-Id: <200610131444.k9DEi74J035961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 14:44:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=107824 Change 107824 by gonzo@gonzo_hq on 2006/10/13 14:43:46 o Tweak exception handlers to conform new pmap model. Kernel map works fine, userland still in action. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#11 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#11 (text+ko) ==== @@ -23,9 +23,128 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#10 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#11 $ + */ + +/* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ + +/* + * Copyright 2002 Wasabi Systems, Inc. + * All rights reserved. + * + * Written by Simon Burge 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 Jonathan Stone (hereinafter referred to as the author) + * 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 Jonathan R. Stone for + * the NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES 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. + */ + +/* + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Digital Equipment Corporation and Ralph Campbell. + * + * 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. 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. + * + * Copyright (C) 1989 Digital Equipment Corporation. + * Permission to use, copy, modify, and distribute this software and + * its documentation for any purpose and without fee is hereby granted, + * provided that the above copyright notice appears in all copies. + * Digital Equipment Corporation makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/loMem.s, + * v 1.1 89/07/11 17:55:04 nelson Exp SPRITE (DECWRL) + * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAsm.s, + * v 9.2 90/01/29 18:00:39 shirriff Exp SPRITE (DECWRL) + * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s, + * v 1.1 89/07/10 14:27:41 nelson Exp SPRITE (DECWRL) + * + * @(#)locore.s 8.5 (Berkeley) 1/4/94 */ + #include "opt_ddb.h" #include @@ -201,38 +320,31 @@ LEAF(TLBMissVector) .set noat - mfc0 k0, MIPS_COP_0_BAD_VADDR + mfc0 k0, MIPS_COP_0_BAD_VADDR # k0=badaddr + bltz k0, 5f # k0<0 -> 5f (kernel fault) nop - bltz k0, 5f - nop +6: /* Userland */ -6: - /* XXX We should switch stack elsewhere. */ - subu sp, sp, TF_SIZE - lw k1, PC_CURTHREAD(t2) - lw k1, TD_KSTACK(k1) - subu k1, k1, TF_SIZE + lui k1, %hi(segtab_active) + lw k1, %lo(segtab_active)(k1) + srl k0, 20 + andi k0, k0, 0xffc + addu k1, k0, k1 + lw k1, 0(k1) - la k0, 4f - j exception_save_registers - nop + mfc0 k0, MIPS_COP_0_BAD_VADDR # k0=bad address (again) + beq k1, zero, 7f # ==0 -- no page table + srl k0, 10 # k0=VPN (aka va>>10) - move sp, k1 - -4: mfc0 a1, MIPS_COP_0_CAUSE - mfc0 a2, MIPS_COP_0_BAD_VADDR - jal trap - move a0, k1 + break # XXX: Not ready yet - move k1, sp - jal exception_restore_registers - nop - - addu sp, sp, TF_SIZE eret 5: - j kernfault + j KVATLBMiss + nop +7: j GenericException + nop VEND(TLBMissVector) .data @@ -240,7 +352,8 @@ .text -kernfault: +LEAF(KVATLBMiss) + .set noat /* * Shift right logical to get a page index, but leaving * enough bits to index an array of 64 bit values, plus @@ -281,32 +394,17 @@ tlbp - mfc0 k1, MIPS_COP_0_BAD_VADDR - srl k1, PAGE_SHIFT - andi k1, k1, 1 - bne k1, zero, 2f + mfc0 k0, MIPS_COP_0_TLB_INDEX + nop + bltz k0, 2f nop - mfc0 k1, MIPS_COP_0_TLB_LO0 - b 3f - nop + tlbwi + eret 2: - mfc0 k1, MIPS_COP_0_TLB_LO1 - nop -3: - andi k1, 2 - bne k1, zero, 4f - nop - /* - * The PTE that triggered the fault is not valid. We need to do a - * "real" page fault. - * - * XXX Maybe we should just ignore the fact that it's not valid here - * and just let the TLB Invalid Exception (vector 0x80000180) handler - * deal with it. - */ - j 6b - nop + tlbwr + eret + 4: mfc0 k0, MIPS_COP_0_TLB_INDEX @@ -322,6 +420,7 @@ eret .set at +END(KVATLBMiss) LEAF(XTLBMissVector) From owner-p4-projects@FreeBSD.ORG Fri Oct 13 15:09:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD02816A47B; Fri, 13 Oct 2006 15:09:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9186816A417 for ; Fri, 13 Oct 2006 15:09:00 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41F5B43D7B for ; Fri, 13 Oct 2006 15:08:41 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DF8fC3040446 for ; Fri, 13 Oct 2006 15:08:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DF8fJU040443 for perforce@freebsd.org; Fri, 13 Oct 2006 15:08:41 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 13 Oct 2006 15:08:41 GMT Message-Id: <200610131508.k9DF8fJU040443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 107827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 15:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107827 Change 107827 by mjacob@newisp on 2006/10/13 15:08:04 Sync with Mendocino tree. 24XX target mode working on linux- pull common code changes here. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#16 edit .. //depot/projects/newisp/dev/isp/isp_library.c#9 edit .. //depot/projects/newisp/dev/isp/isp_library.h#8 edit .. //depot/projects/newisp/dev/isp/isp_pci.c#13 edit .. //depot/projects/newisp/dev/isp/isp_stds.h#5 edit .. //depot/projects/newisp/dev/isp/isp_target.c#7 edit .. //depot/projects/newisp/dev/isp/isp_target.h#9 edit .. //depot/projects/newisp/dev/isp/isp_tpublic.h#4 edit .. //depot/projects/newisp/dev/isp/ispmbox.h#8 edit .. //depot/projects/newisp/dev/isp/ispvar.h#6 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#16 (text+ko) ==== @@ -256,6 +256,8 @@ isp->isp_rqstoutrp = BIU2400_REQOUTP; isp->isp_respinrp = BIU2400_RSPINP; isp->isp_respoutrp = BIU2400_RSPOUTP; + isp->isp_atioinrp = BIU2400_ATIO_RSPINP; + isp->isp_atiooutrp = BIU2400_ATIO_REQINP; } else if (IS_23XX(isp)) { isp->isp_rqstinrp = BIU_REQINP; isp->isp_rqstoutrp = BIU_REQOUTP; @@ -1141,13 +1143,6 @@ isp_setdfltparm(isp, 1); } - /* - * If we have neither Target nor Initiator role, leave now. - */ - if (isp->isp_role == ISP_ROLE_NONE) { - return; - } - if (IS_FC(isp)) { /* * Do this *before* initializing the firmware. @@ -1509,6 +1504,7 @@ MEMZERO(icbp, sizeof (*icbp)); icbp->icb_version = ICB_VERSION1; + icbp->icb_fwoptions = fcp->isp_fwoptions; /* * Firmware Options are either retrieved from NVRAM or @@ -1520,11 +1516,8 @@ /* * If this is a 2100 < revision 5, we have to turn off FAIRNESS. */ - if ((isp->isp_type == ISP_HA_FC_2100) && isp->isp_revision < 5) { - /* - * XXX: This should be applied to icb- not fwoptions - */ - fcp->isp_fwoptions &= ~ICBOPT_FAIRNESS; + if (IS_2100(isp) && isp->isp_revision < 5) { + icbp->icb_fwoptions &= ~ICBOPT_FAIRNESS; } /* @@ -1533,54 +1526,29 @@ * a LIP- this is a known f/w bug for 2100 f/w less than 1.17.0. */ if (!ISP_FW_NEWER_THAN(isp, 1, 17, 0)) { - /* - * XXX: This should be applied to icb- not fwoptions - */ - /* - * XXX: This should be applied to icb- not fwoptions - */ - fcp->isp_fwoptions |= ICBOPT_FULL_LOGIN; + icbp->icb_fwoptions |= ICBOPT_FULL_LOGIN; } /* * Insist on Port Database Update Async notifications */ - /* - * XXX: This should be applied to icb- not fwoptions - */ - fcp->isp_fwoptions |= ICBOPT_PDBCHANGE_AE; + icbp->icb_fwoptions |= ICBOPT_PDBCHANGE_AE; /* * Make sure that target role reflects into fwoptions. */ if (isp->isp_role & ISP_ROLE_TARGET) { - /* - * XXX: This should be applied to icb- not fwoptions - */ - fcp->isp_fwoptions |= ICBOPT_TGT_ENABLE; + icbp->icb_fwoptions |= ICBOPT_TGT_ENABLE; } else { - /* - * XXX: This should be applied to icb- not fwoptions - */ - fcp->isp_fwoptions &= ~ICBOPT_TGT_ENABLE; + icbp->icb_fwoptions &= ~ICBOPT_TGT_ENABLE; } if (isp->isp_role & ISP_ROLE_INITIATOR) { - /* - * XXX: This should be applied to icb- not fwoptions - */ - fcp->isp_fwoptions &= ~ICBOPT_INI_DISABLE; + icbp->icb_fwoptions &= ~ICBOPT_INI_DISABLE; } else { - /* - * XXX: This should be applied to icb- not fwoptions - */ - fcp->isp_fwoptions |= ICBOPT_INI_DISABLE; + icbp->icb_fwoptions |= ICBOPT_INI_DISABLE; } - /* - * Propagate all of this into the ICB structure. - */ - icbp->icb_fwoptions = fcp->isp_fwoptions; icbp->icb_maxfrmlen = fcp->isp_maxfrmlen; if (icbp->icb_maxfrmlen < ICB_MIN_FRMLEN || icbp->icb_maxfrmlen > ICB_MAX_FRMLEN) { @@ -2823,16 +2791,16 @@ } /* - * Scan loop for devices. + * Scan local loop for devices. */ static int isp_scan_loop(ispsoftc_t *isp) { fcportdb_t *lp, tmp; fcparam *fcp = isp->isp_param; - int i, idx; + int i; isp_pdb_t pdb; - uint16_t dbidx, lim; + uint16_t dbidx, lim = 0; if (fcp->isp_fwstate < FW_READY || fcp->isp_loopstate < LOOP_PDB_RCVD) { @@ -2850,6 +2818,9 @@ * The firmware has (typically) peformed a PLOGI for us. * * If we're a N-port connection, we treat this is a short loop (0..1). + * + * If we're in target mode, we can all possible handles to see who + * might have logged into us. */ switch (fcp->isp_topo) { case TOPO_NL_PORT: @@ -2870,8 +2841,7 @@ /* - * Run through the local loop ports and get - * port database info for each one. + * Run through the list and get the port database info for each one. */ for (dbidx = 0; dbidx < lim; dbidx++) { /* @@ -2947,29 +2917,17 @@ /* * Now search the entire port database - * for the same Port and Node WWN. Start - * from where we currently are at and - * search forward. + * for the same Port and Node WWN. */ - idx = dbidx; for (i = 0; i < MAX_FC_TARG; i++) { - lp = &fcp->portdb[idx]; + lp = &fcp->portdb[i]; if (lp->state == FC_PORTDB_STATE_NIL) { - if (++idx >= MAX_FC_TARG) { - idx = 0; - } continue; } if (lp->node_wwn != tmp.node_wwn) { - if (++idx >= MAX_FC_TARG) { - idx = 0; - } continue; } if (lp->port_wwn != tmp.port_wwn) { - if (++idx >= MAX_FC_TARG) { - idx = 0; - } continue; } @@ -2980,7 +2938,7 @@ if (lp->state != FC_PORTDB_STATE_PROBATIONAL) { isp_prt(isp, ISP_LOGERR, "portdb entry %d not probational (0x%x)", - idx, lp->state); + i, lp->state); isp_dump_portdb(isp); isp_mark_portdb(isp, 1); return (-1); @@ -3017,7 +2975,6 @@ break; } - /* * Did we find and update an old entry? */ @@ -3029,23 +2986,18 @@ * Ah. A new device entry. Find an empty slot * for it and save info for later disposition. */ - idx = dbidx; for (i = 0; i < MAX_FC_TARG; i++) { - if (fcp->portdb[idx].state == FC_PORTDB_STATE_NIL) { + if (fcp->portdb[i].state == FC_PORTDB_STATE_NIL) { break; } - if (++idx >= MAX_FC_TARG) { - idx = 0; - } } if (i == MAX_FC_TARG) { isp_prt(isp, ISP_LOGERR, "could not find slot for new entry"); continue; } + lp = &fcp->portdb[i]; - lp = &fcp->portdb[idx]; - lp->autologin = 1; lp->state = FC_PORTDB_STATE_NEW; lp->portid = 0; @@ -3576,7 +3528,8 @@ } /* - * Try to log into this device. + * Try to see if we are logged into this device, + * and maybe log into it. * * isp_login_device will check for handle and * portid consistency after login. @@ -3651,17 +3604,17 @@ static int isp_login_device(ispsoftc_t *isp, uint32_t portid, isp_pdb_t *p, uint16_t *ohp) { - int lim, r, logval; + int lim, i, r, logval; uint16_t handle; if (IS_24XX(isp)) { - lim = 0xffff; + lim = NPH_MAX_24XX; } else { - lim = MAX_FC_TARG; + lim = NPH_MAX; } handle = isp_nxt_handle(isp, *ohp); - for (r = 0; r < lim; r++) { + for (i = 0; i < lim; i++) { /* * See if we're still logged into something with * this handle and that something agrees with this @@ -3702,7 +3655,7 @@ handle = logval >> 16; break; } else if (logval != MBOX_LOOP_ID_USED) { - r = lim; + i = lim; break; } else { *ohp = handle; @@ -3710,7 +3663,7 @@ } } - if (r == lim) { + if (i == lim) { isp_prt(isp, ISP_LOGERR, "PLOGI 0x%06x failed", portid); return (-1); } @@ -4388,7 +4341,7 @@ * of completions on a request queue at any one time. */ #ifndef MAX_REQUESTQ_COMPLETIONS -#define MAX_REQUESTQ_COMPLETIONS 64 +#define MAX_REQUESTQ_COMPLETIONS 32 #endif void @@ -4399,6 +4352,7 @@ int i, nlooked = 0, ndone = 0; again: + optr = isp->isp_residx; /* * Is this a mailbox related interrupt? * The mailbox semaphore will be nonzero if so. @@ -4432,13 +4386,7 @@ } if ((IS_FC(isp) && mbox != ASYNC_RIO_RESP) || isp->isp_state != ISP_RUNSTATE) { - if (IS_24XX(isp)) { - ISP_WRITE(isp, BIU2400_HCCR, - HCCR_2400_CMD_CLEAR_RISC_INT); - } else { - ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT); - ISP_WRITE(isp, BIU_SEMA, 0); - } + goto out; return; } } @@ -4452,47 +4400,44 @@ /* * Thank you very much! *Burrrp*! */ - WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, - READ_RESPONSE_QUEUE_IN_POINTER(isp)); - - if (IS_24XX(isp)) { - ISP_WRITE(isp, BIU2400_HCCR, - HCCR_2400_CMD_CLEAR_RISC_INT); - ISP_DISABLE_INTS(isp); - } else { - ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT); - ISP_WRITE(isp, BIU_SEMA, 0); - } - return; + ISP_WRITE(isp, isp->isp_respoutrp, + ISP_READ(isp, isp->isp_respinrp)); + ISP_DISABLE_INTS(isp); + goto out; } #ifdef ISP_TARGET_MODE /* * Check for ATIO Queue entries. */ - if ((isp->isp_role & ISP_ROLE_TARGET) && IS_24XX(isp)) { + if (isp->isp_rspbsy == 0 && (isp->isp_role & ISP_ROLE_TARGET) && + IS_24XX(isp)) { iptr = ISP_READ(isp, isp->isp_atioinrp); optr = ISP_READ(isp, isp->isp_atiooutrp); isp->isp_rspbsy = 1; - i = 0; while (optr != iptr) { uint8_t qe[QENTRY_LEN]; - uint16_t oop; isphdr_t *hp; + uint32_t oop; void *addr; oop = optr; - optr = ISP_NXT_QENTRY(optr, RESULT_QUEUE_LEN(isp)); MEMORYBARRIER(isp, SYNC_ATIOQ, oop, QENTRY_LEN); - addr = (isphdr_t *) ISP_QUEUE_ENTRY(isp->isp_atioq, optr); + addr = ISP_QUEUE_ENTRY(isp->isp_atioq, oop); isp_get_hdr(isp, addr, (isphdr_t *)qe); hp = (isphdr_t *)qe; - isp_prt(isp, ISP_LOGALL, "ATIOQ: got 0x%x", hp->rqs_entry_type); - isp_print_bytes(isp, "ATIOQU", QENTRY_LEN, addr); - i++; - } - if (i) { + switch (hp->rqs_entry_type) { + case RQSTYPE_NOTIFY: + case RQSTYPE_ATIO: + (void) isp_target_notify(isp, addr, &oop); + break; + default: + isp_print_qentry(isp, "?ATIOQ entry?", + oop, addr); + break; + } + optr = ISP_NXT_QENTRY(oop, RESULT_QUEUE_LEN(isp)); ISP_WRITE(isp, isp->isp_atiooutrp, optr); } isp->isp_rspbsy = 0; @@ -4513,6 +4458,7 @@ isp_prt(isp, ISP_LOGINFO, "isp_intr: hard optr=%x, soft optr %x", optr, isp->isp_residx); + isp->isp_residx = optr; } } else { optr = isp->isp_residx; @@ -4527,24 +4473,18 @@ if (IS_2100(isp) || (IS_2300(isp) && isp->isp_revision < 2)) { i = 0; do { - iptr = READ_RESPONSE_QUEUE_IN_POINTER(isp); - junk = READ_RESPONSE_QUEUE_IN_POINTER(isp); + iptr = ISP_READ(isp, isp->isp_respinrp); + junk = ISP_READ(isp, isp->isp_respinrp); } while (junk != iptr && ++i < 1000); if (iptr != junk) { - if (IS_24XX(isp)) { - ISP_WRITE(isp, BIU2400_HCCR, - HCCR_2400_CMD_CLEAR_RISC_INT); - } else { - ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT); - } isp_prt(isp, ISP_LOGWARN, "Response Queue Out Pointer Unstable (%x, %x)", iptr, junk); - return; + goto out; } } else { - iptr = READ_RESPONSE_QUEUE_IN_POINTER(isp); + iptr = ISP_READ(isp, isp->isp_respinrp); } isp->isp_resodx = iptr; @@ -4562,7 +4502,7 @@ junk = 0; } else if (IS_23XX(isp)) { USEC_DELAY(100); - iptr = READ_RESPONSE_QUEUE_IN_POINTER(isp); + iptr = ISP_READ(isp, isp->isp_respinrp); junk = ISP_READ(isp, BIU_R2HSTSLO); } else { junk = ISP_READ(isp, BIU_ISR); @@ -4585,11 +4525,11 @@ } isp->isp_resodx = iptr; + if (isp->isp_rspbsy) { - return; + goto out; } isp->isp_rspbsy = 1; - while (optr != iptr) { uint8_t qe[QENTRY_LEN]; ispstatusreq_t *sp = (ispstatusreq_t *) qe; @@ -4701,7 +4641,7 @@ if (sp->req_header.rqs_flags & RQSFLAG_CONTINUATION) { isp_prt(isp, ISP_LOGWARN, "continuation segment"); - WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, optr); + ISP_WRITE(isp, isp->isp_respoutrp, optr); continue; } if (sp->req_header.rqs_flags & RQSFLAG_FULL) { @@ -4728,7 +4668,7 @@ "bad request handle %d (type 0x%x)", sp->req_handle, etype); MEMZERO(hp, QENTRY_LEN); /* PERF */ - WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, optr); + ISP_WRITE(isp, isp->isp_respoutrp, optr); continue; } xs = isp_find_xs(isp, sp->req_handle); @@ -4748,7 +4688,7 @@ sp->req_handle, ts); } MEMZERO(hp, QENTRY_LEN); /* PERF */ - WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, optr); + ISP_WRITE(isp, isp->isp_respoutrp, optr); continue; } isp_destroy_handle(isp, sp->req_handle); @@ -4902,15 +4842,18 @@ * ISP's notion of what we've seen so far. */ if (nlooked) { - WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, optr); + ISP_WRITE(isp, isp->isp_respoutrp, optr); /* * While we're at it, read the requst queue out pointer. */ - isp->isp_reqodx = READ_REQUEST_QUEUE_OUT_POINTER(isp); - if (isp->isp_rscchiwater < ndone) + isp->isp_reqodx = ISP_READ(isp, isp->isp_rqstoutrp); + if (isp->isp_rscchiwater < ndone) { isp->isp_rscchiwater = ndone; + } } +out: + if (IS_24XX(isp)) { ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_CLEAR_RISC_INT); } else { @@ -5002,7 +4945,7 @@ * We don't need to be chatty about this- just unlatch things * and move on. */ - mbox = READ_REQUEST_QUEUE_OUT_POINTER(isp); + mbox = ISP_READ(isp, isp->isp_rqstoutrp); break; case ASYNC_TIMEOUT_RESET: @@ -5274,6 +5217,15 @@ FCPARAM(isp)->isp_loopstate = LOOP_LIP_RCVD; break; + case ASYNC_RJT_SENT: /* same as ASYNC_QFULL_SENT */ + if (IS_24XX(isp)) { + isp_prt(isp, ISP_LOGTDEBUG0, "LS_RJT sent"); + break; + } else if (IS_2200(isp)) { + isp_prt(isp, ISP_LOGTDEBUG0, "QFULL sent"); + break; + } + /* FALLTHROUGH */ default: isp_prt(isp, ISP_LOGWARN, "Unknown Async Code 0x%x", mbox); break; @@ -6292,7 +6244,7 @@ ISPOPMAP(0x03, 0x01), /* 0x40: MBOX_LOOP_PORT_BYPASS */ ISPOPMAP(0x03, 0x01), /* 0x41: MBOX_LOOP_PORT_ENABLE */ ISPOPMAP(0x03, 0x07), /* 0x42: MBOX_GET_RESOURCE_COUNT */ - ISPOPMAP(0x01, 0x01), /* 0x43: MBOX_REQUEST_NON_PARTICIPATING_MODE */ + ISPOPMAP(0x01, 0x01), /* 0x43: MBOX_REQUEST_OFFLINE_MODE */ ISPOPMAP(0x00, 0x00), /* 0x44: */ ISPOPMAP(0x00, 0x00), /* 0x45: */ ISPOPMAP(0x00, 0x00), /* 0x46: */ ==== //depot/projects/newisp/dev/isp/isp_library.c#9 (text) ==== @@ -114,7 +114,7 @@ { volatile uint32_t iptr, optr; - optr = isp->isp_reqodx = READ_REQUEST_QUEUE_OUT_POINTER(isp); + optr = isp->isp_reqodx = ISP_READ(isp, isp->isp_rqstoutrp); iptr = isp->isp_reqidx; *resultp = ISP_QUEUE_ENTRY(isp->isp_rquest, iptr); iptr = ISP_NXT_QENTRY(iptr, RQUEST_QUEUE_LEN(isp)); @@ -208,12 +208,9 @@ return (-1); } } - if ((isp->isp_role & ISP_ROLE_INITIATOR) == 0) { - fcp->isp_loopstate = LOOP_READY; - return (0); - } if (isp_control(isp, ISPCTL_SCAN_LOOP, NULL) != 0) { - isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: scan loop fails"); + isp_prt(isp, ISP_LOGINFO, + "isp_fc_runstate: scan loop fails"); return (LOOP_PDB_RCVD); } if (isp_control(isp, ISPCTL_SCAN_FABRIC, NULL) != 0) { @@ -233,6 +230,37 @@ return (0); } +void +isp_shutdown(ispsoftc_t *isp) +{ + if (IS_FC(isp)) { + if (isp->isp_role != ISP_ROLE_NONE) { + mbreg_t mbs; + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_REQUEST_OFFLINE_MODE; + (void) isp_control(isp, ISPCTL_RUN_MBOXCMD, &mbs); + if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { + return; + } + } + if (IS_24XX(isp)) { + ISP_WRITE(isp, BIU2400_ICR, 0); + ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_PAUSE); + } else { + ISP_WRITE(isp, BIU_ICR, 0); + ISP_WRITE(isp, HCCR, HCCR_CMD_PAUSE); + ISP_WRITE(isp, BIU2100_CSR, BIU2100_FPM0_REGS); + ISP_WRITE(isp, FPM_DIAG_CONFIG, FPM_SOFT_RESET); + ISP_WRITE(isp, BIU2100_CSR, BIU2100_FB_REGS); + ISP_WRITE(isp, FBM_CMD, FBMCMD_FIFO_RESET_ALL); + ISP_WRITE(isp, BIU2100_CSR, BIU2100_RISC_REGS); + } + } else { + ISP_WRITE(isp, BIU_ICR, 0); + ISP_WRITE(isp, HCCR, HCCR_CMD_PAUSE); + } +} + /* * Functions to move stuff to a form that the QLogic RISC engine understands * and functions to move stuff back to a form the processor understands. @@ -1130,6 +1158,71 @@ } } +void +isp_get_els(ispsoftc_t *isp, els_t *src, els_t *dst) +{ + int i; + + isp_get_hdr(isp, &src->els_hdr, &dst->els_hdr); + ISP_IOXGET_32(isp, &src->els_handle, dst->els_handle); + ISP_IOXGET_16(isp, &src->els_status, dst->els_status); + ISP_IOXGET_16(isp, &src->els_nphdl, dst->els_nphdl); + ISP_IOXGET_16(isp, &src->els_xmit_dsd_count, dst->els_xmit_dsd_count); + ISP_IOXGET_8(isp, &src->els_vphdl, dst->els_vphdl); + ISP_IOXGET_8(isp, &src->els_sof, dst->els_sof); + ISP_IOXGET_32(isp, &src->els_rxid, dst->els_rxid); + ISP_IOXGET_16(isp, &src->els_recv_dsd_count, dst->els_recv_dsd_count); + ISP_IOXGET_8(isp, &src->els_opcode, dst->els_opcode); + ISP_IOXGET_8(isp, &src->els_reserved2, dst->els_reserved1); + ISP_IOXGET_8(isp, &src->els_did_lo, dst->els_did_lo); + ISP_IOXGET_8(isp, &src->els_did_mid, dst->els_did_mid); + ISP_IOXGET_8(isp, &src->els_did_hi, dst->els_did_hi); + ISP_IOXGET_8(isp, &src->els_reserved2, dst->els_reserved2); + ISP_IOXGET_16(isp, &src->els_reserved3, dst->els_reserved3); + ISP_IOXGET_16(isp, &src->els_ctl_flags, dst->els_ctl_flags); + ISP_IOXGET_32(isp, &src->els_bytecnt, dst->els_bytecnt); + ISP_IOXGET_32(isp, &src->els_subcode1, dst->els_subcode1); + ISP_IOXGET_32(isp, &src->els_subcode2, dst->els_subcode2); + for (i = 0; i < 20; i++) { + ISP_IOXGET_8(isp, &src->els_reserved4[i], + dst->els_reserved4[i]); + } +} + +void +isp_put_els(ispsoftc_t *isp, els_t *src, els_t *dst) +{ + isp_put_hdr(isp, &src->els_hdr, &dst->els_hdr); + ISP_IOXPUT_32(isp, src->els_handle, &dst->els_handle); + ISP_IOXPUT_16(isp, src->els_status, &dst->els_status); + ISP_IOXPUT_16(isp, src->els_nphdl, &dst->els_nphdl); + ISP_IOXPUT_16(isp, src->els_xmit_dsd_count, &dst->els_xmit_dsd_count); + ISP_IOXPUT_8(isp, src->els_vphdl, &dst->els_vphdl); + ISP_IOXPUT_8(isp, src->els_sof, &dst->els_sof); + ISP_IOXPUT_32(isp, src->els_rxid, &dst->els_rxid); + ISP_IOXPUT_16(isp, src->els_recv_dsd_count, &dst->els_recv_dsd_count); + ISP_IOXPUT_8(isp, src->els_opcode, &dst->els_opcode); + ISP_IOXPUT_8(isp, src->els_reserved2, &dst->els_reserved1); + ISP_IOXPUT_8(isp, src->els_did_lo, &dst->els_did_lo); + ISP_IOXPUT_8(isp, src->els_did_mid, &dst->els_did_mid); + ISP_IOXPUT_8(isp, src->els_did_hi, &dst->els_did_hi); + ISP_IOXPUT_8(isp, src->els_reserved2, &dst->els_reserved2); + ISP_IOXPUT_16(isp, src->els_reserved3, &dst->els_reserved3); + ISP_IOXPUT_16(isp, src->els_ctl_flags, &dst->els_ctl_flags); + ISP_IOXPUT_32(isp, src->els_recv_bytecnt, &dst->els_recv_bytecnt); + ISP_IOXPUT_32(isp, src->els_xmit_bytecnt, &dst->els_xmit_bytecnt); + ISP_IOXPUT_32(isp, src->els_xmit_dsd_length, &dst->els_xmit_dsd_length); + ISP_IOXPUT_16(isp, src->els_xmit_dsd_a1500, &dst->els_xmit_dsd_a1500); + ISP_IOXPUT_16(isp, src->els_xmit_dsd_a3116, &dst->els_xmit_dsd_a3116); + ISP_IOXPUT_16(isp, src->els_xmit_dsd_a4732, &dst->els_xmit_dsd_a4732); + ISP_IOXPUT_16(isp, src->els_xmit_dsd_a6348, &dst->els_xmit_dsd_a6348); + ISP_IOXPUT_32(isp, src->els_recv_dsd_length, &dst->els_recv_dsd_length); + ISP_IOXPUT_16(isp, src->els_recv_dsd_a1500, &dst->els_recv_dsd_a1500); + ISP_IOXPUT_16(isp, src->els_recv_dsd_a3116, &dst->els_recv_dsd_a3116); + ISP_IOXPUT_16(isp, src->els_recv_dsd_a4732, &dst->els_recv_dsd_a4732); + ISP_IOXPUT_16(isp, src->els_recv_dsd_a6348, &dst->els_recv_dsd_a6348); +} + /* * FC Structure Canonicalization */ @@ -1137,43 +1230,52 @@ void isp_get_fc_hdr(ispsoftc_t *isp, fc_hdr_t *src, fc_hdr_t *dst) { - int i, amt; - uint32_t *a, *b; - - a = (uint32_t *) src; - b = (uint32_t *) dst; - amt = (sizeof (fc_hdr_t)) >> 2; - for (i = 0; i < amt; i++) { - ISP_IOZGET_32(isp, a++, *b++); - } + ISP_IOZGET_8(isp, &src->r_ctl, dst->r_ctl); + ISP_IOZGET_8(isp, &src->d_id[0], dst->d_id[0]); + ISP_IOZGET_8(isp, &src->d_id[1], dst->d_id[1]); + ISP_IOZGET_8(isp, &src->d_id[2], dst->d_id[2]); + ISP_IOZGET_8(isp, &src->cs_ctl, dst->cs_ctl); + ISP_IOZGET_8(isp, &src->s_id[0], dst->s_id[0]); + ISP_IOZGET_8(isp, &src->s_id[1], dst->s_id[1]); + ISP_IOZGET_8(isp, &src->s_id[2], dst->s_id[2]); + ISP_IOZGET_8(isp, &src->type, dst->type); + ISP_IOZGET_8(isp, &src->f_ctl, dst->f_ctl); + ISP_IOZGET_8(isp, &src->seq_id, dst->seq_id); + ISP_IOZGET_8(isp, &src->df_ctl, dst->df_ctl); + ISP_IOZGET_16(isp, &src->seq_cnt, dst->seq_cnt); + /* XXX SOMETHING WAS AND STILL CONTINUES WRONG HERE XXX */ +#if 0 + ISP_IOZGET_16(isp, &src->ox_id, dst->ox_id); + ISP_IOZGET_16(isp, &src->rx_id, dst->rx_id); +#else + ISP_IOZGET_32(isp, &src->ox_id, dst->parameter); + dst->ox_id = dst->parameter; + dst->rx_id = dst->parameter >> 16; +#endif + ISP_IOZGET_32(isp, &src->parameter, dst->parameter); } void isp_get_fcp_cmnd_iu(ispsoftc_t *isp, fcp_cmnd_iu_t *src, fcp_cmnd_iu_t *dst) { - int i, amt; - uint32_t *a, *b; + int i; - a = (uint32_t *) src; - b = (uint32_t *) dst; - amt = (sizeof (fcp_cmnd_iu_t)) >> 2; - for (i = 0; i < amt; i++) { - ISP_IOZGET_32(isp, a++, *b++); + for (i = 0; i < 8; i++) { + ISP_IOZGET_8(isp, &src->fcp_cmnd_lun[i], dst->fcp_cmnd_lun[i]); } -} - -void -isp_put_fcp_cmnd_iu(ispsoftc_t *isp, fcp_cmnd_iu_t *src, fcp_cmnd_iu_t *dst) -{ - int i, amt; - uint32_t *a, *b; - - a = (uint32_t *) src; - b = (uint32_t *) dst; - amt = (sizeof (fcp_cmnd_iu_t)) >> 2; - for (i = 0; i < amt; i++) { - ISP_IOZPUT_32(isp, *a++, b++); + ISP_IOZGET_8(isp, &src->fcp_cmnd_crn, dst->fcp_cmnd_crn); + ISP_IOZGET_8(isp, &src->fcp_cmnd_task_attribute, + dst->fcp_cmnd_task_attribute); + ISP_IOZGET_8(isp, &src->fcp_cmnd_task_management, + dst->fcp_cmnd_task_management); + ISP_IOZGET_8(isp, &src->fcp_cmnd_alen_datadir, + dst->fcp_cmnd_alen_datadir); + for (i = 0; i < 16; i++) { + ISP_IOZGET_8(isp, &src->cdb_dl.sf.fcp_cmnd_cdb[i], + dst->cdb_dl.sf.fcp_cmnd_cdb[i]); } + ISP_IOZGET_32(isp, &src->cdb_dl.sf.fcp_cmnd_dl, + dst->cdb_dl.sf.fcp_cmnd_dl); } void @@ -1595,31 +1697,31 @@ if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { for (i = 0; i < ISP_RQDSEG_T2; i++) { ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg[i].ds_base, - &dst->rsp.m0.ct_dataseg[i].ds_base); + src->rsp.m0.u.ct_dataseg[i].ds_base, + &dst->rsp.m0.u.ct_dataseg[i].ds_base); ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg[i].ds_count, - &dst->rsp.m0.ct_dataseg[i].ds_count); + src->rsp.m0.u.ct_dataseg[i].ds_count, + &dst->rsp.m0.u.ct_dataseg[i].ds_count); } } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { for (i = 0; i < ISP_RQDSEG_T3; i++) { ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg64[i].ds_base, - &dst->rsp.m0.ct_dataseg64[i].ds_base); + src->rsp.m0.u.ct_dataseg64[i].ds_base, + &dst->rsp.m0.u.ct_dataseg64[i].ds_base); ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg64[i].ds_basehi, - &dst->rsp.m0.ct_dataseg64[i].ds_basehi); + src->rsp.m0.u.ct_dataseg64[i].ds_basehi, + &dst->rsp.m0.u.ct_dataseg64[i].ds_basehi); ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg64[i].ds_count, - &dst->rsp.m0.ct_dataseg64[i].ds_count); + src->rsp.m0.u.ct_dataseg64[i].ds_count, + &dst->rsp.m0.u.ct_dataseg64[i].ds_count); } } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { - ISP_IOXPUT_16(isp, src->rsp.m0.ct_dslist.ds_type, - &dst->rsp.m0.ct_dslist.ds_type); - ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_segment, - &dst->rsp.m0.ct_dslist.ds_segment); - ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_base, - &dst->rsp.m0.ct_dslist.ds_base); + ISP_IOXPUT_16(isp, src->rsp.m0.u.ct_dslist.ds_type, + &dst->rsp.m0.u.ct_dslist.ds_type); + ISP_IOXPUT_32(isp, src->rsp.m0.u.ct_dslist.ds_segment, + &dst->rsp.m0.u.ct_dslist.ds_segment); + ISP_IOXPUT_32(isp, src->rsp.m0.u.ct_dslist.ds_base, + &dst->rsp.m0.u.ct_dslist.ds_base); } } else if ((src->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { ISP_IOXPUT_16(isp, src->rsp.m1._reserved, @@ -1677,31 +1779,31 @@ if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { for (i = 0; i < ISP_RQDSEG_T2; i++) { ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg[i].ds_base, - &dst->rsp.m0.ct_dataseg[i].ds_base); + src->rsp.m0.u.ct_dataseg[i].ds_base, + &dst->rsp.m0.u.ct_dataseg[i].ds_base); ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg[i].ds_count, - &dst->rsp.m0.ct_dataseg[i].ds_count); + src->rsp.m0.u.ct_dataseg[i].ds_count, + &dst->rsp.m0.u.ct_dataseg[i].ds_count); } } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { for (i = 0; i < ISP_RQDSEG_T3; i++) { ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg64[i].ds_base, - &dst->rsp.m0.ct_dataseg64[i].ds_base); + src->rsp.m0.u.ct_dataseg64[i].ds_base, + &dst->rsp.m0.u.ct_dataseg64[i].ds_base); ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg64[i].ds_basehi, - &dst->rsp.m0.ct_dataseg64[i].ds_basehi); + src->rsp.m0.u.ct_dataseg64[i].ds_basehi, + &dst->rsp.m0.u.ct_dataseg64[i].ds_basehi); ISP_IOXPUT_32(isp, - src->rsp.m0.ct_dataseg64[i].ds_count, - &dst->rsp.m0.ct_dataseg64[i].ds_count); + src->rsp.m0.u.ct_dataseg64[i].ds_count, + &dst->rsp.m0.u.ct_dataseg64[i].ds_count); } } else if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { - ISP_IOXPUT_16(isp, src->rsp.m0.ct_dslist.ds_type, - &dst->rsp.m0.ct_dslist.ds_type); - ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_segment, - &dst->rsp.m0.ct_dslist.ds_segment); - ISP_IOXPUT_32(isp, src->rsp.m0.ct_dslist.ds_base, - &dst->rsp.m0.ct_dslist.ds_base); + ISP_IOXPUT_16(isp, src->rsp.m0.u.ct_dslist.ds_type, + &dst->rsp.m0.u.ct_dslist.ds_type); + ISP_IOXPUT_32(isp, src->rsp.m0.u.ct_dslist.ds_segment, + &dst->rsp.m0.u.ct_dslist.ds_segment); + ISP_IOXPUT_32(isp, src->rsp.m0.u.ct_dslist.ds_base, + &dst->rsp.m0.u.ct_dslist.ds_base); } } else if ((src->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { ISP_IOXPUT_16(isp, src->rsp.m1._reserved, @@ -1763,12 +1865,12 @@ &dst->rsp.m0.ct_xfrlen); ISP_IOXPUT_32(isp, src->rsp.m0.reserved1, &dst->rsp.m0.reserved1); - ISP_IOXPUT_32(isp, src->rsp.m0.ct.ds_base, - &dst->rsp.m0.ct.ds_base); - ISP_IOXPUT_32(isp, src->rsp.m0.ct.ds_basehi, - &dst->rsp.m0.ct.ds_basehi); - ISP_IOXPUT_32(isp, src->rsp.m0.ct.ds_count, - &dst->rsp.m0.ct.ds_count); + ISP_IOXPUT_32(isp, src->rsp.m0.ds.ds_base, + &dst->rsp.m0.ds.ds_base); + ISP_IOXPUT_32(isp, src->rsp.m0.ds.ds_basehi, + &dst->rsp.m0.ds.ds_basehi); + ISP_IOXPUT_32(isp, src->rsp.m0.ds.ds_count, + &dst->rsp.m0.ds.ds_count); } else if ((dst->ct_flags & CT7_FLAG_MMASK) == CT7_FLAG_MODE1) { ISP_IOXPUT_16(isp, src->rsp.m1.ct_resplen, &dst->rsp.m1.ct_resplen); @@ -1822,31 +1924,31 @@ if (dst->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { for (i = 0; i < ISP_RQDSEG_T2; i++) { ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg[i].ds_base, - dst->rsp.m0.ct_dataseg[i].ds_base); + &src->rsp.m0.u.ct_dataseg[i].ds_base, + dst->rsp.m0.u.ct_dataseg[i].ds_base); ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg[i].ds_count, - dst->rsp.m0.ct_dataseg[i].ds_count); + &src->rsp.m0.u.ct_dataseg[i].ds_count, + dst->rsp.m0.u.ct_dataseg[i].ds_count); } } else if (dst->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { for (i = 0; i < ISP_RQDSEG_T3; i++) { ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg64[i].ds_base, - dst->rsp.m0.ct_dataseg64[i].ds_base); + &src->rsp.m0.u.ct_dataseg64[i].ds_base, + dst->rsp.m0.u.ct_dataseg64[i].ds_base); ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg64[i].ds_basehi, - dst->rsp.m0.ct_dataseg64[i].ds_basehi); + &src->rsp.m0.u.ct_dataseg64[i].ds_basehi, + dst->rsp.m0.u.ct_dataseg64[i].ds_basehi); ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg64[i].ds_count, - dst->rsp.m0.ct_dataseg64[i].ds_count); + &src->rsp.m0.u.ct_dataseg64[i].ds_count, + dst->rsp.m0.u.ct_dataseg64[i].ds_count); } } else if (dst->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { - ISP_IOXGET_16(isp, &src->rsp.m0.ct_dslist.ds_type, - dst->rsp.m0.ct_dslist.ds_type); - ISP_IOXGET_32(isp, &src->rsp.m0.ct_dslist.ds_segment, - dst->rsp.m0.ct_dslist.ds_segment); - ISP_IOXGET_32(isp, &src->rsp.m0.ct_dslist.ds_base, - dst->rsp.m0.ct_dslist.ds_base); + ISP_IOXGET_16(isp, &src->rsp.m0.u.ct_dslist.ds_type, + dst->rsp.m0.u.ct_dslist.ds_type); + ISP_IOXGET_32(isp, &src->rsp.m0.u.ct_dslist.ds_segment, + dst->rsp.m0.u.ct_dslist.ds_segment); + ISP_IOXGET_32(isp, &src->rsp.m0.u.ct_dslist.ds_base, + dst->rsp.m0.u.ct_dslist.ds_base); } } else if ((dst->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { ISP_IOXGET_16(isp, &src->rsp.m1._reserved, @@ -1906,31 +2008,31 @@ if (src->ct_header.rqs_entry_type == RQSTYPE_CTIO2) { for (i = 0; i < ISP_RQDSEG_T2; i++) { ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg[i].ds_base, - dst->rsp.m0.ct_dataseg[i].ds_base); + &src->rsp.m0.u.ct_dataseg[i].ds_base, + dst->rsp.m0.u.ct_dataseg[i].ds_base); ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg[i].ds_count, - dst->rsp.m0.ct_dataseg[i].ds_count); + &src->rsp.m0.u.ct_dataseg[i].ds_count, + dst->rsp.m0.u.ct_dataseg[i].ds_count); } } else if (dst->ct_header.rqs_entry_type == RQSTYPE_CTIO3) { for (i = 0; i < ISP_RQDSEG_T3; i++) { ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg64[i].ds_base, - dst->rsp.m0.ct_dataseg64[i].ds_base); + &src->rsp.m0.u.ct_dataseg64[i].ds_base, + dst->rsp.m0.u.ct_dataseg64[i].ds_base); ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg64[i].ds_basehi, - dst->rsp.m0.ct_dataseg64[i].ds_basehi); + &src->rsp.m0.u.ct_dataseg64[i].ds_basehi, + dst->rsp.m0.u.ct_dataseg64[i].ds_basehi); ISP_IOXGET_32(isp, - &src->rsp.m0.ct_dataseg64[i].ds_count, - dst->rsp.m0.ct_dataseg64[i].ds_count); + &src->rsp.m0.u.ct_dataseg64[i].ds_count, + dst->rsp.m0.u.ct_dataseg64[i].ds_count); } } else if (dst->ct_header.rqs_entry_type == RQSTYPE_CTIO4) { - ISP_IOXGET_16(isp, &src->rsp.m0.ct_dslist.ds_type, - dst->rsp.m0.ct_dslist.ds_type); - ISP_IOXGET_32(isp, &src->rsp.m0.ct_dslist.ds_segment, - dst->rsp.m0.ct_dslist.ds_segment); - ISP_IOXGET_32(isp, &src->rsp.m0.ct_dslist.ds_base, - dst->rsp.m0.ct_dslist.ds_base); + ISP_IOXGET_16(isp, &src->rsp.m0.u.ct_dslist.ds_type, + dst->rsp.m0.u.ct_dslist.ds_type); + ISP_IOXGET_32(isp, &src->rsp.m0.u.ct_dslist.ds_segment, + dst->rsp.m0.u.ct_dslist.ds_segment); + ISP_IOXGET_32(isp, &src->rsp.m0.u.ct_dslist.ds_base, + dst->rsp.m0.u.ct_dslist.ds_base); } } else if ((dst->ct_flags & CT2_FLAG_MMASK) == CT2_FLAG_MODE1) { ISP_IOXGET_16(isp, &src->rsp.m1._reserved, @@ -1992,12 +2094,12 @@ dst->rsp.m0.ct_xfrlen); ISP_IOXGET_32(isp, &src->rsp.m0.reserved1, dst->rsp.m0.reserved1); - ISP_IOXGET_32(isp, &src->rsp.m0.ct.ds_base, - dst->rsp.m0.ct.ds_base); - ISP_IOXGET_32(isp, &src->rsp.m0.ct.ds_basehi, - dst->rsp.m0.ct.ds_basehi); - ISP_IOXGET_32(isp, &src->rsp.m0.ct.ds_count, - dst->rsp.m0.ct.ds_count); + ISP_IOXGET_32(isp, &src->rsp.m0.ds.ds_base, + dst->rsp.m0.ds.ds_base); + ISP_IOXGET_32(isp, &src->rsp.m0.ds.ds_basehi, + dst->rsp.m0.ds.ds_basehi); + ISP_IOXGET_32(isp, &src->rsp.m0.ds.ds_count, + dst->rsp.m0.ds.ds_count); } else if ((dst->ct_flags & CT7_FLAG_MMASK) == CT7_FLAG_MODE1) { ISP_IOXGET_16(isp, &src->rsp.m1.ct_resplen, dst->rsp.m1.ct_resplen); @@ -2558,8 +2660,8 @@ ISP_IOXPUT_16(isp, src->abts_rsp_sid_lo, &dst->abts_rsp_sid_lo); ISP_IOXPUT_8(isp, src->abts_rsp_sid_hi, &dst->abts_rsp_sid_hi); ISP_IOXPUT_8(isp, src->abts_rsp_cs_ctl, &dst->abts_rsp_cs_ctl); - ISP_IOXPUT_16(isp, src->abts_rsp_fs_ctl, &dst->abts_rsp_fs_ctl); - ISP_IOXPUT_8(isp, src->abts_rsp_f_ctl, &dst->abts_rsp_f_ctl); + ISP_IOXPUT_16(isp, src->abts_rsp_f_ctl_lo, &dst->abts_rsp_f_ctl_lo); + ISP_IOXPUT_8(isp, src->abts_rsp_f_ctl_hi, &dst->abts_rsp_f_ctl_hi); ISP_IOXPUT_8(isp, src->abts_rsp_type, &dst->abts_rsp_type); ISP_IOXPUT_16(isp, src->abts_rsp_seq_cnt, &dst->abts_rsp_seq_cnt); ISP_IOXPUT_8(isp, src->abts_rsp_df_ctl, &dst->abts_rsp_df_ctl); @@ -2567,12 +2669,46 @@ ISP_IOXPUT_16(isp, src->abts_rsp_rx_id, &dst->abts_rsp_rx_id); ISP_IOXPUT_16(isp, src->abts_rsp_ox_id, &dst->abts_rsp_ox_id); ISP_IOXPUT_32(isp, src->abts_rsp_param, &dst->abts_rsp_param); - for (i = 0; i < 12; i++) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 13 18:53:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2635316A47B; Fri, 13 Oct 2006 18:53:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB73516A40F for ; Fri, 13 Oct 2006 18:53:29 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A47243D53 for ; Fri, 13 Oct 2006 18:53:29 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DIrTxU086910 for ; Fri, 13 Oct 2006 18:53:29 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DIrTgg086907 for perforce@freebsd.org; Fri, 13 Oct 2006 18:53:29 GMT (envelope-from piso@freebsd.org) Date: Fri, 13 Oct 2006 18:53:29 GMT Message-Id: <200610131853.k9DIrTgg086907@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 107837 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 18:53:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=107837 Change 107837 by piso@piso_newluxor on 2006/10/13 18:52:28 Fixes compilation of ia64 and pc98. Affected files ... .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#8 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#6 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#8 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#6 (text+ko) ==== @@ -704,7 +704,7 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, clkintr, NULL, NULL, + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) ==== //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#6 (text+ko) ==== @@ -1745,7 +1745,7 @@ if (ret) { ret = bus_setup_intr(dev, com->irqres, INTR_TYPE_TTY, - NULL, siointr, com, &com->cookie); + NULL, (driver_intr_t *)siointr, com, &com->cookie); if (ret == 0) device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n"); } From owner-p4-projects@FreeBSD.ORG Fri Oct 13 19:55:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 249B616A417; Fri, 13 Oct 2006 19:55:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD1F216A407 for ; Fri, 13 Oct 2006 19:55:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A1C243D68 for ; Fri, 13 Oct 2006 19:55:49 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DJtn7I000809 for ; Fri, 13 Oct 2006 19:55:49 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DJtm9j000806 for perforce@freebsd.org; Fri, 13 Oct 2006 19:55:48 GMT (envelope-from piso@freebsd.org) Date: Fri, 13 Oct 2006 19:55:48 GMT Message-Id: <200610131955.k9DJtm9j000806@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 107839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 19:55:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=107839 Change 107839 by piso@piso_newluxor on 2006/10/13 19:55:36 Fixes compilation on sparc64. Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#10 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#10 (text+ko) ==== @@ -68,7 +68,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -241,7 +243,7 @@ for (; iiv_event != NULL) return (iv->iv_event); } From owner-p4-projects@FreeBSD.ORG Fri Oct 13 19:59:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 685D916A4DA; Fri, 13 Oct 2006 19:59:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4301516A4D2; Fri, 13 Oct 2006 19:59:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0766D43D60; Fri, 13 Oct 2006 19:59:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k9DJwuvR017283; Fri, 13 Oct 2006 15:59:08 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Paolo Pisati Date: Fri, 13 Oct 2006 15:58:07 -0400 User-Agent: KMail/1.9.1 References: <200610131200.k9DC0ajd097822@repoman.freebsd.org> In-Reply-To: <200610131200.k9DC0ajd097822@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200610131558.07530.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 13 Oct 2006 15:59:08 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2030/Fri Oct 13 09:34:34 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 107815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 19:59:13 -0000 On Friday 13 October 2006 08:00, Paolo Pisati wrote: > http://perforce.freebsd.org/chv.cgi?CH=107815 > > Change 107815 by piso@piso_newluxor on 2006/10/13 12:00:35 > > Fixes compilation of GENERIC on amd64. It would be better to fix the functions to return an appropriate value. > Affected files ... > > .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#6 edit > > Differences ... > > ==== //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#6 (text+ko) ==== > > @@ -758,7 +758,7 @@ > * timecounter to user a simpler algorithm. > */ > if (!using_lapic_timer) { > - intr_add_handler("clk", 0, clkintr, NULL, NULL, > + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, > INTR_TYPE_CLK, NULL); > i8254_intsrc = intr_lookup_source(0); > if (i8254_intsrc != NULL) > @@ -792,7 +792,7 @@ > > /* Enable periodic interrupts from the RTC. */ > rtc_statusb |= RTCSB_PINTR; > - intr_add_handler("rtc", 8, rtcintr, NULL, NULL, > + intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, > INTR_TYPE_CLK, NULL); > > writertc(RTC_STATUSB, rtc_statusb); > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Oct 13 22:19:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B694216A5F8; Fri, 13 Oct 2006 22:19:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D1CC16A47B for ; Fri, 13 Oct 2006 22:19:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B92643D5F for ; Fri, 13 Oct 2006 22:19:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9DMJuoV062020 for ; Fri, 13 Oct 2006 22:19:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9DMJtCW062017 for perforce@freebsd.org; Fri, 13 Oct 2006 22:19:55 GMT (envelope-from jb@freebsd.org) Date: Fri, 13 Oct 2006 22:19:55 GMT Message-Id: <200610132219.k9DMJtCW062017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2006 22:19:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107846 Change 107846 by jb@jb_freebsd8 on 2006/10/13 22:19:19 IFC. Drop my changes to hvcons. I'll do those in a separate branch. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#27 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#6 integrate .. //depot/projects/dtrace/src/bin/cp/cp.c#7 integrate .. //depot/projects/dtrace/src/bin/ls/ls.1#5 integrate .. //depot/projects/dtrace/src/gnu/lib/libgcc/Makefile#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.1#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/grep/grep.1#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/basename.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/dirname.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/msgsnd.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/sparc64/fpu/fpu_emu.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/getenv.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/string/ffs.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/intro.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/read.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/stat.2#4 integrate .. //depot/projects/dtrace/src/lib/libpam/modules/pam_unix/pam_unix.8#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/alpha/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.8#5 integrate .. //depot/projects/dtrace/src/sbin/dump/main.c#5 integrate .. //depot/projects/dtrace/src/sbin/restore/restore.8#4 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#9 integrate .. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#10 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/ndis.4#4 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/boot/common/help.common#5 integrate .. //depot/projects/dtrace/src/sys/boot/common/loader.8#6 integrate .. //depot/projects/dtrace/src/sys/boot/forth/support.4th#4 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#21 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/fpemu.c#3 delete .. //depot/projects/dtrace/src/sys/sun4v/sun4v/genassym.c#5 delete .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/dtrace/src/sys/sys/rwlock.h#5 integrate .. //depot/projects/dtrace/src/sys/vm/vm_contig.c#6 integrate .. //depot/projects/dtrace/src/tools/tools/tinybsd/tinybsd#4 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.holiday#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/systat.1#6 integrate .. //depot/projects/dtrace/src/usr.bin/tput/tput.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/syslogd/syslog.conf.5#6 integrate .. //depot/projects/dtrace/src/usr.sbin/wicontrol/wicontrol.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/wicontrol/wicontrol.c#4 integrate .. //depot/projects/dtrace/www/en/about.sgml#6 integrate .. //depot/projects/dtrace/www/en/applications.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/Makefile#5 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2506,12 +2506,29 @@ information on configuring the bridge as a firewall. If you need to allow non-IP packets (such as ARP) to flow - through the bridge, there is a firewall option that - must be set. This option is - IPFIREWALL_DEFAULT_TO_ACCEPT. Note that this - changes the default rule for the firewall to accept any packet. - Make sure you know how this changes the meaning of your ruleset - before you set it. + through the bridge, there are three options available. + The first is to add the following option to the kernel and + rebuild: + + option IPFIREWALL_DEFAULT_TO_ACCEPT + + The second is to set the firewall type to accept in the + rc.conf file: + + firewall_type="open" + + Note that these options will make the firewall seem completely + transparent; any packet or connection will be permitted by default. + This may require significant changes to the firewall ruleset. + + The third option is to apply the following &man.ipfw.8; + rule: + + &prompt.root; ipfw add allow mac-type arp layer2 + + Or add it to the current firewall ruleset. This rule effectively + allows &man.arp.8; packets through, so it must be be applied near the + beginning of the ruleset for early evaluation. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ FreeBSD &rel2.current;-RELEASE and FreeBSD &rel.current;-RELEASE. This manual is a work in progress and is the work - of many individuals. Many sections do not yet exist and some of those - that do exist need to be updated. If you are interested in helping + of many individuals. As such, some sections may become dated and + require updating. If you are interested in helping out with this project, send email to the &a.doc;. The latest version of this document is always available from the FreeBSD web site ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -822,6 +822,32 @@ + Locking + + Some applications (e.g. mutt) + require file locking to operate correctly. In the case of + NFS, rpc.lockd + can be used for file locking. To enable it, add the following + to the /etc/rc.conf file on both client + and server (it is assumed that the NFS + client and server are configured already): + + rpc_lockd_enable="YES" +rpc_statd_enable="YES" + + Start the application by using: + + &prompt.root; /etc/rc.d/nfslocking start + + If real locking between the NFS clients + and NFS server is not required, it is + possible to let the NFSclient do locking + locally by passing to &man.mount.nfs.8;. + Refer to the &man.mount.nfs.8; manual page for further details. + + + + Practical Uses NFS has many practical uses. Some of @@ -4489,15 +4515,16 @@ backend is used, the /usr/local/private/smbpasswd file must be created to allow Samba to - authenticate clients. If you would like to give all of + authenticate clients. If you would like to give your &unix; user accounts access from &windows; clients, use the following command: - &prompt.root; grep -v "^#" /etc/passwd | make_smbpasswd > /usr/local/private/smbpasswd -&prompt.root; chmod 600 /usr/local/private/smbpasswd + &prompt.root; smbpasswd -a username - Please see the Samba - documentation for additional information about configuration + Please see the + Official Samba HOWTO + for additional information about configuration options. With the basics outlined here, you should have everything you need to start running Samba. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3422,18 +3422,20 @@ configured using &man.ifconfig.8;. On the gateway machine on network #1 you would run the - following two commands to configure the tunnel. + following commands to configure the tunnel. - ifconfig gif0 A.B.C.D W.X.Y.Z -ifconfig gif0 inet 192.168.1.1 192.168.2.1 netmask 0xffffffff - - + &prompt.root; ifconfig gif0 create +&prompt.root; ifconfig tunnel gif0 A.B.C.D W.X.Y.Z +&prompt.root; ifconfig gif0 inet 192.168.1.1 192.168.2.1 netmask 0xffffffff + + On the other gateway machine you run the same commands, but with the order of the IP addresses reversed. - - ifconfig gif0 W.X.Y.Z A.B.C.D -ifconfig gif0 inet 192.168.2.1 192.168.1.1 netmask 0xffffffff - + + &prompt.root; ifconfig gif0 create +&prompt.root; ifconfig tunnel gif0 W.X.Y.Z A.B.C.D +&prompt.root; ifconfig gif0 inet 192.168.2.1 192.168.1.1 netmask 0xffffffff + You can then run: @@ -3443,11 +3445,11 @@ gateway, you would see this: &prompt.root; ifconfig gif0 -gif0: flags=8011<UP,POINTTOPOINT,MULTICAST> mtu 1280 -inet 192.168.1.1 --> 192.168.2.1 netmask 0xffffffff -physical address inet A.B.C.D --> W.X.Y.Z +gif0: flags=8051<UP,POINTOPOINT,RUNNING,MULTICAST> mtu 1280 + tunnel inet A.B.C.D --> W.X.Y.Z + inet 192.168.1.1 --> 192.168.2.1 netmask 0xffffffff - + As you can see, a tunnel has been created between the physical addresses A.B.C.D and W.X.Y.Z, and the traffic allowed @@ -3565,7 +3567,8 @@ Edit /etc/rc.conf on gateway host #1 and add the following lines (replacing IP addresses as necessary). - gifconfig_gif0="A.B.C.D W.X.Y.Z" + gif_interfaces="gif0" +gifconfig_gif0="A.B.C.D W.X.Y.Z" ifconfig_gif0="inet 192.168.1.1 192.168.2.1 netmask 0xffffffff" static_routes="vpn" route_vpn="192.168.2.0 192.168.2.1 netmask 0xffffff00" ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ The exception to this rule is when the relevant directory does not - exist. In such case, using author's id as + exist or the distfile does not exist in the directory. In such case, using author's id as MASTER_SITE_SUBDIR is allowed.
PR number:
Category: (optional)
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -231,7 +231,7 @@ FreeBSD related employment mailing list"> freebsd-jobs"> - + FreeBSD KDE/Qt and KDE applications mailing list"> freebsd-kde"> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml#3 (text+ko) ==== @@ -27,44 +27,43 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml,v 1.2 2006/01/31 01:31:01 vanilla Exp $ + $FreeBSD: doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml,v 1.3 2006/10/13 16:10:00 chinsan Exp $ Original revision: 1.22 --> - The Website + «Øºc Website - Preparation + ¨Æ«e·Ç³Æ - Get 200MB free disk space. You will need the disk space for the - SGML tools, a subset of the CVS tree, temporary build space and the - installed web pages. If you already have installed the SGML tools and - the CVS tree, you need only ~100MB free disk space. + ½Ð¥ý·Ç³Æ¬ù 200MB ªÅ¶¡¡A³o¨Ç¬O­n¥Î¨Ó©ñ SGML ¤u¨ãµ{¦¡¡BCVS tree¡B + Á{®É½sĶ¥ÎªºªÅ¶¡¡A¥H¤Î½sĶ¦nªººô­¶¦s©ñªÅ¶¡¡C­Y¨Æ¥ý¤w¦³¸Ë SGML ¤u¨ãµ{¦¡¡B + CVS tree ªº¸Ü¡A¨º»ò¥u»Ý³»¦h¬ù 100MB ªÅ¶¡§Y¥i¡C - Make sure your documentation ports are up to date! When in - doubt, remove the old ports using &man.pkg.delete.1; command before - installing the port. For example, we currently depend on - jade-1.2 and if you have installed jade-1.1, please do: + ½Ð½T»{¤@¤U§Aªº¬ÛÃö¤å¥ó»s§@©Ò·|¥Î¨ìªº ports ³£¬O³Ì·sª©¡I + ­Y¤£²M·¡©Ò¸Ëªºª©¥»¬°¦ó¡A¨º»ò´N¥ý¥H &man.pkg.delete.1; «ü¥O¨Ó²¾°£Âª©¡A + ±µµÛ¤~¥h¸Ë port¡C Á|¨Ò¨Ó»¡¡A­Y¤w¸Ëªº¬O jade-1.1¡A + ¦ý¬O§Ú­Ì¥Ø«e»Ý­nªº«o¬O jade-1.2¡A¨º»ò¥ý¥Î¤U¦C¤è¦¡¨Ó²¾°£Âª©¡G &prompt.root; pkg_delete jade-1.1 - Set up a CVS repository. You need the directories www, doc and - ports in the CVS tree (plus the CVSROOT of course). Please read the - CVSup introduction - on how to mirror a CVS tree or parts of a CVS tree. + ±µµÛ¡A´N¬O³]©w CVS repository¡C»Ý­n¦Ü¤Ö www, doc, ports ³o¤T¼Ë + CVS tree(·íµMÁÙ­n¥[¤W CVSROOT)¡C ½Ð°Ñ¾\ + CVSup ²¤¶ + ¥HÁA¸Ñ¦p¦ó¨Ó mirror a CVS tree ©Î³¡¤À CVS tree¡C - The essential cvsup collections are: www, - doc-all, cvs-base, and - ports-base. + ³Ì§C»Ý¨Dªº cvsup collections ¬°¡Gwww, + doc-all, cvs-base ¥H¤Î + ports-base¡C - These collections require ~105MB free disk space. + ­èÁ¿ªº³o¨Ç»Ý­n¬ù 105MB ªÅ¶¡¡C - A full CVS tree - including src, - doc, www, and - ports - is currently 940MB. + ¦Ó§¹¾ãªº CVS tree - ¥]¬A src, + doc, www ¥H¤Î + ports - ¥Ø«e¬ù¬° 940MB¡C @@ -72,23 +71,21 @@ - Create and change directory into a build directory with at least 60MB of free - space. + ¥ý«Ø¥ß­n½sĶªº¥Ø¿ý(¦Ü¤Ö­n¦³ 60MB ªÅ¶¡)¡A¨Ã¤Á´«¨ì¸Ó¥Ø¿ý¡C &prompt.root; mkdir /var/tmp/webbuild &prompt.root; cd /var/tmp/webbuild - Checkout the SGML files from the CVS tree. + ±q CVS tree ¤º checkout ¬ÛÃöªº SGML ÀÉ¡C &prompt.root; cvs -R co www doc - Change into the www/en directory, and run - the &man.make.1; all target, to create - the web pages. + ¤Á¨ì www/en ¥Ø¿ý¡AµM«á¥´ + &man.make.1; all ¨Ó²£¥Íºô­¶¡C &prompt.root; cd en &prompt.root; make all @@ -97,30 +94,28 @@ - Install the web pages into your web server + ¦b§Aªººô­¶¦øªA¾¹¤W¦w¸Ëºô­¶ - If you have moved out of the en - directory, change back to it. + ¦pªG§A¤w¸gÂ÷¶} en + ³o­Ó¥Ø¿ý¡A½Ð¤Á´«¦^³o­Ó¥Ø¿ý¤¤¡C &prompt.root; cd path/www/en - Run the &man.make.1; install target, - setting the DESTDIR variable to the name of the - directory you want to install the files to. + °õ¦æ &man.make.1; install ¡A + ¨Ã±N DESTDIR ³]©w¬°§A·Q¦w¸ËÀɮתº¥Ø¿ý¦WºÙ¡C &prompt.root; make DESTDIR=/usr/local/www install - If you have previously installed the web pages into the same - directory the install process will not have deleted any old or - outdated pages. For example, if you build and install a new copy - of the site every day, this command will find and delete all - files that have not been updated in three days. + ¦pªG§A¤§«e¤w¸g¦b¬Û¦Pªº¥Ø¿ý¤¤¦w¸Ë¤F³o¨Çºô­¶¡A + ¦w¸Ë¹Lµ{¨Ã¤£·|§R°£¥ô¦ó¬J¦³©Î¹L´Áªººô­¶¡C + Á|¨Ò¨Ó»¡¡A¦pªG§A¨C¤é«Øºc©M¦w¸Ë·sªººô­¶°Æ¥»¡A + ³o­Ó«ü¥O±N·|·j´M¨Ã§R°£¦b¤T¤Ñ¤º¨S¦³§ó·sªºÀɮסC &prompt.root; find /usr/local/www -ctime 3 -print0 | xargs -0 rm @@ -128,14 +123,14 @@ - Environment variables + Àô¹ÒÅÜ¼Æ CVSROOT - Location of the CVS tree. Essential. + ³]©w CVS tree ªº¦ì¸m¡A¦¹¬°¥²³Æ±ø¥ó¡C &prompt.root; CVSROOT=/home/ncvs; export CVSROOT @@ -145,16 +140,15 @@ ENGLISH_ONLY - If set and not empty, the makefiles will build and - install only the English documents. All translations will be - ignored. E.g.: + ¦pªG³]©w³o­ÓÀô¹ÒÅܼơA¦Ó¥B­È¤£¬°ªÅ¥Õ¡A + makefiles ±N¥u·|«Øºc©M¦w¸Ë­^¤å¤å¥ó¡C + ©Ò¥H±N·|²¤¹L¨ä¥Lªº¦U°ê½Ķ¡C¨Ò¦p¡G &prompt.root; make ENGLISH_ONLY=YES all install - If you want to unset the variable - ENGLISH_ONLY and build all pages, including - translations, set the variable ENGLISH_ONLY - to an empty value: + ¦pªG§A·Q­n¨ú®øÅÜ¼Æ ENGLISH_ONLY + ¥H¤Î«Øºc©Ò¦³ªº­¶­±¨Ã¥]¬A½Ķ¡A¥u­n±NÅÜ¼Æ ENGLISH_ONLY + ªº­È³]©w¦¨ªÅ¥Õ§Y¥i¡C &prompt.root; make ENGLISH_ONLY="" all install clean @@ -164,10 +158,10 @@ WEB_ONLY - If set and not empty, the makefiles will build and install - only the HTML pages from the www directory. All documents from - the doc directory (Handbook, FAQ, Tutorials) will be ignored. - E.g.: + ¦pªG¦³³]©w³o­ÓÅܼƪº¸Ü¡A + makefiles ±N¥u·|±q www ¥Ø¿ý«Øºc¤Î¦w¸Ë HTML ­¶­±¡C + ©Ò¦³±q doc ¥Ø¿ý¤Uªº¤å¥ó¥þ³¡³£·|³Q©¿²¤ (Handbook, FAQ, Tutorials)¡C + ¨Ò¦p¡G &prompt.root; make WEB_ONLY=YES all install @@ -177,22 +171,22 @@ NOPORTSCVS - If set, the makefiles will not checkout files from the ports - cvs repository. Instead, it will copy the files from - /usr/ports (or where the variable - PORTSBASE points to). + ¦pªG³]¤F³o­ÓÅܼơAmakefiles ´N¤£·|±q ports cvs repository + ¨ú¥XÀɮסC ¨ú¦Ó¥N¤§·|±q + /usr/ports (©Î¬O PORTSBASE + ©Ò³]©wªº­È) ¤º½Æ»sÀɮסC - CVSROOT is an environment variable. You must set it - on the command line or in your dot files (e.g., ~/.profile). + CVSROOT ¬OÀô¹ÒÅܼơC + §A¥²¶·ª½±µ¨Ï¥Î«ü¥O©Î¬O¦b dot files (¦p¡G ~/.profile) ¤¤ + ³]©w³o­ÓÀô¹ÒÅܼơC - WEB_ONLY, ENGLISH_ONLY and - NOPORTSCVS are makefile variables. You can set the - variables in /etc/make.conf, - Makefile.inc, as environment variables on the - command line, or in your dot files. + WEB_ONLY¡BENGLISH_ONLY ¤Î + NOPORTSCVS ³£¬O makefile ÅܼơC + §A¥i¥H¦b /etc/make.conf¡BMakefile.inc + ¤¤³]©w³o¨ÇÅܼơA§@ªk´N¹³¬O¥Î©R¥O¦C©Î¨Ï¥Î dot files ¨Ó³]©wÀô¹ÒÅܼƤ@¯ë¡C ==== //depot/projects/dtrace/ports/Mk/bsd.python.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.84 2006/10/09 14:27:26 perky Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.85 2006/10/13 07:16:44 perky Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -159,8 +159,8 @@ # specific version of zope. # -_PYTHON_PORTBRANCH= 2.5 -_PYTHON_ALLBRANCHES= 2.5 2.4 2.3 2.2 2.1 # preferred first +_PYTHON_PORTBRANCH= 2.4 +_PYTHON_ALLBRANCHES= 2.4 2.5 2.3 2.2 2.1 # preferred first _ZOPE_PORTBRANCH= 2.7 _ZOPE_ALLBRANCHES= 2.7 2.8 2.9 3.2 @@ -358,8 +358,8 @@ @${ECHO} " python2.1" @${ECHO} " python2.2" @${ECHO} " python2.3" - @${ECHO} " python2.4" - @${ECHO} " python2.5 (default)" + @${ECHO} " python2.4 (default)" + @${ECHO} " python2.5" @${FALSE} .endif ==== //depot/projects/dtrace/src/bin/cp/cp.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.56 2006/10/07 22:14:43 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); /* * Cp copies source files to target files. @@ -155,12 +155,9 @@ usage(); fts_options = FTS_NOCHDIR | FTS_PHYSICAL; - if (rflag) { - if (Rflag) - errx(1, - "the -R and -r options may not be specified together."); - } - if (rflag && !Hflag && !Pflag) + if (Rflag && rflag) + errx(1, "the -R and -r options may not be specified together"); + if (rflag) Rflag = 1; if (Rflag) { if (Hflag) @@ -230,7 +227,7 @@ else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag)) + if (S_ISDIR(tmp_stat.st_mode) && Rflag) type = DIR_TO_DNE; else type = FILE_TO_FILE; ==== //depot/projects/dtrace/src/bin/ls/ls.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ .\" -.Dd March 24, 2006 +.Dd October 12, 2006 .Dt LS 1 .Os .Sh NAME @@ -68,7 +68,10 @@ The following options are available: .Bl -tag -width indent .It Fl A -List all entries except for +Include directory entries whose names begin with a +dot +.Pq Sq Pa \&. +except for .Pa \&. and .Pa .. . @@ -159,7 +162,7 @@ .It Fl a Include directory entries whose names begin with a dot -.Pq Pa \&. . +.Pq Sq Pa \&. . .It Fl b As .Fl B , @@ -364,6 +367,8 @@ follows: .Pp .Bl -tag -width 4n -offset indent -compact +.It Sy \- +Regular file. .It Sy b Block special file. .It Sy c @@ -372,12 +377,12 @@ Directory. .It Sy l Symbolic link. -.It Sy s -Socket link. .It Sy p .Tn FIFO . -.It Sy \- -Regular file. +.It Sy s +Socket. +.It Sy w +Whiteout. .El .Pp The next three fields ==== //depot/projects/dtrace/src/gnu/lib/libgcc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.55 2006/03/18 21:37:03 ru Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.56 2006/10/12 16:43:15 cognet Exp $ .include .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" @@ -98,7 +98,7 @@ # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline LIB1ASMSRC = lib1funcs.asm -LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func +LIB1ASMFUNCS = _dvmd_tls _bb_init_func OBJS+= dp-bit.o fp-bit.o # We want fine grained libraries, so use the new code to build the # floating point emulation libraries. ==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.1#4 (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/gdb/kgdb/kgdb.1,v 1.8 2005/07/28 15:59:52 keramida Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $ .Dd March 2, 2005 .Os .Dt KGDB 1 @@ -34,6 +34,7 @@ .Op Fl a | Fl f | Fl fullname .Op Fl q | Fl quiet .Op Fl v +.Op Fl w .Op Fl d Ar crashdir .Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device .Op Ar kernel Op Ar core @@ -67,6 +68,13 @@ form is supported for compatibility as well. .It Fl v Increase verbosity. +.It Fl w +Opens kmem-based targets in read-write mode. +(This is identical to what +.Fl -wcore +used to do in previous +gdb versions for +.Fx . ) .It Fl d Ar crashdir Use .Ar crashdir ==== //depot/projects/dtrace/src/gnu/usr.bin/grep/grep.1#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" grep man page -.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.29 2006/10/10 01:57:25 trhodes Exp $ +.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.30 2006/10/11 09:52:32 trhodes Exp $ .if !\n(.g \{\ . if !\w|\*(lq| \{\ . ds lq `` @@ -202,6 +202,12 @@ as a list of fixed strings, separated by newlines, any of which is to be matched. .TP +.BR \-P ", " \-\^\-perl-regexp +Interpret +.I PATTERN +as a Perl regular expression. +This option is not supported in FreeBSD. +.TP .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE Obtain patterns from .IR FILE , ==== //depot/projects/dtrace/src/lib/libc/gen/basename.3#4 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt BASENAME 3 .Os .Sh NAME @@ -58,6 +58,13 @@ is a null pointer or the empty string, a pointer to the string .Qq \&. is returned. +.Sh IMPLEMENTATION NOTES +The +.Fn basename +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. .Sh RETURN VALUES On successful completion, .Fn basename @@ -77,12 +84,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn basename -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/dtrace/src/lib/libc/gen/dirname.3#4 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt DIRNAME 3 .Os .Sh NAME @@ -58,6 +58,20 @@ returns a pointer to the string .Qq \&. , signifying the current directory. +.Sh IMPLEMENTATION NOTES +The +.Fn dirname +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. +.Pp +Other vendor implementations of +.Fn dirname +may modify the contents of the string passed to +.Fn dirname ; +this should be taken into account when writing code which calls this function +if portability is desired. .Sh RETURN VALUES On successful completion, .Fn dirname @@ -77,19 +91,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn dirname -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls (each function has its own separate storage). -.Pp -Other vendor implementations of -.Fn dirname -may modify the contents of the string passed to -.Fn dirname ; -this should be taken into account when writing code which calls this function -if portability is desired. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/dtrace/src/lib/libc/gen/msgsnd.3#4 (text+ko) ==== @@ -29,9 +29,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/lib/libc/gen/msgsnd.3,v 1.20 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.21 2006/10/12 11:42:41 ru Exp $ .\" -.Dd November 24, 1997 +.Dd October 12, 2006 .Dt MSGSND 3 .Os .Sh NAME @@ -65,8 +65,13 @@ is an integer greater than 0 that can be used for selecting messages (see .Xr msgrcv 3 ) , .Va mtext -is an array of bytes, with a size up to that of the system limit -.Pf ( Dv MSGMAX ) . +is an array of +.Fa msgsz +bytes. +The argument +.Fa msgsz +can range from 0 to a system-imposed maximum, +.Dv MSGMAX . .Pp If the number of bytes already on the message queue plus .Fa msgsz @@ -144,7 +149,7 @@ The .Fa msgsz argument -is less than 0, or greater than +is greater than .Va msg_qbytes . .Pp The ==== //depot/projects/dtrace/src/lib/libc/sparc64/fpu/fpu_emu.h#4 (text+ko) ==== @@ -41,7 +41,7 @@ * * @(#)fpu_emu.h 8.1 (Berkeley) 6/11/93 * $NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $ - * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.4 2002/03/22 23:41:59 obrien Exp $ + * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.5 2006/10/12 04:38:41 kmacy Exp $ */ /* @@ -157,6 +157,7 @@ struct fpemu { u_long fe_fsr; /* fsr copy (modified during op) */ int fe_cx; /* exceptions */ + int pad; /* align access to following fields */ struct fpn fe_f1; /* operand 1 */ struct fpn fe_f2; /* operand 2, if required */ struct fpn fe_f3; /* available storage for result */ ==== //depot/projects/dtrace/src/lib/libc/stdlib/getenv.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.19 2006/10/12 08:39:24 trhodes Exp $ .\" -.Dd December 11, 1993 +.Dd October 12, 2006 .Dt GETENV 3 .Os .Sh NAME @@ -75,6 +75,10 @@ .Fn getenv function obtains the current value of the environment variable, .Fa name . +The application should not modify the string pointed +to by the +.Fn getenv +function. .Pp The .Fn setenv ==== //depot/projects/dtrace/src/lib/libc/string/ffs.3#4 (text+ko) ==== @@ -32,9 +32,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ffs.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.9 2004/06/30 20:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.10 2006/10/12 15:08:41 ru Exp $ .\" -.Dd January 13, 2004 +.Dd October 12, 2006 .Dt FFS 3 .Os .Sh NAME @@ -60,7 +60,9 @@ .Fn ffs and .Fn ffsl -functions find the first bit set in +functions find the first bit set +(beginning with the least significant bit) +in .Fa value and return the index of that bit. .Pp @@ -72,8 +74,7 @@ .Fa value and return the index of that bit. .Pp -Bits are numbered starting from 1, starting at the right-most -(least significant) bit. +Bits are numbered starting at 1 (the least significant bit). A return value of zero from any of these functions means that the argument was zero. .Sh SEE ALSO ==== //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.121 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ # sys sources >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 14 00:44:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9235F16A417; Sat, 14 Oct 2006 00:44:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36F8916A412 for ; Sat, 14 Oct 2006 00:44:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99E4B43D53 for ; Sat, 14 Oct 2006 00:44:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9E0iHS4086695 for ; Sat, 14 Oct 2006 00:44:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9E0hNEg086495 for perforce@freebsd.org; Sat, 14 Oct 2006 00:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 14 Oct 2006 00:43:23 GMT Message-Id: <200610140043.k9E0hNEg086495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 107850 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 00:44:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=107850 Change 107850 by rwatson@rwatson_zoo on 2006/10/14 00:42:30 Integrate TrustedBSD base branch: sun4v mrouted moved to ports tcpslice moved to ports COMPAT_FREEBSD6 libpcap, tcpdump updates OpenBSM 1.0 alpha 11, 12 OpenSSH update OpenSSL update ipmi snd_hda snd_spicds geom_cache tty stability fixes MAC_DEBUG removed no audit system calls in jail (for now) Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#79 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#14 integrate .. //depot/projects/trustedbsd/base/UPDATING#72 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#12 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#19 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#17 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#24 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#33 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#21 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.h#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/main.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#27 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cccp.1#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cpp.1#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cpp.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcc.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcov.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.1#7 delete .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/include/ntpd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/TODO#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_control#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnet/telnet.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnetd/telnetd.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/CREDITS#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/LICENCE#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/OVERVIEW#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.platform#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.tun#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/atomicio.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/atomicio.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/audit.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/audit.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-bsdauth.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-chall.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-options.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-options.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rh-rsa.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rhosts.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-shadow.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-skey.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-chall.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-gss.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-hostbased.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-kbdint.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-none.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-passwd.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pubkey.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufbn.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buildpkg.sh.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-3des1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-acss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-aes.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-bf1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-ctr.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cleanup.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compress.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compress.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/crc32.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/crc32.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/deattack.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/deattack.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dispatch.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dispatch.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/entropy.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/fatal.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/getput.h#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/groupaccess.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/groupaccess.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-genr.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv-krb5.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdh.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhs.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgex.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/logintest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/mac.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/mac.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/match.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/match.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/md-sha256.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/md5crypt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_fdpass.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_fdpass.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/msg.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/msg.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/myproposal.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/nchan.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/basename.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bindresvport.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-asprintf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-closefrom.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-getpeereid.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-nextstep.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-openpty.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-snprintf.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-waitpid.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/daemon.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openbsd-compat.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-irix.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-linux.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-linux.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-solaris.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-solaris.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-tun.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-tun.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-uw.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/regress/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/regress/closefromtest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/regress/snprintftest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/regress/strduptest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/regress/strtonumtest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/rresvport.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setproctitle.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sha2.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sha2.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strtonum.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xcrypt.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xmmap.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openssh.xml.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/pathnames.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/platform.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/platform.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-getpeereid.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/cfgmatch.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/cipher-speed.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/forcecommand.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/forwarding.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/rsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/rsa.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard-opensc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#25 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-glob.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.8#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.1#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-dss.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-gss.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.8#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rsa.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh1.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh2.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#20 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect1.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#19 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#21 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#18 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshlogin.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshlogin.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ttymodes.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ttymodes.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/uidswap.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/uidswap.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/uuencode.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/uuencode.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#20 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/xmalloc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/xmalloc.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/LICENSE#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.shared#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/gendsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/genrsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs12.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/smime.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/speed.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/config#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_core.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_ige.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/asm/aes-586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_dec.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_req.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mont.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_prime.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/camellia.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/camellia.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_cbc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_cfb.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_ctr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_ecb.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_misc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/camellia/cmll_ofb.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_err.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_key.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_ossl.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_allc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_camellia.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_err.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_test.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evptests.txt#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.num#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.txt#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_mutl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_smime.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_unix.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_eay.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_err.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ciphers.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/smime.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/standards.txt#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_clnt.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_lib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_algs.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_cert.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_ciph.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_locl.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_enc.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/tls1.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/evptests.txt#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/igetest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_rehash#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/libeay.num#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mk1mf.pl#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkdef.pl#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkfiles.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/Mingw32.pl#6 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#51 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#60 integrate .. //depot/projects/trustedbsd/base/etc/libalias.conf#1 branch .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#38 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#33 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#44 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#14 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#16 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#43 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/auditd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/devd#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#16 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mixer#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mrouted#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#30 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#55 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#20 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#8 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/startrek#9 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#22 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/config.h#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#19 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#16 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#16 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/arm.md.diff#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/freebsd-native.h#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cpp/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kgdb.1#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.1#12 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/gzip.h#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/inflate.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unlzh.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/unpack.c#2 integrate .. //depot/projects/trustedbsd/base/include/Makefile#55 integrate .. //depot/projects/trustedbsd/base/include/elf.h#3 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#45 integrate .. //depot/projects/trustedbsd/base/lib/csu/sparc64/crt1.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libalias/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libalias/libalias/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/irc/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libbsm/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/killpg.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/arc4random.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/basename.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dirname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/err.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getobjformat.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgsnd.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tls.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/isc/eventlib_p.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_emu.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#27 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getenv.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getopt_long.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtonum.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/ffs.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#21 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/abort2.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_error.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_return.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/intro.2#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/lio_listio.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#13 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_sparc64.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_file.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_misc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_msg.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_nls.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_queue.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_rpc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/pam_ssh.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.8#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_getschedparam.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_kern.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#25 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setprio.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/kld.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login.conf.5#14 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#34 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/sparc64/reloc.c#12 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#70 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#112 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#16 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#10 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/install.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#8 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/PICOBSD#7 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.conf.5#8 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/bpf.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#28 integrate .. //depot/projects/trustedbsd/base/sbin/dump/main.c#25 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/concat/geom_concat.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/label/geom_label.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/geom_mirror.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/geom_nop.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/gnop.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/geom_raid3.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/shsec/geom_shsec.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/geom_stripe.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.h#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/misc/subr.h#5 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/label.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/remove.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/gvinum/gvinum.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/af_inet6.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#42 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#32 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#49 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#44 integrate .. //depot/projects/trustedbsd/base/sbin/mca/mca.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#15 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#26 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.8#15 integrate .. //depot/projects/trustedbsd/base/sbin/natd/natd.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#27 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.8#16 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/setkey.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#28 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#28 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.inc#17 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.man#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ASN1_STRING_length.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ASN1_STRING_new.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_ctrl.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_base64.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_buffer.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_cipher.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_md.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_null.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_ssl.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_find_type.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_new.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_push.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_read.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_accept.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_bio.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_connect.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_fd.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_file.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_mem.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_null.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_socket.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_set_callback.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_should_retry.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_CTX_new.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_CTX_start.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_add.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_add_word.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_bn2bin.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_cmp.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_copy.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_generate_prime.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_mod_inverse.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_new.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_num_bytes.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_rand.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_set_bit.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_swap.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_zero.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/CONF_modules_free.3#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/CONF_modules_load_file.3#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_generate_key.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_generate_parameters.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_get_ex_new_index.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_new.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_set_method.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_size.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_SIG_new.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_do_sign.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_dup_DH.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_generate_key.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_generate_parameters.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_new.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_set_method.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_sign.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_size.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_GET_LIB.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_clear_error.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_error_string.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_get_error.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_load_strings.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_print_errors.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_put_error.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_remove_state.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_set_mark.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_BytesToKey.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_DigestInit.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_EncryptInit.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_OpenInit.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_PKEY_new.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_SealInit.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_SignInit.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_VerifyInit.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OBJ_nid2obj.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OPENSSL_Applink.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OPENSSL_config.3#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/PKCS12_create.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/PKCS12_parse.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/PKCS7_decrypt.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/PKCS7_encrypt.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/PKCS7_sign.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/PKCS7_verify.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_add.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_bytes.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_cleanup.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_egd.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_load_file.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_set_rand_method.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_blinding_on.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_check_key.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_generate_key.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_new.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_print.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_private_encrypt.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_public_encrypt.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_set_method.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_sign.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_size.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/X509_NAME_print_ex.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/X509_new.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/bio.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/blowfish.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/bn.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/bn_internal.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/buffer.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/crypto.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_DHparams.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_X509.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_X509_CRL.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_X509_NAME.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_X509_REQ.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_X509_SIG.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/des.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dh.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dsa.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ecdsa.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/engine.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/err.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/evp.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/hmac.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/lh_stats.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/lhash.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/md5.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/mdc2.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/pem.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rand.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rc4.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ripemd.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rsa.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/sha.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/threads.3#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ui.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ui_compat.3#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/x509.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/opensslconf-amd64.h#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/opensslconf-arm.h#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/opensslconf-i386.h#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/opensslconf-ia64.h#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/opensslconf-powerpc.h#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/opensslconf-sparc64.h#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#23 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/Makefile.man#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CIPHER_get_name.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_add_session.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_ctrl.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_free.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_new.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_sess_number.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_sessions.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_mode.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_options.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_timeout.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_set_verify.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_CTX_use_certificate.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_SESSION_free.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_SESSION_get_time.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_accept.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_alert_type_string.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_clear.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_connect.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_do_handshake.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_free.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_SSL_CTX.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_ciphers.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_client_CA_list.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_current_cipher.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_default_timeout.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_error.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_ex_new_index.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_fd.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_peer_certificate.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_rbio.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_session.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_verify_result.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_get_version.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_library_init.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_load_client_CA_file.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_new.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_pending.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_read.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_rstate_string.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_session_reused.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_set_bio.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_set_connect_state.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_set_fd.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_set_session.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_set_shutdown.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_set_verify_result.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_shutdown.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_state_string.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_want.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/SSL_write.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/d2i_SSL_SESSION.3#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/man/ssl.3#3 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/Makefile.man#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/CA.pl.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/asn1parse.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/ca.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/ciphers.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/crl.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/crl2pkcs7.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/dgst.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/dhparam.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/dsa.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/dsaparam.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/ec.1#2 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/ecparam.1#2 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/enc.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/errstr.1#2 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/gendsa.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/genrsa.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/nseq.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/ocsp.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/openssl.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/passwd.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/pkcs12.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/pkcs7.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/pkcs8.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/rand.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/req.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/rsa.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/rsautl.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/s_client.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/s_server.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/s_time.1#3 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/sess_id.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/smime.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/speed.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/spkac.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/verify.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/version.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/x509.1#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/man/x509v3_config.1#2 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/sftp/Makefile#11 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#21 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#26 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/Makefile#8 integrate .. //depot/projects/trustedbsd/base/share/examples/mdoc/example.4#7 integrate .. //depot/projects/trustedbsd/base/share/examples/mdoc/example.9#2 integrate .. //depot/projects/trustedbsd/base/share/examples/scsi_target/scsi_cmds.c#7 integrate .. //depot/projects/trustedbsd/base/share/examples/scsi_target/scsi_target.c#7 integrate .. //depot/projects/trustedbsd/base/share/examples/scsi_target/scsi_target.h#4 integrate .. //depot/projects/trustedbsd/base/share/man/man1/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/Makefile#15 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread.3#10 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_attr_get_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_attr_setcreatesuspend_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cancel.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_wait.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_create.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_detach.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_exit.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_join.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_lock.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutexattr_getkind_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_once.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_destroy.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_init.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_rdlock.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_unlock.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlock_wrlock.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_destroy.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_getpshared.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_init.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_rwlockattr_setpshared.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_setspecific.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_suspend_all_np.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_suspend_np.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_switch_add_np.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_testcancel.3#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_yield.3#1 branch .. //depot/projects/trustedbsd/base/share/man/man3/queue.3#10 integrate .. //depot/projects/trustedbsd/base/share/man/man3/siginfo.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#70 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#29 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi_dock.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/adw.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amdsmb.4#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 14 00:57:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CD4016A40F; Sat, 14 Oct 2006 00:57:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CA5916A403 for ; Sat, 14 Oct 2006 00:57:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B772B43D49 for ; Sat, 14 Oct 2006 00:57:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9E0vemQ006671 for ; Sat, 14 Oct 2006 00:57:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9E0vYYD006564 for perforce@freebsd.org; Sat, 14 Oct 2006 00:57:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 14 Oct 2006 00:57:34 GMT Message-Id: <200610140057.k9E0vYYD006564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 107851 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 00:57:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=107851 Change 107851 by rwatson@rwatson_zoo on 2006/10/14 00:57:03 Integrate TrustedBSD priv branch from TrustedBSD base. See @107850 for a description of integrated changes. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/clock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/elf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/clock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/elf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/help.common#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/loader.8#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/merge_help.awk#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/panic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/forth/support.4th#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/bsm/audit_record.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_periph.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#4 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.amd64#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.i386#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.sun4v#1 branch .. //depot/projects/trustedbsd/priv/sys/conf/kern.post.mk#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kmod.mk#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options.sun4v#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/freebsd/ah_if.m#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 delete .. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_examine.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_output.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ddb/db_output.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ah_osdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ath/ah_osdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/digi/digi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/exca/exca.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_acpi.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_isa.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_kcs.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_smbus.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_smic.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_ssif.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ips/ips.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_debug.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/driver.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/spicds.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/spicds.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umass.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/nop/g_nop.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/bios/apm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/clock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/elf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/stdarg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/clock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/elf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/stdarg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_sysent.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_conf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_event.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_lock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mac.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_proc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_time.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_clock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_rtc.c#1 branch .. //depot/projects/trustedbsd/priv/sys/kern/sys_generic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.master#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/systrace_args.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_pts.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_pty.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_tty.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_default.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_export.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath_hal/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/geom/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/kbdmux/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/libalias/libalias/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/Makefile.inc#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/irc/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/modules.inc#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/vkbd/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/bridgestp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_bridge.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_tap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_tap.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_vlan.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/if_ether.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_output.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_dummy.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_mod.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_mod.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_old.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_pptp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/libalias.3#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/agp_i810.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.h#1 branch .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/stdarg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/compile/.cvsignore#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/MAC#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/NOTES#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/_bus.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/_inttypes.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/_limits.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/_types.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/asi.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/asm.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/asmacros.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/atomic.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus_common.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus_private.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cache.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ccr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/clock.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cpu.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cpufunc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/db_machdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/elf.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/endian.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/exec.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/float.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/fp.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/frame.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/fsr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hviommu.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/idprom.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ieee.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/in_cksum.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/instr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/iommureg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/iommuvar.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/kdb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/kerneldump.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ktr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/limits.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/lsu.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/md_var.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/memdev.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/metadata.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/mmu.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/mutex.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/nexusvar.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/param.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcpu.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pmap.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/proc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/profile.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pstate.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ptrace.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/reg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/reloc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/resource.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/runq.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/setjmp.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/sf_buf.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/sigframe.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/signal.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/smp.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/stdarg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/sysarch.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tick.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tlb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/trap.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tsb.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tstate.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tte.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/tte_hash.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ucontext.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/upa.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/utrap.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/varargs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ver.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/vmparam.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/watch.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/include/wstate.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/counter.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/exception.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/locore.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mem.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/support.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tick.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/buf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/cdefs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/clock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/consio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/copyright.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/digiio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/elf.h#1 branch .. //depot/projects/trustedbsd/priv/sys/sys/elf32.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/elf64.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/elf_common.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/event.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/ioccom.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/ipmi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/kbio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/kernel.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/lockmgr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mount.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/pioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/proc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/rtprio.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/rwlock.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/signalvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/soundcard.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.mk#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysproto.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/thr.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/time.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/ttycom.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/umtx.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.24 2006/10/13 17:31:57 jhb Exp $ */ /* @@ -37,6 +37,7 @@ * that source. */ +#include "opt_atpic.h" #include "opt_ddb.h" #include @@ -55,6 +56,13 @@ #include #endif +#ifndef DEV_ATPIC +#include +#include +#include +#include +#endif + #define MAX_STRAY_LOG 5 typedef void (*mask_fn)(void *); @@ -62,6 +70,7 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +static STAILQ_HEAD(, pic) pics; #ifdef SMP static int assign_cpu; @@ -70,11 +79,46 @@ #endif static void intr_init(void *__dummy); +static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); static void intrcnt_register(struct intsrc *is); +static int +intr_pic_registered(struct pic *pic) +{ + struct pic *p; + + STAILQ_FOREACH(p, &pics, pics) { + if (p == pic) + return (1); + } + return (0); +} + /* + * Register a new interrupt controller (PIC). This is to support suspend + * and resume where we suspend/resume controllers rather than individual + * sources. This also allows controllers with no active sources (such as + * 8259As in a system using the APICs) to participate in suspend and resume. + */ +int +intr_register_pic(struct pic *pic) +{ + int error; + + mtx_lock_spin(&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); + return (error); +} + +/* * Register a new interrupt source with the global interrupt system. * The global interrupts need to be disabled when this function is * called. @@ -84,6 +128,7 @@ { int error, vector; + KASSERT(intr_pic_registered(isrc->is_pic), ("unregistered PIC")); vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); @@ -255,26 +300,29 @@ void intr_resume(void) { - struct intsrc **isrc; - int i; + struct pic *pic; +#ifndef DEV_ATPIC + atpic_reset(); +#endif mtx_lock_spin(&intr_table_lock); - for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++) - if (*isrc != NULL && (*isrc)->is_pic->pic_resume != NULL) - (*isrc)->is_pic->pic_resume(*isrc); + STAILQ_FOREACH(pic, &pics, pics) { + if (pic->pic_resume != NULL) + pic->pic_resume(pic); + } mtx_unlock_spin(&intr_table_lock); } void intr_suspend(void) { - struct intsrc **isrc; - int i; + struct pic *pic; mtx_lock_spin(&intr_table_lock); - for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++) - if (*isrc != NULL && (*isrc)->is_pic->pic_suspend != NULL) - (*isrc)->is_pic->pic_suspend(*isrc); + STAILQ_FOREACH(pic, &pics, pics) { + if (pic->pic_suspend != NULL) + pic->pic_suspend(pic); + } mtx_unlock_spin(&intr_table_lock); } @@ -327,10 +375,33 @@ intrcnt_setname("???", 0); intrcnt_index = 1; + STAILQ_INIT(&pics); mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) +#ifndef DEV_ATPIC +/* Initialize the two 8259A's to a known-good shutdown state. */ +void +atpic_reset(void) +{ + + outb(IO_ICU1, ICW1_RESET | ICW1_IC4); + outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS); + outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2); + outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086); + outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff); + outb(IO_ICU1, OCW3_SEL | OCW3_RR); + + outb(IO_ICU2, ICW1_RESET | ICW1_IC4); + outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8); + outb(IO_ICU2 + ICU_IMR_OFFSET, 2); + outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086); + outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff); + outb(IO_ICU2, OCW3_SEL | OCW3_RR); +} +#endif + #ifdef DDB /* * Dump data about interrupt handlers ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -28,9 +28,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.25 2006/10/10 23:23:11 jhb Exp $"); -#include "opt_atpic.h" #include "opt_isa.h" #include @@ -61,8 +60,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define TODO printf("%s: not implemented!\n", __func__) - static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); /* @@ -115,8 +112,7 @@ static int ioapic_source_pending(struct intsrc *isrc); static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); -static void ioapic_suspend(struct intsrc *isrc); -static void ioapic_resume(struct intsrc *isrc); +static void ioapic_resume(struct pic *pic); static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); @@ -124,7 +120,7 @@ struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source, ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, - ioapic_suspend, ioapic_resume, + NULL, ioapic_resume, ioapic_config_intr, ioapic_assign_cpu }; static int next_ioapic_base; @@ -419,17 +415,13 @@ } static void -ioapic_suspend(struct intsrc *isrc) +ioapic_resume(struct pic *pic) { + struct ioapic *io = (struct ioapic *)pic; + int i; - TODO; -} - -static void -ioapic_resume(struct intsrc *isrc) -{ - - ioapic_program_intpin((struct ioapic_intsrc *)isrc); + for (i = 0; i < io->io_numintr; i++) + ioapic_program_intpin(&io->io_pins[i]); } /* @@ -727,6 +719,7 @@ io->io_intbase + io->io_numintr - 1); /* Register valid pins as interrupt sources. */ + intr_register_pic(&io->io_pic); for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.32 2006/10/10 23:23:11 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -151,12 +151,15 @@ static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; static void lapic_enable(void); +static void lapic_resume(struct pic *pic); static void lapic_timer_enable_intr(void); static void lapic_timer_oneshot(u_int count); static void lapic_timer_periodic(u_int count); static void lapic_timer_set_divisor(u_int divisor); static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value); +struct pic lapic_pic = { .pic_resume = lapic_resume }; + static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value) { @@ -277,7 +280,7 @@ } void -lapic_setup(void) +lapic_setup(int boot) { struct lapic *la; u_int32_t maxlvt; @@ -306,9 +309,13 @@ /* Program timer LVT and setup handler. */ lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); - snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid)); - intrcnt_add(buf, &la->la_timer_count); - if (PCPU_GET(cpuid) != 0) { + if (boot) { + snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid)); + intrcnt_add(buf, &la->la_timer_count); + } + + /* We don't setup the timer during boot on the BSP until later. */ + if (!(boot && PCPU_GET(cpuid) == 0)) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", lapic_id())); lapic_timer_set_divisor(lapic_timer_divisor); @@ -398,6 +405,14 @@ lapic->svr = value; } +/* Reset the local APIC on the BSP during resume. */ +static void +lapic_resume(struct pic *pic) +{ + + lapic_setup(0); +} + int lapic_id(void) { @@ -613,13 +628,17 @@ /* Send EOI first thing. */ lapic_eoi(); -#ifdef SMP +#if defined(SMP) && !defined(SCHED_ULE) /* * Don't do any accounting for the disabled HTT cores, since it * will provide misleading numbers for the userland. * * No locking is necessary here, since even if we loose the race * when hlt_cpus_mask changes it is not a big deal, really. + * + * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask + * and unlike other schedulers it actually schedules threads to + * those CPUs. */ if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) return; @@ -979,7 +998,8 @@ * Finish setting up the local APIC on the BSP once we know how to * properly program the LINT pins. */ - lapic_setup(); + lapic_setup(1); + intr_register_pic(&lapic_pic); if (bootverbose) lapic_dump("BSP"); } ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.656 2006/10/12 12:48:21 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -124,9 +125,11 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 14 09:49:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4EEE16A40F; Sat, 14 Oct 2006 09:49:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65E4016A403 for ; Sat, 14 Oct 2006 09:49:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3129443D49 for ; Sat, 14 Oct 2006 09:49:45 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9E9njDX063168 for ; Sat, 14 Oct 2006 09:49:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9E9ni8W063165 for perforce@freebsd.org; Sat, 14 Oct 2006 09:49:44 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 09:49:44 GMT Message-Id: <200610140949.k9E9ni8W063165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 09:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=107865 Change 107865 by rdivacky@rdivacky_witten on 2006/10/14 09:49:33 Implement correct prototype for prctl. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#4 edit .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#4 (text+ko) ==== @@ -298,7 +298,8 @@ l_gid16_t egid, l_gid16_t sgid); } 171 AUE_GETRESGID STD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_PRCTL STD { int linux_prctl(void); } +172 AUE_PRCTL STD { int linux_prctl(l_int option, l_int arg2, l_int arg3 \ + l_int arg4, l_int arg5); } 173 AUE_NULL STD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } 174 AUE_NULL STD { int linux_rt_sigaction(l_int sig, \ ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#3 (text+ko) ==== @@ -301,7 +301,8 @@ l_gid16_t egid, l_gid16_t sgid); } 171 AUE_GETRESGID STD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_PRCTL STD { int linux_prctl(void); } +172 AUE_PRCTL STD { int linux_prctl(l_int option, l_int arg2, l_int arg3 \ + l_int arg4, l_int arg5); } 173 AUE_NULL STD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } 174 AUE_NULL STD { int linux_rt_sigaction(l_int sig, \ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 09:50:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 563C116A417; Sat, 14 Oct 2006 09:50:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E926016A403 for ; Sat, 14 Oct 2006 09:50:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D30043D6B for ; Sat, 14 Oct 2006 09:50:47 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9E9ol4U063300 for ; Sat, 14 Oct 2006 09:50:47 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9E9olst063297 for perforce@freebsd.org; Sat, 14 Oct 2006 09:50:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 09:50:47 GMT Message-Id: <200610140950.k9E9olst063297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 09:50:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=107866 Change 107866 by rdivacky@rdivacky_witten on 2006/10/14 09:49:55 Regen after syscalls.master update. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#5 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#5 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#4 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#4 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#4 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#5 (text+ko) ==== @@ -521,7 +521,10 @@ char sgid_l_[PADL_(l_gid16_t *)]; l_gid16_t * sgid; char sgid_r_[PADR_(l_gid16_t *)]; }; struct linux_prctl_args { - register_t dummy; + char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; + char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; + char arg4_l_[PADL_(l_int arg3 l_int)]; l_int arg3 l_int arg4; char arg4_r_[PADR_(l_int arg3 l_int)]; + char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; }; struct linux_rt_sigreturn_args { char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#5 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#4 (text+ko) ==== @@ -192,7 +192,7 @@ { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ - { 0, (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ + { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.83 2006/09/21 16:20:38 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.80 2006/09/21 16:18:33 rwatson Exp */ @@ -512,7 +512,10 @@ char sgid_l_[PADL_(l_gid16_t *)]; l_gid16_t * sgid; char sgid_r_[PADR_(l_gid16_t *)]; }; struct linux_prctl_args { - register_t dummy; + char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; + char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; + char arg4_l_[PADL_(l_int arg3 l_int)]; l_int arg3 l_int arg4; char arg4_r_[PADR_(l_int arg3 l_int)]; + char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; }; struct linux_rt_sigreturn_args { char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.77 2006/09/21 16:20:38 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.80 2006/09/21 16:18:33 rwatson Exp */ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.84 2006/09/21 16:20:38 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.80 2006/09/21 16:18:33 rwatson Exp */ @@ -191,7 +191,7 @@ { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ - { 0, (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ + { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 09:53:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2835816A415; Sat, 14 Oct 2006 09:53:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E58BE16A407 for ; Sat, 14 Oct 2006 09:53:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B349D43D6D for ; Sat, 14 Oct 2006 09:53:51 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9E9rpCE064665 for ; Sat, 14 Oct 2006 09:53:51 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9E9rpKF064662 for perforce@freebsd.org; Sat, 14 Oct 2006 09:53:51 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 09:53:51 GMT Message-Id: <200610140953.k9E9rpKF064662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 09:53:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=107867 Change 107867 by rdivacky@rdivacky_witten on 2006/10/14 09:53:47 Remove prctl from dummy file. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -53,7 +53,6 @@ DUMMY(sysfs); DUMMY(query_module); DUMMY(nfsservctl); -DUMMY(prctl); DUMMY(rt_sigtimedwait); DUMMY(rt_sigqueueinfo); DUMMY(capget); ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#2 (text+ko) ==== @@ -56,7 +56,6 @@ DUMMY(vm86); DUMMY(query_module); DUMMY(nfsservctl); -DUMMY(prctl); DUMMY(rt_sigtimedwait); DUMMY(rt_sigqueueinfo); DUMMY(capget); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 09:55:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 476D616A415; Sat, 14 Oct 2006 09:55:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2348016A407 for ; Sat, 14 Oct 2006 09:55:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E39F643D73 for ; Sat, 14 Oct 2006 09:55:54 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9E9tsFX064945 for ; Sat, 14 Oct 2006 09:55:54 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9E9ts05064942 for perforce@freebsd.org; Sat, 14 Oct 2006 09:55:54 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 09:55:54 GMT Message-Id: <200610140955.k9E9ts05064942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 09:55:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=107868 Change 107868 by rdivacky@rdivacky_witten on 2006/10/14 09:55:19 Implement LINUX_SIG_VALID() macro for checking of validity of linux signal passed in. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#6 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -1545,3 +1545,8 @@ return (0); } + +int +linux_prctl(struct thread *td, struct linux_prctl_args *args) +{ +} ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.h#2 (text+ko) ==== @@ -35,4 +35,7 @@ void bsd_to_linux_sigset(sigset_t *, l_sigset_t *); int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *); +#define LINUX_NSIG 64 +#define LINUX_SIG_VALID(sig) ((sig) <= LINUX_NSIG && (sig) > 0) + #endif /* _LINUX_SIGNAL_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 09:56:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A7B816A412; Sat, 14 Oct 2006 09:56:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E993E16A407 for ; Sat, 14 Oct 2006 09:56:56 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A042C43D45 for ; Sat, 14 Oct 2006 09:56:56 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9E9uuYE064990 for ; Sat, 14 Oct 2006 09:56:56 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9E9uuMG064987 for perforce@freebsd.org; Sat, 14 Oct 2006 09:56:56 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 09:56:56 GMT Message-Id: <200610140956.k9E9uuMG064987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107869 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 09:56:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107869 Change 107869 by rdivacky@rdivacky_witten on 2006/10/14 09:56:45 Remove double definition of LINUX_NSIG Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.h#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.h#3 (text+ko) ==== @@ -35,7 +35,6 @@ void bsd_to_linux_sigset(sigset_t *, l_sigset_t *); int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *); -#define LINUX_NSIG 64 #define LINUX_SIG_VALID(sig) ((sig) <= LINUX_NSIG && (sig) > 0) #endif /* _LINUX_SIGNAL_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:01:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2323316A416; Sat, 14 Oct 2006 10:01:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAEB916A403 for ; Sat, 14 Oct 2006 10:01:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A465843D49 for ; Sat, 14 Oct 2006 10:01:02 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EA12rx065285 for ; Sat, 14 Oct 2006 10:01:02 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EA123a065280 for perforce@freebsd.org; Sat, 14 Oct 2006 10:01:02 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:01:02 GMT Message-Id: <200610141001.k9EA123a065280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107870 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:01:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=107870 Change 107870 by rdivacky@rdivacky_witten on 2006/10/14 10:00:56 Use LINUX_SIG_VALID through the code. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#11 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#6 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#11 (text+ko) ==== @@ -539,7 +539,7 @@ #endif exit_signal = args->flags & 0x000000ff; - if (exit_signal >= LINUX_NSIG) + if (!LINUX_SIG_VALID(exit_signal)) return (EINVAL); if (exit_signal <= LINUX_SIGTBLSZ) ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#2 (text+ko) ==== @@ -144,7 +144,7 @@ struct sigaction act, oact, *nsa, *osa; int error, sig; - if (linux_sig <= 0 || linux_sig > LINUX_NSIG) + if (!LINUX_SIG_VALID(linux_sig)) return (EINVAL); osa = (linux_osa != NULL) ? &oact : NULL; @@ -438,7 +438,7 @@ /* * Allow signal 0 as a means to check for privileges */ - if (args->signum < 0 || args->signum > LINUX_NSIG) + if (!LINUX_SIG_VALID(args->signum) && args->signum != 0) return EINVAL; if (args->signum > 0 && args->signum <= LINUX_SIGTBLSZ) ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#6 (text+ko) ==== @@ -365,7 +365,7 @@ #endif exit_signal = args->flags & 0x000000ff; - if (exit_signal >= LINUX_NSIG) + if (!LINUX_SIG_VALID(exit_signal)) return (EINVAL); if (exit_signal <= LINUX_SIGTBLSZ) From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:21:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 603C616A416; Sat, 14 Oct 2006 10:21:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1985616A412 for ; Sat, 14 Oct 2006 10:21:29 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3EB543D66 for ; Sat, 14 Oct 2006 10:21:28 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EALSJd069994 for ; Sat, 14 Oct 2006 10:21:28 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EALS8d069991 for perforce@freebsd.org; Sat, 14 Oct 2006 10:21:28 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:21:28 GMT Message-Id: <200610141021.k9EALS8d069991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107871 Change 107871 by rdivacky@rdivacky_witten on 2006/10/14 10:20:41 Partially implement prctl() syscall. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#7 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.h#1 add Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -1549,4 +1549,33 @@ int linux_prctl(struct thread *td, struct linux_prctl_args *args) { + int error = 0; + struct proc *p = td->td_proc; + char comm[LINUX_MAX_COMM_LEN]; + + switch (args->options) { + case LINUX_PR_SET_PDEATHSIG: + if (!LINUX_SIG_VALID(args->arg2)) + return (EINVAL); + PROC_LOCK(p); + p->p_sigparent = args->arg2; + PROC_UNLOCK(p); + break; + case LINUX_PR_GET_PDEATHSIG: + error = copyout(&p->p_sigparent, (void *) args->arg2, sizeof(p->p_sigparent)); + break; + case LINUX_PR_SET_NAME: + comm[LINUX_MAX_COMM_LEN-1] = 0; + error = copyin(comm, (void *) args->arg2, LINUX_MAX_COMM_LEN-1); + if (error) + return (error); + /* XXX: no locking needed? */ + strcpy(p->p_comm, comm); + break; + case LINUX_PR_GET_NAME: + error = copyout(&p->p_comm, (void *) args->arg2, MAXCOMLEN+1); + break; + } + + return (error); } From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:22:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE37116A412; Sat, 14 Oct 2006 10:22:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6A3716A403 for ; Sat, 14 Oct 2006 10:22:30 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 838B243D6E for ; Sat, 14 Oct 2006 10:22:30 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EAMU9m070298 for ; Sat, 14 Oct 2006 10:22:30 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EAMUv0070295 for perforce@freebsd.org; Sat, 14 Oct 2006 10:22:30 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:22:30 GMT Message-Id: <200610141022.k9EAMUv0070295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:22:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107872 Change 107872 by rdivacky@rdivacky_witten on 2006/10/14 10:22:29 PROC_LOCK around the copying to p_comm. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#8 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#8 (text+ko) ==== @@ -1569,8 +1569,9 @@ error = copyin(comm, (void *) args->arg2, LINUX_MAX_COMM_LEN-1); if (error) return (error); - /* XXX: no locking needed? */ + PROC_LOCK(p); strcpy(p->p_comm, comm); + PROC_UNLOCK(p); break; case LINUX_PR_GET_NAME: error = copyout(&p->p_comm, (void *) args->arg2, MAXCOMLEN+1); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:24:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECEB616A47B; Sat, 14 Oct 2006 10:24:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96F7116A416 for ; Sat, 14 Oct 2006 10:24:35 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65FE043D78 for ; Sat, 14 Oct 2006 10:24:34 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EAOYWG070770 for ; Sat, 14 Oct 2006 10:24:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EAOXe9070767 for perforce@freebsd.org; Sat, 14 Oct 2006 10:24:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:24:33 GMT Message-Id: <200610141024.k9EAOXe9070767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:24:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=107873 Change 107873 by rdivacky@rdivacky_witten on 2006/10/14 10:24:16 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/common/help.common#2 integrate .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#5 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/linuxolator/src/sys/sys/rwlock.h#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/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.21 2006/10/10 23:23:11 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.24 2006/10/13 17:31:57 jhb Exp $ */ /* @@ -56,6 +56,13 @@ #include #endif +#ifndef DEV_ATPIC +#include +#include +#include +#include +#endif + #define MAX_STRAY_LOG 5 typedef void (*mask_fn)(void *); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.655 2006/10/10 23:23:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.656 2006/10/12 12:48:21 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -125,9 +125,11 @@ #include #endif -#include +#ifdef DEV_ATPIC #include +#else #include +#endif #include #include ==== //depot/projects/linuxolator/src/sys/boot/common/help.common#2 (text+ko) ==== @@ -44,7 +44,7 @@ bcachestat - Displays statistics about disk cache usage. For depuration only. + Displays statistics about disk cache usage. For debugging only. ################################################################################ # Techo DEcho arguments ==== //depot/projects/linuxolator/src/sys/boot/common/loader.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.88 2006/08/20 09:31:17 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.89 2006/10/13 20:48:17 ru Exp $ .\" .Dd August 18, 2006 .Dt LOADER 8 @@ -159,7 +159,7 @@ .Pp .It Ic bcachestat Displays statistics about disk cache usage. -For depuration only. +For debugging only. .Pp .It Ic boot .It Ic boot Ar kernelname Op Cm ... ==== //depot/projects/linuxolator/src/sys/boot/forth/support.4th#2 (text+ko) ==== @@ -22,7 +22,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.15 2002/05/24 02:28:58 gordon Exp $ +\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.16 2006/10/13 20:48:17 ru Exp $ \ Loader.rc support functions: \ @@ -1012,7 +1012,7 @@ ." ^" cr ; -\ Depuration support functions +\ Debugging support functions only forth definitions also support-functions ==== //depot/projects/linuxolator/src/sys/conf/NOTES#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1387 2006/10/06 10:43:40 ru Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1389 2006/10/13 21:44:57 jb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2044,7 +2044,6 @@ # rc: RISCom/8 multiport card # rp: Comtrol Rocketport(ISA/PCI) - single card # si: Specialix SI/XIO 4-32 port terminal multiplexor -# nmdm: nullmodem terminal driver (see nmdm(4)) # Notes on the Comtrol Rocketport driver: # @@ -2100,7 +2099,6 @@ hint.si.0.at="isa" hint.si.0.maddr="0xd0000" hint.si.0.irq="12" -device nmdm # # The 'bktr' device is a PCI video capture device using the Brooktree ==== //depot/projects/linuxolator/src/sys/conf/kern.post.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.96 2006/08/14 13:28:52 des Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.97 2006/10/13 22:28:14 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -121,7 +121,7 @@ linterrs makelinks tags vers.c \ vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ - ${CLEAN} ${_ILINKS} + ${CLEAN} lint: ${LNFILES} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} 2>&1 | \ @@ -153,7 +153,7 @@ SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${MFILES:T:S/.m$/.h/} -.depend: ${SRCS} +.depend: .PRECIOUS ${SRCS} rm -f .newdep ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \ MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS} @@ -184,8 +184,9 @@ ${ECHO} ${.TARGET} "->" $$path ; \ ln -s $$path ${.TARGET} +# .depend needs include links so we remove them only together. kernel-cleandepend: - rm -f .depend + rm -f .depend ${_ILINKS} links: egrep '#if' ${CFILES} | sed -f $S/conf/defines | \ ==== //depot/projects/linuxolator/src/sys/conf/kern.pre.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.78 2006/09/18 16:49:14 sam Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.79 2006/10/13 22:29:06 ru Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -46,6 +46,7 @@ . endif .endif .if ${CC} == "icc" +C_DIALECT= NOSTDINC= -X .else C_DIALECT= -std=c99 ==== //depot/projects/linuxolator/src/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.210 2006/08/14 13:28:52 des Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.211 2006/10/13 22:28:14 ru Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -246,7 +246,7 @@ ${ECHO} ${.TARGET} "->" $$path ; \ ln -sf $$path ${.TARGET} -CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} +CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} .if defined(DEBUG_FLAGS) CLEANFILES+= ${FULLPROG} ${PROG}.symbols @@ -435,6 +435,11 @@ .include +cleandepend: cleanilinks +# .depend needs include links so we remove them only together. +cleanilinks: + rm -f ${_ILINKS} + .if !exists(${.OBJDIR}/${DEPENDFILE}) ${OBJS}: ${SRCS:M*.h} .endif ==== //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#4 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.9 2006/09/20 18:55:16 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.13 2006/10/14 05:30:12 scottl Exp $"); /* * The following controllers are supported by this driver: @@ -300,7 +300,7 @@ static void bce_free_rx_chain (struct bce_softc *); static void bce_free_tx_chain (struct bce_softc *); -static int bce_tx_encap (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); +static int bce_tx_encap (struct bce_softc *, struct mbuf *, u16 *); static void bce_start_locked (struct ifnet *); static void bce_start (struct ifnet *); static int bce_ioctl (struct ifnet *, u_long, caddr_t); @@ -468,10 +468,10 @@ /* Allocate PCI memory resources. */ rid = PCIR_BAR(0); sc->bce_res = bus_alloc_resource_any( - dev, /* dev */ - SYS_RES_MEMORY, /* type */ - &rid, /* rid */ - RF_ACTIVE | PCI_RF_DENSE); /* flags */ + dev, /* dev */ + SYS_RES_MEMORY, /* type */ + &rid, /* rid */ + RF_ACTIVE | PCI_RF_DENSE); /* flags */ if (sc->bce_res == NULL) { BCE_PRINTF(sc, "%s(%d): PCI memory allocation failed\n", @@ -2220,7 +2220,7 @@ * the mbuf. */ - txbd = &map_arg->tx_chain[TX_PAGE(chain_prod)][TX_IDX(chain_prod)]; + txbd = &sc->tx_bd_chain[TX_PAGE(chain_prod)][TX_IDX(chain_prod)]; /* Setup the first tx_bd for the first segment. */ txbd->tx_bd_haddr_lo = htole32(BCE_ADDR_LO(segs[i].ds_addr)); @@ -2235,7 +2235,7 @@ prod = NEXT_TX_BD(prod); chain_prod = TX_CHAIN_IDX(prod); - txbd = &map_arg->tx_chain[TX_PAGE(chain_prod)][TX_IDX(chain_prod)]; + txbd = &sc->tx_bd_chain[TX_PAGE(chain_prod)][TX_IDX(chain_prod)]; txbd->tx_bd_haddr_lo = htole32(BCE_ADDR_LO(segs[i].ds_addr)); txbd->tx_bd_haddr_hi = htole32(BCE_ADDR_HI(segs[i].ds_addr)); @@ -2287,18 +2287,18 @@ * Allocate the parent bus DMA tag appropriate for PCI. */ if (bus_dma_tag_create(NULL, /* parent */ - BCE_DMA_ALIGN, /* alignment */ - BCE_DMA_BOUNDARY, /* boundary */ - sc->max_bus_addr, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, /* filterfunc */ - NULL, /* filterarg */ - MAXBSIZE, /* maxsize */ - BUS_SPACE_UNRESTRICTED, /* nsegments */ - BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ - 0, /* flags */ - NULL, /* locfunc */ - NULL, /* lockarg */ + BCE_DMA_ALIGN, /* alignment */ + BCE_DMA_BOUNDARY, /* boundary */ + sc->max_bus_addr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, /* filterfunc */ + NULL, /* filterarg */ + MAXBSIZE, /* maxsize */ + BUS_SPACE_UNRESTRICTED, /* nsegments */ + BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ + 0, /* flags */ + NULL, /* locfunc */ + NULL, /* lockarg */ &sc->parent_tag)) { BCE_PRINTF(sc, "%s(%d): Could not allocate parent DMA tag!\n", __FILE__, __LINE__); @@ -2312,19 +2312,19 @@ * address of the block. */ if (bus_dma_tag_create( - sc->parent_tag, /* parent */ + sc->parent_tag, /* parent */ BCE_DMA_ALIGN, /* alignment */ BCE_DMA_BOUNDARY, /* boundary */ sc->max_bus_addr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ - NULL, /* filterfunc */ - NULL, /* filterarg */ + NULL, /* filterfunc */ + NULL, /* filterarg */ BCE_STATUS_BLK_SZ, /* maxsize */ - 1, /* nsegments */ + 1, /* nsegments */ BCE_STATUS_BLK_SZ, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &sc->status_tag)) { BCE_PRINTF(sc, "%s(%d): Could not allocate status block DMA tag!\n", __FILE__, __LINE__); @@ -2333,9 +2333,9 @@ } if(bus_dmamem_alloc( - sc->status_tag, /* dmat */ + sc->status_tag, /* dmat */ (void **)&sc->status_block, /* vaddr */ - BUS_DMA_NOWAIT, /* flags */ + BUS_DMA_NOWAIT, /* flags */ &sc->status_map)) { BCE_PRINTF(sc, "%s(%d): Could not allocate status block DMA memory!\n", __FILE__, __LINE__); @@ -2349,12 +2349,12 @@ map_arg.maxsegs = 1; error = bus_dmamap_load( - sc->status_tag, /* dmat */ + sc->status_tag, /* dmat */ sc->status_map, /* map */ sc->status_block, /* buf */ BCE_STATUS_BLK_SZ, /* buflen */ bce_dma_map_addr, /* callback */ - &map_arg, /* callbackarg */ + &map_arg, /* callbackarg */ BUS_DMA_NOWAIT); /* flags */ if(error || (map_arg.maxsegs == 0)) { @@ -2375,19 +2375,19 @@ * address of the block. */ if (bus_dma_tag_create( - sc->parent_tag, /* parent */ + sc->parent_tag, /* parent */ BCE_DMA_ALIGN, /* alignment */ BCE_DMA_BOUNDARY, /* boundary */ sc->max_bus_addr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ - NULL, /* filterfunc */ - NULL, /* filterarg */ + NULL, /* filterfunc */ + NULL, /* filterarg */ BCE_STATS_BLK_SZ, /* maxsize */ - 1, /* nsegments */ + 1, /* nsegments */ BCE_STATS_BLK_SZ, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &sc->stats_tag)) { BCE_PRINTF(sc, "%s(%d): Could not allocate statistics block DMA tag!\n", __FILE__, __LINE__); @@ -2396,9 +2396,9 @@ } if (bus_dmamem_alloc( - sc->stats_tag, /* dmat */ + sc->stats_tag, /* dmat */ (void **)&sc->stats_block, /* vaddr */ - BUS_DMA_NOWAIT, /* flags */ + BUS_DMA_NOWAIT, /* flags */ &sc->stats_map)) { BCE_PRINTF(sc, "%s(%d): Could not allocate statistics block DMA memory!\n", __FILE__, __LINE__); @@ -2412,12 +2412,12 @@ map_arg.maxsegs = 1; error = bus_dmamap_load( - sc->stats_tag, /* dmat */ + sc->stats_tag, /* dmat */ sc->stats_map, /* map */ sc->stats_block, /* buf */ BCE_STATS_BLK_SZ, /* buflen */ bce_dma_map_addr, /* callback */ - &map_arg, /* callbackarg */ + &map_arg, /* callbackarg */ BUS_DMA_NOWAIT); /* flags */ if(error || (map_arg.maxsegs == 0)) { @@ -2438,19 +2438,19 @@ * physical address of the block. */ if(bus_dma_tag_create( - sc->parent_tag, /* parent */ - BCM_PAGE_SIZE, /* alignment */ - BCE_DMA_BOUNDARY, /* boundary */ - sc->max_bus_addr, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, /* filterfunc */ - NULL, /* filterarg */ - BCE_TX_CHAIN_PAGE_SZ, /* maxsize */ - 1, /* nsegments */ - BCE_TX_CHAIN_PAGE_SZ, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ + sc->parent_tag, /* parent */ + BCM_PAGE_SIZE, /* alignment */ + BCE_DMA_BOUNDARY, /* boundary */ + sc->max_bus_addr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, /* filterfunc */ + NULL, /* filterarg */ + BCE_TX_CHAIN_PAGE_SZ, /* maxsize */ + 1, /* nsegments */ + BCE_TX_CHAIN_PAGE_SZ, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &sc->tx_bd_chain_tag)) { BCE_PRINTF(sc, "%s(%d): Could not allocate TX descriptor chain DMA tag!\n", __FILE__, __LINE__); @@ -2461,9 +2461,9 @@ for (i = 0; i < TX_PAGES; i++) { if(bus_dmamem_alloc( - sc->tx_bd_chain_tag, /* tag */ + sc->tx_bd_chain_tag, /* tag */ (void **)&sc->tx_bd_chain[i], /* vaddr */ - BUS_DMA_NOWAIT, /* flags */ + BUS_DMA_NOWAIT, /* flags */ &sc->tx_bd_chain_map[i])) { BCE_PRINTF(sc, "%s(%d): Could not allocate TX descriptor " "chain DMA memory!\n", __FILE__, __LINE__); @@ -2475,13 +2475,13 @@ map_arg.sc = sc; error = bus_dmamap_load( - sc->tx_bd_chain_tag, /* dmat */ - sc->tx_bd_chain_map[i], /* map */ - sc->tx_bd_chain[i], /* buf */ - BCE_TX_CHAIN_PAGE_SZ, /* buflen */ - bce_dma_map_addr, /* callback */ - &map_arg, /* callbackarg */ - BUS_DMA_NOWAIT); /* flags */ + sc->tx_bd_chain_tag, /* dmat */ + sc->tx_bd_chain_map[i], /* map */ + sc->tx_bd_chain[i], /* buf */ + BCE_TX_CHAIN_PAGE_SZ, /* buflen */ + bce_dma_map_addr, /* callback */ + &map_arg, /* callbackarg */ + BUS_DMA_NOWAIT); /* flags */ if(error || (map_arg.maxsegs == 0)) { BCE_PRINTF(sc, "%s(%d): Could not map TX descriptor chain DMA memory!\n", @@ -2499,19 +2499,19 @@ /* Create a DMA tag for TX mbufs. */ if (bus_dma_tag_create( sc->parent_tag, /* parent */ - BCE_DMA_ALIGN, /* alignment */ - BCE_DMA_BOUNDARY, /* boundary */ + BCE_DMA_ALIGN, /* alignment */ + BCE_DMA_BOUNDARY, /* boundary */ sc->max_bus_addr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ - NULL, /* filterfunc */ - NULL, /* filterarg */ + NULL, /* filterfunc */ + NULL, /* filterarg */ MCLBYTES * BCE_MAX_SEGMENTS, /* maxsize */ BCE_MAX_SEGMENTS, /* nsegments */ - MCLBYTES, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ - &sc->tx_mbuf_tag)) { + MCLBYTES, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &sc->tx_mbuf_tag)) { BCE_PRINTF(sc, "%s(%d): Could not allocate TX mbuf DMA tag!\n", __FILE__, __LINE__); rc = ENOMEM; @@ -2536,18 +2536,18 @@ */ if (bus_dma_tag_create( sc->parent_tag, /* parent */ - BCM_PAGE_SIZE, /* alignment */ - BCE_DMA_BOUNDARY, /* boundary */ + BCM_PAGE_SIZE, /* alignment */ + BCE_DMA_BOUNDARY, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ sc->max_bus_addr, /* lowaddr */ - NULL, /* filter */ - NULL, /* filterarg */ - BCE_RX_CHAIN_PAGE_SZ, /* maxsize */ - 1, /* nsegments */ - BCE_RX_CHAIN_PAGE_SZ, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ + NULL, /* filter */ + NULL, /* filterarg */ + BCE_RX_CHAIN_PAGE_SZ, /* maxsize */ + 1, /* nsegments */ + BCE_RX_CHAIN_PAGE_SZ, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &sc->rx_bd_chain_tag)) { BCE_PRINTF(sc, "%s(%d): Could not allocate RX descriptor chain DMA tag!\n", __FILE__, __LINE__); @@ -2558,9 +2558,9 @@ for (i = 0; i < RX_PAGES; i++) { if (bus_dmamem_alloc( - sc->rx_bd_chain_tag, /* tag */ + sc->rx_bd_chain_tag, /* tag */ (void **)&sc->rx_bd_chain[i], /* vaddr */ - BUS_DMA_NOWAIT, /* flags */ + BUS_DMA_NOWAIT, /* flags */ &sc->rx_bd_chain_map[i])) { BCE_PRINTF(sc, "%s(%d): Could not allocate RX descriptor chain " "DMA memory!\n", __FILE__, __LINE__); @@ -2574,13 +2574,13 @@ map_arg.sc = sc; error = bus_dmamap_load( - sc->rx_bd_chain_tag, /* dmat */ + sc->rx_bd_chain_tag, /* dmat */ sc->rx_bd_chain_map[i], /* map */ - sc->rx_bd_chain[i], /* buf */ + sc->rx_bd_chain[i], /* buf */ BCE_RX_CHAIN_PAGE_SZ, /* buflen */ - bce_dma_map_addr, /* callback */ - &map_arg, /* callbackarg */ - BUS_DMA_NOWAIT); /* flags */ + bce_dma_map_addr, /* callback */ + &map_arg, /* callbackarg */ + BUS_DMA_NOWAIT); /* flags */ if(error || (map_arg.maxsegs == 0)) { BCE_PRINTF(sc, "%s(%d): Could not map RX descriptor chain DMA memory!\n", @@ -2599,19 +2599,19 @@ * Create a DMA tag for RX mbufs. */ if (bus_dma_tag_create( - sc->parent_tag, /* parent */ - BCE_DMA_ALIGN, /* alignment */ - BCE_DMA_BOUNDARY, /* boundary */ - sc->max_bus_addr, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, /* filterfunc */ - NULL, /* filterarg */ - MJUM9BYTES, /* maxsize */ - BCE_MAX_SEGMENTS, /* nsegments */ - MJUM9BYTES, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ + sc->parent_tag, /* parent */ + BCE_DMA_ALIGN, /* alignment */ + BCE_DMA_BOUNDARY, /* boundary */ + sc->max_bus_addr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, /* filterfunc */ + NULL, /* filterarg */ + MJUM9BYTES, /* maxsize */ + BCE_MAX_SEGMENTS, /* nsegments */ + MJUM9BYTES, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ &sc->rx_mbuf_tag)) { BCE_PRINTF(sc, "%s(%d): Could not allocate RX mbuf DMA tag!\n", __FILE__, __LINE__); @@ -4639,13 +4639,13 @@ /* 0 for success, positive value for failure. */ /****************************************************************************/ static int -bce_tx_encap(struct bce_softc *sc, struct mbuf *m_head, u16 *prod, - u16 *chain_prod, u32 *prod_bseq) +bce_tx_encap(struct bce_softc *sc, struct mbuf *m_head, u16 *prod) { u32 vlan_tag_flags = 0; + u16 chain_prod; struct bce_dmamap_arg map_arg; bus_dmamap_t map; - int i, error, rc = 0; + int error, rc = 0; /* Transfer any checksum offload flags to the bd. */ if (m_head->m_pkthdr.csum_flags) { @@ -4661,20 +4661,18 @@ (m_head->m_pkthdr.ether_vtag << 16)); /* Map the mbuf into DMAable memory. */ - map = sc->tx_mbuf_map[*chain_prod]; + chain_prod = TX_CHAIN_IDX(*prod); + map = sc->tx_mbuf_map[chain_prod]; map_arg.sc = sc; map_arg.prod = *prod; - map_arg.chain_prod = *chain_prod; - map_arg.prod_bseq = *prod_bseq; + map_arg.chain_prod = chain_prod; + map_arg.prod_bseq = sc->tx_prod_bseq; map_arg.tx_flags = vlan_tag_flags; map_arg.maxsegs = USABLE_TX_BD - sc->used_tx_bd - BCE_TX_SLACK_SPACE; KASSERT(map_arg.maxsegs > 0, ("Invalid TX maxsegs value!")); - for (i = 0; i < TX_PAGES; i++) - map_arg.tx_chain[i] = sc->tx_bd_chain[i]; - /* Map the mbuf into our DMA address space. */ error = bus_dmamap_load_mbuf(sc->tx_mbuf_tag, map, m_head, bce_dma_map_tx_desc, &map_arg, BUS_DMA_NOWAIT); @@ -4717,7 +4715,7 @@ * delete the map before all of the segments * have been freed. */ - sc->tx_mbuf_map[*chain_prod] = + sc->tx_mbuf_map[chain_prod] = sc->tx_mbuf_map[map_arg.chain_prod]; sc->tx_mbuf_map[map_arg.chain_prod] = map; sc->tx_mbuf_ptr[map_arg.chain_prod] = m_head; @@ -4728,13 +4726,12 @@ DBRUNIF(1, sc->tx_mbuf_alloc++); - DBRUN(BCE_VERBOSE_SEND, bce_dump_tx_mbuf_chain(sc, *chain_prod, + DBRUN(BCE_VERBOSE_SEND, bce_dump_tx_mbuf_chain(sc, chain_prod, map_arg.maxsegs)); /* prod still points the last used tx_bd at this point. */ *prod = map_arg.prod; - *chain_prod = map_arg.chain_prod; - *prod_bseq = map_arg.prod_bseq; + sc->tx_prod_bseq = map_arg.prod_bseq; bce_tx_encap_exit: @@ -4755,7 +4752,6 @@ struct mbuf *m_head = NULL; int count = 0; u16 tx_prod, tx_chain_prod; - u32 tx_prod_bseq; /* If there's no link or the transmit queue is empty then just exit. */ if (!sc->bce_link || IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { @@ -4767,12 +4763,11 @@ /* prod points to the next free tx_bd. */ tx_prod = sc->tx_prod; tx_chain_prod = TX_CHAIN_IDX(tx_prod); - tx_prod_bseq = sc->tx_prod_bseq; DBPRINT(sc, BCE_INFO_SEND, "%s(): Start: tx_prod = 0x%04X, tx_chain_prod = %04X, " "tx_prod_bseq = 0x%08X\n", - __FUNCTION__, tx_prod, tx_chain_prod, tx_prod_bseq); + __FUNCTION__, tx_prod, tx_chain_prod, sc->tx_prod_bseq); /* Keep adding entries while there is space in the ring. */ while(sc->tx_mbuf_ptr[tx_chain_prod] == NULL) { @@ -4788,7 +4783,7 @@ * head of the queue and set the OACTIVE flag * to wait for the NIC to drain the chain. */ - if (bce_tx_encap(sc, m_head, &tx_prod, &tx_chain_prod, &tx_prod_bseq)) { + if (bce_tx_encap(sc, m_head, &tx_prod)) { IFQ_DRV_PREPEND(&ifp->if_snd, m_head); ifp->if_drv_flags |= IFF_DRV_OACTIVE; DBPRINT(sc, BCE_INFO_SEND, @@ -4803,7 +4798,6 @@ BPF_MTAP(ifp, m_head); tx_prod = NEXT_TX_BD(tx_prod); - tx_chain_prod = TX_CHAIN_IDX(tx_prod); } if (count == 0) { @@ -4815,12 +4809,12 @@ /* Update the driver's counters. */ sc->tx_prod = tx_prod; - sc->tx_prod_bseq = tx_prod_bseq; + tx_chain_prod = TX_CHAIN_IDX(tx_prod); DBPRINT(sc, BCE_INFO_SEND, "%s(): End: tx_prod = 0x%04X, tx_chain_prod = 0x%04X, " "tx_prod_bseq = 0x%08X\n", - __FUNCTION__, tx_prod, tx_chain_prod, tx_prod_bseq); + __FUNCTION__, tx_prod, tx_chain_prod, sc->tx_prod_bseq); /* Start the transmit. */ REG_WR16(sc, MB_TX_CID_ADDR + BCE_L2CTX_TX_HOST_BIDX, sc->tx_prod); ==== //depot/projects/linuxolator/src/sys/dev/bce/if_bcereg.h#2 (text) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.5 2006/05/16 14:36:23 phk Exp $ + * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.6 2006/10/14 03:58:59 scottl Exp $ */ #ifndef _BCE_H_DEFINED @@ -4658,7 +4658,6 @@ u16 chain_prod; int maxsegs; /* Max segments supported for this mapped memory */ u32 prod_bseq; - struct tx_bd *tx_chain[TX_PAGES]; }; ==== //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#4 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.5 2006/09/26 15:48:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi.c,v 1.6 2006/10/12 16:26:42 jhb Exp $"); #include #include @@ -584,9 +584,9 @@ ipmi_polled_enqueue_request(struct ipmi_softc *sc, struct ipmi_request *req) { - IPMI_LOCK(sc); + IPMI_LOCK_ASSERT(sc); + TAILQ_INSERT_TAIL(&sc->ipmi_pending_requests, req, ir_link); - IPMI_UNLOCK(sc); cv_signal(&sc->ipmi_request_added); return (0); } ==== //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#4 (text+ko) ==== @@ -80,10 +80,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20061009_0031" +#define HDA_DRV_TEST_REV "20061013_0032" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.6 2006/10/12 04:19:37 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.7 2006/10/12 15:37:43 ariff Exp $"); #undef HDA_DEBUG_ENABLED #define HDA_DEBUG_ENABLED 1 @@ -188,6 +188,7 @@ /* Asus */ #define ASUS_VENDORID 0x1043 #define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_U5F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0xffff) /* IBM / Lenovo */ @@ -222,6 +223,7 @@ #define HDA_QUIRK_SOFTPCMVOL (1 << 15) #define HDA_QUIRK_FIXEDRATE (1 << 16) #define HDA_QUIRK_FORCESTEREO (1 << 17) +#define HDA_QUIRK_EAPDINV (1 << 18) static const struct { char *key; @@ -233,6 +235,7 @@ { "softpcmvol", HDA_QUIRK_SOFTPCMVOL }, { "fixedrate", HDA_QUIRK_FIXEDRATE }, { "forcestereo", HDA_QUIRK_FORCESTEREO }, + { "eapdinv", HDA_QUIRK_EAPDINV }, }; #define HDAC_QUIRKS_TAB_LEN \ (sizeof(hdac_quirks_tab) / sizeof(hdac_quirks_tab[0])) @@ -2686,6 +2689,7 @@ hdac_lock(sc); if (dev == SOUND_MIXER_OGAIN) { uint32_t orig; + int set; /*if (left != right || !(left == 0 || left == 1)) { hdac_unlock(sc); return (-1); @@ -2709,7 +2713,10 @@ return (-1); } orig = w->param.eapdbtl; - if (left == 0) + set = (left != 0) ? 1 : 0; + if (devinfo->function.audio.quirks & HDA_QUIRK_EAPDINV) + set ^= 1; + if (set == 0) w->param.eapdbtl &= ~HDA_CMD_SET_EAPD_BTL_ENABLE_EAPD; else w->param.eapdbtl |= HDA_CMD_SET_EAPD_BTL_ENABLE_EAPD; @@ -3231,6 +3238,8 @@ HDA_QUIRK_GPIO1, 0 }, { ASUS_M5200_SUBVENDOR, HDA_CODEC_ALC880, HDA_QUIRK_GPIO1, 0 }, + { ASUS_U5F_SUBVENDOR, HDA_CODEC_AD1986A, + HDA_QUIRK_EAPDINV, 0 }, { HDA_MATCH_ALL, HDA_CODEC_CXVENICE, 0, HDA_QUIRK_FORCESTEREO }, { HDA_MATCH_ALL, HDA_CODEC_STACXXXX, @@ -3912,11 +3921,22 @@ w->wclass.pin.ctrl), cad); } if ((cfl & HDA_COMMIT_EAPD) && - w->param.eapdbtl != HDAC_INVALID) + w->param.eapdbtl != HDAC_INVALID) { + if (devinfo->function.audio.quirks & + HDA_QUIRK_EAPDINV) { + if (w->param.eapdbtl & + HDA_CMD_SET_EAPD_BTL_ENABLE_EAPD) + w->param.eapdbtl &= + ~HDA_CMD_SET_EAPD_BTL_ENABLE_EAPD; + else + w->param.eapdbtl |= + HDA_CMD_SET_EAPD_BTL_ENABLE_EAPD; + } hdac_command(sc, HDA_CMD_SET_EAPD_BTL_ENABLE(cad, w->nid, w->param.eapdbtl), cad); + } DELAY(1000); } } ==== //depot/projects/linuxolator/src/sys/kern/kern_conf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.198 2006/05/17 06:37:14 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.199 2006/10/13 20:49:24 tegge Exp $"); #include #include @@ -658,6 +658,7 @@ dev->si_flags &= ~SI_CLONELIST; } + dev->si_refcount++; /* Avoid race with dev_rel() */ csw = dev->si_devsw; dev->si_devsw = NULL; /* already NULL for SI_ALIAS */ while (csw != NULL && csw->d_purge != NULL && dev->si_threadcount) { @@ -667,6 +668,10 @@ printf("Still %lu threads in %s\n", dev->si_threadcount, devtoname(dev)); } + while (dev->si_threadcount != 0) { + /* Use unique dummy wait ident */ + msleep(&csw, &devmtx, PRIBIO, "devdrn", hz / 10); + } dev->si_drv1 = 0; dev->si_drv2 = 0; @@ -681,6 +686,7 @@ fini_cdevsw(csw); } dev->si_flags &= ~SI_ALIAS; + dev->si_refcount--; /* Avoid race with dev_rel() */ if (dev->si_refcount > 0) { LIST_INSERT_HEAD(&dead_cdevsw.d_devs, dev, si_list); ==== //depot/projects/linuxolator/src/sys/netgraph/ng_nat.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.4 2005/06/27 07:39:13 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.5 2006/10/13 09:11:12 glebius Exp $ */ #include @@ -86,14 +86,14 @@ MODULE_DEPEND(ng_nat, libalias, 1, 1, 1); /* Information we store for each node. */ -struct ng_priv_priv { +struct ng_nat_priv { node_p node; /* back pointer to node */ hook_p in; /* hook for demasquerading */ hook_p out; /* hook for masquerading */ struct libalias *lib; /* libalias handler */ uint32_t flags; /* status flags */ }; -typedef struct ng_priv_priv *priv_p; +typedef struct ng_nat_priv *priv_p; /* Values of flags */ #define NGNAT_READY 0x1 /* We have everything to work */ ==== //depot/projects/linuxolator/src/sys/netinet6/in6_ifattach.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.34 2006/10/02 10:13:30 gnn Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.35 2006/10/13 12:41:36 ume Exp $ */ /* $KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $ */ /*- @@ -63,7 +63,7 @@ #ifdef IP6_AUTO_LINKLOCAL int ip6_auto_linklocal = IP6_AUTO_LINKLOCAL; #else -int ip6_auto_linklocal = 0; /* disable by default */ +int ip6_auto_linklocal = 1; /* enable by default */ #endif struct callout in6_tmpaddrtimer_ch; ==== //depot/projects/linuxolator/src/sys/netinet6/in6_proto.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.38 2006/08/04 21:27:38 brooks Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.39 2006/10/13 12:45:53 ume Exp $ */ /* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */ /*- @@ -500,6 +500,7 @@ sysctl_ip6_tempvltime, "I", ""); SYSCTL_INT(_net_inet6_ip6, IPV6CTL_V6ONLY, v6only, CTLFLAG_RW, &ip6_v6only, 0, ""); +TUNABLE_INT("net.inet6.ip6.auto_linklocal", &ip6_auto_linklocal); SYSCTL_INT(_net_inet6_ip6, IPV6CTL_AUTO_LINKLOCAL, auto_linklocal, CTLFLAG_RW, &ip6_auto_linklocal, 0, ""); SYSCTL_STRUCT(_net_inet6_ip6, IPV6CTL_RIP6STATS, rip6stats, CTLFLAG_RD, ==== //depot/projects/linuxolator/src/sys/nfsclient/nfs_vnops.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.269 2006/09/26 04:15:58 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.270 2006/10/14 07:25:11 bde Exp $"); /* * vnode op calls for Sun NFS version 2 and 3 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:31:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D568716A415; Sat, 14 Oct 2006 10:31:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B040E16A403 for ; Sat, 14 Oct 2006 10:31:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B9D043D46 for ; Sat, 14 Oct 2006 10:31:43 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EAVhHI071674 for ; Sat, 14 Oct 2006 10:31:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EAVhRS071670 for perforce@freebsd.org; Sat, 14 Oct 2006 10:31:43 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:31:43 GMT Message-Id: <200610141031.k9EAVhRS071670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:31:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=107874 Change 107874 by rdivacky@rdivacky_witten on 2006/10/14 10:31:29 Missing comma ;( Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#5 edit .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#5 (text+ko) ==== @@ -298,7 +298,7 @@ l_gid16_t egid, l_gid16_t sgid); } 171 AUE_GETRESGID STD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_PRCTL STD { int linux_prctl(l_int option, l_int arg2, l_int arg3 \ +172 AUE_PRCTL STD { int linux_prctl(l_int option, l_int arg2, l_int arg3, \ l_int arg4, l_int arg5); } 173 AUE_NULL STD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#4 (text+ko) ==== @@ -301,7 +301,7 @@ l_gid16_t egid, l_gid16_t sgid); } 171 AUE_GETRESGID STD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_PRCTL STD { int linux_prctl(l_int option, l_int arg2, l_int arg3 \ +172 AUE_PRCTL STD { int linux_prctl(l_int option, l_int arg2, l_int arg3, \ l_int arg4, l_int arg5); } 173 AUE_NULL STD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:33:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84BBC16A47C; Sat, 14 Oct 2006 10:33:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5AA2C16A417 for ; Sat, 14 Oct 2006 10:33:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0837743D53 for ; Sat, 14 Oct 2006 10:33:47 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EAXkaW072263 for ; Sat, 14 Oct 2006 10:33:46 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EAXkGL072259 for perforce@freebsd.org; Sat, 14 Oct 2006 10:33:46 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:33:46 GMT Message-Id: <200610141033.k9EAXkGL072259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:33:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=107876 Change 107876 by rdivacky@rdivacky_witten on 2006/10/14 10:33:13 Regen after syscalls.master update. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#6 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#6 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#5 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#5 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#5 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -523,7 +523,8 @@ struct linux_prctl_args { char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; - char arg4_l_[PADL_(l_int arg3 l_int)]; l_int arg3 l_int arg4; char arg4_r_[PADR_(l_int arg3 l_int)]; + char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)]; + char arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)]; char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; }; struct linux_rt_sigreturn_args { ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#5 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#5 (text+ko) ==== @@ -514,7 +514,8 @@ struct linux_prctl_args { char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; - char arg4_l_[PADL_(l_int arg3 l_int)]; l_int arg3 l_int arg4; char arg4_r_[PADR_(l_int arg3 l_int)]; + char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)]; + char arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)]; char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; }; struct linux_rt_sigreturn_args { ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#5 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:38:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E661716A47B; Sat, 14 Oct 2006 10:38:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C05F616A416 for ; Sat, 14 Oct 2006 10:38:54 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C42E43D4C for ; Sat, 14 Oct 2006 10:38:54 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EAcs5w072625 for ; Sat, 14 Oct 2006 10:38:54 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EAcsho072622 for perforce@freebsd.org; Sat, 14 Oct 2006 10:38:54 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:38:54 GMT Message-Id: <200610141038.k9EAcsho072622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:38:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=107878 Change 107878 by rdivacky@rdivacky_witten on 2006/10/14 10:37:54 Make it compilable. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#9 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#9 (text+ko) ==== @@ -75,6 +75,7 @@ #include #include +#include #ifdef COMPAT_LINUX32 #include @@ -85,6 +86,7 @@ #endif #include +#include #include #ifdef __i386__ @@ -1553,7 +1555,7 @@ struct proc *p = td->td_proc; char comm[LINUX_MAX_COMM_LEN]; - switch (args->options) { + switch (args->option) { case LINUX_PR_SET_PDEATHSIG: if (!LINUX_SIG_VALID(args->arg2)) return (EINVAL); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:48:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 854BE16A47B; Sat, 14 Oct 2006 10:48:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E00016A403 for ; Sat, 14 Oct 2006 10:48:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B4CA43D73 for ; Sat, 14 Oct 2006 10:48:06 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EAm6Jh074096 for ; Sat, 14 Oct 2006 10:48:06 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EAm6AG074093 for perforce@freebsd.org; Sat, 14 Oct 2006 10:48:06 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:48:06 GMT Message-Id: <200610141048.k9EAm6AG074093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:48:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=107879 Change 107879 by rdivacky@rdivacky_witten on 2006/10/14 10:47:13 Implement debuging for linux_prctl. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#10 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#10 (text+ko) ==== @@ -1554,6 +1554,12 @@ int error = 0; struct proc *p = td->td_proc; char comm[LINUX_MAX_COMM_LEN]; + +#ifdef DEBUG + if (ldebug(prctl)) + printf(ARGS(prctl, "%d, %d, %d, %d, %d"), args->option, args->arg2, + args->arg3, args->arg4, args->arg5); +#endif switch (args->option) { case LINUX_PR_SET_PDEATHSIG: From owner-p4-projects@FreeBSD.ORG Sat Oct 14 10:53:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D848116A417; Sat, 14 Oct 2006 10:53:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE29016A416 for ; Sat, 14 Oct 2006 10:53:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 600F943D62 for ; Sat, 14 Oct 2006 10:53:13 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EArDc8075018 for ; Sat, 14 Oct 2006 10:53:13 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EArDlD075015 for perforce@freebsd.org; Sat, 14 Oct 2006 10:53:13 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 10:53:13 GMT Message-Id: <200610141053.k9EArDlD075015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107880 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 10:53:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=107880 Change 107880 by rdivacky@rdivacky_witten on 2006/10/14 10:52:34 Return EINVAL for not implemented options. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#11 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#11 (text+ko) ==== @@ -1584,6 +1584,9 @@ case LINUX_PR_GET_NAME: error = copyout(&p->p_comm, (void *) args->arg2, MAXCOMLEN+1); break; + default: + error = EINVAL; + break; } return (error); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 11:13:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 047CD16A407; Sat, 14 Oct 2006 11:13:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3B7B16A417 for ; Sat, 14 Oct 2006 11:13:40 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FC4543D46 for ; Sat, 14 Oct 2006 11:13:40 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EBDeeC079545 for ; Sat, 14 Oct 2006 11:13:40 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EBDeqI079541 for perforce@freebsd.org; Sat, 14 Oct 2006 11:13:40 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 11:13:40 GMT Message-Id: <200610141113.k9EBDeqI079541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 11:13:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=107882 Change 107882 by rdivacky@rdivacky_witten on 2006/10/14 11:12:57 RFLINUXTHPN is not used anymore. Remove that. Affected files ... .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#3 edit .. //depot/projects/linuxolator/src/sys/sys/unistd.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -527,10 +527,7 @@ sigacts_copy(newsigacts, p1->p_sigacts); p2->p_sigacts = newsigacts; } - if (flags & RFLINUXTHPN) - p2->p_sigparent = SIGUSR1; - else - p2->p_sigparent = SIGCHLD; + p2->p_sigparent = SIGCHLD; p2->p_textvp = p1->p_textvp; p2->p_fd = fd; ==== //depot/projects/linuxolator/src/sys/sys/unistd.h#2 (text+ko) ==== @@ -169,7 +169,7 @@ #define RFCFDG (1<<12) /* close all fds, zero fd table */ #define RFTHREAD (1<<13) /* enable kernel thread support */ #define RFSIGSHARE (1<<14) /* share signal handlers */ -#define RFLINUXTHPN (1<<16) /* do linux clone exit parent notification */ +#define RFUNUSED (1<<16) /* UNUSED */ #define RFSTOPPED (1<<17) /* leave child in a stopped state */ #define RFHIGHPID (1<<18) /* use a pid higher then 10 (idleproc) */ #define RFPPWAIT (1<<31) /* parent sleeps until child exits (vfork) */ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 11:49:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B20E616A47E; Sat, 14 Oct 2006 11:49:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8649216A47B for ; Sat, 14 Oct 2006 11:49:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39D5F43D80 for ; Sat, 14 Oct 2006 11:49:26 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EBnQUw085211 for ; Sat, 14 Oct 2006 11:49:26 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EBnPPp085203 for perforce@freebsd.org; Sat, 14 Oct 2006 11:49:25 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 11:49:25 GMT Message-Id: <200610141149.k9EBnPPp085203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 11:49:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=107883 Change 107883 by rdivacky@rdivacky_witten on 2006/10/14 11:49:09 I got the semantics of pdeath_signal wrong. Implement it this time correctly. o introduce pdeath_signal in emuldata o introduce eventhandler for proc_reparent o implement proc_reparent event handler that psignals children in a case of parents death Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#2 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#5 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#2 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#12 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#2 edit .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#3 edit .. //depot/projects/linuxolator/src/sys/sys/eventhandler.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -129,6 +129,7 @@ static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; static eventhandler_tag linux_exec_tag; +static eventhandler_tag linux_reparent_tag; /* * Linux syscalls return negative errno's, we do positive and map them @@ -1087,6 +1088,8 @@ NULL, 1000); linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, NULL, 1000); + linux_reparent_tag = EVENTHANDLER_REGISTER(reparent, linux_reparent, + NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -1114,6 +1117,7 @@ EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); + EVENTHANDLER_DEREGISTER(reparent, linux_reparent_tag); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#5 (text+ko) ==== @@ -84,6 +84,7 @@ /* non-exec call */ em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; + em->pdeath_signal = 0; if (flags & CLONE_VM) { /* handled later in the code */ } else { @@ -251,7 +252,7 @@ int error = 0; int *child_set_tid; - if (p->p_sysent != &elf_linux_sysvec) + if (__predict_true(p->p_sysent != &elf_linux_sysvec)) return; retry: @@ -299,3 +300,17 @@ EMUL_UNLOCK(&emul_lock); return 0; } + +/* p is locked */ +void +linux_reparent(void *arg __unused, struct proc *p) +{ + struct linux_emuldata *em; + + if (__predict_true(p->p_sysent != &elf_linux_sysvec)) + return; + + em = em_find(p, EMUL_UNLOCKED); + psignal(p, em->pdeath_signal); + EMUL_UNLOCK(&emul_lock); +} ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#2 (text+ko) ==== @@ -50,6 +50,8 @@ struct linux_emuldata_shared *shared; + int pdeath_signal; /* parent death signal */ + LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ }; @@ -71,6 +73,7 @@ void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); +void linux_reparent(void *, struct proc *); extern struct sx emul_shared_lock; extern struct sx emul_lock; ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#12 (text+ko) ==== @@ -1554,6 +1554,7 @@ int error = 0; struct proc *p = td->td_proc; char comm[LINUX_MAX_COMM_LEN]; + struct linux_emuldata *em; #ifdef DEBUG if (ldebug(prctl)) @@ -1565,12 +1566,16 @@ case LINUX_PR_SET_PDEATHSIG: if (!LINUX_SIG_VALID(args->arg2)) return (EINVAL); - PROC_LOCK(p); - p->p_sigparent = args->arg2; - PROC_UNLOCK(p); + em = em_find(p, EMUL_UNLOCKED); + KASSERT(em != NULL, ("prctl: emuldata not found.\n")); + em->pdeath_signal = args->arg2; + EMUL_UNLOCK(&emul_lock); break; case LINUX_PR_GET_PDEATHSIG: - error = copyout(&p->p_sigparent, (void *) args->arg2, sizeof(p->p_sigparent)); + em = em_find(p, EMUL_UNLOCKED); + KASSERT(em != NULL, ("prctl: emuldata not found.\n")); + error = copyout(&em->pdeath_signal, (void *) args->arg2, sizeof(em->pdeath_signal)); + EMUL_UNLOCK(&emul_lock); break; case LINUX_PR_SET_NAME: comm[LINUX_MAX_COMM_LEN-1] = 0; ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#2 (text+ko) ==== @@ -113,6 +113,7 @@ static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; static eventhandler_tag linux_exec_tag; +static eventhandler_tag linux_reparent_tag; /* * Linux syscalls return negative errno's, we do positive and map them @@ -927,6 +928,8 @@ NULL, 1000); linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, NULL, 1000); + linux_reparent_tag = EVENTHANDLER_REGISTER(reparent, linux_reparent, + NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -954,6 +957,7 @@ EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); + EVENTHANDLER_DEREGISTER(reparent, linux_reparent_tag); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/linuxolator/src/sys/kern/kern_exit.c#3 (text+ko) ==== @@ -900,4 +900,5 @@ LIST_REMOVE(child, p_sibling); LIST_INSERT_HEAD(&parent->p_children, child, p_sibling); child->p_pptr = parent; + EVENTHANDLER_INVOKE(reparent, child); } ==== //depot/projects/linuxolator/src/sys/sys/eventhandler.h#2 (text+ko) ==== @@ -178,4 +178,7 @@ typedef void(*schedtail_fn)(void *, struct proc *); EVENTHANDLER_DECLARE(schedtail, schedtail_fn); + +typedef void(*reparent_fn)(void *, struct proc *); +EVENTHANDLER_DECLARE(reparent, reparent_fn); #endif /* SYS_EVENTHANDLER_H */ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 12:14:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 196D116A415; Sat, 14 Oct 2006 12:14:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE26D16A412 for ; Sat, 14 Oct 2006 12:14:58 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 892DB43D45 for ; Sat, 14 Oct 2006 12:14:58 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9ECEw56090742 for ; Sat, 14 Oct 2006 12:14:58 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9ECEwYn090739 for perforce@freebsd.org; Sat, 14 Oct 2006 12:14:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 12:14:58 GMT Message-Id: <200610141214.k9ECEwYn090739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 12:14:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107884 Change 107884 by rdivacky@rdivacky_witten on 2006/10/14 12:13:59 Make it compilable on amd64. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#13 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#13 (text+ko) ==== @@ -1574,12 +1574,12 @@ case LINUX_PR_GET_PDEATHSIG: em = em_find(p, EMUL_UNLOCKED); KASSERT(em != NULL, ("prctl: emuldata not found.\n")); - error = copyout(&em->pdeath_signal, (void *) args->arg2, sizeof(em->pdeath_signal)); + error = copyout(&em->pdeath_signal, (void *)(register_t) args->arg2, sizeof(em->pdeath_signal)); EMUL_UNLOCK(&emul_lock); break; case LINUX_PR_SET_NAME: comm[LINUX_MAX_COMM_LEN-1] = 0; - error = copyin(comm, (void *) args->arg2, LINUX_MAX_COMM_LEN-1); + error = copyin(comm, (void *)(register_t) args->arg2, LINUX_MAX_COMM_LEN-1); if (error) return (error); PROC_LOCK(p); @@ -1587,7 +1587,7 @@ PROC_UNLOCK(p); break; case LINUX_PR_GET_NAME: - error = copyout(&p->p_comm, (void *) args->arg2, MAXCOMLEN+1); + error = copyout(&p->p_comm, (void *)(register_t) args->arg2, MAXCOMLEN+1); break; default: error = EINVAL; From owner-p4-projects@FreeBSD.ORG Sat Oct 14 14:16:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09A8216A4A0; Sat, 14 Oct 2006 14:16:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D638916A492 for ; Sat, 14 Oct 2006 14:16:57 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66F7A43D53 for ; Sat, 14 Oct 2006 14:16:36 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EEGXwL019498 for ; Sat, 14 Oct 2006 14:16:33 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EEGXoa019495 for perforce@freebsd.org; Sat, 14 Oct 2006 14:16:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 14:16:33 GMT Message-Id: <200610141416.k9EEGXoa019495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 14:16:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=107886 Change 107886 by rdivacky@rdivacky_witten on 2006/10/14 14:16:03 Send the pdeath_signal only if parent is exiting. Previously we were sending it for any proc_reparent() call. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#6 edit .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#6 (text+ko) ==== @@ -310,7 +310,11 @@ if (__predict_true(p->p_sysent != &elf_linux_sysvec)) return; - em = em_find(p, EMUL_UNLOCKED); - psignal(p, em->pdeath_signal); - EMUL_UNLOCK(&emul_lock); + /* do this only if the parent is exiting */ + if (p->p_pptr->p_flags & P_WEXIT) { + em = em_find(p, EMUL_UNLOCKED); + if (em->pdeath_signal != 0) + psignal(p, em->pdeath_signal); + EMUL_UNLOCK(&emul_lock); + } } ==== //depot/projects/linuxolator/src/sys/kern/kern_exit.c#4 (text+ko) ==== @@ -897,8 +897,10 @@ if (child->p_pptr == parent) return; + /* we want to have old parent accessible via p_pptr */ + EVENTHANDLER_INVOKE(reparent, child); + LIST_REMOVE(child, p_sibling); LIST_INSERT_HEAD(&parent->p_children, child, p_sibling); child->p_pptr = parent; - EVENTHANDLER_INVOKE(reparent, child); } From owner-p4-projects@FreeBSD.ORG Sat Oct 14 14:17:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E1CA16A47E; Sat, 14 Oct 2006 14:17:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C56616A412 for ; Sat, 14 Oct 2006 14:17:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B535D43D67 for ; Sat, 14 Oct 2006 14:17:35 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EEHZi7019565 for ; Sat, 14 Oct 2006 14:17:35 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EEHZYq019562 for perforce@freebsd.org; Sat, 14 Oct 2006 14:17:35 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 14:17:35 GMT Message-Id: <200610141417.k9EEHZYq019562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 14:17:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=107887 Change 107887 by rdivacky@rdivacky_witten on 2006/10/14 14:17:19 p_flags -> p_flag, I swear it compiled once :( Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#7 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#7 (text+ko) ==== @@ -311,7 +311,7 @@ return; /* do this only if the parent is exiting */ - if (p->p_pptr->p_flags & P_WEXIT) { + if (p->p_pptr->p_flag & P_WEXIT) { em = em_find(p, EMUL_UNLOCKED); if (em->pdeath_signal != 0) psignal(p, em->pdeath_signal); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 14:25:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF3C116A40F; Sat, 14 Oct 2006 14:25:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9197C16A407 for ; Sat, 14 Oct 2006 14:25:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47DC143D62 for ; Sat, 14 Oct 2006 14:25:46 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EEPkpY022249 for ; Sat, 14 Oct 2006 14:25:46 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EEPkOl022243 for perforce@freebsd.org; Sat, 14 Oct 2006 14:25:46 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 14:25:46 GMT Message-Id: <200610141425.k9EEPkOl022243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 14:25:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=107888 Change 107888 by rdivacky@rdivacky_witten on 2006/10/14 14:25:30 KASSERT that we found the emuldata Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#8 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#8 (text+ko) ==== @@ -313,6 +313,7 @@ /* do this only if the parent is exiting */ if (p->p_pptr->p_flag & P_WEXIT) { em = em_find(p, EMUL_UNLOCKED); + KASSERT(em != NULL, ("linux_reparent: emuldata not found.\n")); if (em->pdeath_signal != 0) psignal(p, em->pdeath_signal); EMUL_UNLOCK(&emul_lock); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 14:36:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A92816A494; Sat, 14 Oct 2006 14:36:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F187216A417 for ; Sat, 14 Oct 2006 14:36:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E766543D60 for ; Sat, 14 Oct 2006 14:35:59 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EEZxS6024300 for ; Sat, 14 Oct 2006 14:35:59 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EEZx1P024297 for perforce@freebsd.org; Sat, 14 Oct 2006 14:35:59 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 14 Oct 2006 14:35:59 GMT Message-Id: <200610141435.k9EEZx1P024297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 14:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107890 Change 107890 by gonzo@gonzo_hq on 2006/10/14 14:35:33 o Rename tlb access methods to point out that this is used only for kernel address space. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/tlb.h#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/tlb.h#6 (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/mips2/src/sys/mips/include/tlb.h#5 $ + * $P4: //depot/projects/mips2/src/sys/mips/include/tlb.h#6 $ */ #ifndef _MACHINE_TLB_H_ @@ -32,8 +32,8 @@ extern pt_entry_t *kptmap; extern vm_size_t kptsize; -#define tlb_pte_index(va) (((va) - (VM_MIN_KERNEL_ADDRESS)) >> PAGE_SHIFT) -#define tlb_pte_find(t,va) (&(t)[tlb_pte_index((va))]) +#define tlb_kern_pte_index(va) (((va) - (VM_MIN_KERNEL_ADDRESS)) >> PAGE_SHIFT) +#define tlb_kern_pte_find(t,va) (&(t)[tlb_kern_pte_index((va))]) void tlb_bootstrap(vm_size_t, vm_offset_t (*)(vm_size_t)); void tlb_enter(pmap_t, vm_offset_t, vm_paddr_t, pt_entry_t); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 14:39:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D7816A492; Sat, 14 Oct 2006 14:39:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F7AC16A407 for ; Sat, 14 Oct 2006 14:39:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B44343D73 for ; Sat, 14 Oct 2006 14:39:04 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EEd4gn024430 for ; Sat, 14 Oct 2006 14:39:04 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EEd4eE024427 for perforce@freebsd.org; Sat, 14 Oct 2006 14:39:04 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 14 Oct 2006 14:39:04 GMT Message-Id: <200610141439.k9EEd4eE024427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 14:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107891 Change 107891 by gonzo@gonzo_hq on 2006/10/14 14:38:03 o Add AENT definition. Define for alternative entry point in asm. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/asm.h#8 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/asm.h#8 (text+ko) ==== @@ -129,6 +129,10 @@ # endif #endif +#define AENT(x) \ + .aent x, 0 + + /* * WEAK_ALIAS: create a weak alias. */ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 14:44:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 085E816A416; Sat, 14 Oct 2006 14:44:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD99F16A403 for ; Sat, 14 Oct 2006 14:44:14 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C86F43D88 for ; Sat, 14 Oct 2006 14:44:11 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EEiBHQ025704 for ; Sat, 14 Oct 2006 14:44:11 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EEiBud025700 for perforce@freebsd.org; Sat, 14 Oct 2006 14:44:11 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 14 Oct 2006 14:44:11 GMT Message-Id: <200610141444.k9EEiBud025700@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 14:44:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=107892 Change 107892 by gonzo@gonzo_hq on 2006/10/14 14:44:05 o Add missing part of TLBMiss handler: get actual PTEs from segtab if it's present. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#12 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#12 (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/mips2/src/sys/mips/mips/exception.S#11 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#12 $ */ /* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ @@ -337,9 +337,22 @@ beq k1, zero, 7f # ==0 -- no page table srl k0, 10 # k0=VPN (aka va>>10) - break # XXX: Not ready yet - - eret + andi k0, k0, 0xff8 # k0=page tab offset + addu k1, k1, k0 # k1=pte address + lw k0, 0(k1) # k0=lo0 pte + lw k1, 4(k1) # k1=lo1 pte + sll k0, 2 # chop top 2 bits (part 1a) + srl k0, 2 # chop top 2 bits (part 1b) + mtc0 k0, MIPS_COP_0_TLB_LO0 # lo0 is loaded + sll k1, 2 # chop top 2 bits (part 2a) + srl k1, 2 # chop top 2 bits (part 2b) + mtc0 k1, MIPS_COP_0_TLB_LO1 # lo1 is loaded + nop # standard nop + tlbwr # write to tlb + nop # standard nop + nop # needed by R4000/4400 + nop # needed by R4000/4400 + eret # return from exception 5: j KVATLBMiss nop From owner-p4-projects@FreeBSD.ORG Sat Oct 14 15:01:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7500716A492; Sat, 14 Oct 2006 15:01:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30FB016A412 for ; Sat, 14 Oct 2006 15:01:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18BD643D7B for ; Sat, 14 Oct 2006 15:01:36 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EF1ZKY028452 for ; Sat, 14 Oct 2006 15:01:35 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EF1ZeI028447 for perforce@freebsd.org; Sat, 14 Oct 2006 15:01:35 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 14 Oct 2006 15:01:35 GMT Message-Id: <200610141501.k9EF1ZeI028447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 15:01:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=107895 Change 107895 by gonzo@gonzo_hq on 2006/10/14 15:00:40 o Increase size of pteobject. We should take into account segtab itself, not only segment maps. o Create segment maps for userland VM on request. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/pmap.h#6 edit .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#13 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/pmap.h#6 (text+ko) ==== @@ -134,6 +134,9 @@ #define MIPS_PMAP_SEGTABSIZE 512 #define MIPS_PMAP_SEGSIZE 1024 +#define pmap_segmap(m, v) \ + ((m)->pm_private.pm_segtab->seg_tab[((v) >> SEGSHIFT)]) + struct segtab { pt_entry_t *seg_tab[MIPS_PMAP_SEGTABSIZE]; }; ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#13 (text+ko) ==== @@ -216,18 +216,11 @@ pt_entry_t *pte = NULL; if (va < MIPS_KSEG0_START) { - /* XXX Try to avoid TLB refills */ -#if 0 - unsigned long lev1; - lev1 = (unsigned long)pmap->pm_lev1; - lev1 = (unsigned long)tlb_pte_find(kptmap, lev1); - lev1 = (unsigned long)MIPS_PTE_TO_PA(*(pt_entry_t *)lev1); - pte = tlb_pte_find( - (pt_entry_t *)MIPS_PHYS_TO_KSEG0((pt_entry_t *)lev1), va); -#endif - panic("XXXMIPS: %s to implement", __func__); + pte = pmap_segmap(pmap, va); + pte += (va >> PAGE_SHIFT) & (NPTEPG - 1); } else pte = tlb_kern_pte_find(kptmap, va); + return pte; } @@ -731,7 +724,8 @@ */ if (pmap->pm_pteobj == NULL) pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, - MIPS_PMAP_SEGTABSIZE * MIPS_PMAP_SEGSIZE + 1); + MIPS_PMAP_SEGTABSIZE * MIPS_PMAP_SEGSIZE + + + MIPS_PMAP_SEGTABSIZE * sizeof(pt_entry_t *) + 1); VM_OBJECT_LOCK(pmap->pm_pteobj); lev1pg = vm_page_grab(pmap->pm_pteobj, @@ -1143,7 +1137,7 @@ vm_offset_t pa; pt_entry_t *pte; vm_offset_t opa; - vm_page_t mpte; + vm_page_t mpte, mem; if (pmap == NULL) return; @@ -1161,6 +1155,24 @@ * resident, we are creating it here. */ if (va < VM_MAXUSER_ADDRESS) { + if(pmap_segmap(pmap, va) == NULL) + { + VM_OBJECT_LOCK(pmap->pm_pteobj); + + mem = vm_page_grab(pmap->pm_pteobj, + MIPS_PMAP_SEGSIZE, + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | \ + VM_ALLOC_WIRED | VM_ALLOC_ZERO); + + vm_page_lock_queues(); + vm_page_flag_clear(mem, PG_BUSY); + mem->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(pmap->pm_pteobj); + + pmap_segmap(pmap, va) = + (pt_entry_t *)MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(mem)); + } } pte = pmap_pte(pmap, va); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 15:03:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07E5A16A417; Sat, 14 Oct 2006 15:03:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A554C16A40F for ; Sat, 14 Oct 2006 15:03:39 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A50B43D5E for ; Sat, 14 Oct 2006 15:03:39 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EF3dsd030170 for ; Sat, 14 Oct 2006 15:03:39 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EF3dJl030167 for perforce@freebsd.org; Sat, 14 Oct 2006 15:03:39 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 14 Oct 2006 15:03:39 GMT Message-Id: <200610141503.k9EF3dJl030167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 15:03:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=107896 Change 107896 by gonzo@gonzo_hq on 2006/10/14 15:02:43 o Add onfault handler to pcb struct. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/pcb.h#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/pcb.h#4 (text+ko) ==== @@ -34,6 +34,7 @@ * Process Control Block. */ struct pcb { + caddr_t pcb_onfault; __register_t pcb_regs[13]; }; From owner-p4-projects@FreeBSD.ORG Sat Oct 14 15:05:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7439116A4A0; Sat, 14 Oct 2006 15:05:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3525116A492 for ; Sat, 14 Oct 2006 15:05:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E2AC43D46 for ; Sat, 14 Oct 2006 15:05:42 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EF5gkP030510 for ; Sat, 14 Oct 2006 15:05:42 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EF5gp9030507 for perforce@freebsd.org; Sat, 14 Oct 2006 15:05:42 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 14 Oct 2006 15:05:42 GMT Message-Id: <200610141505.k9EF5gp9030507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 15:05:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=107897 Change 107897 by gonzo@gonzo_hq on 2006/10/14 15:05:41 o Add asm accessor for pcb_onfault field of pcb struct. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/genassym.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/genassym.c#4 (text+ko) ==== @@ -80,6 +80,7 @@ ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); +ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_MD_REGS, offsetof(struct thread, td_md.md_regs)); From owner-p4-projects@FreeBSD.ORG Sat Oct 14 15:39:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D42C16A47B; Sat, 14 Oct 2006 15:39:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5114C16A416 for ; Sat, 14 Oct 2006 15:39:31 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19F3143D7D for ; Sat, 14 Oct 2006 15:39:25 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EFdOYN035279 for ; Sat, 14 Oct 2006 15:39:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EFdOXC035274 for perforce@freebsd.org; Sat, 14 Oct 2006 15:39:24 GMT (envelope-from piso@freebsd.org) Date: Sat, 14 Oct 2006 15:39:24 GMT Message-Id: <200610141539.k9EFdOXC035274@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 107899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 15:39:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107899 Change 107899 by piso@piso_newluxor on 2006/10/14 15:38:37 filter-ize fxp. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#4 (text+ko) ==== @@ -211,7 +211,9 @@ static int fxp_shutdown(device_t dev); static int fxp_suspend(device_t dev); static int fxp_resume(device_t dev); - +#ifdef INTR_FILTER +static int fxp_filter(void *xsc); +#endif static void fxp_intr(void *xsc); static void fxp_intr_body(struct fxp_softc *sc, struct ifnet *ifp, uint8_t statack, int count); @@ -804,8 +806,14 @@ /* * Hook our interrupt after all initialization is complete. */ + +#ifdef INTR_FILTER + error = bus_setup_intr(dev, sc->fxp_res[1], INTR_TYPE_NET | INTR_MPSAFE, + fxp_filter, fxp_intr, sc, &sc->ih); +#else error = bus_setup_intr(dev, sc->fxp_res[1], INTR_TYPE_NET | INTR_MPSAFE, NULL, fxp_intr, sc, &sc->ih); +#endif if (error) { device_printf(dev, "could not setup irq\n"); ether_ifdetach(sc->ifp); @@ -1482,6 +1490,23 @@ } #endif /* DEVICE_POLLING */ +#ifdef INTR_FILTER +static int +fxp_filter(void *xsc) +{ + struct fxp_softc *sc = xsc; + uint8_t statack; + + statack = CSR_READ_1(sc, FXP_CSR_SCB_STATACK); + if (statack == 0xff || statack == 0) + return (FILTER_STRAY); + + /* disable interrupts */ + CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTR_DISABLE); + return (FILTER_HANDLED|FILTER_SCHEDULE_THREAD); +} +#endif + /* * Process interface interrupts. */ @@ -1522,6 +1547,10 @@ CSR_WRITE_1(sc, FXP_CSR_SCB_STATACK, statack); fxp_intr_body(sc, ifp, statack, -1); } +#ifdef INTR_FILTER + /* enable interrupts */ + CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, 0); +#endif FXP_UNLOCK(sc); } From owner-p4-projects@FreeBSD.ORG Sat Oct 14 15:39:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13B3C16A519; Sat, 14 Oct 2006 15:39:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5C6016A501 for ; Sat, 14 Oct 2006 15:39:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08CF043D45 for ; Sat, 14 Oct 2006 15:39:25 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EFdPHa035285 for ; Sat, 14 Oct 2006 15:39:25 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EFdPmG035282 for perforce@freebsd.org; Sat, 14 Oct 2006 15:39:25 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 15:39:25 GMT Message-Id: <200610141539.k9EFdPmG035282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 15:39:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=107900 Change 107900 by rdivacky@rdivacky_witten on 2006/10/14 15:38:47 Rewritten, yet still panicing version of pdeath_signal. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#3 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#9 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#7 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#3 edit .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#5 edit .. //depot/projects/linuxolator/src/sys/sys/eventhandler.h#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -129,7 +129,6 @@ static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; static eventhandler_tag linux_exec_tag; -static eventhandler_tag linux_reparent_tag; /* * Linux syscalls return negative errno's, we do positive and map them @@ -1088,8 +1087,6 @@ NULL, 1000); linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, NULL, 1000); - linux_reparent_tag = EVENTHANDLER_REGISTER(reparent, linux_reparent, - NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -1117,7 +1114,6 @@ EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); - EVENTHANDLER_DEREGISTER(reparent, linux_reparent_tag); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#9 (text+ko) ==== @@ -152,6 +152,7 @@ int error; struct thread *td = FIRST_THREAD_IN_PROC(p); int *child_clear_tid; + struct proc *q, *nq; if (__predict_true(p->p_sysent != &elf_linux_sysvec)) return; @@ -205,6 +206,24 @@ /* clean the stuff up */ free(em, M_LINUX); + + /* this is a little weird but rewritten from exit1() */ + sx_xlock(&proctree_lock); + q = LIST_FIRST(&p->p_children); + for (; q != NULL; q = nq) { + nq = LIST_NEXT(q, p_sibling); + if (__predict_true(q->p_sysent != &elf_linux_sysvec)) + break; + em = em_find(q, EMUL_UNLOCKED); + KASSERT(em != NULL, ("linux_reparent: emuldata not found: %i\n", q->p_pid)); + if (em->pdeath_signal != 0) { + PROC_LOCK(q); + psignal(q, em->pdeath_signal); + PROC_UNLOCK(q); + } + EMUL_UNLOCK(&emul_lock); + } + sx_xunlock(&proctree_lock); } /* @@ -300,22 +319,3 @@ EMUL_UNLOCK(&emul_lock); return 0; } - -/* p is locked */ -void -linux_reparent(void *arg __unused, struct proc *p) -{ - struct linux_emuldata *em; - - if (__predict_true(p->p_sysent != &elf_linux_sysvec)) - return; - - /* do this only if the parent is exiting */ - if (p->p_pptr->p_flag & P_WEXIT) { - em = em_find(p, EMUL_UNLOCKED); - KASSERT(em != NULL, ("linux_reparent: emuldata not found.\n")); - if (em->pdeath_signal != 0) - psignal(p, em->pdeath_signal); - EMUL_UNLOCK(&emul_lock); - } -} ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#7 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#3 (text+ko) ==== @@ -113,7 +113,6 @@ static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; static eventhandler_tag linux_exec_tag; -static eventhandler_tag linux_reparent_tag; /* * Linux syscalls return negative errno's, we do positive and map them @@ -928,8 +927,6 @@ NULL, 1000); linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, NULL, 1000); - linux_reparent_tag = EVENTHANDLER_REGISTER(reparent, linux_reparent, - NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -957,7 +954,6 @@ EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); - EVENTHANDLER_DEREGISTER(reparent, linux_reparent_tag); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else ==== //depot/projects/linuxolator/src/sys/kern/kern_exit.c#5 (text+ko) ==== @@ -897,9 +897,6 @@ if (child->p_pptr == parent) return; - /* we want to have old parent accessible via p_pptr */ - EVENTHANDLER_INVOKE(reparent, child); - LIST_REMOVE(child, p_sibling); LIST_INSERT_HEAD(&parent->p_children, child, p_sibling); child->p_pptr = parent; ==== //depot/projects/linuxolator/src/sys/sys/eventhandler.h#3 (text+ko) ==== @@ -179,6 +179,4 @@ typedef void(*schedtail_fn)(void *, struct proc *); EVENTHANDLER_DECLARE(schedtail, schedtail_fn); -typedef void(*reparent_fn)(void *, struct proc *); -EVENTHANDLER_DECLARE(reparent, reparent_fn); #endif /* SYS_EVENTHANDLER_H */ From owner-p4-projects@FreeBSD.ORG Sat Oct 14 15:50:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F8C016A492; Sat, 14 Oct 2006 15:50:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB12E16A47C for ; Sat, 14 Oct 2006 15:50:40 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9998A43D46 for ; Sat, 14 Oct 2006 15:50:40 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EFoeHZ036831 for ; Sat, 14 Oct 2006 15:50:40 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EFoeZe036827 for perforce@freebsd.org; Sat, 14 Oct 2006 15:50:40 GMT (envelope-from piso@freebsd.org) Date: Sat, 14 Oct 2006 15:50:40 GMT Message-Id: <200610141550.k9EFoeZe036827@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 107901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 15:50:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=107901 Change 107901 by piso@piso_newluxor on 2006/10/14 15:50:20 Let's start porting intr filter to arm too. Affected files ... .. //depot/projects/soc2006/intr_filter/arm/conf/EP80219#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/arm/conf/EP80219#2 (text+ko) ==== @@ -116,3 +116,5 @@ device bpf #options ROOTDEVNAME=\"ufs:ad4s1a\" +options INTR_FILTER + From owner-p4-projects@FreeBSD.ORG Sat Oct 14 16:05:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85BEF16A407; Sat, 14 Oct 2006 16:05:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43F5116A415 for ; Sat, 14 Oct 2006 16:05:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D155E43D55 for ; Sat, 14 Oct 2006 16:04:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9EG4xmh040873 for ; Sat, 14 Oct 2006 16:04:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9EG4x8o040869 for perforce@freebsd.org; Sat, 14 Oct 2006 16:04:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 14 Oct 2006 16:04:59 GMT Message-Id: <200610141604.k9EG4x8o040869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Oct 2006 16:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=107903 Change 107903 by rdivacky@rdivacky_witten on 2006/10/14 16:04:47 A bunch of fixes that makes this not panic when killpg() is called. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#10 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#10 (text+ko) ==== @@ -212,8 +212,12 @@ q = LIST_FIRST(&p->p_children); for (; q != NULL; q = nq) { nq = LIST_NEXT(q, p_sibling); - if (__predict_true(q->p_sysent != &elf_linux_sysvec)) - break; + PROC_LOCK(q); + if (q->p_flag & P_WEXIT) + continue; + PROC_UNLOCK(q); + if (__predict_false(q->p_sysent != &elf_linux_sysvec)) + continue; em = em_find(q, EMUL_UNLOCKED); KASSERT(em != NULL, ("linux_reparent: emuldata not found: %i\n", q->p_pid)); if (em->pdeath_signal != 0) {