From owner-p4-projects@FreeBSD.ORG Sun May 20 09:45:19 2007 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 1941816A469; Sun, 20 May 2007 09:45:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DFDDD16A41F for ; Sun, 20 May 2007 09:45:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D1F1313C45A for ; Sun, 20 May 2007 09:45:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4K9jIvd079282 for ; Sun, 20 May 2007 09:45:18 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4K9jIVP079271 for perforce@freebsd.org; Sun, 20 May 2007 09:45:18 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 20 May 2007 09:45:18 GMT Message-Id: <200705200945.l4K9jIVP079271@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 120101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 09:45:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=120101 Change 120101 by rdivacky@rdivacky_witten on 2007/05/20 09:44:33 Add linux_support.s to pc98 files. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.pc98#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.pc98#2 (text+ko) ==== @@ -221,6 +221,7 @@ dependency "linux_assym.h" i386/linux/linux_machdep.c optional compat_linux i386/linux/linux_ptrace.c optional compat_linux +i386/linux/linux_support.s optional compat_linux i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci From owner-p4-projects@FreeBSD.ORG Sun May 20 14:08:04 2007 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 48D4816A468; Sun, 20 May 2007 14:08:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 05EBB16A41F for ; Sun, 20 May 2007 14:08:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E7C2913C448 for ; Sun, 20 May 2007 14:08:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KE83hT070067 for ; Sun, 20 May 2007 14:08:03 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KE82C6070036 for perforce@freebsd.org; Sun, 20 May 2007 14:08:02 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 20 May 2007 14:08:02 GMT Message-Id: <200705201408.l4KE82C6070036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 14:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=120112 Change 120112 by rpaulo@rpaulo_epsilon on 2007/05/20 14:07:43 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/md_var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/smp.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/asm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/pmap.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/profile.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/kern.mk#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/mss.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ufoma.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/smp.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/exception.S#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/mca.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/init_main.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_fork.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_lock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_malloc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mib.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_rwlock.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sx.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_synch.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_thread.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_lock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_syscalls.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_default.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_fwsubr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_fec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_mppc.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/icmp6.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_output.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_syncache.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_proto.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/pc98/pc98/machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/ver.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/cache.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/iommureg.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/iommuvar.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/pmap.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/upa.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/ver.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/lockf.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sx.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sysctl.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/vmmeter.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/vnode.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/swap_pager.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/uma_core.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_contig.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_glue.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_meter.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_object.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageq.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -221,8 +221,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -80,6 +80,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.584 2007/04/25 18:10:43 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,8 +1149,7 @@ */ m->right = *free; *free = m; - - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); return 1; } @@ -1460,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/soc2007/rpaulo-macbook/amd64/include/md_var.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/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,8 +57,6 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; -extern struct pcpu __pcpu[]; - typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; struct reg; ==== //depot/projects/soc2007/rpaulo-macbook/amd64/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.89 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ * */ @@ -23,6 +23,7 @@ #include #include #include +#include /* global symbols in mpboot.S */ extern char mptramp_start[]; ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); /* * ARM bus dma support routines @@ -1003,7 +1003,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + vm_offset_t lastaddr = 0; #ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -1079,7 +1079,7 @@ return; } -static __inline void +static void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/machdep.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.25 2007/02/14 04:41:28 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $"); #include #include @@ -286,8 +286,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - (uintmax_t)ptoa(cnt.v_free_count), - (uintmax_t)ptoa(cnt.v_free_count) / 1048576); + (uintmax_t)ptoa(VMCNT_GET(free_count)), + (uintmax_t)ptoa(VMCNT_GET(free_count)) / 1048576); bufinit(); vm_pager_bufferinit(); @@ -547,7 +547,7 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tf = td->td_frame; - __greg_t *gr = mcp->__gregs; + const __greg_t *gr = mcp->__gregs; tf->tf_r0 = gr[_REG_R0]; tf->tf_r1 = gr[_REG_R1]; ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $"); #include #include #include @@ -431,10 +431,10 @@ l1->l1_kva = l1pt; l1->l1_domain_use_count = 0; - l1->l1_domain_first = 0; + l1->l1_domain_first = 1; for (i = 0; i < PMAP_DOMAINS; i++) - l1->l1_domain_free[i] = i + 1; + l1->l1_domain_free[i] = i + 2; /* * Copy the kernel's L1 entries to each new L1. @@ -1970,7 +1970,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2910,7 +2910,7 @@ /* * remove a page rom the kernel pagetables */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { struct l2_bucket *l2b; ==== //depot/projects/soc2007/rpaulo-macbook/arm/include/asm.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -80,7 +80,7 @@ #ifdef GPROF # define _PROF_PROLOGUE \ - mov ip, lr; bl _mcount + mov ip, lr; bl __mcount #else # define _PROF_PROLOGUE #endif ==== //depot/projects/soc2007/rpaulo-macbook/arm/include/pmap.h#2 (text+ko) ==== @@ -44,7 +44,7 @@ * 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/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,8 +237,8 @@ /* * Definitions for MMU domains */ -#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */ -#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */ +#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */ +#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ /* * The new pmap ensures that page-tables are always mapping Write-Thru. ==== //depot/projects/soc2007/rpaulo-macbook/arm/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,9 +61,9 @@ #define MCOUNT \ __asm__(".text"); \ __asm__(".align 0"); \ - __asm__(".type _mcount ,%function"); \ - __asm__(".global _mcount"); \ - __asm__("_mcount:"); \ + __asm__(".type __mcount ,%function"); \ + __asm__(".global __mcount"); \ + __asm__("__mcount:"); \ /* \ * Preserve registers that are trashed during mcount \ */ \ ==== //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $ FILES= boot boot1 boot2 @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections ==== //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); #include @@ -1303,9 +1303,8 @@ struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; - rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_SCSIDA, - M_NOWAIT); + rcap = (struct scsi_read_capacity_data *) + malloc(sizeof(*rcap), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcap == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ @@ -1330,7 +1329,7 @@ struct scsi_read_capacity_data_long *rcaplong; rcaplong = (struct scsi_read_capacity_data_long *) - malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT); + malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcaplong == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ ==== //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.70 2007/03/13 01:50:21 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.71 2007/05/18 13:02:12 kib Exp $"); #include #include @@ -129,7 +129,7 @@ .vop_readlink = coda_readlink, /* readlink */ .vop_inactive = coda_inactive, /* inactive */ .vop_reclaim = coda_reclaim, /* reclaim */ - ._vop_lock = coda_lock, /* lock */ + .vop_lock1 = coda_lock, /* lock */ .vop_unlock = coda_unlock, /* unlock */ .vop_bmap = coda_bmap, /* bmap */ .vop_print = VOP_PANIC, /* print */ @@ -1627,7 +1627,7 @@ } int -coda_lock(struct _vop_lock_args *ap) +coda_lock(struct vop_lock1_args *ap) { /* true args */ struct vnode *vp = ap->a_vp; ==== //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.17 2006/11/13 05:51:21 kmacy Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.18 2007/05/18 13:02:12 kib Exp $ * */ @@ -72,7 +72,7 @@ vop_bmap_t coda_bmap; vop_strategy_t coda_strategy; vop_reclaim_t coda_reclaim; -_vop_lock_t coda_lock; +vop_lock1_t coda_lock; vop_unlock_t coda_unlock; vop_islocked_t coda_islocked; int coda_vop_error(void *); ==== //depot/projects/soc2007/rpaulo-macbook/compat/linprocfs/linprocfs.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.112 2007/05/01 03:09:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.113 2007/05/18 07:10:43 jeff Exp $"); #include #include @@ -146,14 +146,14 @@ /* * The correct thing here would be: * - memfree = cnt.v_free_count * PAGE_SIZE; + memfree = VMCNT_GET(free_count) * PAGE_SIZE; memused = memtotal - memfree; * * but it might mislead linux binaries into thinking there * is very little memory left, so we cheat and tell them that * all memory that isn't wired down is free. */ - memused = cnt.v_wire_count * PAGE_SIZE; + memused = VMCNT_GET(wire_count) * PAGE_SIZE; memfree = memtotal - memused; swap_pager_status(&i, &j); swaptotal = (unsigned long long)i * PAGE_SIZE; @@ -175,7 +175,7 @@ * like unstaticizing it just for linprocfs's sake. */ buffers = 0; - cached = cnt.v_cache_count * PAGE_SIZE; + cached = VMCNT_GET(cache_count) * PAGE_SIZE; sbuf_printf(sb, " total: used: free: shared: buffers: cached:\n" @@ -394,12 +394,12 @@ "intr %u\n" "ctxt %u\n" "btime %lld\n", - cnt.v_vnodepgsin, - cnt.v_vnodepgsout, - cnt.v_swappgsin, - cnt.v_swappgsout, - cnt.v_intr, - cnt.v_swtch, + VMCNT_GET(vnodepgsin), + VMCNT_GET(vnodepgsout), + VMCNT_GET(swappgsin), + VMCNT_GET(swappgsout), + VMCNT_GET(intr), + VMCNT_GET(swtch), (long long)boottime.tv_sec); return (0); } ==== //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.208 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.209 2007/05/18 07:10:43 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -139,7 +139,7 @@ LINUX_SYSINFO_LOADS_SCALE / averunnable.fscale; sysinfo.totalram = physmem * PAGE_SIZE; - sysinfo.freeram = sysinfo.totalram - cnt.v_wire_count * PAGE_SIZE; + sysinfo.freeram = sysinfo.totalram - VMCNT_GET(wire_count) * PAGE_SIZE; sysinfo.sharedram = 0; mtx_lock(&vm_object_list_mtx); ==== //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.91 2006/11/06 13:41:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.92 2007/05/18 07:10:44 jeff Exp $"); #include "opt_mac.h" @@ -778,14 +778,14 @@ #if defined(UVM) *retval = uvmexp.free; /* XXX: free instead of total */ #else - *retval = cnt.v_free_count; /* XXX: free instead of total */ + *retval = VMCNT_GET(free_count); /* XXX: free instead of total */ #endif break; case SVR4_CONFIG_AVPHYS_PAGES: #if defined(UVM) *retval = uvmexp.active; /* XXX: active instead of avg */ #else - *retval = cnt.v_active_count; /* XXX: active instead of avg */ + *retval = VMCNT_GET(active_count); /* XXX: active instead of avg */ #endif break; #endif /* NOTYET */ ==== //depot/projects/soc2007/rpaulo-macbook/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif @@ -46,7 +46,7 @@ # a very small subset of float registers for integer divides. # .if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata INLINE_LIMIT?= 15000 .endif ==== //depot/projects/soc2007/rpaulo-macbook/conf/kern.pre.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -90,7 +90,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/soc2007/rpaulo-macbook/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.217 2007/03/21 03:42:49 sam Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -79,7 +79,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -93,7 +93,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/mss.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.110 2007/05/19 10:53:01 joel Exp $"); /* board-specific include files */ #include @@ -1320,7 +1320,7 @@ goto mss_probe_end; } tmp &= 0x3f; - if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00)) { + if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00 || tmp == 0x05)) { BVDDB(printf("No MSS signature detected on port 0x%lx (0x%x)\n", rman_get_start(mss->io_base), tmpx)); goto no; ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -859,7 +859,7 @@ spicds_setcif(ptr->info, ptr->parent->cfg->cif); spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); /* for the time being, init only first codec */ if (ptr->num == 0) spicds_init(ptr->info); ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -932,7 +932,7 @@ ptr->parent->cfg->type == SPICDS_TYPE_AK4528) { spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); } /* for the time being, init only first codec */ ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/fm801.c#2 (text+ko) ==== @@ -29,11 +29,11 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.31 2007/05/19 13:19:32 joel Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 -#define PCI_DEVICE_FORTEMEDIA1 0x08011319 -#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */ +#define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ +#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ #define FM_PCM_VOLUME 0x00 #define FM_FM_VOLUME 0x02 @@ -417,15 +417,16 @@ struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - if(ch->dir == PCMDIR_PLAY) { - if(fm801->play_flip) return fm801->play_blksize; + /* + * Don't mind for play_flip, set the blocksize to the + * desired values in any case - otherwise sound playback + * breaks here. + */ + if(ch->dir == PCMDIR_PLAY) fm801->play_blksize = blocksize; - } - if(ch->dir == PCMDIR_REC) { - if(fm801->rec_flip) return fm801->rec_blksize; + if(ch->dir == PCMDIR_REC) fm801->rec_blksize = blocksize; - } DPRINT("fm801ch_setblocksize %d (dir %d)\n",blocksize, ch->dir); ==== //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl.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/dev/twa/tw_osl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.4 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -52,7 +52,7 @@ #define TW_OSLI_MAX_NUM_IOS TW_CL_MAX_SIMULTANEOUS_REQUESTS #define TW_OSLI_MAX_NUM_AENS 0x100 -#define TW_OSLI_DEFERRED_INTR_USED +//#define TW_OSLI_DEFERRED_INTR_USED /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ ==== //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl_share.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/dev/twa/tw_osl_share.h,v 1.7 2007/05/10 15:36:58 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.8 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -75,7 +75,7 @@ #define TW_OSL_ENCLOSURE_SUPPORT #endif -#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.006" +#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.007" #define TW_OSL_CAN_SLEEP ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ufoma.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.2 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.3 2007/05/19 04:57:15 kan Exp $"); /*- * Copyright (c) 2005, Takanori Watanabe * Copyright (c) 2003, M. Warner Losh . @@ -256,8 +256,6 @@ }; -static devclass_t ucom_devclass; - DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0); MODULE_DEPEND(ufoma, usb, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/soc2007/rpaulo-macbook/fs/nullfs/null_vnops.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.93 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.94 2007/05/18 13:02:12 kib Exp $ */ /* @@ -510,7 +510,7 @@ * vnodes below us on the stack. */ static int -null_lock(struct _vop_lock_args *ap) +null_lock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; @@ -728,7 +728,7 @@ .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_islocked = null_islocked, - ._vop_lock = null_lock, + .vop_lock1 = null_lock, .vop_lookup = null_lookup, .vop_open = null_open, .vop_print = null_print, ==== //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_io.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.37 2006/08/09 17:43:26 alc Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.38 2007/05/18 07:10:44 jeff Exp $ * */ #include @@ -475,8 +475,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodein++; - cnt.v_vnodepgsin += npages; + VMCNT_ADD(vnodein, 1); + VMCNT_ADD(vnodepgsin, npages); iov.iov_base = (caddr_t) kva; iov.iov_len = count; @@ -626,8 +626,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodeout++; - cnt.v_vnodepgsout += count; + VMCNT_ADD(vnodeout, 1); + VMCNT_ADD(vnodepgsout, count); iov.iov_base = (caddr_t) kva; iov.iov_len = count; ==== //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_vnops.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 - * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.48 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.49 2007/05/18 13:02:12 kib Exp $ */ /* @@ -57,7 +57,7 @@ static vop_generic_t umap_bypass; static vop_getattr_t umap_getattr; static vop_inactive_t umap_inactive; -static vop_lock_t umap_lock; +static vop_lock1_t umap_lock; static vop_print_t umap_print; static vop_reclaim_t umap_reclaim; static vop_rename_t umap_rename; @@ -353,7 +353,7 @@ */ static int umap_lock(ap) - struct vop_lock_args /* { + struct vop_lock1_args /* { struct vnode *a_vp; int a_flags; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 20 14:14:12 2007 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 7E28916A46B; Sun, 20 May 2007 14:14:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3CF3416A400 for ; Sun, 20 May 2007 14:14:12 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B08E13C44C for ; Sun, 20 May 2007 14:14:12 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KEECNp077265 for ; Sun, 20 May 2007 14:14:12 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KEEBqA077254 for perforce@freebsd.org; Sun, 20 May 2007 14:14:11 GMT (envelope-from taleks@FreeBSD.org) Date: Sun, 20 May 2007 14:14:11 GMT Message-Id: <200705201414.l4KEEBqA077254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 120113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 14:14:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=120113 Change 120113 by taleks@taleks_th on 2007/05/20 14:13:12 pxe_isr: updated ISR, added chained ISR calling (but it's still not used) , made more correct installation, solved 16bit issue during loader linkage (relocation truncated), added copy function in vm86 mode (needed for recieved data copy operation, cause user space starts only at a000) . pxe_core: updated transmit function, initialization, receive function. pxe_arp: small changes to fill structures correct and send/receive cycle. Overall: added PXE_DEBUG macro definition to enable debug info. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_isr.S#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_isr.h#3 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/Makefile#2 (text+ko) ==== @@ -6,10 +6,13 @@ SRCS= pxe_conv.c pxe_core.h pxe_isr.S pxe_sock.c pxe_arp.c pxe_ip.c pxe_mutex.c \ pxe_core.c pxe_icmp.c pxe_mem.c -CFLAGS+= -I${.CURDIR}/../../../common -I${.CURDIR}/../../btx/lib \ - -I${.CURDIR}/../../../../contrib/dev/acpica \ - -I${.CURDIR}/../../../.. -I. -I$(.CURDIR)/.. +CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ + -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../.. -I. -I$(.CURDIR)/.. -I${.CURDIR}/../libi386/ # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ +# debug flag +CFLAGS+= -DPXE_DEBUG + .include ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#3 (text+ko) ==== @@ -19,21 +19,52 @@ void pxe_arp_init() { - +#ifdef PXE_DEBUG + printf("pxe_arp_init() started.\n"); + + if (packet_to_send.hdr.hsize != 0) { + printf("Pxe_arp_init() already inited.\n"); + return; + } +#endif pxe_memset(&packet_to_send, 0, sizeof(PXE_ARP_PACK_DATA) ); - /* now body.target_hwaddr filled with zero, which means broadcast MAC */ pxe_memset(arp_table, 0, sizeof(arp_table)); /* filling packet_to_send, it will not change ever */ - packet_to_send.hdr.hwtype = le2be16(ETHER_TYPE); + packet_to_send.hdr.hwtype =le2be16(ETHER_TYPE); packet_to_send.hdr.ptype = le2be16(PXE_PTYPE_IP); packet_to_send.hdr.hsize = 6; /* Ethernet MAC size */ packet_to_send.hdr.psize = 4; /* ip4 size */ - packet_to_send.hdr.operation = PXE_ARPOP_REQUEST; - /* filling source related data, client ip & MAC */ + packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REQUEST); + /* filling source related data: client ip & MAC */ pxe_memcpy(pxe_get_mymac(), packet_to_send.body.src_hwaddr, 6); - packet_to_send.body.src_paddr = le2be32(pxe_get_myip32()); + packet_to_send.body.src_paddr = pxe_get_myip32(); + + /* setting broadcast target address */ + pxe_memset(packet_to_send.body.target_hwaddr, 0xff, 6); +} + +/* + * pxe_arp_table_search() - searches entry in ARP table for given ip + * in: + * ip - ip, for which to search MAC + * out: + * NULL - not found such entry in arp_table + * not NULL - pointer to MAC address + */ +const MAC_ADDR * +pxe_arp_table_search(uint32_t ip) +{ + int entry = 0; + + for (; entry < MAX_ARP_ENTRIES; ++entry) { + + if (arp_table[entry].ip4.ip == ip) + return (const MAC_ADDR *)&(arp_table[entry].mac); + } + + return NULL; } /* @@ -49,21 +80,88 @@ int pxe_arp_protocol(PXE_PACKET *pack, uint8_t function, void *data) { +#ifdef PXE_DEBUG + printf("pxe_arp_protocol() started.\n"); +#endif + const PXE_ARP_PACK_DATA *arp_reply = (const PXE_ARP_PACK_DATA *)pack->raw_data; + +#ifdef PXE_DEBUG + if (arp_reply->hdr.operation == le2be16(PXE_ARPOP_REQUEST) ) { + + uint8_t *mac = arp_reply->body.src_hwaddr; + uint8_t *mac2 = arp_reply->body.target_hwaddr; + PXE_IPADDR ip4; + PXE_IPADDR ip42; - const PXE_ARP_PACK_DATA *arp_reply = (const PXE_ARP_PACK_DATA *)pack->data; + ip4.ip = arp_reply->body.src_paddr; + ip42.ip = arp_reply->body.target_paddr; + + printf("arp request from %x:%x:%x:%x:%x:%x/%d.%d.%d.%d/%x\n\t to: %x:%x:%x:%x:%x:%x/%d.%d.%d.%d/%x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], + ip4.octet[0], ip4.octet[1], ip4.octet[2], ip4.octet[3], ip4.ip, + mac2[0], mac2[1], mac2[2], mac2[3], mac2[4], mac2[5], + ip42.octet[0], ip42.octet[1], ip42.octet[2], ip42.octet[3], ip42.ip + ); + + printf("Sending arp reply."); + + pxe_memcpy(arp_reply->body.src_hwaddr, packet_to_send.body.target_hwaddr, 6); + packet_to_send.body.target_paddr = arp_reply->body.src_paddr; + packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REPLY); + + PXE_PACKET pack; + + pack.raw_size = sizeof(PXE_ARP_PACK_DATA); + pack.raw_data = &packet_to_send; + pack.raw_data = &packet_to_send; + pack.data = &packet_to_send.hdr; + pack.protocol = PXE_PROTOCOL_ARP; + pack.dest_mac = (const MAC_ADDR *)&packet_to_send.body.target_hwaddr[0]; + pack.flags = PXE_SINGLE; + + if (!pxe_core_transmit(&pack)) { + printf("Reply to arp request failed.\n"); + } - if (arp_reply->hdr.operation != PXE_ARPOP_REPLY) /* we don't need answer for requests. May be. */ + /* cleaning packet_to_send back to initiakl state */ + pxe_memset(packet_to_send.body.target_hwaddr, 0xff, 6); + packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REQUEST); + + return 0; + } +#else + if (arp_reply->hdr.operation != le2be16(PXE_ARPOP_REPLY) ) /* we don't need answer for requests. May be. */ return 0; +#endif + + /* if arp_usage exceeds MAX_ARP_ENTRIES, occurs rewriting of earlier placed ARP entries. * MAC may be lost, so protocol must check this case when creating packet (cause * there used pointer to MAC in arp_table). May be better way is to panic if arp_table * is full. In fact, we don't need many entries. Only two: one for gateway, one for DNS-server * or for proxy server. Default arp_table size is 8. It seems more than enough. */ + + if (NULL != pxe_arp_table_search(arp_reply->body.src_paddr)) { +#ifdef PXE_DEBUG + uint8_t *octet = (uint8_t *)&arp_reply->body.src_paddr; + uint8_t *mac = arp_reply->body.src_hwaddr; + printf("MAC of %d.%d.%d.%d already known: %x:%x:%x:%x:%x:%x\n", + octet[0], octet[1], octet[2], octet[3], + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] + ); +#endif + return 0; + } + pxe_memcpy(&arp_reply->body.src_hwaddr, &arp_table[arp_usage % MAX_ARP_ENTRIES].mac, 6); - arp_table[arp_usage % MAX_ARP_ENTRIES].ip4.ip = be2le32(arp_reply->body.src_paddr); + arp_table[arp_usage % MAX_ARP_ENTRIES].ip4.ip = arp_reply->body.src_paddr; ++arp_usage; + +#ifdef PXE_DEBUG + printf("arp reply: arp usage = %d\n", arp_usage); +#endif return 0; /* inform pxe_get_packet() we don't need this packet more. */ } @@ -76,43 +174,33 @@ * out: * none */ -void +int pxe_arp_send_whois(uint32_t ip) { + PXE_PACKET pack; - pack.data_size = sizeof(PXE_ARP_PACK_DATA); - pack.data = &packet_to_send; + pack.raw_size = sizeof(PXE_ARP_PACK_DATA); + pack.raw_data = &packet_to_send; + pack.data = &packet_to_send.hdr; + pack.data_size = sizeof(PXE_ARP_PACK_DATA) - MEDIAHDR_LEN_ETH; + + pack.protocol = PXE_PROTOCOL_ARP; + pack.dest_mac = (const MAC_ADDR *)&packet_to_send.body.target_hwaddr[0]; + pack.flags = PXE_BCAST; - packet_to_send.body.target_paddr = le2be32(ip); + packet_to_send.body.target_paddr = ip; if (!pxe_core_transmit(&pack)) { printf("pxe_arp_send_whois(): failed to send request.\n"); + return (0); } + + return (1); } -/* - * pxe_arp_table_search() - searches entry in ARP table for given ip - * in: - * ip - ip, for which to search MAC - * out: - * NULL - not found such entry in arp_table - * not NULL - pointer to MAC address - */ -const MAC_ADDR * -pxe_arp_table_search(uint32_t ip) -{ - int entry = 0; - - for (; entry < MAX_ARP_ENTRIES; ++entry) { - if (arp_table[entry].ip4.ip == ip) - return &arp_table[entry].mac; - } - return NULL; -} - /* * pxe_arp_ip4mac() - returns MAC for given ip if it's found in arp_table, * otherwise - performs request sending @@ -133,10 +221,14 @@ if (res != NULL) return (res); - pxe_arp_send_whois(ip); + if (pxe_arp_send_whois(ip) != 1) { + return NULL; + } while (1) { - +#ifdef PXE_DEBUG + printf("."); +#endif if (pxe_core_recv_packets()) { /* means some packet was received */ res = pxe_arp_table_search(ip); /* check if ARP protocol was called and @@ -151,20 +243,24 @@ if (timeToDie == 0) { #ifdef PXE_DEBUG - printf("."); + printf(".. request timeout\n"); #endif --trysLeft; if (trysLeft == 0) { /* have not recieved anything, return nothing */ - printf("ARP sending timeout.\n"); + printf("\nARP sending timeout.\n"); return (NULL); } timeToDie = PXE_TIME_TO_DIE; - pxe_arp_send_whois(ip); + + if (pxe_arp_send_whois(ip) != 1) { + return (0); + } } - sleep(1); + /* sleep(1); */ + delay(500000); --timeToDie; } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#3 (text+ko) ==== @@ -6,9 +6,11 @@ * Reference: RFC826 */ +#include +#include #include -#include "pxe.h" +#include "../libi386/pxe.h" #include "pxe_core.h" #include "pxe_ip.h" @@ -57,7 +59,8 @@ } __packed PXE_ARP_PACKET_ETH4; typedef struct pxe_arp_pack_data { - PXE_ARP_PACKET hdr; + uint8_t media_hdr[MEDIAHDR_LEN_ETH]; + PXE_ARP_PACKET hdr; PXE_ARP_PACKET_ETH4 body; } __packed PXE_ARP_PACK_DATA; ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#8 (text+ko) ==== @@ -5,6 +5,7 @@ #include "pxe.h" #include "pxe_arp.h" +#include "pxe_conv.h" #include "pxe_core.h" #include "pxe_ip.h" #include "pxe_isr.h" @@ -20,17 +21,10 @@ #define PXE_TFTP_BUFFER_SIZE 512 static uint8_t scratch_buffer[PXE_BUFFER_SIZE]; static uint8_t data_buffer[PXE_BUFFER_SIZE]; -static pxenv_t *pxenv_p = NULL; /* PXENV+ */ -static pxe_t *pxe_p = NULL; /* !PXE */ +static pxenv_t *pxenv = NULL; /* PXENV+ */ +static pxe_t *pxe = NULL; /* !PXE */ static BOOTPLAYER bootplayer; /* PXE Cached information. */ -/* defined in pxetramp.s */ -extern uint16_t __bangpxeseg; -extern uint16_t __bangpxeoff; -extern void __bangpxeentry(void); -extern uint16_t __pxenvseg; -extern uint16_t __pxenvoff; -extern void __pxenventry(void); /* pxe core structures*/ PXE_PACKET core_packets[PXE_MAX_PACKETS]; /* buffered packets */ @@ -46,20 +40,83 @@ uint32_t packets_sent = 0; uint32_t packets_received = 0; + +/* + * performs startup call during pxe_core_init() + * out: + * 1 - success + * 0 - failed + */ int -pxe_core_init() +pxe_core_undi_startup() +{ + t_PXENV_UNDI_STARTUP *undi_startup = + (t_PXENV_UNDI_STARTUP *)scratch_buffer; + +#ifdef PXE_DEBUG + printf("pxe_core_undi_startup(): started\n"); +#endif + + undi_startup->Status = 0; + + int status = pxe_core_call(PXENV_UNDI_STARTUP); + + if (!status) + printf("pxe_core_undi_startup(): status 0x%x\n", undi_startup->Status); + + return (status); +} + +/* + * performs UNDI initialization call during pxe_core_init() + * out: + * 1 - success + * 0 - failed + */ +int pxe_core_undi_init() +{ + t_PXENV_UNDI_INITIALIZE *undi_init = + (t_PXENV_UNDI_INITIALIZE *)scratch_buffer; + +#ifdef PXE_DEBUG + printf("pxe_core_undi_init(): started\n"); +#endif + + pxe_memset(undi_init, 0, sizeof(t_PXENV_UNDI_INITIALIZE)); + + int status = pxe_core_call(PXENV_UNDI_INITIALIZE); + + if (!status) + printf("pxe_core_undi_init(): status 0x%x\n", undi_init->Status); + + return (status); +} + +int +pxe_core_init(pxenv_t *pxenv_p, pxe_t* pxe_p) { /* int i = 1; /* packet index during initialization loop */ +#ifdef PXE_DEBUG + printf("pxe_core_init(): started (pxenv_p = 0x%x, pxe_p = 0x%x).\n", pxenv_p, pxe_p); +#endif + int counter = 0; uint8_t checksum = 0; uint8_t *checkptr = NULL; +#ifdef PXE_DEBUG + printf("pxe_core_init(): initing structures....\n"); +#endif t_PXENV_GET_CACHED_INFO *gci_p = NULL; pxe_memset(core_packets, 0, sizeof(core_packets)); pxe_memset(core_protocol, 0, sizeof(core_protocol)); nic_ip.ip = 0; + + pxenv = pxenv_p; + pxe = pxe_p; + /* creating 2-linked list of packets */ /* for (; i < PXE_MAX_PACKETS; ++i) { core_packets[i].prev = &core_packets[i-1]; @@ -68,20 +125,6 @@ */ /* 1. determine PXE API entry point */ - /* - * pxe_env is originally is got by pxe_enable() call from - * void - * pxe_enable(void *pxeinfo) { - * pxenv_p = (pxenv_t *)pxeinfo; - * pxe_p = (pxe_t *)PTOV(pxenv_p->PXEPtr.segment * 16 + - * pxenv_p->PXEPtr.offset); - * pxe_call = NULL; - * } - * - * in my case, I must decide how to get this. May be it's best way - * to use same mechanism. or, if I'll not use BTX code, it'll be - * provided other way. So a plenty of things to think. - */ if(pxenv_p == NULL) return (0); @@ -112,7 +155,10 @@ return (0); } - +#ifdef PXE_DEBUG + printf("pxe_core_init(): pxenv checked.\n"); +#endif + /* * PXENV+ passed, so use that if !PXE is not available or * the checksum fails. @@ -132,48 +178,189 @@ pxe_p = NULL; break; } -/* pxe_call = bangpxe_call;*/ break; } } - printf("\nPXE version %d.%d, real mode entry point ", + printf("\nPXE v.%d.%d", (uint8_t) (pxenv_p->Version >> 8), (uint8_t) (pxenv_p->Version & 0xFF)); -/* if (pxe_call == bangpxe_call) */ - printf("@%04x:%04x\n", - pxe_p->EntryPointSP.segment, - pxe_p->EntryPointSP.offset); -/* else - printf("@%04x:%04x\n", - pxenv_p->RMEntry.segment, pxenv_p->RMEntry.offset); -*/ + printf(" @%04x:%04x\n", + pxe_p->EntryPointSP.segment, + pxe_p->EntryPointSP.offset); + gci_p = (t_PXENV_GET_CACHED_INFO *) scratch_buffer; - bzero(gci_p, sizeof(*gci_p)); + pxe_memset(gci_p, 0, sizeof(*gci_p)); gci_p->PacketType = PXENV_PACKET_TYPE_BINL_REPLY; - pxe_core_call(PXENV_GET_CACHED_INFO); + __pxe_entry_seg = pxe->EntryPointSP.segment; + __pxe_entry_off = pxe->EntryPointSP.offset; + + if (!pxe_core_call(PXENV_GET_CACHED_INFO)) { + } if (gci_p->Status != 0) { -/* pxe_perror(gci_p->Status);*/ +#ifdef PXE_DEBUG + printf("pxe_core_init(): error status = 0x%x\n", gci_p->Status); +#endif pxe_p = NULL; return (0); } - bcopy(PTOV((gci_p->Buffer.segment << 4) + gci_p->Buffer.offset), + pxe_memcpy(PTOV((gci_p->Buffer.segment << 4) + gci_p->Buffer.offset), &bootplayer, gci_p->BufferSize); - /* 2. install isr */ + + /* 2. additional start UNDI */ + + /* 2.2 unload stack */ +/* t_PXENV_UNLOAD_STACK *unload_stack = + (t_PXENV_UNLOAD_STACK *)scratch_buffer; + + pxe_memset(unload_stack, 0, sizeof(t_PXENV_UNLOAD_STACK)); + + pxe_core_call(PXENV_UNLOAD_STACK); + + delay(10000000); +*/ + + /* 2.1 stop base */ +/* t_PXENV_STOP_BASE *base_stop = + (t_PXENV_STOP_BASE *)scratch_buffer; + + base_stop->Status = 0; + + pxe_core_call(PXENV_STOP_BASE); + + delay(10000000); +*/ + uint8_t ustate = 3; +/* + t_PXENV_UNDI_GET_STATE *undi_state = + (t_PXENV_UNDI_GET_STATE *)scratch_buffer; + + pxe_core_call(PXENV_UNDI_GET_STATE); + + ustate=undi_state->UNDIstate; + printf("UNDI state: %d\n", ustate); + + delay(5000000); +*/ + /* close */ +/* + if (ustate == 3) { + + t_PXENV_UNDI_CLOSE *undi_close = + (t_PXENV_UNDI_CLOSE *)scratch_buffer; + + undi_close->Status = 0; + + pxe_core_call(PXENV_UNDI_CLOSE); + delay(10000000); + } +*/ + /* cleanup */ +/* + if (ustate > 1) { + t_PXENV_UNDI_CLEANUP *undi_cleanup = + (t_PXENV_UNDI_CLEANUP *)scratch_buffer; + + undi_cleanup->Status = 0; + + pxe_core_call(PXENV_UNDI_CLEANUP); + + delay(10000000); + } + +*/ + /* shutdown */ +/* if (ustate > 0) { + t_PXENV_UNDI_SHUTDOWN *undi_shutdown = + (t_PXENV_UNDI_SHUTDOWN *)scratch_buffer; + + undi_shutdown->Status = 0; + + pxe_core_call(PXENV_UNDI_SHUTDOWN); + + delay(10000000); + } +*/ + +/* + if (ustate < 1) { + if (!pxe_core_undi_startup()) { + return (0); + } else { + ustate = 1; + } + } else { + printf("Skipping startup due to UNDI state.\n"); + } +*/ + +/* if (ustate < 2) { + if (!pxe_core_undi_init()) { + return (0); + } else { + ustate = 2; + } + } else { + printf("Skipping initialization due to UNDI state.\n"); + } + + delay(10000000); +*/ + + /* reset */ +/* t_PXENV_UNDI_RESET *undi_reset = (t_PXENV_UNDI_RESET *)scratch_buffer; + + pxe_memset(undi_reset, 0, sizeof(t_PXENV_UNDI_RESET)); + undi_reset->R_Mcast_Buf.MCastAddrCount = 0; + + if (!pxe_core_call(PXENV_UNDI_RESET_ADAPTER)) { + } +*/ + /* 3. install isr */ pxe_core_install_isr(); + + /* set station addreess */ +/* if (ustate < 3) { + t_PXENV_UNDI_SET_STATION_ADDR *undi_addr= + (t_PXENV_UNDI_SET_STATION_ADDR *)scratch_buffer; + + pxe_memset(undi_addr, 0, sizeof(t_PXENV_UNDI_SET_STATION_ADDR)); + pxe_memcpy(&bootplayer.CAddr, undi_addr->StationAddress, 6); + + if (!pxe_core_call(PXENV_UNDI_SET_STATION_ADDRESS)) { + } + - /* 3. additional start UNDI */ + t_PXENV_UNDI_OPEN *undi_open = (t_PXENV_UNDI_OPEN *)scratch_buffer; + + pxe_memset(undi_open, 0, sizeof(t_PXENV_UNDI_OPEN)); + undi_open->PktFilter = FLTR_DIRECTED | FLTR_BRDCST; + undi_open->R_Mcast_Buf.MCastAddrCount = 0; + + if (!pxe_core_call(PXENV_UNDI_OPEN)) { + } + ustate =3; + } +*/ + /* saving information about NIC */ - nic_ip.ip = be2le32(bootplayer.yip); /* my ip */ - /* my MAC */ - pxe_memcpy(&nic_mac, &bootplayer.CAddr, MAC_ADDR_LEN); + nic_ip.ip = bootplayer.yip; /* my ip */ + printf("my ip: %d.%d.%d.%d\n", nic_ip.octet[0], nic_ip.octet[1], nic_ip.octet[2], nic_ip.octet[3]); + /* my MAC */ + pxe_memcpy(&bootplayer.CAddr, &nic_mac, MAC_ADDR_LEN); + printf("my MAC: %x:%x:%x:%x:%x:%x\n", nic_mac[0], nic_mac[1], nic_mac[2], nic_mac[3], nic_mac[4], nic_mac[5]); + +#ifdef PXE_DEBUG + printf("pxe_core_init(): ended.\n"); +#endif + delay(20000000); return (1); } @@ -186,75 +373,84 @@ #ifdef PXE_DEBUG printf("pxe_isr_install() called\n"); #endif - bzero(undi_info, sizeof(*undi_info)); + pxe_memset(undi_info, 0, sizeof(t_PXENV_UNDI_GET_INFORMATION)); - pxe_core_call(PXENV_UNDI_GET_INFORMATION); + if (!pxe_core_call(PXENV_UNDI_GET_INFORMATION)) { + } if (undi_info->Status != 0) { - printf("pxe_core_install_isr(): failed %x\n", undi_info->Status); + printf("pxe_core_install_isr(): failed with status 0x%x\n", undi_info->Status); return; } - __pxe_nic_irq=(uint16_t)(undi_info->IntNumber); + __pxe_nic_irq = (uint16_t)(undi_info->IntNumber); + uint8_t int_num=(__pxe_nic_irq < 8) ? __pxe_nic_irq + 0x08 : __pxe_nic_irq + 0x68; + #ifdef PXE_DEBUG printf("pxe_core_install_isr() info:\n"); - printf("IRQ: %d\n", undi_info->IntNumber); + printf("IRQ (int): %d (%d)\n", undi_info->IntNumber, int_num); printf("Base io: %d\n", undi_info->BaseIo); printf("MTU: %d\n", undi_info->MaxTranUnit); printf("RX buffer queue: %d\n", undi_info->RxBufCt); printf("TX buffer queue: %d\n", undi_info->TxBufCt); #endif + __pxe_entry_seg2 = pxe->EntryPointSP.segment; + __pxe_entry_off2 = pxe->EntryPointSP.offset; -#ifndef PXE_PMBRANCH - /* main branch - ISR is handled in vm86, so installed also there - * __isr_install uses __pxe_nic_irq to determine interrupt number. - * Well, it may be simplified, cause interrupt number may be got - * in this code (as bellow int_num for PM). - * TODO: simplify pxe_isr.S code. - */ - bzero(&v86, sizeof(v86)); + pxe_memset(&v86, 0, sizeof(v86)); v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.addr = (VTOPSEG(__isr_install) << 16) | VTOPOFF(__isr_install); + v86.eax = int_num; + v86.ebx = VTOPSEG(__pxe_isr); + v86.edx = VTOPOFF(__pxe_isr); v86int(); v86.ctl = V86_FLAGS; -#else - uint16_t int_num=(irq < 8) ? irq + 0x08 : irq + 0x68; + + printf("chained handler @ 0x%x:0x%x (0x%x/0x%x:0x%x)\n", v86.ebx, v86.edx, v86.ecx, VTOPSEG(__chained_irq_off), VTOPOFF(__chained_irq_off)); - caddr_t isr_addr=pxe_isr-__base; - printf("setting interrupt: %d for 0x%x (0x%x, base = 0x%x)\n", - int_num, pxe_isr, isr_addr, __base); +/* v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; + v86.addr = (VTOPSEG(__mask_irq) << 16) | VTOPOFF(__mask_irq); + v86.ebx = __pxe_nic_irq; + v86int(); + v86.ctl = V86_FLAGS; + + printf("enabled irq.\n"); +*/ - /* PMBRANCH - is subproject, which goal to use ISR in PM - * it's not main branch, so just for my own interests - * this __isr_install is syscall - */ - __isr_install(isr_addr, int_num); +#ifdef PXE_DEBUG + printf("pxe_core_install_isr(): success (isr @ 0x%x:0x%x)\n", VTOPSEG(__pxe_isr), VTOPOFF(__pxe_isr)); +#endif +} -#endif +/* + * calls __mem_copy() to copy data in real mode to data buffer + */ +void +pxe_core_copy(uint16_t seg_from, uint16_t off_from, uint16_t seg_to, uint16_t off_to, uint16_t size) +{ + pxe_memset(&v86, 0, sizeof(v86)); -#ifdef PXE_DEBUG - printf("pxe_core_install_isr(): success\n"); -#endif + v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; + v86.addr = (VTOPSEG(__mem_copy) << 16) | VTOPOFF(__mem_copy); + v86.eax = (seg_from << 16 ) | off_from; + v86.ebx = (seg_to << 16 ) | off_to; + v86.ecx = size; + v86int(); + v86.ctl = V86_FLAGS; } void pxe_core_remove_isr() { -#ifdef PXE_PMBRANCH - /* here must be something */ -#else - bzero(&v86, sizeof(v86)); v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.addr = (VTOPSEG(__isr_remove) << 16) | VTOPOFF(__isr_remove); v86int(); v86.ctl = V86_FLAGS; - -#endif } int @@ -287,27 +483,36 @@ /* * function code is taken from bangpxe_call(), /sys/boot/libi386/pxe.c - * needs pxetramp.s wrapper and vm86int() support. - * I'll see later , may be it's simplier to do own v86 monitor, - * than using provided with BTX. + * needs pxe_isr.s wrapper and vm86int() support. + * in: + * func - PXE function number + * out: + * 1 - success + * 0 - failed */ -void +int pxe_core_call(int func) { +#ifdef PXE_DEBUG + printf("pxe_core_call(): func = 0x%x...", func); +#endif bzero(&v86, sizeof(v86)); - bzero(data_buffer, sizeof(data_buffer)); - - __bangpxeseg = pxe_p->EntryPointSP.segment; - __bangpxeoff = pxe_p->EntryPointSP.offset; +/* bzero(data_buffer, sizeof(data_buffer));*/ v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.edx = VTOPSEG(scratch_buffer); v86.eax = VTOPOFF(scratch_buffer); - v86.addr = (VTOPSEG(__bangpxeentry) << 16) | VTOPOFF(__bangpxeentry); + v86.addr = (VTOPSEG(__pxe_call) << 16) | VTOPOFF(__pxe_call); v86.ebx = func; v86int(); v86.ctl = V86_FLAGS; + int status = v86.eax; +#ifdef PXE_DEBUG + printf("%s (0x%x)\n", (status == 0) ? "OK" : "NOK", *((uint16_t *)scratch_buffer) ); +#endif + + return (status == 0) ? 1 : 0; } int @@ -319,38 +524,68 @@ t_PXENV_UNDI_TRANSMIT *undi_send = (t_PXENV_UNDI_TRANSMIT *)scratch_buffer; - bzero(undi_send, sizeof(*undi_send)); + pxe_memset(undi_send, 0, sizeof(t_PXENV_UNDI_TRANSMIT)); t_PXENV_UNDI_TBD tbd; + pxe_memset(&tbd, 0, sizeof(t_PXENV_UNDI_TBD)); + tbd.ImmedLength = pack->data_size; /* packet length */ tbd.Xmit.segment = VTOPSEG(pack->data); /* immediate transmit buffer */ - tbd.Xmit.offset = VTOPOFF(pack->data); + tbd.Xmit.offset = VTOPOFF(pack->data); /* segment & offset */ + +/* tbd.ImmedLength = pack->raw_size; + tbd.Xmit.segment = VTOPSEG(pack->raw_data); + tbd.Xmit.offset = VTOPOFF(pack->raw_data); +*/ tbd.DataBlkCount = 0 ; /* only immediate data */ undi_send->Protocol = pack->protocol; - undi_send->DestAddr.segment = VTOPSEG(pack->dest_mac); - undi_send->DestAddr.offset = VTOPOFF(pack->dest_mac); + undi_send->TBD.segment = VTOPSEG(&tbd); /* SEGOFF16 to xmit block data */ undi_send->TBD.offset = VTOPOFF(&tbd); + + /* if not broadcast packet, specify destination media address */ + undi_send->XmitFlag = (pack->flags & PXE_BCAST) ? XMT_BROADCAST : XMT_DESTADDR; + + if (undi_send->XmitFlag == XMT_DESTADDR) { + undi_send->DestAddr.segment = VTOPSEG(pack->dest_mac); + undi_send->DestAddr.offset = VTOPOFF(pack->dest_mac); + } -/* NOTE: is it needed? we use only immediate block */ - +#ifdef PXE_DEBUG + printf("pxe_core_transmit(): %s %x:%x:%x:%x:%x:%x, proto = %d, %d bytes\n", + (undi_send->XmitFlag == XMT_DESTADDR) ? "to" : "bcast", + (*pack->dest_mac)[0], (*pack->dest_mac)[1], (*pack->dest_mac)[2], + (*pack->dest_mac)[3], (*pack->dest_mac)[4], (*pack->dest_mac)[5], + undi_send->Protocol, pack->raw_size + ); +#endif + +/* NOTE: it is not needed, we use only immediate block */ /* we've inited undi_info with zero, so two lines below are not needed */ -/* tbd.DataBlk[0].TDRsvdByte = 0; /* reserved */ -/* tbd.DataBlk[1].TDRsvdByte = 0; /* reserved */ - tbd.DataBlock[0].TDDataLen=tbd.ImmedLength; /* size of packet*/ - tbd.DataBlock[0].TDPtrType = 1; /* segment:offset type */ - tbd.DataBlock[0].TDDataPtr.segment = VTOPSEG(pack->data);; - tbd.DataBlock[0].TDDataPtr.offset = VTOPOFF(pack->data);; +/* tbd.DataBlk[0].TDRsvdByte = 0; /* reserved */ +/* tbd.DataBlk[1].TDRsvdByte = 0; /* reserved */ +/* tbd.DataBlock[0].TDDataLen=tbd.ImmedLength; /* size of packet*/ +/* tbd.DataBlock[0].TDPtrType = 1; /* segment:offset type */ +/* tbd.DataBlock[0].TDDataPtr.segment = VTOPSEG(pack->data);; /* segment and offset */ +/* tbd.DataBlock[0].TDDataPtr.offset = VTOPOFF(pack->data);; /* to data */ + + int status = 0; /* PXE call status */ + int tryCount = 0; /* tryCount for packet resending */ + + for (; tryCount < 5; ++tryCount) { + status = pxe_core_call(PXENV_UNDI_TRANSMIT); - pxe_core_call(PXENV_UNDI_TRANSMIT); - - if (undi_send->Status != 0) { - printf("pxe_core_transmit(): failed %x\n", undi_send->Status); - return (0); + if (undi_send->Status != 0) { + printf("%d: pxe_core_transmit(): failed with status 0x%x\n", tryCount, undi_send->Status); + continue; + } + + if (status != 0) + break; } - return (1); + return (status); } /* flushes pending, aborted, wrong and etc packets */ @@ -418,38 +653,64 @@ int pxe_core_get_packet(int func, t_PXENV_UNDI_ISR *undi_isr ) { - + printf("get_packet(): started with func %d\n", func); + undi_isr->FuncFlag = func; + int count = 0; while(1) { /* cycle to handle busy flag */ undi_isr->Status = 0; - pxe_core_call(PXENV_UNDI_ISR); + if (!pxe_core_call(PXENV_UNDI_ISR)) { +#ifdef PXE_DEBUG + printf("get_packet(): failed.\n"); +#endif + } if (undi_isr->Status != 0) { /* something gone wrong */ +#ifdef PXE_DEBUG + printf("get_packet(): fail status = 0x%x.\n", undi_isr->Status); +#endif return (0); } if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_DONE) { /* nothing to de */ +#ifdef PXE_DEBUG + printf("get_packet(): all is already done.\n"); +#endif break; } if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_BUSY) { /* NIC is busy, wait */ - sleep(1); +#ifdef PXE_DEBUG + printf("get_packet(): device is busy.\n"); +#endif + ++count; + if (count == 10) + return (0); + + delay(1000); /* wait, may be it will be not busy later */ + continue; } if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_RECIEVE) { /* that's what we are waiting for */ +#ifdef PXE_DEBUG + printf("get_packet(): got packet!.\n"); +#endif break; } if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_TRANSMIT) { /* transmitted packet */ +#ifdef PXE_DEBUG + printf("get_packet(): transmit packet.\n"); +#endif return (0); } } @@ -457,16 +718,6 @@ return (1); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 20 20:50:41 2007 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 989AB16A469; Sun, 20 May 2007 20:50:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48CBC16A41F for ; Sun, 20 May 2007 20:50:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3720D13C44C for ; Sun, 20 May 2007 20:50:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KKofoi056014 for ; Sun, 20 May 2007 20:50:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KKoeXd056002 for perforce@freebsd.org; Sun, 20 May 2007 20:50:40 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 20 May 2007 20:50:40 GMT Message-Id: <200705202050.l4KKoeXd056002@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 120122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 20:50:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=120122 Change 120122 by mjacob@mjexp-obrien on 2007/05/20 20:50:22 IFC Affected files ... .. //depot/projects/mjexp/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/mjexp/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/mjexp/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#10 integrate .. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/mjexp/sys/net/if_lagg.c#5 integrate .. //depot/projects/mjexp/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/mjexp/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/identcpu.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/cache.h#3 delete .. //depot/projects/mjexp/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/mjexp/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/mjexp/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/mjexp/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/nexus.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#8 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tick.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tte_hash.c#5 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/vnex.c#5 integrate .. //depot/projects/mjexp/sys/sys/sx.h#8 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/de/if_devar.h#2 (text) ==== @@ -1,6 +1,6 @@ /* $NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $ */ -/* $FreeBSD: src/sys/dev/de/if_devar.h,v 1.44 2006/09/15 15:16:11 glebius Exp $ */ +/* $FreeBSD: src/sys/dev/de/if_devar.h,v 1.45 2007/05/20 16:43:35 mjacob Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -521,7 +521,7 @@ u_int32_t tulip_intrmask; u_int32_t tulip_cmdmode; u_int32_t tulip_last_system_error:3; - u_int32_t tulip_txtimer:2; /* transmission timer */ + u_int32_t tulip_txtimer:3; /* transmission timer */ u_int32_t tulip_system_errors; u_int32_t tulip_statusbits; /* status bits from * CSR5 that may need ==== //depot/projects/mjexp/sys/dev/hptmv/ioctl.c#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/dev/hptmv/ioctl.c,v 1.6 2007/02/27 17:23:27 jhb Exp $ + * $FreeBSD: src/sys/dev/hptmv/ioctl.c,v 1.7 2007/05/20 16:49:09 mjacob Exp $ */ /* * ioctl.c ioctl interface implementation @@ -151,7 +151,7 @@ } event_queue_add(&e); if (event==ET_DEVICE_REMOVED) { - int controller, channel; + int controller = 0, channel = 0; get_disk_location(&((PVDevice)param)->u.disk, &controller, &channel); hpt_printk(("Device removed: controller %d channel %d\n", controller, channel)); } ==== //depot/projects/mjexp/sys/dev/if_ndis/if_ndis.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.120 2007/03/11 22:37:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.121 2007/05/20 16:59:37 mjacob Exp $"); #include #include @@ -1082,7 +1082,7 @@ uint32_t pktlen; { ndis_miniport_block *block; - uint8_t irql; + uint8_t irql = 0; uint32_t status; ndis_buffer *b; ndis_packet *p; ==== //depot/projects/mjexp/sys/i386/i386/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.86 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.87 2007/05/20 16:53:45 mjacob Exp $"); #include #include @@ -869,6 +869,7 @@ nsegs = 0; error = 0; first = 1; + lastaddr = (bus_addr_t) 0; for (i = 0; i < uio->uio_iovcnt && resid != 0 && !error; i++) { /* * Now at the first iovec to load. Load each iovec ==== //depot/projects/mjexp/sys/ia64/ia64/pmap.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.184 2007/05/19 13:11:27 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.185 2007/05/19 18:25:14 marcel Exp $"); #include #include @@ -1420,14 +1420,14 @@ pmap_remove_pte(pmap, pte, va, pv, 1); } } - } else { - for (va = sva; va < eva; va = va += PAGE_SIZE) { + for (va = sva; va < eva; va += PAGE_SIZE) { pte = pmap_find_vhpt(va); if (pte != NULL) pmap_remove_pte(pmap, pte, va, 0, 1); } } + out: vm_page_unlock_queues(); pmap_install(oldpmap); ==== //depot/projects/mjexp/sys/kern/kern_sx.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.47 2007/05/19 16:35:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.50 2007/05/19 21:26:05 jhb Exp $"); #include #include @@ -101,14 +101,6 @@ */ #define sx_recursed(sx) ((sx)->sx_recurse != 0) -/* - * Return a pointer to the owning thread if the lock is exclusively - * locked. - */ -#define sx_xholder(sx) \ - ((sx)->sx_lock & SX_LOCK_SHARED ? NULL : \ - (struct thread *)SX_OWNER((sx)->sx_lock)) - #ifdef DDB static void db_show_sx(struct lock_object *lock); #endif @@ -147,7 +139,7 @@ struct sx *sx; sx = (struct sx *)lock; - sx_assert(sx, SX_LOCKED | SX_NOTRECURSED); + sx_assert(sx, SA_LOCKED | SA_NOTRECURSED); if (sx_xlocked(sx)) { sx_xunlock(sx); return (1); @@ -171,7 +163,7 @@ int flags; MPASS((opts & ~(SX_QUIET | SX_RECURSE | SX_NOWITNESS | SX_DUPOK | - SX_NOPROFILE)) == 0); + SX_NOPROFILE | SX_ADAPTIVESPIN)) == 0); flags = LO_SLEEPABLE | LO_UPGRADABLE | LO_RECURSABLE; if (opts & SX_DUPOK) @@ -281,7 +273,7 @@ MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_sunlock() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_SLOCKED, file, line); + _sx_assert(sx, SA_SLOCKED, file, line); curthread->td_locks--; WITNESS_UNLOCK(&sx->lock_object, 0, file, line); LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line); @@ -297,7 +289,7 @@ MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xunlock() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_XLOCKED, file, line); + _sx_assert(sx, SA_XLOCKED, file, line); curthread->td_locks--; WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file, @@ -320,7 +312,7 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_try_upgrade() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_SLOCKED, file, line); + _sx_assert(sx, SA_SLOCKED, file, line); /* * Try to switch from one shared lock to an exclusive lock. We need @@ -347,7 +339,7 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_downgrade() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_XLOCKED | SX_NOTRECURSED, file, line); + _sx_assert(sx, SA_XLOCKED | SA_NOTRECURSED, file, line); #ifndef INVARIANTS if (sx_recursed(sx)) panic("downgrade of a recursed lock"); @@ -853,16 +845,16 @@ if (panicstr != NULL) return; switch (what) { - case SX_SLOCKED: - case SX_SLOCKED | SX_NOTRECURSED: - case SX_SLOCKED | SX_RECURSED: + case SA_SLOCKED: + case SA_SLOCKED | SA_NOTRECURSED: + case SA_SLOCKED | SA_RECURSED: #ifndef WITNESS slocked = 1; /* FALLTHROUGH */ #endif - case SX_LOCKED: - case SX_LOCKED | SX_NOTRECURSED: - case SX_LOCKED | SX_RECURSED: + case SA_LOCKED: + case SA_LOCKED | SA_NOTRECURSED: + case SA_LOCKED | SA_RECURSED: #ifdef WITNESS witness_assert(&sx->lock_object, what, file, line); #else @@ -880,31 +872,31 @@ if (!(sx->sx_lock & SX_LOCK_SHARED)) { if (sx_recursed(sx)) { - if (what & SX_NOTRECURSED) + if (what & SA_NOTRECURSED) panic("Lock %s recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); - } else if (what & SX_RECURSED) + } else if (what & SA_RECURSED) panic("Lock %s not recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); } #endif break; - case SX_XLOCKED: - case SX_XLOCKED | SX_NOTRECURSED: - case SX_XLOCKED | SX_RECURSED: + case SA_XLOCKED: + case SA_XLOCKED | SA_NOTRECURSED: + case SA_XLOCKED | SA_RECURSED: if (sx_xholder(sx) != curthread) panic("Lock %s not exclusively locked @ %s:%d\n", sx->lock_object.lo_name, file, line); if (sx_recursed(sx)) { - if (what & SX_NOTRECURSED) + if (what & SA_NOTRECURSED) panic("Lock %s recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); - } else if (what & SX_RECURSED) + } else if (what & SA_RECURSED) panic("Lock %s not recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); break; - case SX_UNLOCKED: + case SA_UNLOCKED: #ifdef WITNESS witness_assert(&sx->lock_object, what, file, line); #else ==== //depot/projects/mjexp/sys/kern/uipc_syscalls.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.255 2007/05/16 20:41:08 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.256 2007/05/19 20:50:59 andre Exp $"); #include "opt_sctp.h" #include "opt_compat.h" @@ -1819,8 +1819,8 @@ struct mbuf *m = NULL; struct sf_buf *sf; struct vm_page *pg; - off_t off, xfsize, sbytes = 0, rem = 0; - int error, mnw = 0; + off_t off, xfsize, fsbytes = 0, sbytes = 0, rem = 0; + int error, hdrlen = 0, mnw = 0; int vfslocked; NET_LOCK_GIANT(); @@ -1916,6 +1916,7 @@ error = mnw ? EAGAIN : ENOBUFS; goto out; } + hdrlen = m_length(m, NULL); } } @@ -1933,7 +1934,7 @@ * The outer loop checks the state and available space of the socket * and takes care of the overall progress. */ - for (off = uap->offset; ; ) { + for (off = uap->offset, rem = uap->nbytes; ; ) { int loopbytes = 0; int space = 0; int done = 0; @@ -1998,6 +1999,13 @@ SOCKBUF_UNLOCK(&so->so_snd); /* + * Reduce space in the socket buffer by the size of + * the header mbuf chain. + * hdrlen is set to 0 after the first loop. + */ + space -= hdrlen; + + /* * Loop and construct maximum sized mbuf chain to be bulk * dumped into socket buffer. */ @@ -2015,12 +2023,12 @@ pgoff = (vm_offset_t)(off & PAGE_MASK); xfsize = omin(PAGE_SIZE - pgoff, obj->un_pager.vnp.vnp_size - uap->offset - - sbytes - loopbytes); + fsbytes - loopbytes); if (uap->nbytes) - rem = (uap->nbytes - sbytes - loopbytes); + rem = (uap->nbytes - fsbytes - loopbytes); else - rem = obj->un_pager.vnp.vnp_size - uap->offset - - sbytes - loopbytes; + rem = obj->un_pager.vnp.vnp_size - + uap->offset - fsbytes - loopbytes; xfsize = omin(rem, xfsize); if (xfsize <= 0) { VM_OBJECT_UNLOCK(obj); @@ -2038,9 +2046,8 @@ } /* - * Attempt to look up the page. - * Allocate if not found or - * wait and loop if busy. + * Attempt to look up the page. Allocate + * if not found or wait and loop if busy. */ pindex = OFF_TO_IDX(off); pg = vm_page_grab(obj, pindex, VM_ALLOC_NOBUSY | @@ -2161,7 +2168,7 @@ /* Add the buffer chain to the socket buffer. */ if (m != NULL) { - int mlen; + int mlen, err; mlen = m_length(m, NULL); SOCKBUF_LOCK(&so->so_snd); @@ -2171,10 +2178,27 @@ goto done; } SOCKBUF_UNLOCK(&so->so_snd); - error = (*so->so_proto->pr_usrreqs->pru_send) + /* Avoid error aliasing. */ + err = (*so->so_proto->pr_usrreqs->pru_send) (so, 0, m, NULL, NULL, td); - if (!error) + if (err == 0) { + /* + * We need two counters to get the + * file offset and nbytes to send + * right: + * - sbytes contains the total amount + * of bytes sent, including headers. + * - fsbytes contains the total amount + * of bytes sent from the file. + */ sbytes += mlen; + fsbytes += mlen; + if (hdrlen) { + fsbytes -= hdrlen; + hdrlen = 0; + } + } else if (error == 0) + error = err; m = NULL; /* pru_send always consumes */ } ==== //depot/projects/mjexp/sys/net/if_lagg.c#5 (text+ko) ==== @@ -1078,8 +1078,6 @@ m = (*sc->sc_input)(sc, lp, m); if (m != NULL) { - ifp->if_ipackets++; - ifp->if_ibytes += m->m_pkthdr.len; trifp->if_ipackets++; trifp->if_ibytes += m->m_pkthdr.len; } @@ -1271,17 +1269,7 @@ { int error = 0; - /* Send mbuf */ - IFQ_ENQUEUE(&ifp->if_snd, m, error); - if (error) - return (error); - if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) - (*ifp->if_start)(ifp); - - ifp->if_obytes += m->m_pkthdr.len; - if (m->m_flags & M_MCAST) - ifp->if_omcasts++; - + IFQ_HANDOFF(ifp, m, error); return (error); } ==== //depot/projects/mjexp/sys/sparc64/include/smp.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/smp.h,v 1.20 2007/05/19 05:01:43 kan Exp $ + * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.21 2007/05/20 14:49:01 marius Exp $ */ #ifndef _MACHINE_SMP_H_ @@ -42,6 +42,8 @@ #define IDR_BUSY (1<<0) #define IDR_NACK (1<<1) +#define IDC_ITID_SHIFT 14 + #define IPI_AST PIL_AST #define IPI_RENDEZVOUS PIL_RENDEZVOUS #define IPI_STOP PIL_STOP @@ -79,7 +81,6 @@ void cpu_mp_shutdown(void); void cpu_ipi_selected(u_int cpus, u_long d0, u_long d1, u_long d2); -void cpu_ipi_send(u_int mid, u_long d0, u_long d1, u_long d2); void ipi_selected(u_int cpus, u_int ipi); void ipi_all(u_int ipi); @@ -220,36 +221,42 @@ static __inline void * ipi_dcache_page_inval(void *func, vm_paddr_t pa) { + return (NULL); } static __inline void * ipi_icache_page_inval(void *func, vm_paddr_t pa) { + return (NULL); } static __inline void * ipi_tlb_context_demap(struct pmap *pm) { + return (NULL); } static __inline void * ipi_tlb_page_demap(struct pmap *pm, vm_offset_t va) { + return (NULL); } static __inline void * ipi_tlb_range_demap(struct pmap *pm, vm_offset_t start, vm_offset_t end) { + return (NULL); } static __inline void ipi_wait(void *cookie) { + } #endif /* SMP */ ==== //depot/projects/mjexp/sys/sparc64/include/ver.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/sparc64/include/ver.h,v 1.5 2004/12/24 16:21:46 scottl Exp $ + * $FreeBSD: src/sys/sparc64/include/ver.h,v 1.6 2007/05/20 13:47:36 marius Exp $ */ #ifndef _MACHINE_VER_H_ @@ -62,13 +62,16 @@ extern char sparc64_model[]; /* Known implementations. */ -#define CPU_IMPL_SPARC64 0x01 -#define CPU_IMPL_ULTRASPARCI 0x10 -#define CPU_IMPL_ULTRASPARCII 0x11 -#define CPU_IMPL_ULTRASPARCIIi 0x12 -#define CPU_IMPL_ULTRASPARCIIe 0x13 -#define CPU_IMPL_ULTRASPARCIII 0x14 -#define CPU_IMPL_ULTRASPARCIIIp 0x15 -#define CPU_IMPL_ULTRASPARCIIIi 0x16 +#define CPU_IMPL_SPARC64 0x01 +#define CPU_IMPL_ULTRASPARCI 0x10 +#define CPU_IMPL_ULTRASPARCII 0x11 +#define CPU_IMPL_ULTRASPARCIIi 0x12 +#define CPU_IMPL_ULTRASPARCIIe 0x13 +#define CPU_IMPL_ULTRASPARCIII 0x14 +#define CPU_IMPL_ULTRASPARCIIIp 0x15 +#define CPU_IMPL_ULTRASPARCIIIi 0x16 +#define CPU_IMPL_ULTRASPARCIV 0x18 +#define CPU_IMPL_ULTRASPARCIVp 0x19 +#define CPU_IMPL_ULTRASPARCIIIip 0x22 #endif /* !_MACHINE_VER_H_ */ ==== //depot/projects/mjexp/sys/sparc64/pci/ofw_pcibus.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcibus.c,v 1.12 2007/01/08 01:08:24 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcibus.c,v 1.13 2007/05/20 13:06:44 marius Exp $"); #include "opt_ofw_pci.h" @@ -48,8 +48,8 @@ #include #ifndef SUN4V #include +#include #endif -#include #include #include @@ -162,8 +162,8 @@ (clnsz / 4) * 4 == clnsz, ("bogus cache line size %d", clnsz)); PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_CACHELNSZ, clnsz / 4, 1); +#endif -#endif /* * The preset in the intline register is usually wrong. Reset it to 255, * so that the PCI code will reroute the interrupt if needed. ==== //depot/projects/mjexp/sys/sparc64/sparc64/identcpu.c#3 (text+ko) ==== @@ -5,9 +5,11 @@ * * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. - * - * $FreeBSD: src/sys/sparc64/sparc64/identcpu.c,v 1.16 2006/11/18 07:10:51 kmacy Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/identcpu.c,v 1.17 2007/05/20 13:47:36 marius Exp $"); + #include #include #include @@ -25,9 +27,7 @@ SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "Machine model"); -#ifndef SUN4V int cpu_impl; -#endif void setPQL2(int *const size, int *const ways); @@ -88,6 +88,15 @@ case CPU_IMPL_ULTRASPARCIIIi: impls = "UltraSparc-IIIi"; break; + case CPU_IMPL_ULTRASPARCIV: + impls = "UltraSparc-IV"; + break; + case CPU_IMPL_ULTRASPARCIVp: + impls = "UltraSparc-IV+"; + break; + case CPU_IMPL_ULTRASPARCIIIip: + impls = "UltraSparc-IIIi+"; + break; default: impls = NULL; break; ==== //depot/projects/mjexp/sys/sparc64/sparc64/mem.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mem.c,v 1.17 2006/11/18 07:10:51 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mem.c,v 1.18 2007/05/20 13:06:45 marius Exp $"); /* * Memory special file @@ -70,7 +70,9 @@ #include #include +#ifndef SUN4V #include +#endif #include #include #include @@ -94,9 +96,6 @@ vm_page_t m; int error; int i; -#ifndef SUN4V - int color; -#endif cnt = 0; error = 0; @@ -136,16 +135,20 @@ } if (m != NULL) { - if (ova == 0) { +#ifndef SUN4V + if (ova == 0) ova = kmem_alloc_wait(kernel_map, PAGE_SIZE * DCACHE_COLORS); - } -#ifndef SUN4V - if ((color = m->md.color) != -1) - va = ova + color * PAGE_SIZE; + if (m->md.color != -1) + va = ova + m->md.color * PAGE_SIZE; else + va = ova; +#else + if (ova == 0) + ova = kmem_alloc_wait(kernel_map, + PAGE_SIZE); + va = ova; #endif - va = ova; pmap_qenter(va, &m, 1); error = uiomove((void *)(va + off), cnt, uio); @@ -182,7 +185,11 @@ /* else panic! */ } if (ova != 0) +#ifndef SUN4V kmem_free_wakeup(kernel_map, ova, PAGE_SIZE * DCACHE_COLORS); +#else + kmem_free_wakeup(kernel_map, ova, PAGE_SIZE); +#endif return (error); } ==== //depot/projects/mjexp/sys/sparc64/sparc64/mp_machdep.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.33 2006/09/03 21:20:21 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.34 2007/05/20 14:49:01 marius Exp $"); #include #include @@ -93,8 +93,8 @@ /* * Argument area used to pass data to non-boot processors as they start up. - * This must be statically initialized with a known invalid upa module id, - * since the other processors will use it before the boot cpu enters the + * This must be statically initialized with a known invalid CPU module ID, + * since the other processors will use it before the boot CPU enters the * kernel. */ struct cpu_start_args cpu_start_args = { 0, -1, -1, 0, 0 }; @@ -106,12 +106,14 @@ vm_offset_t mp_tramp; -u_int mp_boot_mid; - static u_int cpuid_to_mid[MAXCPU]; static volatile u_int shutdown_cpus; -void cpu_mp_unleash(void *); +static void cpu_ipi_send(u_int mid, u_long d0, u_long d1, u_long d2); +static void cpu_mp_unleash(void *v); +static void sun4u_startcpu(phandle_t cpu, void *func, u_long arg); +static void sun4u_stopself(void); + SYSINIT(cpu_mp_unleash, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL); vm_offset_t @@ -123,7 +125,7 @@ v = OF_claim(NULL, PAGE_SIZE, PAGE_SIZE); if (v == NULL) - panic("mp_tramp_alloc"); + panic("%s", __func__); bcopy(mp_tramp_code, v, mp_tramp_code_len); *(u_long *)(v + mp_tramp_tlb_slots) = kernel_tlb_slots; *(u_long *)(v + mp_tramp_func) = (u_long)mp_startup; @@ -139,18 +141,17 @@ } /* - * Probe for other cpus. + * Probe for other CPUs. */ void cpu_mp_setmaxid(void) { + char buf[128]; phandle_t child; phandle_t root; - char buf[128]; int cpus; - all_cpus = 1 << PCPU_GET(cpuid); - mp_boot_mid = PCPU_GET(mid); + all_cpus = 1 << curcpu; mp_ncpus = 1; cpus = 0; @@ -212,7 +213,7 @@ }; openfirmware_exit(&args); - panic("sun4u_stopself: failed."); + panic("%s: failed.", __func__); } /* @@ -221,16 +222,16 @@ void cpu_mp_start(void) { + char buf[128]; volatile struct cpu_start_args *csa; struct pcpu *pc; + register_t s; + vm_offset_t va; phandle_t child; phandle_t root; - vm_offset_t va; - char buf[128]; u_int clock; + u_int mid; int cpuid; - u_int mid; - u_long s; mtx_init(&ipi_mtx, "ipi", NULL, MTX_SPIN); @@ -239,7 +240,7 @@ -1, NULL, NULL); intr_setup(PIL_STOP, cpu_ipi_stop, -1, NULL, NULL); - cpuid_to_mid[PCPU_GET(cpuid)] = mp_boot_mid; + cpuid_to_mid[curcpu] = PCPU_GET(mid); root = OF_peer(0); csa = &cpu_start_args; @@ -249,12 +250,12 @@ continue; if (OF_getprop(child, "upa-portid", &mid, sizeof(mid)) <= 0 && OF_getprop(child, "portid", &mid, sizeof(mid)) <= 0) - panic("cpu_mp_start: can't get module id"); - if (mid == mp_boot_mid) + panic("%s: can't get module ID", __func__); + if (mid == PCPU_GET(mid)) continue; if (OF_getprop(child, "clock-frequency", &clock, sizeof(clock)) <= 0) - panic("cpu_mp_start: can't get clock"); + panic("%s: can't get clock", __func__); csa->csa_state = 0; sun4u_startcpu(child, (void *)mp_tramp, 0); @@ -281,25 +282,26 @@ all_cpus |= 1 << cpuid; } - PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid))); + PCPU_SET(other_cpus, all_cpus & ~(1 << curcpu)); smp_active = 1; } void cpu_mp_announce(void) { + } -void +static void cpu_mp_unleash(void *v) { volatile struct cpu_start_args *csa; struct pcpu *pc; + register_t s; vm_offset_t va; vm_paddr_t pa; u_int ctx_min; u_int ctx_inc; - u_long s; int i; ctx_min = TLB_CTX_USER_MIN; @@ -312,17 +314,17 @@ pc->pc_tlb_ctx_max = ctx_min + ctx_inc; ctx_min += ctx_inc; - if (pc->pc_cpuid == PCPU_GET(cpuid)) + if (pc->pc_cpuid == curcpu) continue; KASSERT(pc->pc_idlethread != NULL, - ("cpu_mp_unleash: idlethread")); - pc->pc_curthread = pc->pc_idlethread; + ("%s: idlethread", __func__)); + pc->pc_curthread = pc->pc_idlethread; pc->pc_curpcb = pc->pc_curthread->td_pcb; for (i = 0; i < PCPU_PAGES; i++) { va = pc->pc_addr + i * PAGE_SIZE; pa = pmap_kextract(va); if (pa == 0) - panic("cpu_mp_unleash: pmap_kextract\n"); + panic("%s: pmap_kextract", __func__); csa->csa_ttes[i].tte_vpn = TV_VPN(va, TS_8K); csa->csa_ttes[i].tte_data = TD_V | TD_8K | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; @@ -337,7 +339,7 @@ } membar(StoreLoad); - csa->csa_count = 0; + csa->csa_count = 0; smp_started = 1; } @@ -352,9 +354,9 @@ tick_start(); smp_cpus++; - KASSERT(curthread != NULL, ("cpu_mp_bootstrap: curthread")); - PCPU_SET(other_cpus, all_cpus & ~(1 << PCPU_GET(cpuid))); - printf("SMP: AP CPU #%d Launched!\n", PCPU_GET(cpuid)); + KASSERT(curthread != NULL, ("%s: curthread", __func__)); + PCPU_SET(other_cpus, all_cpus & ~(1 << curcpu)); + printf("SMP: AP CPU #%d Launched!\n", curcpu); csa->csa_count--; membar(StoreLoad); @@ -394,14 +396,15 @@ static void cpu_ipi_ast(struct trapframe *tf) { + } static void cpu_ipi_stop(struct trapframe *tf) { - CTR1(KTR_SMP, "cpu_ipi_stop: stopped %d", PCPU_GET(cpuid)); - savectx(&stoppcbs[PCPU_GET(cpuid)]); + CTR2(KTR_SMP, "%s: stopped %d", __func__, curcpu); + savectx(&stoppcbs[curcpu]); atomic_set_acq_int(&stopped_cpus, PCPU_GET(cpumask)); while ((started_cpus & PCPU_GET(cpumask)) == 0) { if ((shutdown_cpus & PCPU_GET(cpumask)) != 0) { @@ -411,7 +414,7 @@ } atomic_clear_rel_int(&started_cpus, PCPU_GET(cpumask)); atomic_clear_rel_int(&stopped_cpus, PCPU_GET(cpumask)); - CTR1(KTR_SMP, "cpu_ipi_stop: restarted %d", PCPU_GET(cpuid)); + CTR2(KTR_SMP, "%s: restarted %d", __func__, curcpu); } void @@ -426,21 +429,22 @@ } } -void +static void cpu_ipi_send(u_int mid, u_long d0, u_long d1, u_long d2) { + register_t s; u_long ids; - u_long s; int i; KASSERT((ldxa(0, ASI_INTR_DISPATCH_STATUS) & IDR_BUSY) == 0, - ("cpu_ipi_send: outstanding dispatch")); + ("%s: outstanding dispatch", __func__)); for (i = 0; i < IPI_RETRIES; i++) { s = intr_disable(); stxa(AA_SDB_INTR_D0, ASI_SDB_INTR_W, d0); stxa(AA_SDB_INTR_D1, ASI_SDB_INTR_W, d1); stxa(AA_SDB_INTR_D2, ASI_SDB_INTR_W, d2); - stxa(AA_INTR_SEND | (mid << 14), ASI_SDB_INTR_W, 0); + stxa(AA_INTR_SEND | (mid << IDC_ITID_SHIFT), + ASI_SDB_INTR_W, 0); /* * Workaround for SpitFire erratum #54; do a dummy read * from a SDB internal register before the MEMBAR #Sync @@ -451,7 +455,8 @@ membar(Sync); (void)ldxa(AA_SDB_CNTL_HIGH, ASI_SDB_CONTROL_R); membar(Sync); - while ((ids = ldxa(0, ASI_INTR_DISPATCH_STATUS)) & IDR_BUSY) + while (((ids = ldxa(0, ASI_INTR_DISPATCH_STATUS)) & + IDR_BUSY) != 0) ; intr_restore(s); if ((ids & IDR_NACK) == 0) @@ -468,25 +473,29 @@ kdb_active || #endif panicstr != NULL) - printf("cpu_ipi_send: couldn't send ipi to module %u\n", mid); + printf("%s: couldn't send IPI to module 0x%u\n", + __func__, mid); else - panic("cpu_ipi_send: couldn't send ipi"); + panic("%s: couldn't send IPI", __func__); } void ipi_selected(u_int cpus, u_int ipi) { + cpu_ipi_selected(cpus, 0, (u_long)tl_ipi_level, ipi); } void ipi_all(u_int ipi) { - panic("ipi_all"); + + panic("%s", __func__); } void ipi_all_but_self(u_int ipi) { + cpu_ipi_selected(PCPU_GET(other_cpus), 0, (u_long)tl_ipi_level, ipi); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 20 21:35:37 2007 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 B112816A488; Sun, 20 May 2007 21:35:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E57616A484 for ; Sun, 20 May 2007 21:35:37 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 26AB313C448 for ; Sun, 20 May 2007 21:35:37 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KLZaP3096604 for ; Sun, 20 May 2007 21:35:37 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KLZapM096591 for perforce@freebsd.org; Sun, 20 May 2007 21:35:36 GMT (envelope-from smilicic@FreeBSD.org) Date: Sun, 20 May 2007 21:35:36 GMT Message-Id: <200705202135.l4KLZapM096591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 120124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 21:35:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=120124 Change 120124 by smilicic@tanarri_marilith on 2007/05/20 21:34:36 File operations for geom_log Affected files ... .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/g_log_fileops.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 20 21:43:48 2007 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 24F6716A41F; Sun, 20 May 2007 21:43:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9BA9316A421 for ; Sun, 20 May 2007 21:43:47 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8BF9213C447 for ; Sun, 20 May 2007 21:43:47 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KLhlhP001286 for ; Sun, 20 May 2007 21:43:47 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KLhlW9001276 for perforce@freebsd.org; Sun, 20 May 2007 21:43:47 GMT (envelope-from smilicic@FreeBSD.org) Date: Sun, 20 May 2007 21:43:47 GMT Message-Id: <200705202143.l4KLhlW9001276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 120125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 21:43:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120125 Change 120125 by smilicic@tanarri_marilith on 2007/05/20 21:43:04 Style changes Affected files ... .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/g_log_fileops.c#2 edit Differences ... ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/g_log_fileops.c#2 (text+ko) ==== @@ -8,10 +8,10 @@ #include #include -static int +int glog_open_file(struct vnode *vn, char *filename, int uiflags) { - /*opens a file for reading or writing (specified in uiflags variable*/ + /*opens a file for reading or writing (specified in uiflags)*/ struct thread *td; struct nameidata *nd; int err; @@ -24,10 +24,11 @@ VOP_UNLOCK(nd->ni_vp, 0, td); vn = nd->ni_vp; + return err; } -static int +int glog_close_file(struct vnode *vn, int uiflags) { /*closes a file*/ @@ -36,11 +37,12 @@ td = curthread; err = vn_close(vn, uiflags, td->td_ucred, td); + return err; } -static int -glog_write_file(struct vnode *vp, struct uio *data) +int +glog_write_file(struct vnode *vn, struct uio *data) { /*appends data to a file*/ struct thread *td; @@ -49,26 +51,27 @@ td = curthread; data->uio_rw = UIO_WRITE; - vn_lock(vp, LK_EXCLUSIVE|LK_RETRY,td); - err = VOP_WRITE(vp, data, IO_APPEND|IO_SYNC, td->td_ucred); - VOP_UNLOCK(vp,0,td); + vn_lock(vn, LK_EXCLUSIVE|LK_RETRY,td); + err = VOP_WRITE(vn, data, IO_APPEND|IO_SYNC, td->td_ucred); + VOP_UNLOCK(vn, 0, td); return err; } -static int -glog_read_data(struct vnode *vp, struct uio *data) +int +glog_read_data(struct vnode *vn, struct uio *data) { /*reads data from a file*/ struct thread *td; int err; + td = curthread; bzero(data,sizeof(data)); data->uio_rw = UIO_READ; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - err = VOP_READ(vp, data, IO_UNIT | IO_SYNC, td->td_ucred); - VOP_UNLOCK(vp, 0, td); + vn_lock(vn, LK_EXCLUSIVE | LK_RETRY, td); + err = VOP_READ(vn, data, IO_UNIT | IO_SYNC, td->td_ucred); + VOP_UNLOCK(vn, 0, td); return err; } From owner-p4-projects@FreeBSD.ORG Sun May 20 22:53:15 2007 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 8A58116A468; Sun, 20 May 2007 22:53:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3DA7B16A41F for ; Sun, 20 May 2007 22:53:15 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2D2DE13C465 for ; Sun, 20 May 2007 22:53:15 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KMrFPM069182 for ; Sun, 20 May 2007 22:53:15 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KMrEnp069168 for perforce@freebsd.org; Sun, 20 May 2007 22:53:14 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 20 May 2007 22:53:14 GMT Message-Id: <200705202253.l4KMrEnp069168@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 120130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 22:53:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=120130 Change 120130 by mjacob@mjexp-obrien on 2007/05/20 22:52:30 IFC Affected files ... .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/mjexp/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/mjexp/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/mjexp/sys/i386/include/proc.h#2 integrate .. //depot/projects/mjexp/sys/kern/kern_clock.c#6 integrate .. //depot/projects/mjexp/sys/kern/subr_prof.c#3 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#11 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#9 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#6 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tte_hash.c#6 integrate .. //depot/projects/mjexp/sys/sys/systm.h#13 integrate .. //depot/projects/mjexp/sys/sys/vmmeter.h#4 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#11 integrate Differences ... ==== //depot/projects/mjexp/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.586 2007/05/20 22:33:41 jeff Exp $"); /* * Manages physical address maps. @@ -1149,7 +1149,7 @@ */ m->right = *free; *free = m; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); return 1; } @@ -1459,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/mjexp/sys/compat/ndis/kern_windrv.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.13 2005/11/02 18:01:04 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.14 2007/05/20 22:03:57 jeff Exp $"); #include #include @@ -883,9 +883,9 @@ struct gdt gtable; uint16_t ltable; - mtx_lock_spin(&sched_lock); + t = curthread; - t = curthread; + mtx_lock_spin(&dt_lock); /* Grab location of existing GDT. */ @@ -904,7 +904,7 @@ x86_setldt(>able, ltable); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&dt_lock); return; } @@ -918,9 +918,9 @@ struct x86desc *l; struct thread *t; - mtx_lock_spin(&sched_lock); + t = curthread; - t = curthread; + mtx_lock_spin(&dt_lock); /* Grab location of existing GDT. */ @@ -952,7 +952,7 @@ x86_setldt(>able, ltable); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&dt_lock); /* Whew. */ ==== //depot/projects/mjexp/sys/i386/i386/machdep.c#12 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.651 2007/05/18 07:10:44 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.652 2007/05/20 22:03:57 jeff Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -1171,8 +1171,10 @@ pcb->pcb_gs = _udatasel; load_gs(_udatasel); + mtx_lock_spin(&dt_lock); if (td->td_proc->p_md.md_ldt) user_ldt_free(td); + mtx_unlock_spin(&dt_lock); bzero((char *)regs, sizeof(struct trapframe)); regs->tf_eip = entry; @@ -1278,6 +1280,7 @@ struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ union descriptor ldt[NLDT]; /* local descriptor table */ struct region_descriptor r_gdt, r_idt; /* table descriptors */ +struct mtx dt_lock; /* lock for GDT and LDT */ #if defined(I586_CPU) && !defined(NO_F00F_HACK) extern int has_f00f_bug; @@ -2101,6 +2104,7 @@ r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; r_gdt.rd_base = (int) gdt; + mtx_init(&dt_lock, "descriptor tables", NULL, MTX_SPIN); lgdt(&r_gdt); pcpu_init(pc, 0, sizeof(struct pcpu)); ==== //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.278 2007/05/08 22:01:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.279 2007/05/20 22:03:57 jeff Exp $"); #include "opt_apic.h" #include "opt_cpu.h" @@ -1388,11 +1388,9 @@ if (mp_ncpus == 1) return; - mtx_lock_spin(&sched_lock); atomic_store_rel_int(&aps_ready, 1); while (smp_started == 0) ia32_pause(); - mtx_unlock_spin(&sched_lock); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); ==== //depot/projects/mjexp/sys/i386/i386/pmap.c#13 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.590 2007/05/18 07:10:44 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.591 2007/05/20 22:33:42 jeff Exp $"); /* * Manages physical address maps. @@ -1168,7 +1168,7 @@ pmap->pm_pdir[m->pindex] = 0; --pmap->pm_stats.resident_count; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); /* * Do an invltlb to make the invalidated mapping @@ -1536,7 +1536,7 @@ ("pmap_release: got wrong ptd page")); #endif m->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free_zero(m); } PMAP_LOCK_DESTROY(pmap); ==== //depot/projects/mjexp/sys/i386/i386/sys_machdep.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.108 2007/04/22 15:31:21 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.109 2007/05/20 22:03:57 jeff Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -115,7 +116,6 @@ break; } - mtx_lock(&Giant); switch(uap->op) { case I386_GET_LDT: error = i386_get_ldt(td, &kargs.largs); @@ -215,7 +215,6 @@ error = EINVAL; break; } - mtx_unlock(&Giant); return (error); } @@ -351,16 +350,19 @@ /* * Update the GDT entry pointing to the LDT to point to the LDT of the - * current process. - * - * This must be called with sched_lock held. Unfortunately, we can't use a - * mtx_assert() here because cpu_switch() calls this function after changing - * curproc but before sched_lock's owner is updated in mi_switch(). + * current process. Manage dt_lock holding/unholding autonomously. */ void set_user_ldt(struct mdproc *mdp) { struct proc_ldt *pldt; + int dtlocked; + + dtlocked = 0; + if (!mtx_owned(&dt_lock)) { + mtx_lock_spin(&dt_lock); + dtlocked = 1; + } pldt = mdp->md_ldt; #ifdef SMP @@ -370,6 +372,8 @@ #endif lldt(GSEL(GUSERLDT_SEL, SEL_KPL)); PCPU_SET(currentldt, GSEL(GUSERLDT_SEL, SEL_KPL)); + if (dtlocked) + mtx_unlock_spin(&dt_lock); } #ifdef SMP @@ -385,17 +389,15 @@ #endif /* - * Must be called with either sched_lock free or held but not recursed. - * If it does not return NULL, it will return with it owned. + * dt_lock must be held. Returns with dt_lock held. */ struct proc_ldt * user_ldt_alloc(struct mdproc *mdp, int len) { struct proc_ldt *pldt, *new_ldt; - if (mtx_owned(&sched_lock)) - mtx_unlock_spin(&sched_lock); - mtx_assert(&sched_lock, MA_NOTOWNED); + mtx_assert(&dt_lock, MA_OWNED); + mtx_unlock_spin(&dt_lock); MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt), M_SUBPROC, M_WAITOK); @@ -406,54 +408,49 @@ FREE(new_ldt, M_SUBPROC); return NULL; } - new_ldt->ldt_refcnt = 1; + refcount_init(&new_ldt->ldt_refcnt, 1); new_ldt->ldt_active = 0; - mtx_lock_spin(&sched_lock); + mtx_lock_spin(&dt_lock); gdt_segs[GUSERLDT_SEL].ssd_base = (unsigned)new_ldt->ldt_base; gdt_segs[GUSERLDT_SEL].ssd_limit = len * sizeof(union descriptor) - 1; ssdtosd(&gdt_segs[GUSERLDT_SEL], &new_ldt->ldt_sd); - if ((pldt = mdp->md_ldt)) { + if ((pldt = mdp->md_ldt) != NULL) { if (len > pldt->ldt_len) len = pldt->ldt_len; bcopy(pldt->ldt_base, new_ldt->ldt_base, len * sizeof(union descriptor)); - } else { + } else bcopy(ldt, new_ldt->ldt_base, sizeof(ldt)); - } - return new_ldt; + + return (new_ldt); } /* - * Must be called either with sched_lock free or held but not recursed. - * If md_ldt is not NULL, it will return with sched_lock released. + * Must be called with dt_lock held. */ void user_ldt_free(struct thread *td) { struct mdproc *mdp = &td->td_proc->p_md; - struct proc_ldt *pldt = mdp->md_ldt; + struct proc_ldt *pldt; - if (pldt == NULL) + mtx_assert(&dt_lock, MA_OWNED); + if ((pldt = mdp->md_ldt) == NULL) return; - if (!mtx_owned(&sched_lock)) - mtx_lock_spin(&sched_lock); - mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); if (td == PCPU_GET(curthread)) { lldt(_default_ldt); PCPU_SET(currentldt, _default_ldt); } mdp->md_ldt = NULL; - if (--pldt->ldt_refcnt == 0) { - mtx_unlock_spin(&sched_lock); + if (refcount_release(&pldt->ldt_refcnt)) { kmem_free(kernel_map, (vm_offset_t)pldt->ldt_base, pldt->ldt_len * sizeof(union descriptor)); FREE(pldt, M_SUBPROC); - } else - mtx_unlock_spin(&sched_lock); + } } /* @@ -468,7 +465,7 @@ struct i386_ldt_args *uap; { int error = 0; - struct proc_ldt *pldt = td->td_proc->p_md.md_ldt; + struct proc_ldt *pldt; int nldt, num; union descriptor *lp; @@ -477,11 +474,14 @@ uap->start, uap->num, (void *)uap->descs); #endif - if (pldt) { + mtx_lock_spin(&dt_lock); + if ((pldt = td->td_proc->p_md.md_ldt) != NULL) { nldt = pldt->ldt_len; + lp = &((union descriptor *)(pldt->ldt_base))[uap->start]; + mtx_unlock_spin(&dt_lock); num = min(uap->num, nldt); - lp = &((union descriptor *)(pldt->ldt_base))[uap->start]; } else { + mtx_unlock_spin(&dt_lock); nldt = sizeof(ldt)/sizeof(ldt[0]); num = min(uap->num, nldt); lp = &ldt[uap->start]; @@ -531,10 +531,10 @@ } if (uap->num <= 0) return (EINVAL); - mtx_lock_spin(&sched_lock); - pldt = mdp->md_ldt; - if (pldt == NULL || uap->start >= pldt->ldt_len) { - mtx_unlock_spin(&sched_lock); + mtx_lock_spin(&dt_lock); + if ((pldt = mdp->md_ldt) == NULL || + uap->start >= pldt->ldt_len) { + mtx_unlock_spin(&dt_lock); return (0); } largest_ld = uap->start + uap->num; @@ -543,7 +543,7 @@ i = largest_ld - uap->start; bzero(&((union descriptor *)(pldt->ldt_base))[uap->start], sizeof(union descriptor) * i); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&dt_lock); return (0); } @@ -626,15 +626,15 @@ if (uap->start == LDT_AUTO_ALLOC && uap->num == 1) { /* Allocate a free slot */ - pldt = mdp->md_ldt; - if (pldt == NULL) { - error = i386_ldt_grow(td, NLDT + 1); - if (error) + mtx_lock_spin(&dt_lock); + if ((pldt = mdp->md_ldt) == NULL) { + if ((error = i386_ldt_grow(td, NLDT + 1))) { + mtx_unlock_spin(&dt_lock); return (error); + } pldt = mdp->md_ldt; } again: - mtx_lock_spin(&sched_lock); /* * start scanning a bit up to leave room for NVidia and * Wine, which still user the "Blat" method of allocation. @@ -646,24 +646,23 @@ dp++; } if (i >= pldt->ldt_len) { - mtx_unlock_spin(&sched_lock); - error = i386_ldt_grow(td, pldt->ldt_len+1); - if (error) + if ((error = i386_ldt_grow(td, pldt->ldt_len+1))) { + mtx_unlock_spin(&dt_lock); return (error); + } goto again; } uap->start = i; error = i386_set_ldt_data(td, i, 1, descs); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&dt_lock); } else { largest_ld = uap->start + uap->num; - error = i386_ldt_grow(td, largest_ld); - if (error == 0) { - mtx_lock_spin(&sched_lock); + mtx_lock_spin(&dt_lock); + if (!(error = i386_ldt_grow(td, largest_ld))) { error = i386_set_ldt_data(td, uap->start, uap->num, descs); - mtx_unlock_spin(&sched_lock); } + mtx_unlock_spin(&dt_lock); } if (error == 0) td->td_retval[0] = uap->start; @@ -677,7 +676,7 @@ struct mdproc *mdp = &td->td_proc->p_md; struct proc_ldt *pldt = mdp->md_ldt; - mtx_assert(&sched_lock, MA_OWNED); + mtx_assert(&dt_lock, MA_OWNED); /* Fill in range */ bcopy(descs, @@ -694,14 +693,15 @@ caddr_t old_ldt_base; int old_ldt_len; + mtx_assert(&dt_lock, MA_OWNED); + if (len > MAX_LD) return (ENOMEM); if (len < NLDT + 1) len = NLDT + 1; /* Allocate a user ldt. */ - pldt = mdp->md_ldt; - if (!pldt || len > pldt->ldt_len) { + if ((pldt = mdp->md_ldt) != NULL || len > pldt->ldt_len) { struct proc_ldt *new_ldt; new_ldt = user_ldt_alloc(mdp, len); @@ -709,42 +709,35 @@ return (ENOMEM); pldt = mdp->md_ldt; - /* sched_lock was acquired by user_ldt_alloc. */ - if (pldt) { + if (pldt != NULL) { if (new_ldt->ldt_len > pldt->ldt_len) { old_ldt_base = pldt->ldt_base; old_ldt_len = pldt->ldt_len; pldt->ldt_sd = new_ldt->ldt_sd; pldt->ldt_base = new_ldt->ldt_base; pldt->ldt_len = new_ldt->ldt_len; - mtx_unlock_spin(&sched_lock); kmem_free(kernel_map, (vm_offset_t)old_ldt_base, old_ldt_len * sizeof(union descriptor)); FREE(new_ldt, M_SUBPROC); - mtx_lock_spin(&sched_lock); } else { /* * If other threads already did the work, * do nothing. */ - mtx_unlock_spin(&sched_lock); kmem_free(kernel_map, (vm_offset_t)new_ldt->ldt_base, new_ldt->ldt_len * sizeof(union descriptor)); FREE(new_ldt, M_SUBPROC); return (0); } - } else { + } else mdp->md_ldt = pldt = new_ldt; - } #ifdef SMP - mtx_unlock_spin(&sched_lock); /* signal other cpus to reload ldt */ smp_rendezvous(NULL, (void (*)(void *))set_user_ldt_rv, NULL, td); #else set_user_ldt(mdp); - mtx_unlock_spin(&sched_lock); #endif } return (0); ==== //depot/projects/mjexp/sys/i386/i386/vm_machdep.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.279 2007/04/24 21:17:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.280 2007/05/20 22:03:57 jeff Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -158,8 +159,9 @@ struct mdproc *mdp1 = &p1->p_md; struct proc_ldt *pldt; - pldt = mdp1->md_ldt; - if (pldt && pldt->ldt_refcnt > 1) { + mtx_lock_spin(&dt_lock); + if ((pldt = mdp1->md_ldt) != NULL && + pldt->ldt_refcnt > 1) { pldt = user_ldt_alloc(mdp1, pldt->ldt_len); if (pldt == NULL) panic("could not copy LDT"); @@ -167,6 +169,7 @@ set_user_ldt(mdp1); user_ldt_free(td1); } + mtx_unlock_spin(&dt_lock); } return; } @@ -248,10 +251,10 @@ pcb2->pcb_ext = 0; /* Copy the LDT, if necessary. */ - mtx_lock_spin(&sched_lock); + mtx_lock_spin(&dt_lock); if (mdp2->md_ldt != NULL) { if (flags & RFMEM) { - mdp2->md_ldt->ldt_refcnt++; + refcount_acquire(&mdp2->md_ldt->ldt_refcnt); } else { mdp2->md_ldt = user_ldt_alloc(mdp2, mdp2->md_ldt->ldt_len); @@ -259,7 +262,7 @@ panic("could not copy LDT"); } } - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&dt_lock); /* Setup to release sched_lock in fork_exit(). */ td2->td_md.md_spinlock_count = 1; @@ -304,11 +307,13 @@ * If this process has a custom LDT, release it. Reset pc->pcb_gs * and %gs before we free it in case they refer to an LDT entry. */ + mtx_lock_spin(&dt_lock); if (td->td_proc->p_md.md_ldt) { td->td_pcb->pcb_gs = _udatasel; load_gs(_udatasel); user_ldt_free(td); } + mtx_unlock_spin(&dt_lock); } void ==== //depot/projects/mjexp/sys/i386/include/proc.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/i386/include/proc.h,v 1.25 2005/04/04 21:53:54 jhb Exp $ + * $FreeBSD: src/sys/i386/include/proc.h,v 1.26 2007/05/20 22:03:57 jeff Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -45,6 +45,8 @@ /* * Machine-dependent part of the proc structure for i386. + * Table of MD locks: + * t - Descriptor tables lock */ struct mdthread { int md_spinlock_count; /* (k) */ @@ -52,7 +54,7 @@ }; struct mdproc { - struct proc_ldt *md_ldt; /* (j) per-process ldt */ + struct proc_ldt *md_ldt; /* (t) per-process ldt */ }; #ifdef _KERNEL @@ -61,6 +63,8 @@ struct proc_ldt *user_ldt_alloc(struct mdproc *, int); void user_ldt_free(struct thread *); +extern struct mtx dt_lock; + #endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/mjexp/sys/kern/kern_clock.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.194 2007/03/08 06:44:33 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.195 2007/05/20 22:11:49 jeff Exp $"); #include "opt_device_polling.h" #include "opt_hwpmc_hooks.h" @@ -83,6 +83,9 @@ /* Some of these don't belong here, but it's easiest to concentrate them. */ long cp_time[CPUSTATES]; +/* Spin-lock protecting profiling statistics. */ +struct mtx time_lock; + static int sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS) { @@ -172,6 +175,7 @@ * code do its bit. */ cpu_initclocks(); + mtx_init(&time_lock, "time lock", NULL, MTX_SPIN); /* * Compute profhz/stathz, and fix profhz if needed. @@ -349,20 +353,15 @@ register struct proc *p; { - /* - * XXX; Right now sched_lock protects statclock(), but perhaps - * it should be protected later on by a time_lock, which would - * cover psdiv, etc. as well. - */ PROC_LOCK_ASSERT(p, MA_OWNED); if (p->p_flag & P_STOPPROF) return; if ((p->p_flag & P_PROFIL) == 0) { - mtx_lock_spin(&sched_lock); p->p_flag |= P_PROFIL; + mtx_lock_spin(&time_lock); if (++profprocs == 1) cpu_startprofclock(); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&time_lock); } } @@ -385,11 +384,11 @@ } if ((p->p_flag & P_PROFIL) == 0) return; - mtx_lock_spin(&sched_lock); p->p_flag &= ~P_PROFIL; + mtx_lock_spin(&time_lock); if (--profprocs == 0) cpu_stopprofclock(); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&time_lock); } } @@ -412,7 +411,6 @@ td = curthread; p = td->td_proc; - mtx_lock_spin_flags(&sched_lock, MTX_QUIET); if (usermode) { /* * Charge the time as appropriate. @@ -422,6 +420,7 @@ thread_statclock(1); #endif td->td_uticks++; + mtx_lock_spin_flags(&time_lock, MTX_QUIET); if (p->p_nice > NZERO) cp_time[CP_NICE]++; else @@ -442,6 +441,7 @@ if ((td->td_pflags & TDP_ITHREAD) || td->td_intr_nesting_level >= 2) { td->td_iticks++; + mtx_lock_spin_flags(&time_lock, MTX_QUIET); cp_time[CP_INTR]++; } else { #ifdef KSE @@ -450,15 +450,18 @@ #endif td->td_pticks++; td->td_sticks++; + mtx_lock_spin_flags(&time_lock, MTX_QUIET); if (!TD_IS_IDLETHREAD(td)) cp_time[CP_SYS]++; else cp_time[CP_IDLE]++; } } + mtx_unlock_spin_flags(&time_lock, MTX_QUIET); CTR4(KTR_SCHED, "statclock: %p(%s) prio %d stathz %d", td, td->td_proc->p_comm, td->td_priority, (stathz)?stathz:hz); + mtx_lock_spin_flags(&sched_lock, MTX_QUIET); sched_clock(td); /* Update resource usage integrals and maximums. */ ==== //depot/projects/mjexp/sys/kern/subr_prof.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.77 2007/03/04 22:36:46 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.78 2007/05/20 22:11:49 jeff Exp $"); #include #include @@ -423,12 +423,12 @@ } PROC_LOCK(p); upp = &td->td_proc->p_stats->p_prof; - mtx_lock_spin(&sched_lock); + mtx_lock_spin(&time_lock); upp->pr_off = uap->offset; upp->pr_scale = uap->scale; upp->pr_base = uap->samples; upp->pr_size = uap->size; - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&time_lock); startprofclock(p); PROC_UNLOCK(p); @@ -468,15 +468,15 @@ if (ticks == 0) return; prof = &td->td_proc->p_stats->p_prof; - mtx_lock_spin(&sched_lock); + mtx_lock_spin(&time_lock); if (pc < prof->pr_off || (i = PC_TO_INDEX(pc, prof)) >= prof->pr_size) { - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&time_lock); return; /* out of range; ignore */ } addr = prof->pr_base + i; - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&time_lock); if ((v = fuswintr(addr)) == -1 || suswintr(addr, v + ticks) == -1) { td->td_profil_addr = pc; td->td_profil_ticks = ticks; ==== //depot/projects/mjexp/sys/kern/subr_witness.c#11 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.230 2007/04/19 08:02:51 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.231 2007/05/20 22:11:49 jeff Exp $"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" @@ -410,6 +410,7 @@ { "callout", &lock_class_mtx_spin }, { "entropy harvest mutex", &lock_class_mtx_spin }, { "syscons video lock", &lock_class_mtx_spin }, + { "time lock", &lock_class_mtx_spin }, /* * leaf locks */ ==== //depot/projects/mjexp/sys/sparc64/sparc64/pmap.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.161 2007/05/18 07:10:47 jeff Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.162 2007/05/20 22:33:42 jeff Exp $ */ /* @@ -1088,7 +1088,7 @@ ("pmap_release: freeing held tsb page")); m->md.pmap = NULL; m->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free_zero(m); vm_page_unlock_queues(); } ==== //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.35 2007/05/20 13:06:45 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.36 2007/05/20 22:33:42 jeff Exp $"); #include "opt_kstack_pages.h" #include "opt_msgbuf.h" @@ -1312,7 +1312,7 @@ m = PHYS_TO_VM_PAGE(TLB_DIRECT_TO_PHYS((vm_offset_t)ptr)); for (i = 0; i < npages; i++, m++) { m->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free(m); } } ==== //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * */ #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tsb.c,v 1.8 2007/05/18 07:10:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tsb.c,v 1.9 2007/05/20 22:33:42 jeff Exp $"); #include "opt_ddb.h" @@ -104,7 +104,7 @@ m = PHYS_TO_VM_PAGE((vm_paddr_t)hvtsb->hti_ra); for (i = 0, tm = m; i < TSB_SIZE; i++, m++) { tm->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free(tm); } } ==== //depot/projects/mjexp/sys/sun4v/sun4v/tte_hash.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tte_hash.c,v 1.11 2007/05/20 09:21:29 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/tte_hash.c,v 1.12 2007/05/20 22:33:42 jeff Exp $"); #include #include @@ -231,7 +231,7 @@ for (fh = ptr; fh != NULL; fh = fh->thf_head.fh_next) { m = PHYS_TO_VM_PAGE(TLB_DIRECT_TO_PHYS((vm_offset_t)fh)); m->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free(m); } } ==== //depot/projects/mjexp/sys/sys/systm.h#13 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.255 2007/04/08 23:54:01 pjd Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.256 2007/05/20 22:11:50 jeff Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -71,6 +71,8 @@ extern int maxusers; /* system tune hint */ +extern struct mtx time_lock; /* time lock for profiling */ + #ifdef INVARIANTS /* The option is always available */ #define KASSERT(exp,msg) do { \ if (__predict_false(!(exp))) \ ==== //depot/projects/mjexp/sys/sys/vmmeter.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vmmeter.h 8.2 (Berkeley) 7/10/94 - * $FreeBSD: src/sys/sys/vmmeter.h,v 1.29 2007/05/18 07:10:48 jeff Exp $ + * $FreeBSD: src/sys/sys/vmmeter.h,v 1.30 2007/05/20 22:33:42 jeff Exp $ */ #ifndef _SYS_VMMETER_H_ @@ -109,7 +109,7 @@ atomic_store_rel_int(__CONCAT(&cnt.v_, member), val) #define VMCNT_ADD(member, val) \ atomic_add_int(__CONCAT(&cnt.v_, member), val) -#define VMCNT_DEC(member, val) \ +#define VMCNT_SUB(member, val) \ atomic_subtract_int(__CONCAT(&cnt.v_, member), val) #define VMCNT_GET(member) (__CONCAT(cnt.v_, member)) #define VMCNT_PTR(member) \ ==== //depot/projects/mjexp/sys/vm/vm_page.c#11 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.343 2007/05/18 07:10:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.344 2007/05/20 22:33:42 jeff Exp $"); #include #include @@ -1249,7 +1249,7 @@ if (m->wire_count > 0) { m->wire_count--; if (m->wire_count == 0) { - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); if (m->flags & PG_UNMANAGED) { ; } else if (activate) From owner-p4-projects@FreeBSD.ORG Sun May 20 23:09:55 2007 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 CA7EB16A46E; Sun, 20 May 2007 23:09:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7013616A41F for ; Sun, 20 May 2007 23:09:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5E8E313C4B0 for ; Sun, 20 May 2007 23:09:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KN9sTC086572 for ; Sun, 20 May 2007 23:09:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KN9pT2086521 for perforce@freebsd.org; Sun, 20 May 2007 23:09:51 GMT (envelope-from marcel@freebsd.org) Date: Sun, 20 May 2007 23:09:51 GMT Message-Id: <200705202309.l4KN9pT2086521@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 120132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 May 2007 23:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=120132 Change 120132 by marcel@marcel_cluster on 2007/05/20 23:08:55 Juniper's platform branch for MPC85xx and Book-E support. Needs work. Affected files ... .. //depot/projects/e500/lib/libc/Makefile#2 edit .. //depot/projects/e500/lib/libc/powerpc/gen/Makefile.inc#2 edit .. //depot/projects/e500/lib/libc/powerpc/gen/eabi.c#1 add .. //depot/projects/e500/lib/libc/powerpc/gen/flt_rounds.c#2 edit .. //depot/projects/e500/lib/libc/powerpc/gen/fpgetmask.c#2 edit .. //depot/projects/e500/lib/libc/powerpc/gen/fpgetround.c#2 edit .. //depot/projects/e500/lib/libc/powerpc/gen/fpgetsticky.c#2 edit .. //depot/projects/e500/lib/libc/powerpc/gen/fpsetmask.c#2 edit .. //depot/projects/e500/lib/libc/powerpc/gen/fpsetround.c#2 edit .. //depot/projects/e500/lib/libc/powerpc/softfloat/milieu.h#1 add .. //depot/projects/e500/lib/libc/powerpc/softfloat/powerpc-gcc.h#1 add .. //depot/projects/e500/lib/libc/powerpc/softfloat/softfloat.h#1 add .. //depot/projects/e500/lib/libstand/Makefile#2 edit .. //depot/projects/e500/lib/msun/powerpc/fenv.h#2 edit .. //depot/projects/e500/share/mk/bsd.cpu.mk#2 edit .. //depot/projects/e500/share/sendmail/Makefile#2 edit .. //depot/projects/e500/sys/boot/Makefile#2 edit .. //depot/projects/e500/sys/boot/common/bootstrap.h#2 edit .. //depot/projects/e500/sys/boot/common/dev_net.c#2 edit .. //depot/projects/e500/sys/boot/common/load_elf.c#2 edit .. //depot/projects/e500/sys/boot/powerpc/Makefile#2 edit .. //depot/projects/e500/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/e500/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/e500/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/e500/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/e500/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/e500/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/e500/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/e500/sys/boot/powerpc/ofw/Makefile#1 add .. //depot/projects/e500/sys/boot/powerpc/ofw/conf.c#1 add .. //depot/projects/e500/sys/boot/powerpc/ofw/help.ofw#1 add .. //depot/projects/e500/sys/boot/powerpc/ofw/ldscript.powerpc#1 add .. //depot/projects/e500/sys/boot/powerpc/ofw/metadata.c#1 add .. //depot/projects/e500/sys/boot/powerpc/ofw/start.c#1 add .. //depot/projects/e500/sys/boot/powerpc/ofw/version#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/defs.sh#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/gnu/NOTES#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/gnu/global_data.h#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/gnu/u-boot.h#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/help.uboot#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/ldscript.powerpc#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#1 add .. //depot/projects/e500/sys/boot/powerpc/uboot/version#1 add .. //depot/projects/e500/sys/boot/uboot/Makefile#1 add .. //depot/projects/e500/sys/boot/uboot/common/Makefile.inc#1 add .. //depot/projects/e500/sys/boot/uboot/common/calls.sh#1 add .. //depot/projects/e500/sys/boot/uboot/common/main.c#1 add .. //depot/projects/e500/sys/boot/uboot/gnu/NOTES#1 add .. //depot/projects/e500/sys/boot/uboot/gnu/_exports.h#1 add .. //depot/projects/e500/sys/boot/uboot/lib/Makefile#1 add .. //depot/projects/e500/sys/boot/uboot/lib/console.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/copy.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/devicename.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/disk.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/elf_freebsd.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#1 add .. //depot/projects/e500/sys/boot/uboot/lib/module.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/net.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/reboot.c#1 add .. //depot/projects/e500/sys/boot/uboot/lib/time.c#1 add .. //depot/projects/e500/sys/conf/NOTES#2 edit .. //depot/projects/e500/sys/conf/files#2 edit .. //depot/projects/e500/sys/conf/files.powerpc#2 edit .. //depot/projects/e500/sys/conf/ldscript.powerpc#2 edit .. //depot/projects/e500/sys/conf/options.powerpc#2 edit .. //depot/projects/e500/sys/dev/ic/quicc.h#1 add .. //depot/projects/e500/sys/dev/md/md.c#2 edit .. //depot/projects/e500/sys/dev/mii/ciphy.c#2 edit .. //depot/projects/e500/sys/dev/mii/miidevs#2 edit .. //depot/projects/e500/sys/dev/quicc/quicc_bfe.h#1 add .. //depot/projects/e500/sys/dev/quicc/quicc_bfe_ocp.c#1 add .. //depot/projects/e500/sys/dev/quicc/quicc_bus.h#1 add .. //depot/projects/e500/sys/dev/quicc/quicc_core.c#1 add .. //depot/projects/e500/sys/dev/scc/scc_bfe.h#2 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe_ebus.c#2 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe_macio.c#2 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe_quicc.c#1 add .. //depot/projects/e500/sys/dev/scc/scc_bfe_sbus.c#2 edit .. //depot/projects/e500/sys/dev/scc/scc_bus.h#2 edit .. //depot/projects/e500/sys/dev/scc/scc_core.c#2 edit .. //depot/projects/e500/sys/dev/scc/scc_dev_quicc.c#1 add .. //depot/projects/e500/sys/dev/scc/scc_dev_sab82532.c#2 edit .. //depot/projects/e500/sys/dev/scc/scc_dev_z8530.c#2 edit .. //depot/projects/e500/sys/dev/scc/scc_if.m#2 edit .. //depot/projects/e500/sys/dev/tsec/if_tsec.c#1 add .. //depot/projects/e500/sys/dev/tsec/if_tsec.h#1 add .. //depot/projects/e500/sys/dev/tsec/if_tsecreg.h#1 add .. //depot/projects/e500/sys/dev/uart/uart_bus_ocp.c#1 add .. //depot/projects/e500/sys/dev/uart/uart_bus_scc.c#2 edit .. //depot/projects/e500/sys/dev/uart/uart_cpu_alpha.c#1 add .. //depot/projects/e500/sys/dev/uart/uart_cpu_powerpc.c#2 edit .. //depot/projects/e500/sys/dev/uart/uart_dev_quicc.c#1 add .. //depot/projects/e500/sys/gdb/gdb_packet.c#2 edit .. //depot/projects/e500/sys/kern/subr_witness.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/clock.c#1 add .. //depot/projects/e500/sys/powerpc/aim/copyinout.c#1 add .. //depot/projects/e500/sys/powerpc/aim/interrupt.c#1 add .. //depot/projects/e500/sys/powerpc/aim/locore.S#1 add .. //depot/projects/e500/sys/powerpc/aim/machdep.c#1 add .. //depot/projects/e500/sys/powerpc/aim/mem.c#1 add .. //depot/projects/e500/sys/powerpc/aim/nexus.c#1 add .. //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#1 add .. //depot/projects/e500/sys/powerpc/aim/ofwmagic.S#1 add .. //depot/projects/e500/sys/powerpc/aim/pmap.c#1 add .. //depot/projects/e500/sys/powerpc/aim/swtch.S#1 add .. //depot/projects/e500/sys/powerpc/aim/trap.c#1 add .. //depot/projects/e500/sys/powerpc/aim/trap_subr.S#1 add .. //depot/projects/e500/sys/powerpc/aim/uio_machdep.c#1 add .. //depot/projects/e500/sys/powerpc/aim/uma_machdep.c#1 add .. //depot/projects/e500/sys/powerpc/aim/vm_machdep.c#1 add .. //depot/projects/e500/sys/powerpc/booke/clock.c#1 add .. //depot/projects/e500/sys/powerpc/booke/copyinout.c#1 add .. //depot/projects/e500/sys/powerpc/booke/interrupt.c#1 add .. //depot/projects/e500/sys/powerpc/booke/locore.S#1 add .. //depot/projects/e500/sys/powerpc/booke/machdep.c#1 add .. //depot/projects/e500/sys/powerpc/booke/mem.c#1 add .. //depot/projects/e500/sys/powerpc/booke/pmap.c#1 add .. //depot/projects/e500/sys/powerpc/booke/support.S#1 add .. //depot/projects/e500/sys/powerpc/booke/swtch.S#1 add .. //depot/projects/e500/sys/powerpc/booke/trap.c#1 add .. //depot/projects/e500/sys/powerpc/booke/trap_subr.S#1 add .. //depot/projects/e500/sys/powerpc/booke/uio_machdep.c#1 add .. //depot/projects/e500/sys/powerpc/booke/vm_machdep.c#1 add .. //depot/projects/e500/sys/powerpc/conf/GENERIC#2 edit .. //depot/projects/e500/sys/powerpc/conf/JUNIPER#1 add .. //depot/projects/e500/sys/powerpc/conf/MORNINGSTAR#1 add .. //depot/projects/e500/sys/powerpc/conf/NOTES#2 edit .. //depot/projects/e500/sys/powerpc/include/_bus.h#2 edit .. //depot/projects/e500/sys/powerpc/include/bootinfo.h#2 edit .. //depot/projects/e500/sys/powerpc/include/bus.h#2 edit .. //depot/projects/e500/sys/powerpc/include/float.h#2 edit .. //depot/projects/e500/sys/powerpc/include/fpu.h#2 edit .. //depot/projects/e500/sys/powerpc/include/frame.h#2 edit .. //depot/projects/e500/sys/powerpc/include/gdb_machdep.h#2 edit .. //depot/projects/e500/sys/powerpc/include/hid.h#2 edit .. //depot/projects/e500/sys/powerpc/include/intr_machdep.h#2 edit .. //depot/projects/e500/sys/powerpc/include/kdb.h#2 edit .. //depot/projects/e500/sys/powerpc/include/md_var.h#2 edit .. //depot/projects/e500/sys/powerpc/include/metadata.h#2 edit .. //depot/projects/e500/sys/powerpc/include/ocpbus.h#1 add .. //depot/projects/e500/sys/powerpc/include/pcb.h#2 edit .. //depot/projects/e500/sys/powerpc/include/pcpu.h#2 edit .. //depot/projects/e500/sys/powerpc/include/pmap.h#2 edit .. //depot/projects/e500/sys/powerpc/include/psl.h#2 edit .. //depot/projects/e500/sys/powerpc/include/pte.h#2 edit .. //depot/projects/e500/sys/powerpc/include/sf_buf.h#2 edit .. //depot/projects/e500/sys/powerpc/include/spr.h#2 edit .. //depot/projects/e500/sys/powerpc/include/tlb.h#1 add .. //depot/projects/e500/sys/powerpc/include/trap.h#2 edit .. //depot/projects/e500/sys/powerpc/include/trap_aim.h#1 add .. //depot/projects/e500/sys/powerpc/include/trap_booke.h#1 add .. //depot/projects/e500/sys/powerpc/include/vmparam.h#2 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc.c#1 add .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc.h#1 add .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc_if.m#1 add .. //depot/projects/e500/sys/powerpc/mpc85xx/nexus.c#1 add .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#1 add .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.h#1 add .. //depot/projects/e500/sys/powerpc/mpc85xx/opic.c#1 add .. //depot/projects/e500/sys/powerpc/mpc85xx/pci_ocp.c#1 add .. //depot/projects/e500/sys/powerpc/powerpc/autoconf.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/bus_machdep.c#1 add .. //depot/projects/e500/sys/powerpc/powerpc/busdma_machdep.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/clock.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/copyinout.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/cpu.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/db_trace.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/gdb_machdep.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/genassym.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/interrupt.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/locore.S#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/machdep.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/mem.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/nexus.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/ofw_machdep.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/ofwmagic.S#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/swtch.S#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/trap.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/trap_subr.S#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/uio_machdep.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/uma_machdep.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/vm_machdep.c#2 delete Differences ... ==== //depot/projects/e500/lib/libc/Makefile#2 (text+ko) ==== @@ -56,7 +56,7 @@ .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" ==== //depot/projects/e500/lib/libc/powerpc/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/lib/libc/powerpc/gen/Makefile.inc,v 1.8 2005/03/15 15:53:38 das Exp $ -SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ +SRCS += _ctx_start.S eabi.c fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ fpgetsticky.c fpsetmask.c fpsetround.c \ infinity.c ldexp.c makecontext.c modf.c _setjmp.S \ setjmp.S sigsetjmp.S signalcontext.c syncicache.c \ ==== //depot/projects/e500/lib/libc/powerpc/gen/flt_rounds.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#ifndef _SOFT_FLOAT static const int map[] = { 1, /* round to nearest */ 0, /* round to zero */ @@ -52,3 +53,4 @@ __asm__ __volatile("mffs %0" : "=f"(fpscr)); return map[(fpscr & 0x03)]; } +#endif ==== //depot/projects/e500/lib/libc/powerpc/gen/fpgetmask.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include +#ifndef _SOFT_FLOAT fp_except_t fpgetmask() { @@ -51,3 +52,4 @@ __asm__("mffs %0" : "=f"(fpscr)); return ((fp_except_t)((fpscr >> 3) & 0x1f)); } +#endif ==== //depot/projects/e500/lib/libc/powerpc/gen/fpgetround.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include +#ifndef _SOFT_FLOAT fp_rnd_t fpgetround() { @@ -51,3 +52,4 @@ __asm__("mffs %0" : "=f"(fpscr)); return ((fp_rnd_t)(fpscr & 0x3)); } +#endif ==== //depot/projects/e500/lib/libc/powerpc/gen/fpgetsticky.c#2 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +#ifndef _SOFT_FLOAT #ifdef __weak_alias __weak_alias(fpgetsticky,_fpgetsticky) #endif @@ -57,3 +58,4 @@ __asm__ __volatile("mffs %0" : "=f"(fpscr)); return ((fp_except_t)((fpscr >> 25) & 0x1f)); } +#endif ==== //depot/projects/e500/lib/libc/powerpc/gen/fpsetmask.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include +#ifndef _SOFT_FLOAT fp_except_t fpsetmask(fp_except_t mask) { @@ -55,3 +56,4 @@ __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr)); return (old); } +#endif ==== //depot/projects/e500/lib/libc/powerpc/gen/fpsetround.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include +#ifndef _SOFT_FLOAT fp_rnd_t fpsetround(fp_rnd_t rnd_dir) { @@ -55,3 +56,4 @@ __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr)); return (old); } +#endif ==== //depot/projects/e500/lib/libstand/Makefile#2 (text+ko) ==== @@ -66,7 +66,7 @@ .PATH: ${.CURDIR}/../libc/quad SRCS+= ashldi3.c ashrdi3.c .PATH: ${.CURDIR}/../libc/powerpc/gen -SRCS+= syncicache.c +SRCS+= eabi.c syncicache.c .endif # _setjmp/_longjmp ==== //depot/projects/e500/lib/msun/powerpc/fenv.h#2 (text+ko) ==== @@ -82,8 +82,13 @@ #define _ENABLE_MASK ((FE_DIVBYZERO | FE_INEXACT | FE_INVALID | \ FE_OVERFLOW | FE_UNDERFLOW) >> _FPUSW_SHIFT) +#ifndef _SOFT_FLOAT #define __mffs(__env) __asm __volatile("mffs %0" : "=f" (*(__env))) #define __mtfsf(__env) __asm __volatile("mtfsf 255,%0" : : "f" (__env)) +#else +#define __mffs(__env) +#define __mtfsf(__env) +#endif union __fpscr { double __d; ==== //depot/projects/e500/share/mk/bsd.cpu.mk#2 (text+ko) ==== @@ -109,6 +109,9 @@ . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif +. elif ${MACHINE_ARCH} == "powerpc" +# XXX: This needs to be configurable. Use TARGET_USE_SOFTFLOAT? +_CPUCFLAGS += -msoft-float . endif # Set up the list of CPU features based on the CPU type. This is an ==== //depot/projects/e500/share/sendmail/Makefile#2 (text+ko) ==== @@ -4,8 +4,8 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail CFDIR= cf -CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type d -print) -CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type f -print) +CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name .svn -prune \) -o -type d -print) +CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name .svn -prune \) -o -type f -print) DDIR= ${DESTDIR}/usr/share/sendmail ==== //depot/projects/e500/sys/boot/Makefile#2 (text+ko) ==== @@ -17,6 +17,11 @@ SUBDIR+= ofw .endif +# Build U-Boot library. +.if ${MACHINE_ARCH} == "powerpc" +SUBDIR+= uboot +.endif + # Pick the machine-dependent subdir based on the target architecture. SUBDIR+= ${MACHINE:S/amd64/i386/:S/sun4v/sparc64/} ==== //depot/projects/e500/sys/boot/common/bootstrap.h#2 (text+ko) ==== @@ -233,13 +233,15 @@ int file_addmodule(struct preloaded_file *fp, char *modname, int version, struct kernel_module **newmp); - /* MI module loaders */ #ifdef __elfN /* Relocation types. */ #define ELF_RELOC_REL 1 #define ELF_RELOC_RELA 2 +/* Relocation offset for some architectures */ +extern u_int64_t __elfN(relocation_offset); + struct elf_file; typedef Elf_Addr (symaddr_fn)(struct elf_file *ef, Elf_Size symidx); ==== //depot/projects/e500/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -144,7 +144,6 @@ return (error); } } - netdev_opens++; } netdev_opens++; f->f_devdata = &netdev_sock; @@ -245,7 +244,8 @@ printf("net_open: bootparam/whoami RPC failed\n"); return (EIO); } - printf("net_open: client name: %s\n", hostname); + if (debug) + printf("net_open: client name: %s\n", hostname); /* * Ignore the gateway from whoami (unreliable). @@ -259,10 +259,11 @@ } if (smask) { netmask = smask; - printf("net_open: subnet mask: %s\n", intoa(netmask)); + if (debug) + printf("net_open: subnet mask: %s\n", intoa(netmask)); } - if (gateip.s_addr) - printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); + if (gateip.s_addr && debug) + printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); /* Get the root server and pathname. */ if (bp_getfile(sock, "root", &rootip, rootpath)) { @@ -270,7 +271,7 @@ return (EIO); } exit: - /* + /* * If present, strip the server's address off of the rootpath * before passing it along. This allows us to be compatible with * the kernel's diskless (BOOTP_NFSROOT) booting conventions @@ -285,8 +286,10 @@ bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); } - printf("net_open: server addr: %s\n", inet_ntoa(rootip)); - printf("net_open: server path: %s\n", rootpath); + if (debug) { + printf("net_open: server addr: %s\n", inet_ntoa(rootip)); + printf("net_open: server path: %s\n", rootpath); + } d = socktodesc(sock); sprintf(temp, "%6D", d->myea, ":"); @@ -303,5 +306,21 @@ static void net_print(int verbose) { - return; + int i, d, cnt; + struct netif_driver *drv; + + cnt = 0; + for (d = 0; netif_drivers[d]; d++) { + drv = netif_drivers[d]; + + for (i = 0; i < drv->netif_nifs; i++) { + printf("\t%s%d:", "net", cnt++); + if (verbose) { + printf(" (%s%d)", drv->netif_bname, + drv->netif_ifs[i].dif_unit); + } + } + } + printf("\n"); + return; } ==== //depot/projects/e500/sys/boot/common/load_elf.c#2 (text+ko) ==== @@ -83,6 +83,8 @@ const char *__elfN(kerneltype) = "elf kernel"; const char *__elfN(moduletype) = "elf module"; +u_int64_t __elfN(relocation_offset) = 0; + /* * Attempt to load the file (file) as an ELF module. It will be stored at * (dest), and a pointer to a module structure describing the loaded object @@ -100,7 +102,7 @@ fp = NULL; bzero(&ef, sizeof(struct elf_file)); - + /* * Open the image, read and validate the ELF header */ @@ -266,9 +268,33 @@ #else off = - (off & 0xff000000u); /* i386 relocates after locore */ #endif +#elif defined(__powerpc__) + /* + * On the purely virtual memory machines like e500, the kernel is + * linked against its final VA range, which is most often not + * available at the loader stage, but only after kernel initializes + * and completes its VM settings. In such cases we cannot use p_vaddr + * field directly to load ELF segments, but put them at some + * 'load-time' locations. + */ + if (off & 0xf0000000u) { + off = -(off & 0xf0000000u); + /* + * FIXME allow for specifying the offset via loader env var - + * hard code 0x01000000 for the moment - needs to be on 16MB + * boundary! + */ + off += 0x01000000; + ehdr->e_entry += off; +#ifdef ELF_VERBOSE + printf("Converted entry 0x%08x\n", ehdr->e_entry); +#endif + } else + off = 0; #else off = 0; /* other archs use direct mapped kernels */ #endif + __elfN(relocation_offset) = off; } ef->off = off; ==== //depot/projects/e500/sys/boot/powerpc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/powerpc/Makefile,v 1.1 2000/10/16 10:46:10 obrien Exp $ -SUBDIR= loader +SUBDIR= ofw uboot .include ==== //depot/projects/e500/sys/conf/NOTES#2 (text+ko) ==== @@ -1739,6 +1739,11 @@ # communications controllers. device scc +# Serial Communications Controller +# Supports the Siemens SAB 82532 and Zilog Z8530 multi-channel +# communications controllers. +device scc + # PCI Universal Communications driver # Supports various multi port PCI I/O cards. device puc ==== //depot/projects/e500/sys/conf/files#2 (text+ko) ==== @@ -867,6 +867,7 @@ dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci dev/puc/pucdata.c optional puc pci +dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral dev/ral/if_ralrate.c optional ral @@ -888,8 +889,10 @@ dev/sbsh/if_sbsh.c optional sbsh dev/scc/scc_if.m optional scc dev/scc/scc_bfe_ebus.c optional scc ebus +dev/scc/scc_bfe_quicc.c optional scc quicc dev/scc/scc_bfe_sbus.c optional scc fhc | scc sbus dev/scc/scc_core.c optional scc +dev/scc/scc_dev_quicc.c optional scc dev/scc/scc_dev_sab82532.c optional scc dev/scc/scc_dev_z8530.c optional scc dev/scd/scd.c optional scd isa @@ -1051,6 +1054,7 @@ dev/uart/uart_core.c optional uart dev/uart/uart_dbg.c optional uart gdb dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 +dev/uart/uart_dev_quicc.c optional uart scc dev/uart/uart_dev_sab82532.c optional uart uart_sab82532 dev/uart/uart_dev_sab82532.c optional uart scc dev/uart/uart_dev_z8530.c optional uart uart_z8530 ==== //depot/projects/e500/sys/conf/files.powerpc#2 (text+ko) ==== @@ -25,65 +25,26 @@ clean "opt_ah.h" # +crypto/blowfish/bf_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional ipsec ipsec_esp | netsmb dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc +dev/ofw/openfirm.c optional aim +dev/ofw/ofw_bus_if.m optional aim +dev/ofw/ofw_bus_subr.c optional aim +dev/ofw/ofw_console.c optional aim +dev/ofw/ofw_disk.c optional ofwd aim +dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac +dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx +dev/scc/scc_bfe_macio.c optional scc powermac dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-sc.c optional sc dev/syscons/scvtb.c optional sc +dev/tsec/if_tsec.c optional tsec +dev/uart/uart_bus_ocp.c optional uart mpc85xx dev/uart/uart_cpu_powerpc.c optional uart kern/syscalls.c optional ktr -powerpc/powerpc/atomic.S standard -powerpc/powerpc/autoconf.c standard -powerpc/powerpc/bcopy.c standard -powerpc/powerpc/busdma_machdep.c standard -powerpc/powerpc/clock.c standard -powerpc/powerpc/copyinout.c standard -powerpc/powerpc/copystr.c standard -powerpc/powerpc/cpu.c standard -powerpc/powerpc/elf_machdep.c standard -powerpc/powerpc/fpu.c standard -powerpc/powerpc/fuswintr.c standard -powerpc/powerpc/gdb_machdep.c optional gdb -powerpc/powerpc/in_cksum.c optional inet -powerpc/powerpc/interrupt.c standard -powerpc/powerpc/intr_machdep.c standard -powerpc/powerpc/locore.S standard no-obj -powerpc/powerpc/machdep.c standard -powerpc/powerpc/mmu_if.m standard -powerpc/powerpc/mmu_oea.c standard -powerpc/powerpc/nexus.c standard -powerpc/powerpc/ofwmagic.S standard -powerpc/powerpc/ofw_machdep.c standard -powerpc/powerpc/openpic.c standard -powerpc/powerpc/pic_if.m standard -powerpc/powerpc/pmap_dispatch.c standard -powerpc/powerpc/sc_machdep.c optional sc -powerpc/powerpc/setjmp.S standard -powerpc/powerpc/sigcode.S standard -powerpc/powerpc/suswintr.c standard -powerpc/powerpc/syncicache.c standard -powerpc/powerpc/sys_machdep.c standard -powerpc/powerpc/swtch.S standard -powerpc/powerpc/trap.c standard -powerpc/powerpc/uio_machdep.c standard -powerpc/powerpc/uma_machdep.c standard -powerpc/powerpc/vm_machdep.c standard - -powerpc/powerpc/db_disasm.c optional ddb -powerpc/powerpc/db_interface.c optional ddb -powerpc/powerpc/db_hwwatch.c optional ddb -powerpc/powerpc/db_trace.c optional ddb - -crypto/blowfish/bf_enc.c optional ipsec ipsec_esp -crypto/des/des_enc.c optional ipsec ipsec_esp | netsmb - -dev/ofw/openfirm.c standard -dev/ofw/ofw_bus_if.m standard -dev/ofw/ofw_bus_subr.c standard -dev/ofw/ofw_console.c standard -dev/ofw/ofw_disk.c optional ofwd - libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/bcmp.c standard @@ -99,14 +60,39 @@ libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard - -powerpc/powerpc/mem.c optional mem -powerpc/powerpc/mp_machdep.c optional smp - -powerpc/ofw/ofw_pci.c optional pci -powerpc/ofw/ofw_pcib_pci.c optional pci -powerpc/ofw/ofw_syscons.c optional sc - +powerpc/aim/clock.c optional aim +powerpc/aim/copyinout.c optional aim +powerpc/aim/interrupt.c optional aim +powerpc/aim/locore.S optional aim no-obj +powerpc/aim/machdep.c optional aim +powerpc/aim/mem.c optional mem aim +powerpc/aim/nexus.c optional aim +powerpc/aim/ofw_machdep.c optional aim +powerpc/aim/ofwmagic.S optional aim +powerpc/aim/swtch.S optional aim +powerpc/aim/trap.c optional aim +powerpc/aim/uio_machdep.c optional aim +powerpc/aim/uma_machdep.c optional aim +powerpc/aim/vm_machdep.c optional aim +powerpc/booke/clock.c optional e500 +powerpc/booke/copyinout.c optional e500 +powerpc/booke/interrupt.c optional e500 +powerpc/booke/locore.S optional e500 no-obj +powerpc/booke/machdep.c optional e500 +powerpc/booke/mem.c optional mem e500 +powerpc/booke/pmap.c optional e500 +powerpc/booke/support.S optional e500 +powerpc/booke/swtch.S optional e500 +powerpc/booke/trap.c optional e500 +powerpc/booke/uio_machdep.c optional e500 +powerpc/booke/vm_machdep.c optional e500 +powerpc/mpc85xx/nexus.c optional mpc85xx +powerpc/mpc85xx/ocpbus.c optional mpc85xx +powerpc/mpc85xx/opic.c optional mpc85xx +powerpc/mpc85xx/pci_ocp.c optional mpc85xx pci +powerpc/ofw/ofw_pci.c optional pci aim +powerpc/ofw/ofw_pcib_pci.c optional pci aim +powerpc/ofw/ofw_syscons.c optional sc aim powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata powerpc/powermac/grackle.c optional powermac pci @@ -115,12 +101,37 @@ powerpc/powermac/openpic_macio.c optional powermac pci powerpc/powermac/pswitch.c optional powermac pswitch powerpc/powermac/uninorth.c optional powermac pci - +powerpc/powerpc/atomic.S standard +powerpc/powerpc/autoconf.c standard +powerpc/powerpc/bcopy.c standard +powerpc/powerpc/bus_machdep.c standard +powerpc/powerpc/busdma_machdep.c standard +powerpc/powerpc/copystr.c standard +powerpc/powerpc/cpu.c standard +powerpc/powerpc/db_disasm.c optional ddb +powerpc/powerpc/db_interface.c optional ddb +powerpc/powerpc/db_hwwatch.c optional ddb +powerpc/powerpc/db_memrw.c optional ddb +powerpc/powerpc/db_trace.c optional ddb +powerpc/powerpc/elf_machdep.c standard +powerpc/powerpc/fpu.c optional aim +powerpc/powerpc/fuswintr.c standard +powerpc/powerpc/gdb_machdep.c optional gdb +powerpc/powerpc/in_cksum.c optional inet +powerpc/powerpc/intr_machdep.c standard +powerpc/powerpc/mmu_if.m optional aim +powerpc/powerpc/mmu_oea.c optional aim +powerpc/powerpc/mp_machdep.c optional smp aim +powerpc/powerpc/openpic.c standard +powerpc/powerpc/pic_if.m standard +powerpc/powerpc/pmap_dispatch.c optional aim +powerpc/powerpc/sc_machdep.c optional sc +powerpc/powerpc/setjmp.S standard +powerpc/powerpc/sigcode.S standard +powerpc/powerpc/suswintr.c standard +powerpc/powerpc/syncicache.c standard +powerpc/powerpc/sys_machdep.c standard powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim powerpc/psim/uart_iobus.c optional uart psim - -dev/scc/scc_bfe_macio.c optional scc powermac - -dev/powermac_nvram/powermac_nvram.c optional powermac powermac_nvram ==== //depot/projects/e500/sys/conf/ldscript.powerpc#2 (text+ko) ==== @@ -10,7 +10,22 @@ SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0x00100000 + SIZEOF_HEADERS; + + . = kernbase + SIZEOF_HEADERS; + + /********************************************************/ + /* FIXME: temporary location of text segment */ + .text : + { + *(.text) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) + } =0 + _etext = .; + PROVIDE (etext = .); + /********************************************************/ + .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } @@ -37,15 +52,8 @@ .rela.sbss : { *(.rela.sbss) } .rela.sdata2 : { *(.rela.sdata2) } .rela.sbss2 : { *(.rela.sbss2) } - .text : - { - *(.text) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0 - _etext = .; - PROVIDE (etext = .); + + .init : { *(.init) } =0 .fini : { *(.fini) } =0 .rodata : { *(.rodata) *(.gnu.linkonce.r*) } ==== //depot/projects/e500/sys/conf/options.powerpc#2 (text+ko) ==== @@ -1,7 +1,8 @@ # $FreeBSD: src/sys/conf/options.powerpc,v 1.9 2004/06/25 13:44:34 grehan Exp $ # Options specific to the powerpc platform kernels -OEA opt_global.h +AIM opt_global.h +E500 opt_global.h IPKDB GFB_DEBUG opt_gfb.h @@ -10,6 +11,7 @@ POWERMAC opt_platform.h PSIM +MPC85xx SC_OFWFB opt_ofwfb.h ==== //depot/projects/e500/sys/dev/md/md.c#2 (text+ko) ==== @@ -1179,7 +1179,7 @@ sc->start = mdstart_preload; #ifdef MD_ROOT if (sc->unit == 0) - rootdevnames[0] = "ufs:/dev/md0"; + rootdevnames[0] = "cd9660:/dev/md0"; #endif mdinit(sc); } @@ -1215,6 +1215,7 @@ ptr = *(u_char **)c; c = preload_search_info(mod, MODINFO_SIZE); len = *(size_t *)c; + ptr = pmap_mapdev((uintptr_t)ptr, len); printf("%s%d: Preloaded image <%s> %d bytes at %p\n", MD_NAME, mdunits, name, len, ptr); sx_xlock(&md_sx); ==== //depot/projects/e500/sys/dev/mii/ciphy.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.8 2006/12/02 19:36:25 marius Exp $"); /* - * Driver for the Cicada CS8201 10/100/1000 copper PHY. + * Driver for the Cicada CS8201/CS8204 10/100/1000 copper PHY. */ #include @@ -91,6 +91,7 @@ MII_PHY_DESC(CICADA, CS8201), MII_PHY_DESC(CICADA, CS8201A), MII_PHY_DESC(CICADA, CS8201B), + MII_PHY_DESC(CICADA, CS8204), MII_PHY_END }; @@ -360,6 +361,7 @@ speed = status & CIPHY_AUXCSR_SPEED; switch (model) { + case MII_MODEL_CICADA_CS8204: case MII_MODEL_CICADA_CS8201: /* Turn off "aux mode" (whatever that means) */ ==== //depot/projects/e500/sys/dev/mii/miidevs#2 (text+ko) ==== @@ -136,6 +136,7 @@ /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY +model CICADA CS8204 0x0004 Cicada CS8204 10/100/1000TX PHY model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY @@ -206,6 +207,20 @@ model MARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY model MARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY +model MARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY +model xxMARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY +model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY +model xxMARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY +model xxMARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY +model MARVELL E1000S 0x0004 Marvell 88E1000S Gigabit PHY +model MARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY +model MARVELL E1000_6 0x0006 Marvell 88E1000 Gigabit PHY +model MARVELL E3082 0x0008 Marvell 88E3082 10/100 Fast Ethernet PHY +model MARVELL E1112 0x0009 Marvell 88E1112 Gigabit PHY +model MARVELL E1149 0x000b Marvell 88E1149 Gigabit PHY +model MARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY +model MARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY +model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY model xxMARVELL E1000 0x0005 Marvell 88E1000 Gigabit PHY model xxMARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY ==== //depot/projects/e500/sys/dev/scc/scc_bfe.h#2 (text) ==== @@ -76,7 +76,7 @@ int m_probed:1; int m_sysdev:1; - driver_filter_t *ih; + driver_intr_t *ih; serdev_intr_t *ih_src[SCC_ISRCCNT]; void *ih_arg; }; @@ -110,6 +110,7 @@ int cl_range; }; +extern struct scc_class scc_quicc_class; extern struct scc_class scc_sab82532_class; extern struct scc_class scc_z8530_class; @@ -139,7 +140,7 @@ int scc_bfe_attach(device_t dev); int scc_bfe_detach(device_t dev); -int scc_bfe_probe(device_t dev, u_int regshft, u_int rclk, u_int rid); +int scc_bfe_probe(device_t dev, u_int, u_int); struct resource *scc_bus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); @@ -147,7 +148,7 @@ int scc_bus_read_ivar(device_t, device_t, int, uintptr_t *); int scc_bus_release_resource(device_t, device_t, int, int, struct resource *); int scc_bus_setup_intr(device_t, device_t, struct resource *, int, - driver_filter_t *, void (*)(void *), void *, void **); + void (*)(void *), void *, void **); int scc_bus_teardown_intr(device_t, device_t, struct resource *, void *); #endif /* _DEV_SCC_BFE_H_ */ ==== //depot/projects/e500/sys/dev/scc/scc_bfe_ebus.c#2 (text) ==== @@ -59,7 +59,7 @@ if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); sc->sc_class = &scc_sab82532_class; - return (scc_bfe_probe(dev, EBUS_REGSHFT, EBUS_RCLK, 0)); + return (scc_bfe_probe(dev, EBUS_REGSHFT, EBUS_RCLK)); } return (ENXIO); } ==== //depot/projects/e500/sys/dev/scc/scc_bfe_macio.c#2 (text) ==== @@ -56,7 +56,7 @@ if (!strcmp(nm, "escc")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); sc->sc_class = &scc_z8530_class; - return (scc_bfe_probe(dev, MACIO_REGSHFT, MACIO_RCLK, 0)); + return (scc_bfe_probe(dev, MACIO_REGSHFT, MACIO_RCLK)); } return (ENXIO); } ==== //depot/projects/e500/sys/dev/scc/scc_bfe_sbus.c#2 (text) ==== @@ -56,7 +56,7 @@ if (!strcmp(nm, "zs")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); sc->sc_class = &scc_z8530_class; - return (scc_bfe_probe(dev, SBUS_REGSHFT, SBUS_RCLK, 0)); + return (scc_bfe_probe(dev, SBUS_REGSHFT, SBUS_RCLK)); } return (ENXIO); } ==== //depot/projects/e500/sys/dev/scc/scc_bus.h#2 (text) ==== @@ -42,6 +42,7 @@ /* Hardware class -- the SCC type. */ #define SCC_CLASS_SAB82532 0 #define SCC_CLASS_Z8530 1 +#define SCC_CLASS_QUICC 2 /* The possible modes supported by the SCC. */ #define SCC_MODE_ASYNC 0x01 ==== //depot/projects/e500/sys/dev/scc/scc_core.c#2 (text) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 21 01:59:44 2007 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 7790816A475; Mon, 21 May 2007 01:59:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 071EB16A41F for ; Mon, 21 May 2007 01:59:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E925A13C4AE for ; Mon, 21 May 2007 01:59:43 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4L1xhHd048252 for ; Mon, 21 May 2007 01:59:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4L1xhT1048237 for perforce@freebsd.org; Mon, 21 May 2007 01:59:43 GMT (envelope-from marcel@freebsd.org) Date: Mon, 21 May 2007 01:59:43 GMT Message-Id: <200705210159.l4L1xhT1048237@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 120140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 01:59:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=120140 Change 120140 by marcel@marcel_cluster on 2007/05/21 01:59:00 First round of cleanups. Affected files ... .. //depot/projects/e500/share/sendmail/Makefile#3 edit .. //depot/projects/e500/sys/conf/NOTES#3 edit .. //depot/projects/e500/sys/dev/md/md.c#3 edit .. //depot/projects/e500/sys/dev/mii/miidevs#3 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe.h#3 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe_ebus.c#3 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe_macio.c#3 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe_sbus.c#3 edit .. //depot/projects/e500/sys/dev/scc/scc_core.c#3 edit .. //depot/projects/e500/sys/dev/scc/scc_dev_sab82532.c#3 edit .. //depot/projects/e500/sys/dev/scc/scc_dev_z8530.c#3 edit .. //depot/projects/e500/sys/dev/scc/scc_if.m#3 edit .. //depot/projects/e500/sys/dev/uart/uart_cpu_alpha.c#2 delete .. //depot/projects/e500/sys/powerpc/aim/clock.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/copyinout.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/interrupt.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/locore.S#2 edit .. //depot/projects/e500/sys/powerpc/aim/machdep.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/mem.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/nexus.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/trap.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/trap_subr.S#2 edit .. //depot/projects/e500/sys/powerpc/aim/uio_machdep.c#2 edit .. //depot/projects/e500/sys/powerpc/aim/vm_machdep.c#2 edit .. //depot/projects/e500/sys/powerpc/include/gdb_machdep.h#3 edit .. //depot/projects/e500/sys/powerpc/include/vmparam.h#3 edit Differences ... ==== //depot/projects/e500/share/sendmail/Makefile#3 (text+ko) ==== @@ -4,8 +4,8 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail CFDIR= cf -CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name .svn -prune \) -o -type d -print) -CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name .svn -prune \) -o -type f -print) +CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type d -print) +CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type f -print) DDIR= ${DESTDIR}/usr/share/sendmail ==== //depot/projects/e500/sys/conf/NOTES#3 (text+ko) ==== @@ -1739,11 +1739,6 @@ # communications controllers. device scc -# Serial Communications Controller -# Supports the Siemens SAB 82532 and Zilog Z8530 multi-channel -# communications controllers. -device scc - # PCI Universal Communications driver # Supports various multi port PCI I/O cards. device puc ==== //depot/projects/e500/sys/dev/md/md.c#3 (text+ko) ==== @@ -1179,7 +1179,7 @@ sc->start = mdstart_preload; #ifdef MD_ROOT if (sc->unit == 0) - rootdevnames[0] = "cd9660:/dev/md0"; + rootdevnames[0] = "ufs:/dev/md0"; #endif mdinit(sc); } @@ -1215,7 +1215,6 @@ ptr = *(u_char **)c; c = preload_search_info(mod, MODINFO_SIZE); len = *(size_t *)c; - ptr = pmap_mapdev((uintptr_t)ptr, len); printf("%s%d: Preloaded image <%s> %d bytes at %p\n", MD_NAME, mdunits, name, len, ptr); sx_xlock(&md_sx); ==== //depot/projects/e500/sys/dev/mii/miidevs#3 (text+ko) ==== @@ -207,20 +207,6 @@ model MARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY model MARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY -model MARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY -model xxMARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY -model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY -model xxMARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY -model xxMARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY -model MARVELL E1000S 0x0004 Marvell 88E1000S Gigabit PHY -model MARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY -model MARVELL E1000_6 0x0006 Marvell 88E1000 Gigabit PHY -model MARVELL E3082 0x0008 Marvell 88E3082 10/100 Fast Ethernet PHY -model MARVELL E1112 0x0009 Marvell 88E1112 Gigabit PHY -model MARVELL E1149 0x000b Marvell 88E1149 Gigabit PHY -model MARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY -model MARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY -model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY model xxMARVELL E1000 0x0005 Marvell 88E1000 Gigabit PHY model xxMARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY ==== //depot/projects/e500/sys/dev/scc/scc_bfe.h#3 (text) ==== @@ -76,7 +76,7 @@ int m_probed:1; int m_sysdev:1; - driver_intr_t *ih; + driver_filter_t *ih; serdev_intr_t *ih_src[SCC_ISRCCNT]; void *ih_arg; }; @@ -140,7 +140,7 @@ int scc_bfe_attach(device_t dev); int scc_bfe_detach(device_t dev); -int scc_bfe_probe(device_t dev, u_int, u_int); +int scc_bfe_probe(device_t dev, u_int regshft, u_int rclk, u_int rid); struct resource *scc_bus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); @@ -148,7 +148,7 @@ int scc_bus_read_ivar(device_t, device_t, int, uintptr_t *); int scc_bus_release_resource(device_t, device_t, int, int, struct resource *); int scc_bus_setup_intr(device_t, device_t, struct resource *, int, - void (*)(void *), void *, void **); + driver_filter_t *, void (*)(void *), void *, void **); int scc_bus_teardown_intr(device_t, device_t, struct resource *, void *); #endif /* _DEV_SCC_BFE_H_ */ ==== //depot/projects/e500/sys/dev/scc/scc_bfe_ebus.c#3 (text) ==== @@ -59,7 +59,7 @@ if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); sc->sc_class = &scc_sab82532_class; - return (scc_bfe_probe(dev, EBUS_REGSHFT, EBUS_RCLK)); + return (scc_bfe_probe(dev, EBUS_REGSHFT, EBUS_RCLK, 0)); } return (ENXIO); } ==== //depot/projects/e500/sys/dev/scc/scc_bfe_macio.c#3 (text) ==== @@ -56,7 +56,7 @@ if (!strcmp(nm, "escc")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); sc->sc_class = &scc_z8530_class; - return (scc_bfe_probe(dev, MACIO_REGSHFT, MACIO_RCLK)); + return (scc_bfe_probe(dev, MACIO_REGSHFT, MACIO_RCLK, 0)); } return (ENXIO); } ==== //depot/projects/e500/sys/dev/scc/scc_bfe_sbus.c#3 (text) ==== @@ -56,7 +56,7 @@ if (!strcmp(nm, "zs")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); sc->sc_class = &scc_z8530_class; - return (scc_bfe_probe(dev, SBUS_REGSHFT, SBUS_RCLK)); + return (scc_bfe_probe(dev, SBUS_REGSHFT, SBUS_RCLK, 0)); } return (ENXIO); } ==== //depot/projects/e500/sys/dev/scc/scc_core.c#3 (text) ==== @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/scc/scc_core.c,v 1.10 2007/03/28 18:05:17 marcel Exp $"); -#define __RMAN_RESOURCE_VISIBLE - #include #include #include @@ -52,7 +50,7 @@ MALLOC_DEFINE(M_SCC, "SCC", "SCC driver"); -static void +static int scc_bfe_intr(void *arg) { struct scc_softc *sc = arg; @@ -90,7 +88,9 @@ else SCC_ICLEAR(sc, ch); } + return (FILTER_HANDLED); } + return (FILTER_STRAY); } int @@ -225,12 +225,12 @@ if (ch->ch_ires == NULL) continue; error = bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY | INTR_FAST, scc_bfe_intr, sc, + INTR_TYPE_TTY, scc_bfe_intr, NULL, sc, &ch->ch_icookie); if (error) { error = bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY | INTR_MPSAFE, scc_bfe_intr, sc, - &ch->ch_icookie); + INTR_TYPE_TTY | INTR_MPSAFE, NULL, + (driver_intr_t *)scc_bfe_intr, sc, &ch->ch_icookie); } else sc->sc_fastintr = 1; @@ -338,7 +338,7 @@ } int -scc_bfe_probe(device_t dev, u_int regshft, u_int rclk) +scc_bfe_probe(device_t dev, u_int regshft, u_int rclk, u_int rid) { struct scc_softc *sc; struct scc_class *cl; @@ -367,12 +367,12 @@ * I/O space. Any SCC that needs multiple windows will consequently * not be supported by this driver as-is. */ - sc->sc_rrid = 0; + sc->sc_rrid = rid; sc->sc_rtype = SYS_RES_MEMORY; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, 0, ~0, cl->cl_channels * size, RF_ACTIVE); if (sc->sc_rres == NULL) { - sc->sc_rrid = 0; + sc->sc_rrid = rid; sc->sc_rtype = SYS_RES_IOPORT; sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, 0, ~0, cl->cl_channels * size, RF_ACTIVE); @@ -504,7 +504,7 @@ int scc_bus_setup_intr(device_t dev, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filt, void (*ihand)(void *), void *arg, void **cookiep) { struct scc_chan *ch; struct scc_mode *m; @@ -515,14 +515,14 @@ return (EINVAL); /* Interrupt handlers must be FAST or MPSAFE. */ - if ((flags & (INTR_FAST|INTR_MPSAFE)) == 0) + if (filt == NULL && !(flags & INTR_MPSAFE)) return (EINVAL); sc = device_get_softc(dev); if (sc->sc_polled) return (ENXIO); - if (sc->sc_fastintr && !(flags & INTR_FAST)) { + if (sc->sc_fastintr && filt == NULL) { sc->sc_fastintr = 0; for (c = 0; c < sc->sc_class->cl_channels; c++) { ch = &sc->sc_chan[c]; @@ -530,15 +530,15 @@ continue; bus_teardown_intr(dev, ch->ch_ires, ch->ch_icookie); bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY | INTR_MPSAFE, scc_bfe_intr, sc, - &ch->ch_icookie); + INTR_TYPE_TTY | INTR_MPSAFE, NULL, + (driver_intr_t *)scc_bfe_intr, sc, &ch->ch_icookie); } } m = device_get_ivars(child); m->m_hasintr = 1; - m->m_fastintr = (flags & INTR_FAST) ? 1 : 0; - m->ih = ihand; + m->m_fastintr = (filt != NULL) ? 1 : 0; + m->ih = (filt != NULL) ? filt : (driver_filter_t *)ihand; m->ih_arg = arg; i = 0, isrc = SER_INT_OVERRUN; ==== //depot/projects/e500/sys/dev/scc/scc_dev_sab82532.c#3 (text) ==== @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/scc/scc_dev_sab82532.c,v 1.2 2006/04/01 04:51:56 marcel Exp $"); -#define __RMAN_RESOURCE_VISIBLE - #include #include #include ==== //depot/projects/e500/sys/dev/scc/scc_dev_z8530.c#3 (text) ==== @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/scc/scc_dev_z8530.c,v 1.3 2006/07/26 03:10:01 marcel Exp $"); -#define __RMAN_RESOURCE_VISIBLE - #include #include #include ==== //depot/projects/e500/sys/dev/scc/scc_if.m#3 (text) ==== @@ -25,10 +25,6 @@ # # $FreeBSD: src/sys/dev/scc/scc_if.m,v 1.2 2007/03/28 18:05:17 marcel Exp $ -CODE { -#define __RMAN_RESOURCE_VISIBLE -} - #include #include #include ==== //depot/projects/e500/sys/powerpc/aim/clock.c#2 (text+ko) ==== @@ -56,13 +56,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.20 2005/02/04 01:41:38 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.27 2006/10/05 06:04:44 grehan Exp $"); #include #include #include #include #include +#include #include #include @@ -82,17 +83,6 @@ static long ticks_per_intr; static volatile u_long lasttb; -static int sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS); - -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ -SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - -int adjkerntz; /* local offset from GMT in seconds */ -SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -#define SECDAY 86400 #define DIFF19041970 2082844800 static int clockinitted = 0; @@ -107,17 +97,6 @@ "decrementer" /* name */ }; -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); - if (!error && req->newptr) - resettodr(); - return (error); -} - void inittodr(time_t base) { @@ -183,7 +162,7 @@ } void -decr_intr(struct clockframe *frame) +decr_intr(struct trapframe *frame) { u_long tb; long tick; @@ -225,10 +204,10 @@ */ #if 0 while (--nticks > 0) { - hardclock(frame); + hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); } #endif - hardclock(frame); + hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); } void ==== //depot/projects/e500/sys/powerpc/aim/copyinout.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.11 2005/01/07 02:29:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.15 2006/10/18 19:56:20 grehan Exp $"); #include #include @@ -322,17 +322,23 @@ return ((int32_t)fuword(addr)); } -intptr_t -casuptr(intptr_t *addr, intptr_t old, intptr_t new) +uint32_t +casuword32(volatile uint32_t *base, uint32_t oldval, uint32_t newval) +{ + return (casuword((volatile u_long *)base, oldval, newval)); +} + +u_long +casuword(volatile u_long *addr, u_long old, u_long new) { struct thread *td; pmap_t pm; faultbuf env; - intptr_t *p, val; + u_long *p, val; td = PCPU_GET(curthread); pm = &td->td_proc->p_vmspace->vm_pmap; - p = (intptr_t *)((u_int)USER_ADDR + ((u_int)addr & ~SEGMENT_MASK)); + p = (u_long *)((u_int)USER_ADDR + ((u_int)addr & ~SEGMENT_MASK)); set_user_sr(pm->pm_sr[(u_int)addr >> ADDR_SR_SHFT]); @@ -342,7 +348,7 @@ } val = *p; - (void) atomic_cmpset_32(p, old, new); + (void) atomic_cmpset_32((volatile uint32_t *)p, old, new); td->td_pcb->pcb_onfault = NULL; ==== //depot/projects/e500/sys/powerpc/aim/interrupt.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powerpc/interrupt.c,v 1.4 2005/01/07 02:29:20 imp Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/interrupt.c,v 1.5 2005/12/22 22:16:08 jhb Exp $ */ /* @@ -72,7 +72,7 @@ powerpc_extintr_handler = new_extint; } -extern void decr_intr(struct clockframe *); +extern void decr_intr(struct trapframe *); extern void trap(struct trapframe *); /* @@ -84,7 +84,6 @@ powerpc_interrupt(struct trapframe *framep) { struct thread *td; - struct clockframe ckframe; td = curthread; @@ -97,9 +96,7 @@ case EXC_DECR: atomic_add_int(&td->td_intr_nesting_level, 1); - ckframe.srr0 = framep->srr0; - ckframe.srr1 = framep->srr1; - decr_intr(&ckframe); + decr_intr(framep); atomic_subtract_int(&td->td_intr_nesting_level, 1); break; ==== //depot/projects/e500/sys/powerpc/aim/locore.S#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/locore.S,v 1.21.2.1 2005/11/11 05:21:08 grehan Exp $ */ +/* $FreeBSD: src/sys/powerpc/powerpc/locore.S,v 1.22 2005/10/30 21:29:59 grehan Exp $ */ /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ /*- ==== //depot/projects/e500/sys/powerpc/aim/machdep.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.89.2.1 2005/08/08 07:02:12 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.101 2007/05/18 07:10:47 jeff Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -104,12 +104,12 @@ #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -136,9 +136,6 @@ char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); -static char model[128]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, model, 0, ""); - static int cacheline_size = CACHELINESIZE; SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, CTLFLAG_RD, &cacheline_size, 0, ""); @@ -169,6 +166,14 @@ struct kva_md_info kmi; +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} + static void powerpc_ofw_shutdown(void *junk, int howto) { @@ -218,8 +223,8 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ld (%ld MB)\n", ptoa(cnt.v_free_count), - ptoa(cnt.v_free_count) / 1048576); + printf("avail memory = %ld (%ld MB)\n", ptoa(VMCNT_GET(free_count)), + ptoa(VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. @@ -287,7 +292,7 @@ /* * Start initializing proc0 and thread0. */ - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_frame = &frame0; /* @@ -317,6 +322,8 @@ kdb_init(); + kobj_machdep_init(); + /* * XXX: Initialize the interrupt tables. * Disable translation in case the vector area @@ -329,7 +336,7 @@ bcopy(&dsitrap, (void *)EXC_DSI, (size_t)&dsisize); bcopy(&trapcode, (void *)EXC_ISI, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_EXI, (size_t)&trapsize); - bcopy(&trapcode, (void *)EXC_ALI, (size_t)&trapsize); + bcopy(&alitrap, (void *)EXC_ALI, (size_t)&alisize); bcopy(&trapcode, (void *)EXC_PGM, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_FPU, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_DECR, (size_t)&trapsize); @@ -358,6 +365,7 @@ /* * Initialise virtual memory. */ + pmap_mmu_install(MMU_TYPE_OEA, 0); /* XXX temporary */ pmap_bootstrap(startkernel, endkernel); /* @@ -432,7 +440,7 @@ } void -sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct trapframe *tf; struct sigframe *sfp; @@ -441,10 +449,14 @@ struct thread *td; struct proc *p; int oonstack, rndfsize; + int sig; + int code; td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); + sig = ksi->ksi_signo; + code = ksi->ksi_code; psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); tf = td->td_frame; @@ -472,7 +484,7 @@ */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + + sfp = (struct sigframe *)(td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); } else { sfp = (struct sigframe *)(tf->fixreg[1] - rndfsize); @@ -512,12 +524,15 @@ /* * Fill siginfo structure. */ + sf.sf_si = ksi->ksi_info; sf.sf_si.si_signo = sig; - sf.sf_si.si_code = code; - sf.sf_si.si_addr = (void *)tf->srr0; + sf.sf_si.si_addr = (void *) ((tf->exc == EXC_DSI) ? + tf->dar : tf->srr0); } else { /* Old FreeBSD-style arguments. */ tf->fixreg[FIRSTARG+1] = code; + tf->fixreg[FIRSTARG+3] = (tf->exc == EXC_DSI) ? + tf->dar : tf->srr0; } mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(p); @@ -527,7 +542,7 @@ /* * copy the frame out to userland. */ - if (copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)) != 0) { + if (copyout(&sf, sfp, sizeof(*sfp)) != 0) { /* * Process has trashed its stack. Kill it. */ @@ -543,25 +558,6 @@ mtx_lock(&psp->ps_mtx); } -/* - * Build siginfo_t for SA thread - */ -void -cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) -{ - struct proc *p; - struct thread *td; - - td = curthread; - p = td->td_proc; - PROC_LOCK_ASSERT(p, MA_OWNED); - - bzero(si, sizeof(*si)); - si->si_signo = sig; - si->si_code = code; - /* XXXKSE fill other fields */ -} - int sigreturn(struct thread *td, struct sigreturn_args *uap) { ==== //depot/projects/e500/sys/powerpc/aim/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mem.c,v 1.1 2004/08/16 13:07:40 ssouhlal Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mem.c,v 1.2 2006/07/26 17:12:54 marcel Exp $"); /* * Memory special file @@ -59,7 +59,6 @@ #include #include -#include #include #include ==== //depot/projects/e500/sys/powerpc/aim/nexus.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ * * from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09 * - * $FreeBSD: src/sys/powerpc/powerpc/nexus.c,v 1.12 2005/01/07 02:29:20 imp Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/nexus.c,v 1.14 2007/04/20 03:24:59 grehan Exp $ */ #include "opt_psim.h" @@ -74,6 +74,7 @@ #include +#include "ofw_bus_if.h" #include "pic_if.h" /* @@ -112,7 +113,7 @@ static int nexus_read_ivar(device_t, device_t, int, uintptr_t *); static int nexus_write_ivar(device_t, device_t, int, uintptr_t); static int nexus_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *, driver_intr_t *, void *, void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, @@ -124,6 +125,11 @@ static int nexus_release_resource(device_t, device_t, int, int, struct resource *); +static phandle_t nexus_ofw_get_node(device_t, device_t); +static const char *nexus_ofw_get_name(device_t, device_t); +static const char *nexus_ofw_get_type(device_t, device_t); +static const char *nexus_ofw_get_compat(device_t, device_t); + /* * Local routines */ @@ -151,6 +157,12 @@ DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), + /* OFW bus interface */ + DEVMETHOD(ofw_bus_get_node, nexus_ofw_get_node), + DEVMETHOD(ofw_bus_get_name, nexus_ofw_get_name), + DEVMETHOD(ofw_bus_get_type, nexus_ofw_get_type), + DEVMETHOD(ofw_bus_get_compat, nexus_ofw_get_compat), + { 0, 0 } }; @@ -290,7 +302,7 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct nexus_softc *sc; @@ -299,8 +311,8 @@ if (device_get_state(sc->sc_pic) != DS_ATTACHED) panic("nexus_setup_intr: no pic attached\n"); - return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, intr, arg, - cookiep)); + return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, filter, intr, + arg, cookiep)); } static int @@ -416,3 +428,47 @@ return (0); } + +static const char * +nexus_ofw_get_name(device_t bus, device_t dev) +{ + struct nexus_devinfo *dinfo; + + if ((dinfo = device_get_ivars(dev)) == NULL) + return (NULL); + + return (dinfo->ndi_name); +} + +static phandle_t +nexus_ofw_get_node(device_t bus, device_t dev) +{ + struct nexus_devinfo *dinfo; + + if ((dinfo = device_get_ivars(dev)) == NULL) + return (0); + + return (dinfo->ndi_node); +} + +static const char * +nexus_ofw_get_type(device_t bus, device_t dev) +{ + struct nexus_devinfo *dinfo; + + if ((dinfo = device_get_ivars(dev)) == NULL) + return (NULL); + + return (dinfo->ndi_device_type); +} + +static const char * +nexus_ofw_get_compat(device_t bus, device_t dev) +{ + struct nexus_devinfo *dinfo; + + if ((dinfo = device_get_ivars(dev)) == NULL) + return (NULL); + + return (dinfo->ndi_compatible); +} ==== //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.13.2.1 2005/11/11 05:21:08 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.17 2006/12/13 06:11:22 marcel Exp $"); #include #include @@ -46,11 +46,14 @@ #include #include +#include #include #include #include +#include +#include #include #include #include @@ -62,7 +65,6 @@ extern register_t ofmsr[5]; extern struct pcpu __pcpu[MAXCPU]; extern struct pmap ofw_pmap; -extern int pmap_bootstrapped; static int (*ofwcall)(void *); /* @@ -285,6 +287,141 @@ OF_getprop(node, "local-mac-address", addr, ETHER_ADDR_LEN); } +/* + * Return a bus handle and bus tag that corresponds to the register + * numbered regno for the device referenced by the package handle + * dev. This function is intended to be used by console drivers in + * early boot only. It works by mapping the address of the device's + * register in the address space of its parent and recursively walk + * the device tree upward this way. + */ +static void +OF_get_addr_props(phandle_t node, uint32_t *addrp, uint32_t *sizep, int *pcip) +{ + char name[16]; + uint32_t addr, size; + int pci, res; + + res = OF_getprop(node, "#address-cells", &addr, sizeof(addr)); + if (res == -1) + addr = 2; + res = OF_getprop(node, "#size-cells", &size, sizeof(size)); + if (res == -1) + size = 1; + pci = 0; + if (addr == 3 && size == 2) { + res = OF_getprop(node, "name", name, sizeof(name)); + if (res != -1) { + name[sizeof(name) - 1] = '\0'; + pci = (strcmp(name, "pci") == 0) ? 1 : 0; + } + } + if (addrp != NULL) + *addrp = addr; + if (sizep != NULL) + *sizep = size; + if (pcip != NULL) + *pcip = pci; +} + +int +OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag, + bus_space_handle_t *handle) +{ + uint32_t cell[32]; + bus_addr_t addr, raddr, baddr; + bus_size_t size, rsize; + uint32_t c, nbridge, naddr, nsize; + phandle_t bridge, parent; + u_int spc, rspc; + int pci, pcib, res; + + /* Sanity checking. */ + if (dev == 0) + return (EINVAL); + bridge = OF_parent(dev); + if (bridge == 0) + return (EINVAL); + if (regno < 0) + return (EINVAL); + if (tag == NULL || handle == NULL) + return (EINVAL); + + /* Get the requested register. */ + OF_get_addr_props(bridge, &naddr, &nsize, &pci); + res = OF_getprop(dev, (pci) ? "assigned-addresses" : "reg", + cell, sizeof(cell)); + if (res == -1) + return (ENXIO); + if (res % sizeof(cell[0])) + return (ENXIO); + res /= sizeof(cell[0]); + regno *= naddr + nsize; + if (regno + naddr + nsize > res) + return (EINVAL); + spc = (pci) ? cell[regno] & OFW_PCI_PHYS_HI_SPACEMASK : ~0; + addr = 0; + for (c = 0; c < naddr; c++) + addr = ((uint64_t)addr << 32) | cell[regno++]; + size = 0; + for (c = 0; c < nsize; c++) + size = ((uint64_t)size << 32) | cell[regno++]; + + /* + * Map the address range in the bridge's decoding window as given + * by the "ranges" property. If a node doesn't have such property + * then no mapping is done. + */ + parent = OF_parent(bridge); + while (parent != 0) { + OF_get_addr_props(parent, &nbridge, NULL, &pcib); + res = OF_getprop(bridge, "ranges", cell, sizeof(cell)); + if (res == -1) + goto next; + if (res % sizeof(cell[0])) + return (ENXIO); + res /= sizeof(cell[0]); + regno = 0; + while (regno < res) { + rspc = (pci) + ? cell[regno] & OFW_PCI_PHYS_HI_SPACEMASK + : ~0; + if (rspc != spc) { + regno += naddr + nbridge + nsize; + continue; + } + raddr = 0; + for (c = 0; c < naddr; c++) + raddr = ((uint64_t)raddr << 32) | cell[regno++]; + rspc = (pcib) + ? cell[regno] & OFW_PCI_PHYS_HI_SPACEMASK + : ~0; + baddr = 0; + for (c = 0; c < nbridge; c++) + baddr = ((uint64_t)baddr << 32) | cell[regno++]; + rsize = 0; + for (c = 0; c < nsize; c++) + rsize = ((uint64_t)rsize << 32) | cell[regno++]; + if (addr < raddr || addr >= raddr + rsize) + continue; + addr = addr - raddr + baddr; + if (rspc != ~0) + spc = rspc; + } + + next: + bridge = parent; + parent = OF_parent(bridge); + OF_get_addr_props(bridge, &naddr, &nsize, &pci); + } + + /* Default to memory mapped I/O. */ + *tag = PPC_BUS_SPACE_MEM; + if (spc == OFW_PCI_PHYS_HI_SPACE_IO) + *tag = PPC_BUS_SPACE_IO; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 21 05:50:31 2007 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 561C216A469; Mon, 21 May 2007 05:50:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D351116A400 for ; Mon, 21 May 2007 05:50:30 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C3D5613C447 for ; Mon, 21 May 2007 05:50:30 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4L5oUYn073527 for ; Mon, 21 May 2007 05:50:30 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4L5oUcF073518 for perforce@freebsd.org; Mon, 21 May 2007 05:50:30 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 21 May 2007 05:50:30 GMT Message-Id: <200705210550.l4L5oUcF073518@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 120150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 05:50:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=120150 Change 120150 by mjacob@mjexp on 2007/05/21 05:49:28 IFC Affected files ... .. //depot/projects/mjexp/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/mjexp/sys/ia64/ia64/trap.c#4 integrate Differences ... ==== //depot/projects/mjexp/sys/dev/firewire/firewire.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.92 2007/04/30 13:51:13 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.93 2007/05/21 02:18:49 simokawa Exp $ * */ @@ -44,6 +44,7 @@ #include #include #include +#include #if defined(__DragonFly__) || __FreeBSD_version < 500000 #include /* for DELAY() */ @@ -103,14 +104,11 @@ static void fw_asystart (struct fw_xfer *); static int fw_get_tlabel (struct firewire_comm *, struct fw_xfer *); static void fw_bus_probe (struct firewire_comm *); -static void fw_bus_explore (struct firewire_comm *); -static void fw_bus_explore_callback (struct fw_xfer *); static void fw_attach_dev (struct firewire_comm *); +static void fw_bus_probe_thread(void *); #ifdef FW_VMACCESS static void fw_vmaccess (struct fw_xfer *); #endif -struct fw_xfer *asyreqq (struct firewire_comm *, uint8_t, uint8_t, uint8_t, - uint32_t, uint32_t, void (*)(struct fw_xfer *)); static int fw_bmr (struct firewire_comm *); static device_method_t firewire_methods[] = { @@ -379,6 +377,7 @@ struct firewire_softc *sc = device_get_softc(dev); device_t pa = device_get_parent(dev); struct firewire_comm *fc; + struct proc *p; fc = (struct firewire_comm *)device_get_softc(pa); sc->fc = fc; @@ -396,6 +395,10 @@ callout_reset(&sc->fc->timeout_callout, hz, (void *)firewire_watchdog, (void *)sc->fc); + /* create thread */ + kthread_create(fw_bus_probe_thread, (void *)fc, &p, + 0, 0, "fw%d_probe", unit); + /* Locate our children */ bus_generic_probe(dev); @@ -448,34 +451,38 @@ firewire_detach(device_t dev) { struct firewire_softc *sc; - struct csrdir *csrd, *next; + struct firewire_comm *fc; struct fw_device *fwdev, *fwdev_next; int err; sc = (struct firewire_softc *)device_get_softc(dev); + fc = sc->fc; + fc->status = FWBUSDETACH; + if ((err = fwdev_destroydev(sc)) != 0) return err; if ((err = bus_generic_detach(dev)) != 0) return err; - callout_stop(&sc->fc->timeout_callout); - callout_stop(&sc->fc->bmr_callout); - callout_stop(&sc->fc->busprobe_callout); + callout_stop(&fc->timeout_callout); + callout_stop(&fc->bmr_callout); + callout_stop(&fc->busprobe_callout); /* XXX xfree_free and untimeout on all xfers */ - for (fwdev = STAILQ_FIRST(&sc->fc->devices); fwdev != NULL; + for (fwdev = STAILQ_FIRST(&fc->devices); fwdev != NULL; fwdev = fwdev_next) { fwdev_next = STAILQ_NEXT(fwdev, link); free(fwdev, M_FW); } - for (csrd = SLIST_FIRST(&sc->fc->csrfree); csrd != NULL; csrd = next) { - next = SLIST_NEXT(csrd, link); - free(csrd, M_FW); - } - free(sc->fc->topology_map, M_FW); - free(sc->fc->speed_map, M_FW); - free(sc->fc->crom_src_buf, M_FW); + free(fc->topology_map, M_FW); + free(fc->speed_map, M_FW); + free(fc->crom_src_buf, M_FW); + + wakeup(fc); + if (tsleep(fc, PWAIT, "fwthr", hz * 60)) + printf("firewire task thread didn't die\n"); + return(0); } #if 0 @@ -678,7 +685,6 @@ void fw_init(struct firewire_comm *fc) { int i; - struct csrdir *csrd; #ifdef FW_VMACCESS struct fw_xfer *xfer; struct fw_bind *fwb; @@ -742,15 +748,6 @@ STAILQ_INIT(&fc->devices); -/* Initialize csr ROM work space */ - SLIST_INIT(&fc->ongocsr); - SLIST_INIT(&fc->csrfree); - for( i = 0 ; i < FWMAXCSRDIR ; i++){ - csrd = (struct csrdir *) malloc(sizeof(struct csrdir), M_FW,M_NOWAIT); - if(csrd == NULL) break; - SLIST_INSERT_HEAD(&fc->csrfree, csrd, link); - } - /* Initialize Async handlers */ STAILQ_INIT(&fc->binds); for( i = 0 ; i < 0x40 ; i++){ @@ -1284,105 +1281,146 @@ fwdev->status = FWDEVINVAL; fwdev->rcnt = 0; } + splx(s); + + wakeup((void *)fc); +} + +static int +fw_explore_read_quads(struct fw_device *fwdev, int offset, + uint32_t *quad, int n) +{ + struct fw_xfer *xfer; + uint32_t tmp; + int i, error; + + for (i = 0; i < n; i ++, offset += sizeof(uint32_t)) { + xfer = fwmem_read_quad(fwdev, NULL, -1, + 0xffff, 0xf0000000 | offset, (void *)&tmp, + fw_asy_callback); + if (xfer == NULL) + return (-1); + tsleep((void *)xfer, PWAIT|PCATCH, "rquad", 0); - fc->ongonode = 0; - fc->ongoaddr = CSRROMOFF; - fc->ongodev = NULL; - fc->ongoeui.hi = 0xffffffff; fc->ongoeui.lo = 0xffffffff; - fw_bus_explore(fc); - splx(s); + if (xfer->resp == 0) + quad[i] = ntohl(tmp); + + error = xfer->resp; + fw_xfer_free(xfer); + if (error) + return (error); + } + return (0); } -/* - * Find the self_id packet for a node, ignoring sequels. - */ -static union fw_self_id * -fw_find_self_id(struct firewire_comm *fc, int node) + +static int +fw_explore_csrblock(struct fw_device *fwdev, int offset, int recur) { - uint32_t i; - union fw_self_id *s; + int err, i, off; + struct csrdirectory *dir; + struct csrreg *reg; + + dir = (struct csrdirectory *)&fwdev->csrrom[offset/sizeof(uint32_t)]; + err = fw_explore_read_quads(fwdev, CSRROMOFF + offset, + (uint32_t *)dir, 1); + if (err) + return (-1); + + offset += sizeof(uint32_t); + reg = (struct csrreg *)&fwdev->csrrom[offset/sizeof(uint32_t)]; + err = fw_explore_read_quads(fwdev, CSRROMOFF + offset, + (uint32_t *)reg, dir->crc_len); + if (err) + return (-1); + + /* XXX check CRC */ + + off = CSRROMOFF + offset + sizeof(uint32_t) * (dir->crc_len - 1); + if (fwdev->rommax < off) + fwdev->rommax = off; + + if (recur == 0) + return (0); - for (i = 0; i < fc->topology_map->self_id_count; i++) { - s = &fc->topology_map->self_id[i]; - if (s->p0.sequel) + for (i = 0; i < dir->crc_len; i ++, offset += sizeof(uint32_t)) { + if (reg[i].key == CROM_UDIR) + recur = 1; + else if (reg[i].key == CROM_TEXTLEAF) + recur = 0; + else continue; - if (s->p0.phy_id == node) - return s; + + off = offset + reg[i].val * sizeof(uint32_t); + if (off > CROMSIZE) { + printf("%s: invalid offset %d\n", __FUNCTION__, off); + return(-1); + } + err = fw_explore_csrblock(fwdev, off, recur); + if (err) + return (-1); } - return 0; + return (0); } -/* - * To collect device informations on the IEEE1394 bus. - */ -static void -fw_bus_explore(struct firewire_comm *fc ) +static int +fw_explore_node(struct fw_device *dfwdev) { - int err = 0; + struct firewire_comm *fc; struct fw_device *fwdev, *pfwdev, *tfwdev; - uint32_t addr; - struct fw_xfer *xfer; - struct fw_pkt *fp; - union fw_self_id *fwsid; + uint32_t *csr; + struct csrhdr *hdr; + struct bus_info *binfo; + int err, node, spd; - if(fc->status != FWBUSEXPLORE) - return; + fc = dfwdev->fc; + csr = dfwdev->csrrom; + node = dfwdev->dst; -loop: - if(fc->ongonode == fc->nodeid) fc->ongonode++; + /* First quad */ + err = fw_explore_read_quads(dfwdev, CSRROMOFF, &csr[0], 1); + if (err) + return (-1); + hdr = (struct csrhdr *)&csr[0]; + if (hdr->info_len != 4) { + if (firewire_debug) + printf("node%d: wrong bus info len(%d)\n", + node, hdr->info_len); + return (-1); + } - if(fc->ongonode > fc->max_node) goto done; - if(fc->ongonode >= 0x3f) goto done; - - /* check link */ - /* XXX we need to check phy_id first */ - fwsid = fw_find_self_id(fc, fc->ongonode); - if (!fwsid || !fwsid->p0.link_active) { + /* bus info */ + err = fw_explore_read_quads(dfwdev, CSRROMOFF + 0x04, &csr[1], 4); + if (err) + return (-1); + binfo = (struct bus_info *)&csr[1]; + if (binfo->bus_name != CSR_BUS_NAME_IEEE1394) { if (firewire_debug) - printf("node%d: link down\n", fc->ongonode); - fc->ongonode++; - goto loop; + printf("node%d: invalid bus name 0x%08x\n", + node, binfo->bus_name); + return (-1); } - - if(fc->ongoaddr <= CSRROMOFF && - fc->ongoeui.hi == 0xffffffff && - fc->ongoeui.lo == 0xffffffff ){ - fc->ongoaddr = CSRROMOFF; - addr = 0xf0000000 | fc->ongoaddr; - }else if(fc->ongoeui.hi == 0xffffffff ){ - fc->ongoaddr = CSRROMOFF + 0xc; - addr = 0xf0000000 | fc->ongoaddr; - }else if(fc->ongoeui.lo == 0xffffffff ){ - fc->ongoaddr = CSRROMOFF + 0x10; - addr = 0xf0000000 | fc->ongoaddr; - }else if(fc->ongodev == NULL){ - STAILQ_FOREACH(fwdev, &fc->devices, link) - if (FW_EUI64_EQUAL(fwdev->eui, fc->ongoeui)) - break; - if(fwdev != NULL){ - fwdev->dst = fc->ongonode; - fwdev->status = FWDEVINIT; - fc->ongodev = fwdev; - fc->ongoaddr = CSRROMOFF; - addr = 0xf0000000 | fc->ongoaddr; - goto dorequest; + spd = fc->speed_map->speed[fc->nodeid][node]; + STAILQ_FOREACH(fwdev, &fc->devices, link) + if (FW_EUI64_EQUAL(fwdev->eui, binfo->eui64)) + break; + if (fwdev == NULL) { + /* new device */ + fwdev = malloc(sizeof(struct fw_device), M_FW, + M_NOWAIT | M_ZERO); + if (fwdev == NULL) { + if (firewire_debug) + printf("node%d: no memory\n", node); + return (-1); } - fwdev = malloc(sizeof(struct fw_device), M_FW, - M_NOWAIT | M_ZERO); - if(fwdev == NULL) - return; fwdev->fc = fc; - fwdev->rommax = 0; - fwdev->dst = fc->ongonode; - fwdev->eui.hi = fc->ongoeui.hi; fwdev->eui.lo = fc->ongoeui.lo; - fwdev->status = FWDEVINIT; - fwdev->speed = fc->speed_map->speed[fc->nodeid][fc->ongonode]; - + fwdev->eui = binfo->eui64; + /* inesrt into sorted fwdev list */ pfwdev = NULL; STAILQ_FOREACH(tfwdev, &fc->devices, link) { if (tfwdev->eui.hi > fwdev->eui.hi || - (tfwdev->eui.hi == fwdev->eui.hi && - tfwdev->eui.lo > fwdev->eui.lo)) + (tfwdev->eui.hi == fwdev->eui.hi && + tfwdev->eui.lo > fwdev->eui.lo)) break; pfwdev = tfwdev; } @@ -1392,258 +1430,121 @@ STAILQ_INSERT_AFTER(&fc->devices, pfwdev, fwdev, link); device_printf(fc->bdev, "New %s device ID:%08x%08x\n", - linkspeed[fwdev->speed], - fc->ongoeui.hi, fc->ongoeui.lo); - - fc->ongodev = fwdev; - fc->ongoaddr = CSRROMOFF; - addr = 0xf0000000 | fc->ongoaddr; - }else{ - addr = 0xf0000000 | fc->ongoaddr; + linkspeed[spd], + fwdev->eui.hi, fwdev->eui.lo); } -dorequest: -#if 0 - xfer = asyreqq(fc, FWSPD_S100, 0, 0, - ((FWLOCALBUS | fc->ongonode) << 16) | 0xffff , addr, - fw_bus_explore_callback); - if(xfer == NULL) goto done; -#else - xfer = fw_xfer_alloc(M_FWXFER); - if(xfer == NULL){ - goto done; - } - xfer->send.spd = 0; - fp = &xfer->send.hdr; - fp->mode.rreqq.dest_hi = 0xffff; - fp->mode.rreqq.tlrt = 0; - fp->mode.rreqq.tcode = FWTCODE_RREQQ; - fp->mode.rreqq.pri = 0; - fp->mode.rreqq.src = 0; - fp->mode.rreqq.dst = FWLOCALBUS | fc->ongonode; - fp->mode.rreqq.dest_lo = addr; - xfer->hand = fw_bus_explore_callback; + fwdev->dst = node; + fwdev->status = FWDEVINIT; + fwdev->speed = spd; - if (firewire_debug) - printf("node%d: explore addr=0x%x\n", - fc->ongonode, fc->ongoaddr); - err = fw_asyreq(fc, -1, xfer); - if(err){ - fw_xfer_free( xfer); - return; + /* unchanged ? */ + if (bcmp(&csr[0], &fwdev->csrrom[0], sizeof(uint32_t) * 5) == 0) { + if (firewire_debug) + printf("node%d: crom unchanged\n", node); + return (0); } -#endif - return; -done: - /* fw_attach_devs */ - fc->status = FWBUSEXPDONE; - if (firewire_debug) - printf("bus_explore done\n"); - fw_attach_dev(fc); - return; -} + bzero(&fwdev->csrrom[0], CROMSIZE); -/* Portable Async. request read quad */ -struct fw_xfer * -asyreqq(struct firewire_comm *fc, uint8_t spd, uint8_t tl, uint8_t rt, - uint32_t addr_hi, uint32_t addr_lo, - void (*hand) (struct fw_xfer*)) -{ - struct fw_xfer *xfer; - struct fw_pkt *fp; - int err; + /* copy first quad and bus info block */ + bcopy(&csr[0], &fwdev->csrrom[0], sizeof(uint32_t) * 5); + fwdev->rommax = CSRROMOFF + sizeof(uint32_t) * 4; - xfer = fw_xfer_alloc(M_FWXFER); - if (xfer == NULL) - return NULL; + err = fw_explore_csrblock(fwdev, 0x14, 1); /* root directory */ - xfer->send.spd = spd; /* XXX:min(spd, fc->spd) */ - fp = &xfer->send.hdr; - fp->mode.rreqq.dest_hi = addr_hi & 0xffff; - if(tl & FWP_TL_VALID){ - fp->mode.rreqq.tlrt = (tl & 0x3f) << 2; - }else{ - fp->mode.rreqq.tlrt = 0; + if (err) { + fwdev->status = FWDEVINVAL; + fwdev->csrrom[0] = 0; } - fp->mode.rreqq.tlrt |= rt & 0x3; - fp->mode.rreqq.tcode = FWTCODE_RREQQ; - fp->mode.rreqq.pri = 0; - fp->mode.rreqq.src = 0; - fp->mode.rreqq.dst = addr_hi >> 16; - fp->mode.rreqq.dest_lo = addr_lo; - xfer->hand = hand; + return (err); - err = fw_asyreq(fc, -1, xfer); - if(err){ - fw_xfer_free( xfer); - return NULL; - } - return xfer; } /* - * Callback for the IEEE1394 bus information collection. + * Find the self_id packet for a node, ignoring sequels. */ -static void -fw_bus_explore_callback(struct fw_xfer *xfer) +static union fw_self_id * +fw_find_self_id(struct firewire_comm *fc, int node) { - struct firewire_comm *fc; - struct fw_pkt *sfp,*rfp; - struct csrhdr *chdr; - struct csrdir *csrd; - struct csrreg *csrreg; - uint32_t offset; + uint32_t i; + union fw_self_id *s; - - if(xfer == NULL) { - printf("xfer == NULL\n"); - return; + for (i = 0; i < fc->topology_map->self_id_count; i++) { + s = &fc->topology_map->self_id[i]; + if (s->p0.sequel) + continue; + if (s->p0.phy_id == node) + return s; } - fc = xfer->fc; + return 0; +} - if (firewire_debug) - printf("node%d: callback addr=0x%x\n", - fc->ongonode, fc->ongoaddr); +static void +fw_explore(struct firewire_comm *fc) +{ + int node, err, s, i, todo, todo2, trys; + char nodes[63]; + struct fw_device dfwdev; - if(xfer->resp != 0){ - device_printf(fc->bdev, - "bus_explore node=%d addr=0x%x resp=%d\n", - fc->ongonode, fc->ongoaddr, xfer->resp); - goto errnode; - } + todo = 0; + /* setup dummy fwdev */ + dfwdev.fc = fc; + dfwdev.speed = 0; + dfwdev.maxrec = 8; /* 512 */ + dfwdev.status = FWDEVINIT; - sfp = &xfer->send.hdr; - rfp = &xfer->recv.hdr; -#if 0 - { - uint32_t *qld; - int i; - qld = (uint32_t *)xfer->recv.buf; - printf("len:%d\n", xfer->recv.len); - for( i = 0 ; i <= xfer->recv.len && i < 32; i+= 4){ - printf("0x%08x ", rfp->mode.ld[i/4]); - if((i % 16) == 15) printf("\n"); + for (node = 0; node <= fc->max_node; node ++) { + /* We don't probe myself and linkdown nodes */ + if (node == fc->nodeid) + continue; + if (!fw_find_self_id(fc, node)->p0.link_active) { + if (firewire_debug) + printf("node%d: link down\n", node); + continue; } - if((i % 16) != 15) printf("\n"); + nodes[todo++] = node; } -#endif - if(fc->ongodev == NULL){ - if(sfp->mode.rreqq.dest_lo == (0xf0000000 | CSRROMOFF)){ - rfp->mode.rresq.data = ntohl(rfp->mode.rresq.data); - chdr = (struct csrhdr *)(&rfp->mode.rresq.data); -/* If CSR is minimal confinguration, more investigation is not needed. */ - if(chdr->info_len == 1){ - if (firewire_debug) - printf("node%d: minimal config\n", - fc->ongonode); - goto nextnode; - }else{ - fc->ongoaddr = CSRROMOFF + 0xc; - } - }else if(sfp->mode.rreqq.dest_lo == (0xf0000000 |(CSRROMOFF + 0xc))){ - fc->ongoeui.hi = ntohl(rfp->mode.rresq.data); - fc->ongoaddr = CSRROMOFF + 0x10; - }else if(sfp->mode.rreqq.dest_lo == (0xf0000000 |(CSRROMOFF + 0x10))){ - fc->ongoeui.lo = ntohl(rfp->mode.rresq.data); - if (fc->ongoeui.hi == 0 && fc->ongoeui.lo == 0) { - if (firewire_debug) - printf("node%d: eui64 is zero.\n", - fc->ongonode); - goto nextnode; - } - fc->ongoaddr = CSRROMOFF; - } - }else{ - if (fc->ongoaddr == CSRROMOFF && - fc->ongodev->csrrom[0] == ntohl(rfp->mode.rresq.data)) { - fc->ongodev->status = FWDEVATTACHED; - goto nextnode; - } - fc->ongodev->csrrom[(fc->ongoaddr - CSRROMOFF)/4] = ntohl(rfp->mode.rresq.data); - if(fc->ongoaddr > fc->ongodev->rommax){ - fc->ongodev->rommax = fc->ongoaddr; - } - csrd = SLIST_FIRST(&fc->ongocsr); - if((csrd = SLIST_FIRST(&fc->ongocsr)) == NULL){ - chdr = (struct csrhdr *)(fc->ongodev->csrrom); - offset = CSRROMOFF; - }else{ - chdr = (struct csrhdr *)&fc->ongodev->csrrom[(csrd->off - CSRROMOFF)/4]; - offset = csrd->off; - } - if(fc->ongoaddr > (CSRROMOFF + 0x14) && fc->ongoaddr != offset){ - csrreg = (struct csrreg *)&fc->ongodev->csrrom[(fc->ongoaddr - CSRROMOFF)/4]; - if( csrreg->key == 0x81 || csrreg->key == 0xd1){ - csrd = SLIST_FIRST(&fc->csrfree); - if(csrd == NULL){ - goto nextnode; - }else{ - csrd->ongoaddr = fc->ongoaddr; - fc->ongoaddr += csrreg->val * 4; - csrd->off = fc->ongoaddr; - SLIST_REMOVE_HEAD(&fc->csrfree, link); - SLIST_INSERT_HEAD(&fc->ongocsr, csrd, link); - goto nextaddr; - } - } - } - fc->ongoaddr += 4; - if(((fc->ongoaddr - offset)/4 > chdr->crc_len) && - (fc->ongodev->rommax < 0x414)){ - if(fc->ongodev->rommax <= 0x414){ - csrd = SLIST_FIRST(&fc->csrfree); - if(csrd == NULL) goto nextnode; - csrd->off = fc->ongoaddr; - csrd->ongoaddr = fc->ongoaddr; - SLIST_REMOVE_HEAD(&fc->csrfree, link); - SLIST_INSERT_HEAD(&fc->ongocsr, csrd, link); - } - goto nextaddr; - } - while(((fc->ongoaddr - offset)/4 > chdr->crc_len)){ - if(csrd == NULL){ - goto nextnode; - }; - fc->ongoaddr = csrd->ongoaddr + 4; - SLIST_REMOVE_HEAD(&fc->ongocsr, link); - SLIST_INSERT_HEAD(&fc->csrfree, csrd, link); - csrd = SLIST_FIRST(&fc->ongocsr); - if((csrd = SLIST_FIRST(&fc->ongocsr)) == NULL){ - chdr = (struct csrhdr *)(fc->ongodev->csrrom); - offset = CSRROMOFF; - }else{ - chdr = (struct csrhdr *)&(fc->ongodev->csrrom[(csrd->off - CSRROMOFF)/4]); - offset = csrd->off; - } + s = splfw(); + for (trys = 0; todo > 0 && trys < 3; trys ++) { + todo2 = 0; + for (i = 0; i < todo; i ++) { + dfwdev.dst = nodes[i]; + err = fw_explore_node(&dfwdev); + if (err) + nodes[todo2++] = nodes[i]; + if (firewire_debug) + printf("%s: node %d, err = %d\n", + __FUNCTION__, node, err); } - if((fc->ongoaddr - CSRROMOFF) > CSRROMSIZE){ - goto nextnode; - } + todo = todo2; } -nextaddr: - fw_xfer_free( xfer); - fw_bus_explore(fc); - return; -errnode: - if (fc->ongodev != NULL) { - fc->ongodev->status = FWDEVINVAL; - /* Invalidate ROM */ - fc->ongodev->csrrom[0] = 0; + splx(s); +} + + +static void +fw_bus_probe_thread(void *arg) +{ + struct firewire_comm *fc; + + fc = (struct firewire_comm *)arg; + + mtx_lock(&Giant); + while (1) { + if (fc->status == FWBUSEXPLORE) { + fw_explore(fc); + fc->status = FWBUSEXPDONE; + if (firewire_debug) + printf("bus_explore done\n"); + fw_attach_dev(fc); + } else if (fc->status == FWBUSDETACH) + break; + tsleep((void *)fc, PWAIT|PCATCH, "-", 0); } -nextnode: - fw_xfer_free( xfer); - fc->ongonode++; -/* housekeeping work space */ - fc->ongoaddr = CSRROMOFF; - fc->ongodev = NULL; - fc->ongoeui.hi = 0xffffffff; fc->ongoeui.lo = 0xffffffff; - while((csrd = SLIST_FIRST(&fc->ongocsr)) != NULL){ - SLIST_REMOVE_HEAD(&fc->ongocsr, link); - SLIST_INSERT_HEAD(&fc->csrfree, csrd, link); - } - fw_bus_explore(fc); - return; + mtx_unlock(&Giant); + wakeup(fc); + kthread_exit(0); } /* ==== //depot/projects/mjexp/sys/dev/firewire/firewirereg.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.45 2007/04/30 13:41:40 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.46 2007/05/21 02:18:50 simokawa Exp $ * */ @@ -113,15 +113,8 @@ u_int max_node; u_int max_hop; #define FWPHYASYST (1 << 0) - uint32_t ongobus:10, - ongonode:6, - ongoaddr:16; - struct fw_device *ongodev; - struct fw_eui64 ongoeui; -#define FWMAXCSRDIR 16 - SLIST_HEAD(, csrdir) ongocsr; - SLIST_HEAD(, csrdir) csrfree; uint32_t status; +#define FWBUSDETACH (-2) #define FWBUSNOTREADY (-1) #define FWBUSRESET 0 #define FWBUSINIT 1 @@ -170,12 +163,6 @@ }; #define CSRARC(sc, offset) ((sc)->csr_arc[(offset)/4]) -struct csrdir{ - uint32_t ongoaddr; - uint32_t off; - SLIST_ENTRY(csrdir) link; -}; - struct fw_xferq { int flag; #define FWXFERQ_CHTAGMASK 0xff ==== //depot/projects/mjexp/sys/ia64/ia64/trap.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.126 2007/03/09 04:02:37 mohans Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.127 2007/05/21 05:11:43 marcel Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -629,8 +629,20 @@ break; } + case IA64_VEC_SPECULATION: + /* + * The branching behaviour of the chk instruction is not + * implemented by the processor. All we need to do is + * compute the target address of the branch and make sure + * that control is transfered to that address. + * We should do this in the IVT table and not by entring + * the kernel... + */ + tf->tf_special.iip += tf->tf_special.ifa << 4; + tf->tf_special.psr &= ~IA64_PSR_RI; + goto out; + case IA64_VEC_NAT_CONSUMPTION: - case IA64_VEC_SPECULATION: case IA64_VEC_UNSUPP_DATA_REFERENCE: if (user) { ucode = vector; From owner-p4-projects@FreeBSD.ORG Mon May 21 16:29:06 2007 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 C99A416A46E; Mon, 21 May 2007 16:29:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8568616A468 for ; Mon, 21 May 2007 16:29:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 753B813C46C for ; Mon, 21 May 2007 16:29:05 +0000 (UTC) (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.8/8.13.8) with ESMTP id l4LGT4gg080957 for ; Mon, 21 May 2007 16:29:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4LGT3Xe080933 for perforce@freebsd.org; Mon, 21 May 2007 16:29:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 21 May 2007 16:29:04 GMT Message-Id: <200705211629.l4LGT3Xe080933@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 120180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 16:29:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=120180 Change 120180 by rwatson@rwatson_fledge on 2007/05/21 16:28:02 Fix typo. Submitted by: brd Affected files ... .. //depot/projects/trustedbsd/www/home.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/home.page#4 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/home.page#3 $ + $P4: //depot/projects/trustedbsd/www/home.page#4 $ @@ -82,7 +82,7 @@ resources allowing fine-grained and manageable discretionary access control. -
  • Event auditing support, OpenBMS audit API and audit trail file +
  • Event auditing support, OpenBSM audit API and audit trail file format, and single-host modular IDS system to monitor security events and notify administrators in the event of irregularities.
    • From owner-p4-projects@FreeBSD.ORG Mon May 21 17:14:01 2007 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 B180916A46D; Mon, 21 May 2007 17:14:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6BE6E16A46B for ; Mon, 21 May 2007 17:14:01 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5BB6713C458 for ; Mon, 21 May 2007 17:14:01 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4LHE1mA026228 for ; Mon, 21 May 2007 17:14:01 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4LHE02j026218 for perforce@freebsd.org; Mon, 21 May 2007 17:14:00 GMT (envelope-from taleks@FreeBSD.org) Date: Mon, 21 May 2007 17:14:00 GMT Message-Id: <200705211714.l4LHE02j026218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 120182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 17:14:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=120182 Change 120182 by taleks@taleks_th on 2007/05/21 17:13:03 Added check of frame size to pxe_core_recv_packets() to avoid run-time memory problems. Modified pxe_core_call() status understanding behaviour. From this day it checks not AX register (now: API call_status), but Status field of used structure in API call (status). It seems, all available PXE implementations now work well. Removed some useless code in pxe_core_init(), need to test it on more NICs and remove last commented lines related to UNDI_SHUTDOWN and UNDI_INITIALIZE. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#9 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#9 (text+ko) ==== @@ -214,43 +214,8 @@ /* 2. additional start UNDI */ - /* 2.2 unload stack */ -/* t_PXENV_UNLOAD_STACK *unload_stack = - (t_PXENV_UNLOAD_STACK *)scratch_buffer; - - pxe_memset(unload_stack, 0, sizeof(t_PXENV_UNLOAD_STACK)); - - pxe_core_call(PXENV_UNLOAD_STACK); - - delay(10000000); -*/ - - /* 2.1 stop base */ -/* t_PXENV_STOP_BASE *base_stop = - (t_PXENV_STOP_BASE *)scratch_buffer; - - base_stop->Status = 0; - - pxe_core_call(PXENV_STOP_BASE); - - delay(10000000); -*/ - uint8_t ustate = 3; + /* 2.1 close connection to network */ /* - t_PXENV_UNDI_GET_STATE *undi_state = - (t_PXENV_UNDI_GET_STATE *)scratch_buffer; - - pxe_core_call(PXENV_UNDI_GET_STATE); - - ustate=undi_state->UNDIstate; - printf("UNDI state: %d\n", ustate); - - delay(5000000); -*/ - /* close */ -/* - if (ustate == 3) { - t_PXENV_UNDI_CLOSE *undi_close = (t_PXENV_UNDI_CLOSE *)scratch_buffer; @@ -260,94 +225,32 @@ delay(10000000); } */ - /* cleanup */ -/* - if (ustate > 1) { - t_PXENV_UNDI_CLEANUP *undi_cleanup = - (t_PXENV_UNDI_CLEANUP *)scratch_buffer; + /* 2.1. shutdown UNDI */ + +/* t_PXENV_UNDI_SHUTDOWN *undi_shutdown = + (t_PXENV_UNDI_SHUTDOWN *)scratch_buffer; - undi_cleanup->Status = 0; + undi_shutdown->Status = 0; - pxe_core_call(PXENV_UNDI_CLEANUP); - - delay(10000000); - } - + pxe_core_call(PXENV_UNDI_SHUTDOWN); */ - /* shutdown */ -/* if (ustate > 0) { - t_PXENV_UNDI_SHUTDOWN *undi_shutdown = - (t_PXENV_UNDI_SHUTDOWN *)scratch_buffer; - - undi_shutdown->Status = 0; - - pxe_core_call(PXENV_UNDI_SHUTDOWN); - - delay(10000000); - } -*/ - -/* - if (ustate < 1) { - if (!pxe_core_undi_startup()) { - return (0); - } else { - ustate = 1; - } - } else { - printf("Skipping startup due to UNDI state.\n"); - } -*/ - -/* if (ustate < 2) { - if (!pxe_core_undi_init()) { - return (0); - } else { - ustate = 2; - } - } else { - printf("Skipping initialization due to UNDI state.\n"); + /* 2.2 init UNDI */ +/* if (!pxe_core_undi_init()) { + return (0); } - - delay(10000000); */ - - /* reset */ -/* t_PXENV_UNDI_RESET *undi_reset = (t_PXENV_UNDI_RESET *)scratch_buffer; - - pxe_memset(undi_reset, 0, sizeof(t_PXENV_UNDI_RESET)); - undi_reset->R_Mcast_Buf.MCastAddrCount = 0; - - if (!pxe_core_call(PXENV_UNDI_RESET_ADAPTER)) { - } -*/ /* 3. install isr */ pxe_core_install_isr(); - /* set station addreess */ -/* if (ustate < 3) { - t_PXENV_UNDI_SET_STATION_ADDR *undi_addr= - (t_PXENV_UNDI_SET_STATION_ADDR *)scratch_buffer; - - pxe_memset(undi_addr, 0, sizeof(t_PXENV_UNDI_SET_STATION_ADDR)); - pxe_memcpy(&bootplayer.CAddr, undi_addr->StationAddress, 6); - - if (!pxe_core_call(PXENV_UNDI_SET_STATION_ADDRESS)) { - } - + /* 4. open connection to network */ + t_PXENV_UNDI_OPEN *undi_open = (t_PXENV_UNDI_OPEN *)scratch_buffer; - t_PXENV_UNDI_OPEN *undi_open = (t_PXENV_UNDI_OPEN *)scratch_buffer; - - pxe_memset(undi_open, 0, sizeof(t_PXENV_UNDI_OPEN)); - undi_open->PktFilter = FLTR_DIRECTED | FLTR_BRDCST; - undi_open->R_Mcast_Buf.MCastAddrCount = 0; + pxe_memset(undi_open, 0, sizeof(t_PXENV_UNDI_OPEN)); + undi_open->PktFilter = FLTR_DIRECTED | FLTR_BRDCST; + undi_open->R_Mcast_Buf.MCastAddrCount = 0; - if (!pxe_core_call(PXENV_UNDI_OPEN)) { - } - ustate =3; - - } -*/ + if (!pxe_core_call(PXENV_UNDI_OPEN)) { + } /* saving information about NIC */ nic_ip.ip = bootplayer.yip; /* my ip */ @@ -360,7 +263,7 @@ printf("pxe_core_init(): ended.\n"); #endif - delay(20000000); + delay(5000000); return (1); } @@ -483,7 +386,7 @@ /* * function code is taken from bangpxe_call(), /sys/boot/libi386/pxe.c - * needs pxe_isr.s wrapper and vm86int() support. + * needs pxe_srs.s wrapper and vm86int() support. * in: * func - PXE function number * out: @@ -497,8 +400,7 @@ #ifdef PXE_DEBUG printf("pxe_core_call(): func = 0x%x...", func); #endif - bzero(&v86, sizeof(v86)); -/* bzero(data_buffer, sizeof(data_buffer));*/ + pxe_memset(&v86, 0, sizeof(v86)); v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.edx = VTOPSEG(scratch_buffer); @@ -507,9 +409,12 @@ v86.ebx = func; v86int(); v86.ctl = V86_FLAGS; - int status = v86.eax; + + int call_status = v86.eax; + int status = *((uint16_t *)scratch_buffer); + #ifdef PXE_DEBUG - printf("%s (0x%x)\n", (status == 0) ? "OK" : "NOK", *((uint16_t *)scratch_buffer) ); + printf("%s (0x%x)\n", (call_status == 0) ? "?OK" : "?NOK", status ); #endif return (status == 0) ? 1 : 0; @@ -518,8 +423,7 @@ int pxe_core_transmit(PXE_PACKET *pack) { - /* NOTE:all provided data must be in base memory, - * if it's not here, it must be copied here (TO IMPLEMENT) + /* NOTE: is all provided data must be in base memory? */ t_PXENV_UNDI_TRANSMIT *undi_send = (t_PXENV_UNDI_TRANSMIT *)scratch_buffer; @@ -790,8 +694,16 @@ drop_flag = 1; /* clear queue, receiving all frames of packet */ } - pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, + /* sanity check */ + if (frame_size < PXE_BUFFER_SIZE) { + pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, VTOPSEG(data_buffer), VTOPOFF(data_buffer), frame_size); + } else { + printf("pxe_core_recv_packets(): not enough buffer size (%d bytes) for frame size %d bytes.", + PXE_BUFFER_SIZE, frame_size); + + drop_flag = 1; /* drop this packet */ + } /* checking first fragment, this may help to avoid memory allocation @@ -810,9 +722,6 @@ dummy_pack.data = data_buffer + MEDIAHDR_LEN_ETH; dummy_pack.data_size = frame_size - MEDIAHDR_LEN_ETH; -/* dummy_pack.data = frame_data; - dummy_pack.data_size = frame_size; -*/ dummy_pack.user_data = NULL; @@ -871,12 +780,19 @@ break; frame_size = undi_isr->FrameLength; -/* how to get in this address from userspace, which starts at 0xa800?*/ -/* frame_data = undi_isr->Frame.segment << 4 + undi_isr->Frame.offset; */ + + if (frame_size < PXE_BUFFER_SIZE) { + pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, + VTOPSEG(data_buffer), VTOPOFF(data_buffer), frame_size); + } else { + printf("pxe_core_recv_packets(): not enough buffer size (%d bytes) for frame size %d bytes.", + PXE_BUFFER_SIZE, frame_size); + drop_flag = 1; /* drop this packet */ + } if (!drop_flag) - pxe_core_recieve(pack, frame_data, frame_size); + pxe_core_recieve(pack, data_buffer, frame_size); received += frame_size; } @@ -884,7 +800,7 @@ if (received < buffer_size) { /* pxe_core_get_packet() in cycle failed */ if (!drop_flag) - pxe_core_drop(pack); + pxe_core_drop(pack); /* !!TODO: check, if we have this memory leak in some cases */ return (processed_packets); /* it's failed, finish receive cycle */ } @@ -912,7 +828,7 @@ func = PXENV_UNDI_ISR_IN_GET_NEXT; if (received == buffer_size) - return processed_packets; + return processed_packets; goto packet_start; From owner-p4-projects@FreeBSD.ORG Mon May 21 17:40:18 2007 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 111DD16A468; Mon, 21 May 2007 17:40:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B47C016A421 for ; Mon, 21 May 2007 17:40:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A3CBC13C457 for ; Mon, 21 May 2007 17:40:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4LHeHXV049710 for ; Mon, 21 May 2007 17:40:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4LHdbOo049094 for perforce@freebsd.org; Mon, 21 May 2007 17:39:37 GMT (envelope-from marcel@freebsd.org) Date: Mon, 21 May 2007 17:39:37 GMT Message-Id: <200705211739.l4LHdbOo049094@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 120183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 17:40:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=120183 Change 120183 by marcel@marcel_cluster on 2007/05/21 17:39:16 IFC @120181 Affected files ... .. //depot/projects/powerpc/MAINTAINERS#3 integrate .. //depot/projects/powerpc/Makefile.inc1#6 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#7 integrate .. //depot/projects/powerpc/UPDATING#8 integrate .. //depot/projects/powerpc/bin/df/df.c#4 integrate .. //depot/projects/powerpc/bin/mv/mv.1#2 integrate .. //depot/projects/powerpc/bin/sh/var.c#2 integrate .. //depot/projects/powerpc/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/powerpc/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/powerpc/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/powerpc/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/powerpc/contrib/gdb/gdb/ppcfbsd-nat.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/listener.c#3 integrate .. //depot/projects/powerpc/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/powerpc/contrib/top/commands.c#3 integrate .. //depot/projects/powerpc/contrib/top/machine.h#3 integrate .. //depot/projects/powerpc/contrib/top/top.X#3 integrate .. //depot/projects/powerpc/contrib/top/top.c#3 integrate .. //depot/projects/powerpc/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/powerpc/etc/defaults/periodic.conf#3 integrate .. //depot/projects/powerpc/etc/periodic/daily/480.status-ntpd#1 branch .. //depot/projects/powerpc/etc/rc.d/netoptions#3 integrate .. //depot/projects/powerpc/etc/rc.d/routing#2 integrate .. //depot/projects/powerpc/etc/rc.d/zfs#3 integrate .. //depot/projects/powerpc/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/powerpc/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/arch/powerpc/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/arch/powerpc/init.c#2 integrate .. //depot/projects/powerpc/include/stdlib.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/Makefile#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive.h.in#7 integrate .. //depot/projects/powerpc/lib/libbsm/Makefile#2 integrate .. //depot/projects/powerpc/lib/libc/Makefile#3 integrate .. //depot/projects/powerpc/lib/libc/Versions.def#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/arm/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/db/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/powerpc/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/powerpc/lib/libc/gmon/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/i386/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/inet/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/locale/isdigit.3#3 integrate .. //depot/projects/powerpc/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/libc/net/ether_addr.c#2 integrate .. //depot/projects/powerpc/lib/libc/net/ethers.3#2 integrate .. //depot/projects/powerpc/lib/libc/nls/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/powerpc/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/quad/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/regex/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/resolv/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/libc/rpc/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/softfloat/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/putenv.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/setenv.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdtime/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/powerpc/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/sys/send.2#3 integrate .. //depot/projects/powerpc/lib/libc/uuid/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/xdr/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/yp/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc_r/Makefile#2 integrate .. //depot/projects/powerpc/lib/libelf/Version.map#3 integrate .. //depot/projects/powerpc/lib/libexpat/expat_config.h#2 integrate .. //depot/projects/powerpc/lib/libfetch/fetch.3#2 integrate .. //depot/projects/powerpc/lib/libfetch/ftp.c#2 integrate .. //depot/projects/powerpc/lib/libfetch/http.c#2 integrate .. //depot/projects/powerpc/lib/libgeom/Makefile#2 integrate .. //depot/projects/powerpc/lib/libgeom/geom_getxml.c#2 integrate .. //depot/projects/powerpc/lib/libgeom/geom_util.c#1 branch .. //depot/projects/powerpc/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/powerpc/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/powerpc/lib/libipsec/pfkey_dump.c#2 integrate .. //depot/projects/powerpc/lib/libpthread/Makefile#2 integrate .. //depot/projects/powerpc/lib/libpthread/pthread.map#2 integrate .. //depot/projects/powerpc/lib/libpthread/thread/thr_info.c#3 integrate .. //depot/projects/powerpc/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/powerpc/lib/librt/Makefile#2 integrate .. //depot/projects/powerpc/lib/librt/Version.map#1 branch .. //depot/projects/powerpc/lib/libthr/Makefile#2 integrate .. //depot/projects/powerpc/lib/libthr/pthread.map#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/powerpc/lib/libthread_db/Makefile#2 integrate .. //depot/projects/powerpc/lib/libthread_db/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libthread_db/arch/powerpc/libpthread_md.c#2 integrate .. //depot/projects/powerpc/lib/libutil/Makefile#2 integrate .. //depot/projects/powerpc/lib/libutil/flopen.3#1 branch .. //depot/projects/powerpc/lib/libutil/flopen.c#1 branch .. //depot/projects/powerpc/lib/libutil/libutil.h#2 integrate .. //depot/projects/powerpc/lib/libutil/login_class.c#2 integrate .. //depot/projects/powerpc/lib/libutil/pidfile.c#2 integrate .. //depot/projects/powerpc/lib/msun/Makefile#3 integrate .. //depot/projects/powerpc/lib/msun/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/msun/amd64/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/msun/arm/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/msun/bsdsrc/b_tgamma.c#2 integrate .. //depot/projects/powerpc/lib/msun/i387/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/msun/ia64/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/msun/powerpc/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/msun/sparc64/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_lgamma_r.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/powerpc/libexec/pppoed/pppoed.c#2 integrate .. //depot/projects/powerpc/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/powerpc/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/powerpc/libexec/rtld-elf/Versions.def#2 delete .. //depot/projects/powerpc/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/powerpc/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/powerpc/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/powerpc/release/Makefile#3 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/powerpc/sbin/dumpfs/dumpfs.8#2 integrate .. //depot/projects/powerpc/sbin/fdisk/fdisk.8#3 integrate .. //depot/projects/powerpc/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/powerpc/sbin/fdisk_pc98/fdisk.8#2 integrate .. //depot/projects/powerpc/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/powerpc/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/powerpc/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/powerpc/sbin/mdmfs/mdmfs.c#4 integrate .. //depot/projects/powerpc/sbin/setkey/setkey.8#2 integrate .. //depot/projects/powerpc/sbin/setkey/token.l#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/Makefile.inc#3 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/opensslconf-amd64.h#2 integrate .. //depot/projects/powerpc/secure/lib/libcrypto/opensslconf-i386.h#2 integrate .. //depot/projects/powerpc/share/examples/Makefile#2 integrate .. //depot/projects/powerpc/share/examples/netgraph/bluetooth/rc.bluetooth#2 delete .. //depot/projects/powerpc/share/man/man4/Makefile#9 integrate .. //depot/projects/powerpc/share/man/man4/altq.4#4 integrate .. //depot/projects/powerpc/share/man/man4/axe.4#2 integrate .. //depot/projects/powerpc/share/man/man4/hptiop.4#1 branch .. //depot/projects/powerpc/share/man/man4/led.4#2 integrate .. //depot/projects/powerpc/share/man/man4/md.4#2 integrate .. //depot/projects/powerpc/share/man/man4/rum.4#1 branch .. //depot/projects/powerpc/share/man/man4/sbsh.4#2 integrate .. //depot/projects/powerpc/share/man/man4/snd_atiixp.4#2 integrate .. //depot/projects/powerpc/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/powerpc/share/man/man4/snd_via8233.4#2 integrate .. //depot/projects/powerpc/share/man/man4/twa.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ubsa.4#3 integrate .. //depot/projects/powerpc/share/man/man4/uftdi.4#3 integrate .. //depot/projects/powerpc/share/man/man4/vlan.4#3 integrate .. //depot/projects/powerpc/share/man/man4/worm.4#2 delete .. //depot/projects/powerpc/share/man/man5/passwd.5#2 integrate .. //depot/projects/powerpc/share/man/man5/periodic.conf.5#2 integrate .. //depot/projects/powerpc/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/powerpc/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/powerpc/share/man/man9/disk.9#3 integrate .. //depot/projects/powerpc/share/man/man9/g_bio.9#2 integrate .. //depot/projects/powerpc/share/man/man9/make_dev.9#2 integrate .. //depot/projects/powerpc/share/man/man9/rman.9#2 integrate .. //depot/projects/powerpc/share/misc/bsd-family-tree#4 integrate .. //depot/projects/powerpc/share/misc/committers-ports.dot#4 integrate .. //depot/projects/powerpc/share/misc/committers-src.dot#4 integrate .. //depot/projects/powerpc/share/misc/organization.dot#2 integrate .. //depot/projects/powerpc/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/powerpc/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/powerpc/share/mk/bsd.own.mk#4 integrate .. //depot/projects/powerpc/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/powerpc/share/mk/version_gen.awk#2 integrate .. //depot/projects/powerpc/share/mklocale/ja_JP.eucJP.src#2 integrate .. //depot/projects/powerpc/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/powerpc/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/powerpc/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/powerpc/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/powerpc/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/powerpc/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/powerpc/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/powerpc/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/powerpc/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/powerpc/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/powerpc/sys/amd64/include/smp.h#3 integrate .. //depot/projects/powerpc/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/powerpc/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/powerpc/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/powerpc/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/powerpc/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/powerpc/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/powerpc/sys/arm/include/asm.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/pmap.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/profile.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/loader.8#6 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/Makefile#4 integrate .. //depot/projects/powerpc/sys/cam/cam_periph.c#5 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt.h#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ch.c#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pt.c#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/powerpc/sys/coda/coda_vnops.c#6 integrate .. //depot/projects/powerpc/sys/coda/coda_vnops.h#5 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/powerpc/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/powerpc/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/powerpc/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/powerpc/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/powerpc/sys/conf/Makefile.arm#2 integrate .. //depot/projects/powerpc/sys/conf/Makefile.i386#5 integrate .. //depot/projects/powerpc/sys/conf/Makefile.ia64#5 integrate .. //depot/projects/powerpc/sys/conf/Makefile.pc98#5 integrate .. //depot/projects/powerpc/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/powerpc/sys/conf/Makefile.sparc64#5 integrate .. //depot/projects/powerpc/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/powerpc/sys/conf/NOTES#11 integrate .. //depot/projects/powerpc/sys/conf/files#12 integrate .. //depot/projects/powerpc/sys/conf/kern.mk#2 integrate .. //depot/projects/powerpc/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/powerpc/sys/conf/kmod.mk#7 integrate .. //depot/projects/powerpc/sys/conf/options#13 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/powerpc/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/powerpc/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/powerpc/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/powerpc/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/powerpc/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/powerpc/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/powerpc/sys/dev/cardbus/cardbus_cis.c#5 integrate .. //depot/projects/powerpc/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/powerpc/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/powerpc/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/powerpc/sys/dev/em/LICENSE#2 integrate .. //depot/projects/powerpc/sys/dev/em/README#3 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/powerpc/sys/dev/em/if_em.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/if_em.h#3 integrate .. //depot/projects/powerpc/sys/dev/em/if_em_hw.c#3 delete .. //depot/projects/powerpc/sys/dev/em/if_em_hw.h#3 delete .. //depot/projects/powerpc/sys/dev/em/if_em_osdep.h#3 delete .. //depot/projects/powerpc/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/powerpc/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/powerpc/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/powerpc/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/powerpc/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/powerpc/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/powerpc/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/powerpc/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/powerpc/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/powerpc/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/powerpc/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/powerpc/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/powerpc/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/powerpc/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/powerpc/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/powerpc/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/powerpc/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/powerpc/sys/dev/isp/isp.c#8 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.h#10 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_pci.c#11 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_tpublic.h#7 integrate .. //depot/projects/powerpc/sys/dev/led/led.c#2 integrate .. //depot/projects/powerpc/sys/dev/led/led.h#2 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/powerpc/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/powerpc/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/powerpc/sys/dev/mii/mii.c#6 integrate .. //depot/projects/powerpc/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/powerpc/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/powerpc/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/powerpc/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/powerpc/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/powerpc/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/powerpc/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/powerpc/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/powerpc/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/powerpc/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/powerpc/sys/dev/pci/pci.c#11 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_if.m#5 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/powerpc/sys/dev/pci/pcib_if.m#5 integrate .. //depot/projects/powerpc/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/powerpc/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/powerpc/sys/dev/pci/pcivar.h#7 integrate .. //depot/projects/powerpc/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/fm801.c#7 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/buffer.h#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/powerpc/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/powerpc/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/powerpc/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/powerpc/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/powerpc/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/if_cuereg.h#4 integrate .. //depot/projects/powerpc/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/if_kuereg.h#4 integrate .. //depot/projects/powerpc/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/powerpc/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/powerpc/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/powerpc/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/powerpc/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/powerpc/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/powerpc/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/ums.c#6 integrate .. //depot/projects/powerpc/sys/dev/usb/usb.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/powerpc/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/powerpc/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/powerpc/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/powerpc/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/powerpc/sys/fs/pseudofs/pseudofs_vncache.c#9 integrate .. //depot/projects/powerpc/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/powerpc/sys/fs/umapfs/umap_vnops.c#6 integrate .. //depot/projects/powerpc/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/powerpc/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/powerpc/sys/geom/geom.h#3 integrate .. //depot/projects/powerpc/sys/geom/geom_dev.c#4 integrate .. //depot/projects/powerpc/sys/geom/geom_disk.c#4 integrate .. //depot/projects/powerpc/sys/geom/geom_disk.h#2 integrate .. //depot/projects/powerpc/sys/geom/geom_io.c#5 integrate .. //depot/projects/powerpc/sys/geom/geom_slice.c#3 integrate .. //depot/projects/powerpc/sys/geom/geom_subr.c#3 integrate .. //depot/projects/powerpc/sys/geom/part/g_part.c#2 integrate .. //depot/projects/powerpc/sys/geom/part/g_part.h#2 integrate .. //depot/projects/powerpc/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/powerpc/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/powerpc/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/powerpc/sys/i386/Makefile#3 integrate .. //depot/projects/powerpc/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/powerpc/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/powerpc/sys/i386/conf/NOTES#6 integrate .. //depot/projects/powerpc/sys/i386/conf/PAE#2 integrate .. //depot/projects/powerpc/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/powerpc/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/powerpc/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/powerpc/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/powerpc/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/powerpc/sys/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/msi.c#3 integrate .. //depot/projects/powerpc/sys/i386/i386/nexus.c#8 integrate .. //depot/projects/powerpc/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/powerpc/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/powerpc/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/powerpc/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/powerpc/sys/i386/include/proc.h#5 integrate .. //depot/projects/powerpc/sys/i386/include/smp.h#5 integrate .. //depot/projects/powerpc/sys/i386/include/vmparam.h#6 integrate .. //depot/projects/powerpc/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/powerpc/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/powerpc/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/powerpc/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/powerpc/sys/ia64/ia64/mca.c#3 integrate .. //depot/projects/powerpc/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/powerpc/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/powerpc/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/powerpc/sys/kern/Make.tags.inc#5 integrate .. //depot/projects/powerpc/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/powerpc/sys/kern/init_main.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_clock.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_condvar.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/powerpc/sys/kern/kern_exec.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_exit.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_fork.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_intr.c#9 integrate .. //depot/projects/powerpc/sys/kern/kern_linker.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_lock.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_mib.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_resource.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/powerpc/sys/kern/kern_sx.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_synch.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_thread.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_time.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/powerpc/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/powerpc/sys/kern/subr_lock.c#4 integrate .. //depot/projects/powerpc/sys/kern/subr_prof.c#6 integrate .. //depot/projects/powerpc/sys/kern/subr_rman.c#7 integrate .. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/powerpc/sys/kern/subr_trap.c#6 integrate .. //depot/projects/powerpc/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#11 integrate .. //depot/projects/powerpc/sys/kern/sys_generic.c#7 integrate .. //depot/projects/powerpc/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/powerpc/sys/kern/uipc_domain.c#4 integrate .. //depot/projects/powerpc/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/powerpc/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/powerpc/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/powerpc/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/powerpc/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/powerpc/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/powerpc/sys/kern/vfs_default.c#6 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/powerpc/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/powerpc/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/powerpc/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/powerpc/sys/kern/vnode_if.src#6 integrate .. //depot/projects/powerpc/sys/modules/Makefile#11 integrate .. //depot/projects/powerpc/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/powerpc/sys/modules/em/Makefile#3 integrate .. //depot/projects/powerpc/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/powerpc/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/rum/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/twa/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/powerpc/sys/net/ethernet.h#7 integrate .. //depot/projects/powerpc/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/powerpc/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/powerpc/sys/net/if.c#9 integrate .. //depot/projects/powerpc/sys/net/if.h#5 integrate .. //depot/projects/powerpc/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/powerpc/sys/net/if_lagg.c#2 integrate .. //depot/projects/powerpc/sys/net/if_lagg.h#2 integrate .. //depot/projects/powerpc/sys/net/if_var.h#8 integrate .. //depot/projects/powerpc/sys/net/pfkeyv2.h#4 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/powerpc/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/powerpc/sys/netgraph/ng_car.c#1 branch .. //depot/projects/powerpc/sys/netgraph/ng_car.h#1 branch .. //depot/projects/powerpc/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/powerpc/sys/netgraph/ng_mppc.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/powerpc/sys/netinet/icmp6.h#4 integrate .. //depot/projects/powerpc/sys/netinet/if_ether.c#8 integrate .. //depot/projects/powerpc/sys/netinet/in.c#7 integrate .. //depot/projects/powerpc/sys/netinet/in_cksum.c#4 integrate .. //depot/projects/powerpc/sys/netinet/in_gif.c#5 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/powerpc/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip.h#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/powerpc/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_ecn.c#4 integrate .. //depot/projects/powerpc/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/powerpc/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/powerpc/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_id.c#4 integrate .. //depot/projects/powerpc/sys/netinet/ip_input.c#7 integrate .. //depot/projects/powerpc/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/powerpc/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/powerpc/sys/netinet/ip_options.c#2 integrate .. //depot/projects/powerpc/sys/netinet/ip_options.h#2 integrate .. //depot/projects/powerpc/sys/netinet/ip_output.c#7 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/powerpc/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os.h#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/powerpc/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#10 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.h#7 integrate .. //depot/projects/powerpc/sys/netinet/tcp.h#7 integrate .. //depot/projects/powerpc/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/powerpc/sys/netinet/tcp_fsm.h#4 integrate .. //depot/projects/powerpc/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/powerpc/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/powerpc/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/powerpc/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/powerpc/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/powerpc/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/powerpc/sys/netinet/tcp_timer.h#6 integrate .. //depot/projects/powerpc/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/powerpc/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/powerpc/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/powerpc/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/powerpc/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/powerpc/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/powerpc/sys/netinet6/esp_core.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/powerpc/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6_pcb.h#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/nd6.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/route6.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/powerpc/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/powerpc/sys/netipx/ipx.c#6 integrate .. //depot/projects/powerpc/sys/netipx/ipx.h#5 integrate .. //depot/projects/powerpc/sys/netipx/ipx_cksum.c#5 integrate .. //depot/projects/powerpc/sys/netipx/ipx_if.h#5 integrate .. //depot/projects/powerpc/sys/netipx/ipx_input.c#5 integrate .. //depot/projects/powerpc/sys/netipx/ipx_outputfl.c#5 integrate .. //depot/projects/powerpc/sys/netipx/ipx_pcb.c#6 integrate .. //depot/projects/powerpc/sys/netipx/ipx_pcb.h#6 integrate .. //depot/projects/powerpc/sys/netipx/ipx_usrreq.c#6 integrate .. //depot/projects/powerpc/sys/netipx/ipx_var.h#6 integrate .. //depot/projects/powerpc/sys/netipx/spx_debug.c#5 integrate .. //depot/projects/powerpc/sys/netipx/spx_debug.h#5 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_lock.c#5 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/powerpc/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/powerpc/sys/opencrypto/cryptodev.h#3 integrate .. //depot/projects/powerpc/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/powerpc/sys/opencrypto/xform.c#2 integrate .. //depot/projects/powerpc/sys/opencrypto/xform.h#2 integrate .. //depot/projects/powerpc/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/powerpc/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/powerpc/sys/pci/if_tl.c#5 integrate .. //depot/projects/powerpc/sys/pci/if_vr.c#6 integrate .. //depot/projects/powerpc/sys/pci/if_vrreg.h#5 integrate .. //depot/projects/powerpc/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#9 integrate .. //depot/projects/powerpc/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/powerpc/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/powerpc/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_audit.c#1 branch .. //depot/projects/powerpc/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/powerpc/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/powerpc/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/powerpc/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/powerpc/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/powerpc/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/powerpc/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/powerpc/sys/security/mac_ifoff/mac_ifoff.c#5 integrate .. //depot/projects/powerpc/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/powerpc/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/powerpc/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/powerpc/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/powerpc/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/powerpc/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/powerpc/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/powerpc/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/powerpc/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/powerpc/sys/sparc64/include/ver.h#4 integrate .. //depot/projects/powerpc/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/identcpu.c#4 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/upa.c#6 integrate .. //depot/projects/powerpc/sys/sun4v/include/cache.h#2 delete .. //depot/projects/powerpc/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/powerpc/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/powerpc/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/powerpc/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/powerpc/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/powerpc/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/powerpc/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/powerpc/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/tick.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/powerpc/sys/sys/callout.h#5 integrate .. //depot/projects/powerpc/sys/sys/disk.h#4 integrate .. //depot/projects/powerpc/sys/sys/filedesc.h#6 integrate .. //depot/projects/powerpc/sys/sys/interrupt.h#8 integrate .. //depot/projects/powerpc/sys/sys/ioctl_compat.h#4 integrate .. //depot/projects/powerpc/sys/sys/lockf.h#4 integrate .. //depot/projects/powerpc/sys/sys/mount.h#11 integrate .. //depot/projects/powerpc/sys/sys/param.h#9 integrate .. //depot/projects/powerpc/sys/sys/priv.h#6 integrate .. //depot/projects/powerpc/sys/sys/proc.h#11 integrate .. //depot/projects/powerpc/sys/sys/rwlock.h#3 integrate .. //depot/projects/powerpc/sys/sys/socketvar.h#7 integrate .. //depot/projects/powerpc/sys/sys/sx.h#8 integrate .. //depot/projects/powerpc/sys/sys/sysctl.h#6 integrate .. //depot/projects/powerpc/sys/sys/sysent.h#7 integrate .. //depot/projects/powerpc/sys/sys/systm.h#9 integrate .. //depot/projects/powerpc/sys/sys/vmmeter.h#4 integrate .. //depot/projects/powerpc/sys/sys/vnode.h#9 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_softdep.c#8 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/powerpc/sys/vm/swap_pager.c#8 integrate .. //depot/projects/powerpc/sys/vm/uma_core.c#5 integrate .. //depot/projects/powerpc/sys/vm/uma_int.h#3 integrate .. //depot/projects/powerpc/sys/vm/vm_contig.c#7 integrate .. //depot/projects/powerpc/sys/vm/vm_fault.c#7 integrate .. //depot/projects/powerpc/sys/vm/vm_glue.c#6 integrate .. //depot/projects/powerpc/sys/vm/vm_map.c#6 integrate .. //depot/projects/powerpc/sys/vm/vm_meter.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_object.c#9 integrate .. //depot/projects/powerpc/sys/vm/vm_page.c#7 integrate .. //depot/projects/powerpc/sys/vm/vm_page.h#7 integrate .. //depot/projects/powerpc/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/powerpc/sys/vm/vm_pageq.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_zeroidle.c#6 integrate .. //depot/projects/powerpc/sys/vm/vnode_pager.c#5 integrate .. //depot/projects/powerpc/tools/regression/lib/libc/net/Makefile#2 integrate .. //depot/projects/powerpc/tools/regression/lib/libc/net/test-ether.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/libc/net/test-ether.t#1 branch .. //depot/projects/powerpc/tools/regression/netinet6/inet6_rth/Makefile#1 branch .. //depot/projects/powerpc/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c#1 branch .. //depot/projects/powerpc/tools/regression/netinet6/inet6_rth/test_subr.c#1 branch .. //depot/projects/powerpc/tools/regression/netinet6/inet6_rth/test_subr.h#1 branch .. //depot/projects/powerpc/tools/regression/sockets/sblock/Makefile#1 branch .. //depot/projects/powerpc/tools/regression/sockets/sblock/sblock.c#1 branch .. //depot/projects/powerpc/tools/regression/usr.bin/sed/regress.sh#4 integrate .. //depot/projects/powerpc/tools/sched/schedgraph.py#4 integrate .. //depot/projects/powerpc/tools/tools/net80211/wesside/wesside/wesside.c#3 integrate .. //depot/projects/powerpc/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/calendar.c#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/powerpc/usr.bin/calendar/calendars/calendar.usholiday#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/day.c#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/io.c#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/ostern.c#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/paskha.c#2 integrate .. //depot/projects/powerpc/usr.bin/du/du.c#2 integrate .. //depot/projects/powerpc/usr.bin/env/env.c#2 integrate .. //depot/projects/powerpc/usr.bin/lastcomm/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/lastcomm/lastcomm.c#4 integrate .. //depot/projects/powerpc/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/powerpc/usr.bin/limits/limits.c#2 integrate .. //depot/projects/powerpc/usr.bin/logger/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/logger/logger.c#2 integrate .. //depot/projects/powerpc/usr.bin/login/login.c#3 integrate .. //depot/projects/powerpc/usr.bin/login/login.h#3 integrate .. //depot/projects/powerpc/usr.bin/login/login_audit.c#2 integrate .. //depot/projects/powerpc/usr.bin/login/login_fbtab.c#2 integrate .. //depot/projects/powerpc/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/powerpc/usr.bin/quota/quota.c#3 integrate .. //depot/projects/powerpc/usr.bin/sed/extern.h#2 integrate .. //depot/projects/powerpc/usr.bin/sed/main.c#2 integrate .. //depot/projects/powerpc/usr.bin/sed/process.c#4 integrate .. //depot/projects/powerpc/usr.bin/sed/sed.1#2 integrate .. //depot/projects/powerpc/usr.bin/stat/stat.1#2 integrate .. //depot/projects/powerpc/usr.bin/su/su.c#2 integrate .. //depot/projects/powerpc/usr.bin/tar/read.c#6 integrate .. //depot/projects/powerpc/usr.bin/tar/write.c#7 integrate .. //depot/projects/powerpc/usr.bin/time/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/time/time.c#2 integrate .. //depot/projects/powerpc/usr.bin/tip/tip/acu.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/powerpc/usr.sbin/boot0cfg/boot0cfg.8#2 integrate .. //depot/projects/powerpc/usr.sbin/config/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/config/config.8#2 integrate .. //depot/projects/powerpc/usr.sbin/config/config.h#2 integrate .. //depot/projects/powerpc/usr.sbin/config/config.y#2 integrate .. //depot/projects/powerpc/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/powerpc/usr.sbin/config/kernconf.tmpl#1 branch .. //depot/projects/powerpc/usr.sbin/config/lang.l#2 integrate .. //depot/projects/powerpc/usr.sbin/config/main.c#2 integrate .. //depot/projects/powerpc/usr.sbin/diskinfo/diskinfo.c#2 integrate .. //depot/projects/powerpc/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/powerpc/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/powerpc/usr.sbin/nologin/nologin.5#2 integrate .. //depot/projects/powerpc/usr.sbin/pccard/pccardc/pccardc.8#2 integrate .. //depot/projects/powerpc/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/powerpc/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/powerpc/usr.sbin/pstat/pstat.c#4 integrate .. //depot/projects/powerpc/usr.sbin/rpcbind/rpcbind.8#2 integrate .. //depot/projects/powerpc/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sade/main.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/variable.c#2 integrate .. //depot/projects/powerpc/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/powerpc/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.144 2007/04/26 21:30:16 imp Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -128,6 +128,7 @@ usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. +usb core Please contact core@ before any major changes Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/powerpc/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.574 2007/05/13 18:15:50 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,7 +1016,7 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/libpthread \ + lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ @@ -1135,18 +1135,14 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" -.for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) # Remove catpages without corresponding manpages. @3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1161,11 +1157,11 @@ check-old-files: @echo ">>> Checking for old files" -.for file in ${OLD_FILES} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ @@ -1179,25 +1175,21 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) delete-old-dirs: @echo ">>> Removing old directories" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 21 17:49:29 2007 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 A977B16A46B; Mon, 21 May 2007 17:49:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EC8C16A421 for ; Mon, 21 May 2007 17:49:29 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 57F2313C46A for ; Mon, 21 May 2007 17:49:29 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4LHnTJM059513 for ; Mon, 21 May 2007 17:49:29 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4LHnTNr059507 for perforce@freebsd.org; Mon, 21 May 2007 17:49:29 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 21 May 2007 17:49:29 GMT Message-Id: <200705211749.l4LHnTNr059507@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 120184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 17:49:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=120184 Change 120184 by gonzo@gonzo_jeeves on 2007/05/21 17:49:17 o Move adm5120 directory to mips32/ Affected files ... .. //depot/projects/mips2/src/sys/mips/adm5120/files.adm5120#2 delete .. //depot/projects/mips2/src/sys/mips/adm5120/std.adm5120#2 delete .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/std.adm5120#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 21 18:06:14 2007 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 C0DDD16A400; Mon, 21 May 2007 18:06:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8BC1A16A41F for ; Mon, 21 May 2007 18:06:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7A3F713C469 for ; Mon, 21 May 2007 18:06:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4LI6Di2076791 for ; Mon, 21 May 2007 18:06:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4LI5oV9076234 for perforce@freebsd.org; Mon, 21 May 2007 18:05:50 GMT (envelope-from marcel@freebsd.org) Date: Mon, 21 May 2007 18:05:50 GMT Message-Id: <200705211805.l4LI5oV9076234@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 120185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 18:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=120185 Change 120185 by marcel@marcel_cluster on 2007/05/21 18:04:49 IFC @120181 Affected files ... .. //depot/projects/ia64/MAINTAINERS#58 integrate .. //depot/projects/ia64/Makefile.inc1#117 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#18 integrate .. //depot/projects/ia64/UPDATING#97 integrate .. //depot/projects/ia64/bin/df/df.c#26 integrate .. //depot/projects/ia64/bin/mv/mv.1#10 integrate .. //depot/projects/ia64/bin/sh/var.c#17 integrate .. //depot/projects/ia64/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/ia64/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/ia64/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/ia64/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/ia64/contrib/amd/amq/amq.8#6 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ppcfbsd-nat.c#2 integrate .. //depot/projects/ia64/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#17 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/main.c#12 integrate .. //depot/projects/ia64/contrib/top/commands.c#8 integrate .. //depot/projects/ia64/contrib/top/machine.h#6 integrate .. //depot/projects/ia64/contrib/top/top.X#10 integrate .. //depot/projects/ia64/contrib/top/top.c#10 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#11 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#22 integrate .. //depot/projects/ia64/etc/periodic/daily/480.status-ntpd#1 branch .. //depot/projects/ia64/etc/rc.d/netoptions#7 integrate .. //depot/projects/ia64/etc/rc.d/routing#7 integrate .. //depot/projects/ia64/etc/rc.d/zfs#2 integrate .. //depot/projects/ia64/etc/sendmail/freebsd.mc#14 integrate .. //depot/projects/ia64/etc/sendmail/freebsd.submit.mc#5 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/powerpc/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/powerpc/init.c#2 integrate .. //depot/projects/ia64/include/stdlib.h#30 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#26 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#14 integrate .. //depot/projects/ia64/lib/libbsm/Makefile#4 integrate .. //depot/projects/ia64/lib/libc/Makefile#26 integrate .. //depot/projects/ia64/lib/libc/Versions.def#2 integrate .. //depot/projects/ia64/lib/libc/amd64/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/arm/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/db/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/gdtoa/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/gdtoa/_hdtoa.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/gmon/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/i386/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/inet/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/locale/isdigit.3#11 integrate .. //depot/projects/ia64/lib/libc/nameser/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/net/Symbol.map#5 integrate .. //depot/projects/ia64/lib/libc/net/ether_addr.c#5 integrate .. //depot/projects/ia64/lib/libc/net/ethers.3#6 integrate .. //depot/projects/ia64/lib/libc/nls/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/powerpc/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/quad/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/regex/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/resolv/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/rpc/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/softfloat/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/stdio/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#30 integrate .. //depot/projects/ia64/lib/libc/stdlib/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/getenv.3#7 integrate .. //depot/projects/ia64/lib/libc/stdlib/getenv.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/putenv.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/setenv.c#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#29 integrate .. //depot/projects/ia64/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/sys/send.2#13 integrate .. //depot/projects/ia64/lib/libc/uuid/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/xdr/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/yp/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#14 integrate .. //depot/projects/ia64/lib/libelf/Version.map#3 integrate .. //depot/projects/ia64/lib/libexpat/expat_config.h#2 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#15 integrate .. //depot/projects/ia64/lib/libfetch/ftp.c#18 integrate .. //depot/projects/ia64/lib/libfetch/http.c#19 integrate .. //depot/projects/ia64/lib/libgeom/Makefile#9 integrate .. //depot/projects/ia64/lib/libgeom/geom_getxml.c#2 integrate .. //depot/projects/ia64/lib/libgeom/geom_util.c#1 branch .. //depot/projects/ia64/lib/libgeom/libgeom.3#8 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.h#8 integrate .. //depot/projects/ia64/lib/libipsec/pfkey_dump.c#7 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#21 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#18 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_info.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#41 integrate .. //depot/projects/ia64/lib/librt/Makefile#2 integrate .. //depot/projects/ia64/lib/librt/Version.map#1 branch .. //depot/projects/ia64/lib/libthr/Makefile#17 integrate .. //depot/projects/ia64/lib/libthr/pthread.map#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#24 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#31 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/ia64/lib/libthread_db/Makefile#5 integrate .. //depot/projects/ia64/lib/libthread_db/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libthread_db/arch/powerpc/libpthread_md.c#2 integrate .. //depot/projects/ia64/lib/libutil/Makefile#16 integrate .. //depot/projects/ia64/lib/libutil/flopen.3#1 branch .. //depot/projects/ia64/lib/libutil/flopen.c#1 branch .. //depot/projects/ia64/lib/libutil/libutil.h#9 integrate .. //depot/projects/ia64/lib/libutil/login_class.c#9 integrate .. //depot/projects/ia64/lib/libutil/pidfile.c#4 integrate .. //depot/projects/ia64/lib/msun/Makefile#22 integrate .. //depot/projects/ia64/lib/msun/Symbol.map#3 integrate .. //depot/projects/ia64/lib/msun/amd64/Symbol.map#2 integrate .. //depot/projects/ia64/lib/msun/arm/Symbol.map#2 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/b_tgamma.c#5 integrate .. //depot/projects/ia64/lib/msun/i387/Symbol.map#2 integrate .. //depot/projects/ia64/lib/msun/ia64/Symbol.map#2 integrate .. //depot/projects/ia64/lib/msun/powerpc/Symbol.map#2 integrate .. //depot/projects/ia64/lib/msun/sparc64/Symbol.map#2 integrate .. //depot/projects/ia64/lib/msun/src/e_lgamma_r.c#4 integrate .. //depot/projects/ia64/lib/msun/src/e_lgammaf_r.c#4 integrate .. //depot/projects/ia64/libexec/pppoed/pppoed.c#8 integrate .. //depot/projects/ia64/libexec/rtld-elf/Makefile#15 integrate .. //depot/projects/ia64/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/ia64/libexec/rtld-elf/Versions.def#2 delete .. //depot/projects/ia64/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.1#17 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#37 integrate .. //depot/projects/ia64/release/Makefile#104 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#102 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#20 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#23 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.8#10 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.8#8 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.c#27 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.8#8 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.c#15 integrate .. //depot/projects/ia64/sbin/geom/class/eli/geom_eli.c#10 integrate .. //depot/projects/ia64/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#56 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#55 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#20 integrate .. //depot/projects/ia64/sbin/setkey/setkey.8#5 integrate .. //depot/projects/ia64/sbin/setkey/token.l#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#31 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile.inc#18 integrate .. //depot/projects/ia64/secure/lib/libcrypto/opensslconf-amd64.h#3 integrate .. //depot/projects/ia64/secure/lib/libcrypto/opensslconf-i386.h#4 integrate .. //depot/projects/ia64/share/examples/Makefile#15 integrate .. //depot/projects/ia64/share/examples/netgraph/bluetooth/rc.bluetooth#3 delete .. //depot/projects/ia64/share/man/man4/Makefile#102 integrate .. //depot/projects/ia64/share/man/man4/altq.4#13 integrate .. //depot/projects/ia64/share/man/man4/axe.4#10 integrate .. //depot/projects/ia64/share/man/man4/hptiop.4#1 branch .. //depot/projects/ia64/share/man/man4/led.4#9 integrate .. //depot/projects/ia64/share/man/man4/md.4#5 integrate .. //depot/projects/ia64/share/man/man4/rum.4#1 branch .. //depot/projects/ia64/share/man/man4/sbsh.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_atiixp.4#4 integrate .. //depot/projects/ia64/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/ia64/share/man/man4/snd_via8233.4#7 integrate .. //depot/projects/ia64/share/man/man4/twa.4#7 integrate .. //depot/projects/ia64/share/man/man4/ubsa.4#7 integrate .. //depot/projects/ia64/share/man/man4/uftdi.4#8 integrate .. //depot/projects/ia64/share/man/man4/vlan.4#17 integrate .. //depot/projects/ia64/share/man/man4/worm.4#6 delete .. //depot/projects/ia64/share/man/man5/passwd.5#11 integrate .. //depot/projects/ia64/share/man/man5/periodic.conf.5#23 integrate .. //depot/projects/ia64/share/man/man9/VFS_SYNC.9#9 integrate .. //depot/projects/ia64/share/man/man9/VOP_FSYNC.9#8 integrate .. //depot/projects/ia64/share/man/man9/disk.9#7 integrate .. //depot/projects/ia64/share/man/man9/g_bio.9#6 integrate .. //depot/projects/ia64/share/man/man9/make_dev.9#11 integrate .. //depot/projects/ia64/share/man/man9/rman.9#7 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#36 integrate .. //depot/projects/ia64/share/misc/committers-ports.dot#2 integrate .. //depot/projects/ia64/share/misc/committers-src.dot#2 integrate .. //depot/projects/ia64/share/misc/organization.dot#2 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#41 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#36 integrate .. //depot/projects/ia64/share/mk/bsd.own.mk#20 integrate .. //depot/projects/ia64/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/ia64/share/mk/version_gen.awk#2 integrate .. //depot/projects/ia64/share/mklocale/ja_JP.eucJP.src#4 integrate .. //depot/projects/ia64/sys/amd64/acpica/madt.c#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#18 integrate .. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#20 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#48 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#28 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable.c#11 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable_pci.c#8 integrate .. //depot/projects/ia64/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#21 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#62 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#28 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#43 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#25 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#16 integrate .. //depot/projects/ia64/sys/amd64/include/intr_machdep.h#13 integrate .. //depot/projects/ia64/sys/amd64/include/md_var.h#14 integrate .. //depot/projects/ia64/sys/amd64/include/smp.h#13 integrate .. //depot/projects/ia64/sys/amd64/include/vmparam.h#9 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic.c#14 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#15 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#19 integrate .. //depot/projects/ia64/sys/arm/arm/busdma_machdep.c#18 integrate .. //depot/projects/ia64/sys/arm/arm/machdep.c#15 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#26 integrate .. //depot/projects/ia64/sys/arm/include/asm.h#6 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#20 integrate .. //depot/projects/ia64/sys/arm/include/profile.h#6 integrate .. //depot/projects/ia64/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#17 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#36 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/Makefile#19 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#26 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#38 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#34 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.c#16 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#75 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pass.c#15 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#14 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#27 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.c#15 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#13 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#25 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.h#11 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#24 integrate .. //depot/projects/ia64/sys/compat/ia32/ia32_sysvec.c#13 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#49 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#54 integrate .. //depot/projects/ia64/sys/compat/ndis/kern_windrv.c#6 integrate .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/ia64/sys/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/ia64/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/ia64/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/ia64/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#40 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#14 integrate .. //depot/projects/ia64/sys/conf/Makefile.arm#16 integrate .. //depot/projects/ia64/sys/conf/Makefile.i386#18 integrate .. //depot/projects/ia64/sys/conf/Makefile.ia64#26 integrate .. //depot/projects/ia64/sys/conf/Makefile.pc98#18 integrate .. //depot/projects/ia64/sys/conf/Makefile.powerpc#24 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#24 integrate .. //depot/projects/ia64/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/ia64/sys/conf/NOTES#116 integrate .. //depot/projects/ia64/sys/conf/files#156 integrate .. //depot/projects/ia64/sys/conf/kern.mk#20 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#42 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#58 integrate .. //depot/projects/ia64/sys/conf/options#106 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/ia64/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/ia64/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/ia64/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/ia64/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/ia64/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#72 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#22 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#44 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#50 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#33 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#39 integrate .. //depot/projects/ia64/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#74 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#44 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#29 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#27 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#50 integrate .. //depot/projects/ia64/sys/dev/ciss/cissvar.h#9 integrate .. //depot/projects/ia64/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/ia64/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/ia64/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/ia64/sys/dev/em/LICENSE#5 integrate .. //depot/projects/ia64/sys/dev/em/README#14 integrate .. //depot/projects/ia64/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/ia64/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/ia64/sys/dev/em/if_em.c#60 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#39 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#23 delete .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#22 delete .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#21 delete .. //depot/projects/ia64/sys/dev/firewire/firewire.c#48 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#18 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#31 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#31 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#45 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#19 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwip.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#56 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp_targ.c#10 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem.c#29 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#21 integrate .. //depot/projects/ia64/sys/dev/gem/if_gemvar.h#12 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#31 integrate .. //depot/projects/ia64/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/ia64/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/ia64/sys/dev/hptmv/ioctl.c#4 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#25 integrate .. //depot/projects/ia64/sys/dev/ipmi/ipmi_smbios.c#3 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#36 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#39 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#31 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#38 integrate .. //depot/projects/ia64/sys/dev/isp/isp_sbus.c#22 integrate .. //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#13 integrate .. //depot/projects/ia64/sys/dev/led/led.c#10 integrate .. //depot/projects/ia64/sys/dev/led/led.h#4 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/ia64/sys/dev/mfi/mfi_disk.c#4 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_ioctl.h#5 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/mfi/mfireg.h#6 integrate .. //depot/projects/ia64/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#34 integrate .. //depot/projects/ia64/sys/dev/mii/mii.c#17 integrate .. //depot/projects/ia64/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/ia64/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/ia64/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#19 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#20 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_cam.c#17 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#30 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/ia64/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/ia64/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/ia64/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/ia64/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/ia64/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/ia64/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/ia64/sys/dev/nve/if_nve.c#12 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#54 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#67 integrate .. //depot/projects/ia64/sys/dev/pci/pci_if.m#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#36 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#19 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_if.m#7 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#11 integrate .. //depot/projects/ia64/sys/dev/pci/pcireg.h#20 integrate .. //depot/projects/ia64/sys/dev/pci/pcivar.h#22 integrate .. //depot/projects/ia64/sys/dev/sk/if_sk.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/isa/mss.c#23 integrate .. //depot/projects/ia64/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#18 integrate .. //depot/projects/ia64/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#40 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/buffer.h#13 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.h#22 integrate .. //depot/projects/ia64/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/ia64/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_externs.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_fwif.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_fwimg.c#3 delete .. //depot/projects/ia64/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_ioctl.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_includes.h#4 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_ioctl.h#3 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_share.h#5 integrate .. //depot/projects/ia64/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_bus_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/uart/uart_kbd_sun.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/if_axe.c#24 integrate .. //depot/projects/ia64/sys/dev/usb/if_axereg.h#9 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#28 integrate .. //depot/projects/ia64/sys/dev/usb/if_cuereg.h#10 integrate .. //depot/projects/ia64/sys/dev/usb/if_kue.c#26 integrate .. //depot/projects/ia64/sys/dev/usb/if_kuereg.h#11 integrate .. //depot/projects/ia64/sys/dev/usb/if_rue.c#16 integrate .. //depot/projects/ia64/sys/dev/usb/if_ruereg.h#6 integrate .. //depot/projects/ia64/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/ia64/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/ia64/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/ia64/sys/dev/usb/if_udav.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/if_ural.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/if_uralvar.h#5 integrate .. //depot/projects/ia64/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/ia64/sys/dev/usb/ubsa.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/uftdi.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/uhid.c#28 integrate .. //depot/projects/ia64/sys/dev/usb/ukbd.c#21 integrate .. //depot/projects/ia64/sys/dev/usb/ums.c#25 integrate .. //depot/projects/ia64/sys/dev/usb/usb.c#30 integrate .. //depot/projects/ia64/sys/dev/usb/usb_mem.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/usb_subr.c#31 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#83 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#23 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#52 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#25 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#15 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_map.c#13 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vncache.c#22 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#24 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap_vnops.c#12 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#31 integrate .. //depot/projects/ia64/sys/geom/eli/g_eli_ctl.c#7 integrate .. //depot/projects/ia64/sys/geom/geom.h#51 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#56 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#53 integrate .. //depot/projects/ia64/sys/geom/geom_disk.h#6 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#47 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#38 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#48 integrate .. //depot/projects/ia64/sys/geom/part/g_part.c#2 integrate .. //depot/projects/ia64/sys/geom/part/g_part.h#2 integrate .. //depot/projects/ia64/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/ia64/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/ia64/sys/geom/uzip/g_uzip.c#9 integrate .. //depot/projects/ia64/sys/i386/Makefile#4 integrate .. //depot/projects/ia64/sys/i386/acpica/madt.c#14 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#72 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#81 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#20 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#41 integrate .. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/io_apic.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#80 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#58 integrate .. //depot/projects/ia64/sys/i386/i386/mptable.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/mptable_pci.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/msi.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/nexus.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#102 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#38 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#56 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#17 integrate .. //depot/projects/ia64/sys/i386/include/intr_machdep.h#14 integrate .. //depot/projects/ia64/sys/i386/include/proc.h#13 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#20 integrate .. //depot/projects/ia64/sys/i386/include/vmparam.h#9 integrate .. //depot/projects/ia64/sys/i386/isa/atpic.c#15 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#27 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#32 integrate .. //depot/projects/ia64/sys/ia64/ia64/exception.S#12 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#125 integrate .. //depot/projects/ia64/sys/ia64/ia64/mca.c#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#101 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#87 integrate .. //depot/projects/ia64/sys/ia64/include/vmparam.h#18 integrate .. //depot/projects/ia64/sys/kern/Make.tags.inc#7 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#50 integrate .. //depot/projects/ia64/sys/kern/init_main.c#63 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#90 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#87 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#76 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#72 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#44 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_mib.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#50 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_sx.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#71 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#101 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_uuid.c#15 integrate .. //depot/projects/ia64/sys/kern/subr_lock.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#22 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#26 integrate .. //depot/projects/ia64/sys/kern/subr_sleepqueue.c#18 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#56 integrate .. //depot/projects/ia64/sys/kern/subr_turnstile.c#18 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#63 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#44 integrate .. //depot/projects/ia64/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/ia64/sys/kern/uipc_domain.c#21 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#43 integrate .. //depot/projects/ia64/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#64 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#70 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#52 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#91 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#46 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#57 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#97 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#80 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#60 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#28 integrate .. //depot/projects/ia64/sys/modules/Makefile#105 integrate .. //depot/projects/ia64/sys/modules/crypto/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/em/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/ia64/sys/modules/mfi/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/Makefile#21 integrate .. //depot/projects/ia64/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/ia64/sys/modules/rum/Makefile#1 branch .. //depot/projects/ia64/sys/modules/twa/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/ia64/sys/net/ethernet.h#13 integrate .. //depot/projects/ia64/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/ia64/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/ia64/sys/net/if.c#58 integrate .. //depot/projects/ia64/sys/net/if.h#28 integrate .. //depot/projects/ia64/sys/net/if_fwsubr.c#11 integrate .. //depot/projects/ia64/sys/net/if_lagg.c#2 integrate .. //depot/projects/ia64/sys/net/if_lagg.h#2 integrate .. //depot/projects/ia64/sys/net/if_var.h#38 integrate .. //depot/projects/ia64/sys/net/pfkeyv2.h#7 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/ia64/sys/netatalk/ddp_usrreq.c#23 integrate .. //depot/projects/ia64/sys/netgraph/ng_car.c#1 branch .. //depot/projects/ia64/sys/netgraph/ng_car.h#1 branch .. //depot/projects/ia64/sys/netgraph/ng_fec.c#15 integrate .. //depot/projects/ia64/sys/netgraph/ng_l2tp.c#12 integrate .. //depot/projects/ia64/sys/netgraph/ng_mppc.c#11 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#33 integrate .. //depot/projects/ia64/sys/netinet/icmp6.h#13 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#42 integrate .. //depot/projects/ia64/sys/netinet/in.c#27 integrate .. //depot/projects/ia64/sys/netinet/in_cksum.c#4 integrate .. //depot/projects/ia64/sys/netinet/in_gif.c#19 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#53 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#34 integrate .. //depot/projects/ia64/sys/netinet/in_rmx.c#13 integrate .. //depot/projects/ia64/sys/netinet/ip.h#11 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#39 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#44 integrate .. //depot/projects/ia64/sys/netinet/ip_ecn.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_encap.c#14 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#35 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#66 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#33 integrate .. //depot/projects/ia64/sys/netinet/ip_id.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#68 integrate .. //depot/projects/ia64/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#43 integrate .. //depot/projects/ia64/sys/netinet/ip_options.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_options.h#2 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#61 integrate .. //depot/projects/ia64/sys/netinet/libalias/alias_proxy.c#6 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#53 integrate .. //depot/projects/ia64/sys/netinet/sctp.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/ia64/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/ia64/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/ia64/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/ia64/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/ia64/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/ia64/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/ia64/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/ia64/sys/netinet/sctp_peeloff.c#5 integrate .. //depot/projects/ia64/sys/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/ia64/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/ia64/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/ia64/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/ia64/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/ia64/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/ia64/sys/netinet/sctputil.c#7 integrate .. //depot/projects/ia64/sys/netinet/sctputil.h#7 integrate .. //depot/projects/ia64/sys/netinet/tcp.h#15 integrate .. //depot/projects/ia64/sys/netinet/tcp_debug.c#8 integrate .. //depot/projects/ia64/sys/netinet/tcp_fsm.h#6 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#76 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#40 integrate .. //depot/projects/ia64/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/ia64/sys/netinet/tcp_sack.c#16 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#63 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#48 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#30 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.h#14 integrate .. //depot/projects/ia64/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#38 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#37 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#52 integrate .. //depot/projects/ia64/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/ia64/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/ia64/sys/netinet6/esp_core.c#12 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#34 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#34 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.h#12 integrate .. //depot/projects/ia64/sys/netinet6/in6_proto.c#19 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/ia64/sys/netinet6/ip6_input.c#40 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#32 integrate .. //depot/projects/ia64/sys/netinet6/nd6_nbr.c#20 integrate .. //depot/projects/ia64/sys/netinet6/raw_ip6.c#29 integrate .. //depot/projects/ia64/sys/netinet6/route6.c#8 integrate .. //depot/projects/ia64/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/ia64/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#14 integrate .. //depot/projects/ia64/sys/netipx/ipx.c#12 integrate .. //depot/projects/ia64/sys/netipx/ipx.h#9 integrate .. //depot/projects/ia64/sys/netipx/ipx_cksum.c#7 integrate .. //depot/projects/ia64/sys/netipx/ipx_if.h#7 integrate .. //depot/projects/ia64/sys/netipx/ipx_input.c#17 integrate .. //depot/projects/ia64/sys/netipx/ipx_outputfl.c#9 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.c#16 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.h#9 integrate .. //depot/projects/ia64/sys/netipx/ipx_usrreq.c#23 integrate .. //depot/projects/ia64/sys/netipx/ipx_var.h#7 integrate .. //depot/projects/ia64/sys/netipx/spx_debug.c#5 integrate .. //depot/projects/ia64/sys/netipx/spx_debug.h#6 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#41 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#23 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#42 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#56 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#31 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.c#26 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.h#12 integrate .. //depot/projects/ia64/sys/opencrypto/cryptosoft.c#13 integrate .. //depot/projects/ia64/sys/opencrypto/xform.c#7 integrate .. //depot/projects/ia64/sys/opencrypto/xform.h#4 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#61 integrate .. //depot/projects/ia64/sys/pc98/pc98/machdep.c#17 integrate .. //depot/projects/ia64/sys/pci/if_tl.c#28 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#38 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#16 integrate .. //depot/projects/ia64/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#52 integrate .. //depot/projects/ia64/sys/security/audit/audit_ioctl.h#4 integrate .. //depot/projects/ia64/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/ia64/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_audit.c#1 branch .. //depot/projects/ia64/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/ia64/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/ia64/sys/security/mac/mac_net.c#13 integrate .. //depot/projects/ia64/sys/security/mac/mac_pipe.c#7 integrate .. //depot/projects/ia64/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/ia64/sys/security/mac/mac_process.c#11 integrate .. //depot/projects/ia64/sys/security/mac/mac_socket.c#8 integrate .. //depot/projects/ia64/sys/security/mac/mac_system.c#8 integrate .. //depot/projects/ia64/sys/security/mac/mac_vfs.c#12 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#40 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#24 integrate .. //depot/projects/ia64/sys/security/mac_ifoff/mac_ifoff.c#12 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#30 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#37 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#13 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#13 integrate .. //depot/projects/ia64/sys/security/mac_seeotheruids/mac_seeotheruids.c#12 integrate .. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#16 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#33 integrate .. //depot/projects/ia64/sys/sparc64/include/profile.h#8 integrate .. //depot/projects/ia64/sys/sparc64/include/smp.h#14 integrate .. //depot/projects/ia64/sys/sparc64/include/ver.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/vmparam.h#10 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/identcpu.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#66 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mem.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#28 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#66 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/upa.c#5 integrate .. //depot/projects/ia64/sys/sun4v/include/cache.h#3 delete .. //depot/projects/ia64/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/ia64/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/ia64/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/ia64/sys/sun4v/include/pmap.h#4 integrate .. //depot/projects/ia64/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/machdep.c#7 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/nexus.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#10 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/tick.c#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/tsb.c#5 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/tte_hash.c#5 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/vnex.c#6 integrate .. //depot/projects/ia64/sys/sys/callout.h#6 integrate .. //depot/projects/ia64/sys/sys/disk.h#17 integrate .. //depot/projects/ia64/sys/sys/filedesc.h#28 integrate .. //depot/projects/ia64/sys/sys/interrupt.h#14 integrate .. //depot/projects/ia64/sys/sys/ioctl_compat.h#6 integrate .. //depot/projects/ia64/sys/sys/lockf.h#7 integrate .. //depot/projects/ia64/sys/sys/mount.h#44 integrate .. //depot/projects/ia64/sys/sys/param.h#83 integrate .. //depot/projects/ia64/sys/sys/priv.h#4 integrate .. //depot/projects/ia64/sys/sys/proc.h#110 integrate .. //depot/projects/ia64/sys/sys/rwlock.h#7 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#47 integrate .. //depot/projects/ia64/sys/sys/sx.h#12 integrate .. //depot/projects/ia64/sys/sys/sysctl.h#34 integrate .. //depot/projects/ia64/sys/sys/sysent.h#18 integrate .. //depot/projects/ia64/sys/sys/systm.h#54 integrate .. //depot/projects/ia64/sys/sys/vmmeter.h#7 integrate .. //depot/projects/ia64/sys/sys/vnode.h#62 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#55 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#55 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#66 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#76 integrate .. //depot/projects/ia64/sys/vm/uma_int.h#29 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#37 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#61 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#55 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#88 integrate .. //depot/projects/ia64/sys/vm/vm_meter.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#49 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#94 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#84 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#41 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#64 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#23 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#23 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#61 integrate .. //depot/projects/ia64/tools/regression/lib/libc/net/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/lib/libc/net/test-ether.c#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/net/test-ether.t#1 branch .. //depot/projects/ia64/tools/regression/netinet6/inet6_rth/Makefile#1 branch .. //depot/projects/ia64/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c#1 branch .. //depot/projects/ia64/tools/regression/netinet6/inet6_rth/test_subr.c#1 branch .. //depot/projects/ia64/tools/regression/netinet6/inet6_rth/test_subr.h#1 branch .. //depot/projects/ia64/tools/regression/sockets/sblock/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sockets/sblock/sblock.c#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/sed/regress.sh#7 integrate .. //depot/projects/ia64/tools/sched/schedgraph.py#6 integrate .. //depot/projects/ia64/tools/tools/net80211/wesside/wesside/wesside.c#3 integrate .. //depot/projects/ia64/tools/tools/recoverdisk/recoverdisk.c#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendar.c#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendar.h#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#67 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.usholiday#3 integrate .. //depot/projects/ia64/usr.bin/calendar/day.c#10 integrate .. //depot/projects/ia64/usr.bin/calendar/io.c#5 integrate .. //depot/projects/ia64/usr.bin/calendar/ostern.c#4 integrate .. //depot/projects/ia64/usr.bin/calendar/paskha.c#4 integrate .. //depot/projects/ia64/usr.bin/du/du.c#16 integrate .. //depot/projects/ia64/usr.bin/env/env.c#8 integrate .. //depot/projects/ia64/usr.bin/lastcomm/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/lastcomm/lastcomm.c#10 integrate .. //depot/projects/ia64/usr.bin/ldd/ldd.1#6 integrate .. //depot/projects/ia64/usr.bin/limits/limits.c#7 integrate .. //depot/projects/ia64/usr.bin/logger/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/logger/logger.c#9 integrate .. //depot/projects/ia64/usr.bin/login/login.c#23 integrate .. //depot/projects/ia64/usr.bin/login/login.h#6 integrate .. //depot/projects/ia64/usr.bin/login/login_audit.c#2 integrate .. //depot/projects/ia64/usr.bin/login/login_fbtab.c#5 integrate .. //depot/projects/ia64/usr.bin/netstat/inet.c#18 integrate .. //depot/projects/ia64/usr.bin/quota/quota.c#12 integrate .. //depot/projects/ia64/usr.bin/sed/extern.h#7 integrate .. //depot/projects/ia64/usr.bin/sed/main.c#17 integrate .. //depot/projects/ia64/usr.bin/sed/process.c#20 integrate .. //depot/projects/ia64/usr.bin/sed/sed.1#15 integrate .. //depot/projects/ia64/usr.bin/stat/stat.1#8 integrate .. //depot/projects/ia64/usr.bin/su/su.c#22 integrate .. //depot/projects/ia64/usr.bin/tar/read.c#12 integrate .. //depot/projects/ia64/usr.bin/tar/write.c#14 integrate .. //depot/projects/ia64/usr.bin/time/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/time/time.c#11 integrate .. //depot/projects/ia64/usr.bin/tip/tip/acu.c#5 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#11 integrate .. //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.8#13 integrate .. //depot/projects/ia64/usr.sbin/config/Makefile#5 integrate .. //depot/projects/ia64/usr.sbin/config/config.8#14 integrate .. //depot/projects/ia64/usr.sbin/config/config.h#12 integrate .. //depot/projects/ia64/usr.sbin/config/config.y#16 integrate .. //depot/projects/ia64/usr.sbin/config/configvers.h#14 integrate .. //depot/projects/ia64/usr.sbin/config/kernconf.tmpl#1 branch .. //depot/projects/ia64/usr.sbin/config/lang.l#12 integrate .. //depot/projects/ia64/usr.sbin/config/main.c#16 integrate .. //depot/projects/ia64/usr.sbin/diskinfo/diskinfo.c#6 integrate .. //depot/projects/ia64/usr.sbin/iostat/iostat.c#7 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.8#9 integrate .. //depot/projects/ia64/usr.sbin/nologin/nologin.5#3 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/pccardc.8#6 integrate .. //depot/projects/ia64/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/ia64/usr.sbin/pmcstat/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.8#6 integrate .. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.c#8 integrate .. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.h#3 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#22 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.8#7 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.c#13 integrate .. //depot/projects/ia64/usr.sbin/sade/main.c#3 integrate .. //depot/projects/ia64/usr.sbin/sade/variable.c#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/main.c#9 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/variable.c#5 integrate .. //depot/projects/ia64/usr.sbin/traceroute6/traceroute6.c#8 integrate .. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#5 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#58 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.144 2007/04/26 21:30:16 imp Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -128,6 +128,7 @@ usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. +usb core Please contact core@ before any major changes Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/ia64/Makefile.inc1#117 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.574 2007/05/13 18:15:50 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,7 +1016,7 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/libpthread \ + lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ @@ -1135,18 +1135,14 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" -.for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) # Remove catpages without corresponding manpages. @3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1161,11 +1157,11 @@ check-old-files: @echo ">>> Checking for old files" -.for file in ${OLD_FILES} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ @@ -1179,25 +1175,21 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) delete-old-dirs: @echo ">>> Removing old directories" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 21 18:20:40 2007 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 64A6616A4AC; Mon, 21 May 2007 18:20:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F0A816A4A9 for ; Mon, 21 May 2007 18:20:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0E1D513C457 for ; Mon, 21 May 2007 18:20:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4LIKdgx096837 for ; Mon, 21 May 2007 18:20:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4LIKWxL096695 for perforce@freebsd.org; Mon, 21 May 2007 18:20:32 GMT (envelope-from sam@freebsd.org) Date: Mon, 21 May 2007 18:20:32 GMT Message-Id: <200705211820.l4LIKWxL096695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 120186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 18:20:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=120186 Change 120186 by sam@sam_laptop on 2007/05/21 18:19:32 IFC @ 120185 (gcc 42 and symbol versioning) Affected files ... .. //depot/projects/wifi/Makefile.inc1#34 integrate .. //depot/projects/wifi/UPDATING#29 integrate .. //depot/projects/wifi/etc/defaults/periodic.conf#9 integrate .. //depot/projects/wifi/etc/periodic/daily/480.status-ntpd#1 branch .. //depot/projects/wifi/lib/libc/Makefile#10 integrate .. //depot/projects/wifi/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/gmon/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/i386/Symbol.map#4 integrate .. //depot/projects/wifi/lib/libc/net/Symbol.map#4 integrate .. //depot/projects/wifi/lib/libc/net/ether_addr.c#2 integrate .. //depot/projects/wifi/lib/libc/net/ethers.3#3 integrate .. //depot/projects/wifi/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc_r/Makefile#7 integrate .. //depot/projects/wifi/lib/libpthread/Makefile#6 integrate .. //depot/projects/wifi/lib/libpthread/pthread.map#7 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_private.h#9 integrate .. //depot/projects/wifi/lib/librt/Makefile#3 integrate .. //depot/projects/wifi/lib/libthr/Makefile#12 integrate .. //depot/projects/wifi/lib/libthr/pthread.map#9 integrate .. //depot/projects/wifi/lib/libthread_db/Makefile#5 integrate .. //depot/projects/wifi/lib/msun/Makefile#15 integrate .. //depot/projects/wifi/libexec/rtld-elf/Makefile#8 integrate .. //depot/projects/wifi/share/man/man5/periodic.conf.5#9 integrate .. //depot/projects/wifi/share/mk/bsd.lib.mk#10 integrate .. //depot/projects/wifi/share/mk/bsd.libnames.mk#12 integrate .. //depot/projects/wifi/share/mk/bsd.own.mk#8 integrate .. //depot/projects/wifi/share/mk/bsd.symver.mk#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#20 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/wifi/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/wifi/sys/amd64/include/smp.h#10 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#17 integrate .. //depot/projects/wifi/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#20 integrate .. //depot/projects/wifi/sys/arm/include/asm.h#5 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#13 integrate .. //depot/projects/wifi/sys/arm/include/profile.h#3 integrate .. //depot/projects/wifi/sys/boot/i386/boot2/Makefile#4 integrate .. //depot/projects/wifi/sys/cam/cam_periph.c#9 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#20 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.h#6 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ch.c#6 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sa.c#9 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_targ_bh.c#6 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#15 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.h#6 integrate .. //depot/projects/wifi/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_windrv.c#11 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#11 integrate .. //depot/projects/wifi/sys/conf/Makefile.amd64#9 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#13 integrate .. //depot/projects/wifi/sys/conf/Makefile.i386#9 integrate .. //depot/projects/wifi/sys/conf/Makefile.ia64#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.pc98#9 integrate .. //depot/projects/wifi/sys/conf/Makefile.powerpc#10 integrate .. //depot/projects/wifi/sys/conf/Makefile.sparc64#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.sun4v#3 integrate .. //depot/projects/wifi/sys/conf/NOTES#38 integrate .. //depot/projects/wifi/sys/conf/files#48 edit .. //depot/projects/wifi/sys/conf/kern.mk#7 integrate .. //depot/projects/wifi/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#23 integrate .. //depot/projects/wifi/sys/conf/options#32 edit .. //depot/projects/wifi/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/wifi/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/wifi/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/wifi/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#13 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#18 integrate .. //depot/projects/wifi/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/wifi/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#23 integrate .. //depot/projects/wifi/sys/dev/em/if_em.h#12 integrate .. //depot/projects/wifi/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/wifi/sys/dev/firewire/firewirereg.h#6 integrate .. //depot/projects/wifi/sys/dev/hptmv/ioctl.c#4 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#29 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/wifi/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/wifi/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/wifi/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb.c#14 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#29 integrate .. //depot/projects/wifi/sys/dev/pci/pci_private.h#8 integrate .. //depot/projects/wifi/sys/dev/pci/pcireg.h#16 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#13 integrate .. //depot/projects/wifi/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/fm801.c#7 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_share.h#7 integrate .. //depot/projects/wifi/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/wifi/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#17 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#8 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#20 integrate .. //depot/projects/wifi/sys/geom/part/g_part.c#4 integrate .. //depot/projects/wifi/sys/i386/Makefile#2 integrate .. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/wifi/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#14 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#22 integrate .. //depot/projects/wifi/sys/i386/include/proc.h#4 integrate .. //depot/projects/wifi/sys/i386/include/smp.h#10 integrate .. //depot/projects/wifi/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#16 integrate .. //depot/projects/wifi/sys/ia64/ia64/mca.c#5 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#15 integrate .. //depot/projects/wifi/sys/ia64/ia64/trap.c#12 integrate .. //depot/projects/wifi/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/wifi/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/wifi/sys/kern/init_main.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_clock.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#22 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#19 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#19 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_sx.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_synch.c#15 integrate .. //depot/projects/wifi/sys/kern/kern_thread.c#17 integrate .. //depot/projects/wifi/sys/kern/subr_lock.c#5 integrate .. //depot/projects/wifi/sys/kern/subr_prof.c#5 integrate .. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/wifi/sys/kern/subr_trap.c#10 integrate .. //depot/projects/wifi/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#27 integrate .. //depot/projects/wifi/sys/kern/uipc_domain.c#9 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf.c#20 integrate .. //depot/projects/wifi/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#24 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#25 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#39 integrate .. //depot/projects/wifi/sys/kern/vfs_vnops.c#21 integrate .. //depot/projects/wifi/sys/kern/vnode_if.src#14 integrate .. //depot/projects/wifi/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/wifi/sys/modules/netgraph/Makefile#11 integrate .. //depot/projects/wifi/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/wifi/sys/modules/rum/Makefile#1 branch .. //depot/projects/wifi/sys/net/ethernet.h#5 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/wifi/sys/net/if.c#28 integrate .. //depot/projects/wifi/sys/net/if.h#11 integrate .. //depot/projects/wifi/sys/net/if_fwsubr.c#13 integrate .. //depot/projects/wifi/sys/net/if_lagg.c#4 integrate .. //depot/projects/wifi/sys/net/if_lagg.h#4 integrate .. //depot/projects/wifi/sys/net/if_var.h#23 integrate .. //depot/projects/wifi/sys/netgraph/ng_car.c#1 branch .. //depot/projects/wifi/sys/netgraph/ng_car.h#1 branch .. //depot/projects/wifi/sys/netgraph/ng_fec.c#9 integrate .. //depot/projects/wifi/sys/netgraph/ng_mppc.c#7 integrate .. //depot/projects/wifi/sys/netinet/icmp6.h#6 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#18 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#8 integrate .. //depot/projects/wifi/sys/netinet/tcp.h#12 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#16 integrate .. //depot/projects/wifi/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#29 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.c#15 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.h#7 integrate .. //depot/projects/wifi/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#20 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#16 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/wifi/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/wifi/sys/netinet6/nd6.c#13 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#18 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#20 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#18 integrate .. //depot/projects/wifi/sys/pc98/pc98/machdep.c#11 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#16 integrate .. //depot/projects/wifi/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/wifi/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/wifi/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcibus.c#8 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/identcpu.c#6 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#15 integrate .. //depot/projects/wifi/sys/sun4v/include/cache.h#2 delete .. //depot/projects/wifi/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/wifi/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/wifi/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/wifi/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/wifi/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/wifi/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/wifi/sys/sys/lockf.h#5 integrate .. //depot/projects/wifi/sys/sys/param.h#28 integrate .. //depot/projects/wifi/sys/sys/sx.h#8 integrate .. //depot/projects/wifi/sys/sys/sysctl.h#10 integrate .. //depot/projects/wifi/sys/sys/sysent.h#7 integrate .. //depot/projects/wifi/sys/sys/systm.h#22 integrate .. //depot/projects/wifi/sys/sys/vmmeter.h#3 integrate .. //depot/projects/wifi/sys/sys/vnode.h#32 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#18 integrate .. //depot/projects/wifi/sys/vm/swap_pager.c#17 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#23 integrate .. //depot/projects/wifi/sys/vm/vm_contig.c#13 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#16 integrate .. //depot/projects/wifi/sys/vm/vm_glue.c#13 integrate .. //depot/projects/wifi/sys/vm/vm_map.c#16 integrate .. //depot/projects/wifi/sys/vm/vm_meter.c#10 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#11 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#20 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#18 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#12 integrate .. //depot/projects/wifi/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#11 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#24 integrate .. //depot/projects/wifi/tools/regression/lib/libc/net/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/lib/libc/net/test-ether.c#1 branch .. //depot/projects/wifi/tools/regression/lib/libc/net/test-ether.t#1 branch .. //depot/projects/wifi/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#7 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.574 2007/05/13 18:15:50 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,7 +1016,7 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/libpthread \ + lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ @@ -1135,18 +1135,14 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" -.for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) # Remove catpages without corresponding manpages. @3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1161,11 +1157,11 @@ check-old-files: @echo ">>> Checking for old files" -.for file in ${OLD_FILES} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ @@ -1179,25 +1175,21 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) delete-old-dirs: @echo ">>> Removing old directories" ==== //depot/projects/wifi/UPDATING#29 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20070513: + Symbol versioning is enabled by default. To disable it, use + option WITHOUT_SYMVER. It is not advisable to attempt to + disable symbol versioning once it is enabled; your installworld + will break because a symbol version-less libc will get installed + before the install tools. As a result, the old install tools, + which previously had symbol dependencies to FBSD_1.0, will fail + because the freshly installed libc will not have them. + + The default threading library has been changed to libthr. If + you wish to have libpthread as your default, use option + DEFAULT_THREAD_LIB=libpthread for the buildworld. + 20070423: The ABI breakage in sendmail(8)'s libmilter has been repaired so it is no longer necessary to recompile mail filters (aka, @@ -773,4 +786,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.490 2007/05/13 14:41:48 deischen Exp $ ==== //depot/projects/wifi/etc/defaults/periodic.conf#9 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.42 2007/04/06 02:33:06 pjd Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.43 2007/05/13 09:33:35 maxim Exp $ # # What files override these defaults ? @@ -130,6 +130,9 @@ daily_status_named_enable="YES" daily_status_named_usedns="YES" # DNS lookups are ok +# 480.status-ntpd +daily_status_ntpd_enable="NO" # Check NTP status + # 500.queuerun daily_queuerun_enable="YES" # Run mail queue daily_submit_queuerun="YES" # Also submit queue ==== //depot/projects/wifi/lib/libc/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.69 2007/03/04 12:25:03 simon Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.70 2007/05/13 14:12:38 deischen Exp $ SHLIBDIR?= /lib @@ -76,11 +76,9 @@ CFLAGS+=-D_FREEFALL_CONFIG .endif -.if defined(SYMVER_ENABLED) VERSION_DEF=${.CURDIR}/Versions.def SYMBOL_MAPS=${SYM_MAPS} CFLAGS+= -DSYMBOL_VERSIONING -.endif # If there are no machine dependent sources, append all the # machine-independent sources: ==== //depot/projects/wifi/lib/libc/amd64/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $ + * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + .mcount; _setjmp; _longjmp; fabs; ==== //depot/projects/wifi/lib/libc/arm/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $ + * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; _longjmp; alloca; @@ -22,7 +23,7 @@ setjmp; longjmp; sigsetjmp; - siglongjmp + siglongjmp; htonl; __htonl; htons; @@ -65,4 +66,26 @@ __sys_fork; _fork; _sbrk; + + /* softfloat */ + __addsf3; + __adddf3; + __subsf3; + __subdf3; + __mulsf3; + __muldf3; + __divsf3; + __divdf3; + __floatsisf; + __floatsidf; + __floatdisf; + __floatdidf; + __fixsfsi; + __fixdfsi; + __fixsfdi; + __fixdfdi; + __fixunssfsi; + __fixunsdfsi; + __extendsfdf2; + __truncdfsf2; }; ==== //depot/projects/wifi/lib/libc/gmon/Symbol.map#3 (text) ==== @@ -1,9 +1,8 @@ /* - * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $ */ FBSD_1.0 { - .mcount; _mcleanup; monstartup; moncontrol; ==== //depot/projects/wifi/lib/libc/i386/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.3 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.4 2007/05/13 14:16:55 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + .mcount; _setjmp; _longjmp; alloca; ==== //depot/projects/wifi/lib/libc/net/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.8 2007/04/29 14:05:17 deischen Exp $ + * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.9 2007/05/13 15:01:25 rwatson Exp $ */ FBSD_1.0 { @@ -7,7 +7,9 @@ __b64_pton; ether_line; ether_aton; + ether_aton_r; ether_ntoa; + ether_ntoa_r; ether_ntohost; ether_hostton; eui64_aton; ==== //depot/projects/wifi/lib/libc/net/ether_addr.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* - * Copyright (c) 1995 - * Bill Paul . All rights reserved. + * Copyright (c) 1995 Bill Paul . + * Copyright (c) 2007 Robert N. M. Watson + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,103 +38,104 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.15 2002/04/08 07:51:10 ru Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.17 2007/05/13 13:57:44 rwatson Exp $"); -#include -#include #include -#include -#include #include #include + #include + #ifdef YP #include #include #include #endif +#include +#include +#include +#include + #ifndef _PATH_ETHERS -#define _PATH_ETHERS "/etc/ethers" +#define _PATH_ETHERS "/etc/ethers" #endif /* - * Parse a string of text containing an ethernet address and hostname - * and separate it into its component parts. + * Parse a string of text containing an ethernet address and hostname and + * separate it into its component parts. */ int -ether_line(l, e, hostname) - const char *l; - struct ether_addr *e; - char *hostname; +ether_line(const char *l, struct ether_addr *e, char *hostname) { - int i, o[6]; + int i, o[6]; - i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], - &o[3], &o[4], &o[5], - hostname); + i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3], + &o[4], &o[5], hostname); if (i != 7) - return (i); - - for (i=0; i<6; i++) - e->octet[i] = o[i]; - return (0); + return (i); + for (i=0; i<6; i++) + e->octet[i] = o[i]; + return (0); } /* - * Convert an ASCII representation of an ethernet address to - * binary form. + * Convert an ASCII representation of an ethernet address to binary form. */ -struct -ether_addr *ether_aton(a) - const char *a; +struct ether_addr * +ether_aton_r(const char *a, struct ether_addr *e) { - int i; - static struct ether_addr o; + int i; unsigned int o0, o1, o2, o3, o4, o5; - i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); + i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); + if (i != 6) + return (NULL); + e->octet[0]=o0; + e->octet[1]=o1; + e->octet[2]=o2; + e->octet[3]=o3; + e->octet[4]=o4; + e->octet[5]=o5; + return (e); +} - if (i != 6) - return (NULL); +struct ether_addr * +ether_aton(const char *a) +{ + static struct ether_addr e; - o.octet[0]=o0; - o.octet[1]=o1; - o.octet[2]=o2; - o.octet[3]=o3; - o.octet[4]=o4; - o.octet[5]=o5; - - return ((struct ether_addr *)&o); + return (ether_aton_r(a, &e)); } /* - * Convert a binary representation of an ethernet address to - * an ASCII string. + * Convert a binary representation of an ethernet address to an ASCII string. */ -char -*ether_ntoa(n) - const struct ether_addr *n; +char * +ether_ntoa_r(const struct ether_addr *n, char *a) +{ + int i; + + i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0], + n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]); + if (i < 17) + return (NULL); + return (a); +} + +char * +ether_ntoa(const struct ether_addr *n) { - int i; static char a[18]; - i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", - n->octet[0], n->octet[1], n->octet[2], - n->octet[3], n->octet[4], n->octet[5]); - if (i < 17) - return (NULL); - return ((char *)&a); + return (ether_ntoa_r(n, a)); } /* - * Map an ethernet address to a hostname. Use either /etc/ethers or - * NIS/YP. + * Map an ethernet address to a hostname. Use either /etc/ethers or NIS/YP. */ int -ether_ntohost(hostname, e) - char *hostname; - const struct ether_addr *e; +ether_ntohost(char *hostname, const struct ether_addr *e) { FILE *fp; char buf[BUFSIZ + 2]; @@ -145,9 +147,9 @@ char *ether_a; char *yp_domain; #endif + if ((fp = fopen(_PATH_ETHERS, "r")) == NULL) return (1); - while (fgets(buf,BUFSIZ,fp)) { if (buf[0] == '#') continue; @@ -157,7 +159,7 @@ continue; ether_a = ether_ntoa(e); if (yp_match(yp_domain, "ethers.byaddr", ether_a, - strlen(ether_a), &result, &resultlen)) { + strlen(ether_a), &result, &resultlen)) { continue; } strncpy(buf, result, resultlen); @@ -167,8 +169,8 @@ #endif if (!ether_line(buf, &local_ether, local_host)) { if (!bcmp((char *)&local_ether.octet[0], - (char *)&e->octet[0], 6)) { - /* We have a match */ + (char *)&e->octet[0], 6)) { + /* We have a match. */ strcpy(hostname, local_host); fclose(fp); return(0); @@ -180,13 +182,10 @@ } /* - * Map a hostname to an ethernet address using /etc/ethers or - * NIS/YP. + * Map a hostname to an ethernet address using /etc/ethers or NIS/YP. */ int -ether_hostton(hostname, e) - const char *hostname; - struct ether_addr *e; +ether_hostton(const char *hostname, struct ether_addr *e) { FILE *fp; char buf[BUFSIZ + 2]; @@ -197,9 +196,9 @@ int resultlen; char *yp_domain; #endif + if ((fp = fopen(_PATH_ETHERS, "r")) == NULL) return (1); - while (fgets(buf,BUFSIZ,fp)) { if (buf[0] == '#') continue; @@ -208,7 +207,7 @@ if (yp_get_default_domain(&yp_domain)) continue; if (yp_match(yp_domain, "ethers.byname", hostname, - strlen(hostname), &result, &resultlen)) { + strlen(hostname), &result, &resultlen)) { continue; } strncpy(buf, result, resultlen); @@ -218,9 +217,9 @@ #endif if (!ether_line(buf, &local_ether, local_host)) { if (!strcmp(hostname, local_host)) { - /* We have a match */ + /* We have a match. */ bcopy((char *)&local_ether.octet[0], - (char *)&e->octet[0], 6); + (char *)&e->octet[0], 6); fclose(fp); return(0); } ==== //depot/projects/wifi/lib/libc/net/ethers.3#3 (text+ko) ==== @@ -1,5 +1,6 @@ -.\" Copyright (c) 1995 -.\" Bill Paul . All rights reserved. +.\" Copyright (c) 1995 Bill Paul . +.\" Copyright (c) 2007 Robert N. M. Watson +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -28,16 +29,18 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.23 2005/01/20 09:17:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.24 2007/05/13 13:57:45 rwatson Exp $ .\" -.Dd April 12, 1995 +.Dd May 13, 2007 .Dt ETHERS 3 .Os .Sh NAME .Nm ethers , .Nm ether_line , .Nm ether_aton , +.Nm ether_aton_r , .Nm ether_ntoa , +.Nm ether_ntoa_r , .Nm ether_ntohost , .Nm ether_hostton .Nd Ethernet address conversion and lookup routines @@ -51,8 +54,12 @@ .Fn ether_line "const char *l" "struct ether_addr *e" "char *hostname" .Ft struct ether_addr * .Fn ether_aton "const char *a" +.Ft struct ether_addr * +.Fn ether_aton_r "const char *a" "struct ether_addr *e" .Ft char * .Fn ether_ntoa "const struct ether_addr *n" +.Ft char * +.Fn ether_ntoa_r "const struct ether_addr *n" "char *buf" .Ft int .Fn ether_ntohost "char *hostname" "const struct ether_addr *e" .Ft int @@ -95,18 +102,23 @@ .Pp The .Fn ether_aton -function converts an +and +.Fn ether_aton_r +functions convert .Tn ASCII -representation of an ethernet address into an +representation of ethernet addresses into .Vt ether_addr -structure. -Likewise, +structures. +Likewise, the .Fn ether_ntoa -converts an ethernet address specified as an +and +.Fn ether_ntoa_r +functions +convert ethernet addresses specified as .Vt ether_addr -structure into an +structures into .Tn ASCII -string. +strings. .Pp The .Fn ether_ntohost @@ -138,7 +150,9 @@ .Pp On success, .Fn ether_ntoa -returns a pointer to a string containing an +and +.Fn ether_ntoa_r +functions return a pointer to a string containing an .Tn ASCII representation of an ethernet address. If it is unable to convert @@ -147,13 +161,25 @@ structure, it returns a .Dv NULL pointer. +.Fn ether_ntoa +stores the result in a static buffer; +.Fn ether_ntoa_r +stores the result in a user-passed buffer. +.Pp + Likewise, .Fn ether_aton -returns a pointer to an +and +.Fn ether_aton_r +return a pointer to an .Vt ether_addr structure on success and a .Dv NULL pointer on failure. +.Fn ether_aton +stores the result in a static buffer; +.Fn ether_aton_r +stores the result in a user-passed buffer. .Pp The .Fn ether_ntohost @@ -192,6 +218,8 @@ .Nm library functions were written for and first appeared in .Fx 2.1 . +Thread-safe function variants first appeared in +.Fx 7.0 . .Sh BUGS The .Fn ether_aton @@ -199,3 +227,8 @@ .Fn ether_ntoa functions returns values that are stored in static memory areas which may be overwritten the next time they are called. +.Pp +.Fn ether_ntoa_r +accepts a character buffer pointer, but not a buffer length. +The caller must ensure adequate space is available in the buffer in order to +avoid a buffer overflow. ==== //depot/projects/wifi/lib/libc/powerpc/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.2 2007/04/29 14:05:18 deischen Exp $ + * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 21 20:04:00 2007 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 6331316A474; Mon, 21 May 2007 20:04:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2AB8816A468 for ; Mon, 21 May 2007 20:04:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 18AFA13C487 for ; Mon, 21 May 2007 20:04:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4LK40vP094296 for ; Mon, 21 May 2007 20:04:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4LK3xH8094270 for perforce@freebsd.org; Mon, 21 May 2007 20:03:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 21 May 2007 20:03:59 GMT Message-Id: <200705212003.l4LK3xH8094270@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 120191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 May 2007 20:04:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=120191 Change 120191 by hselasky@hselasky_mini_itx on 2007/05/21 20:03:52 Add tons of documentation to my Linux USB emulation layer. Got help from Julian Elischer on this. Some nits. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#5 (text+ko) ==== @@ -1,9 +1,7 @@ /* - * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa + * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. * - * All rights reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -40,8 +38,6 @@ #include -struct usb_linux_driver_list usb_linux_driver_list; - struct usb_linux_softc { LIST_ENTRY(usb_linux_softc) sc_attached_list; @@ -66,7 +62,7 @@ static uint16_t usb_max_isoc_frames(struct usb_device *dev); static int32_t usb_start_wait_urb(struct urb *urb, uint32_t timeout, uint32_t *p_actlen); -static const struct usb_device_id * usb_linux_lookup_id(struct usb_driver *udrv, struct usb_attach_arg *uaa); +static const struct usb_device_id * usb_linux_lookup_id(const struct usb_device_id *id, struct usb_attach_arg *uaa); static struct usb_driver * usb_linux_get_usb_driver(struct usb_linux_softc *sc); static struct usb_device * usb_linux_create_usb_device(struct usbd_device *udev, device_t dev); static void usb_linux_cleanup_interface(struct usb_device *dev, struct usb_interface *iface); @@ -77,6 +73,7 @@ *------------------------------------------------------------------------*/ static LIST_HEAD(,usb_linux_softc) usb_linux_attached_list; +static LIST_HEAD(,usb_driver) usb_linux_driver_list; static device_method_t usb_linux_methods[] = { /* Device interface */ @@ -101,14 +98,20 @@ DRIVER_MODULE(usb_linux, uhub, usb_linux_driver, usb_linux_devclass, usbd_driver_load, 0); MODULE_DEPEND(usb_linux, usb, 1, 1, 1); +/*------------------------------------------------------------------------* + * usb_linux_lookup_id + * + * This functions takes an array of "struct usb_device_id" and tries + * to match the entries with the information in "struct usb_attach_arg". + * If it finds a match the matching entry will be returned. + * Else "NULL" will be returned. + *------------------------------------------------------------------------*/ static const struct usb_device_id * -usb_linux_lookup_id(struct usb_driver *udrv, struct usb_attach_arg *uaa) +usb_linux_lookup_id(const struct usb_device_id *id, struct usb_attach_arg *uaa) { - const struct usb_device_id *id; usb_interface_descriptor_t *idesc; usb_device_descriptor_t *dd; - id = udrv->id_table; if (id == NULL) { goto done; } @@ -120,6 +123,11 @@ dd = &(uaa->device->ddesc); + /* Keep on matching array entries until + * we find one with "match_flags" + * equal to zero, which indicates the + * end of the array: + */ for ( ; id->match_flags; id++) { if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) && @@ -188,6 +196,12 @@ return NULL; } +/*------------------------------------------------------------------------* + * usb_linux_probe + * + * This function is the FreeBSD probe callback. It is called from the + * FreeBSD USB stack through the "device_probe_and_attach()" function. + *------------------------------------------------------------------------*/ static int usb_linux_probe(device_t dev) { @@ -202,7 +216,7 @@ mtx_lock(&usb_global_lock); LIST_FOREACH(udrv, &usb_linux_driver_list, linux_driver_list) { - if (usb_linux_lookup_id(udrv, uaa)) + if (usb_linux_lookup_id(udrv->id_table, uaa)) { err = 0; break; @@ -213,6 +227,13 @@ return err; } +/*------------------------------------------------------------------------* + * usb_linux_get_usb_driver + * + * This function returns the pointer to the "struct usb_driver" where + * the Linux USB device driver "struct usb_device_id" match was found. + * We apply a lock before reading out the pointer to avoid races. + *------------------------------------------------------------------------*/ static struct usb_driver * usb_linux_get_usb_driver(struct usb_linux_softc *sc) { @@ -223,6 +244,13 @@ return udrv; } +/*------------------------------------------------------------------------* + * usb_linux_attach + * + * This function is the FreeBSD attach callback. It is called from the + * FreeBSD USB stack through the "device_probe_and_attach()" function. + * This function is called when "usb_linux_probe()" returns zero. + *------------------------------------------------------------------------*/ static int usb_linux_attach(device_t dev) { @@ -239,7 +267,7 @@ mtx_lock(&usb_global_lock); LIST_FOREACH(udrv, &usb_linux_driver_list, linux_driver_list) { - id = usb_linux_lookup_id(udrv, uaa); + id = usb_linux_lookup_id(udrv->id_table, uaa); if (id) break; } mtx_unlock(&usb_global_lock); @@ -284,6 +312,12 @@ return 0; } +/*------------------------------------------------------------------------* + * usb_linux_detach + * + * This function is the FreeBSD detach callback. It is called from the + * FreeBSD USB stack through the "device_detach()" function. + *------------------------------------------------------------------------*/ static int usb_linux_detach(device_t dev) { @@ -303,10 +337,19 @@ (udrv->disconnect)(sc->sc_ui); } + /* Make sure that we free all FreeBSD USB transfers + * belonging to this Linux "usb_interface", hence + * they will most likely not be needed any more. + */ usb_linux_cleanup_interface(sc->sc_fbsd_udev->linux_dev, sc->sc_ui); return 0; } +/*------------------------------------------------------------------------* + * usb_linux_suspend + * + * This function is the FreeBSD suspend callback. Usually it does nothing. + *------------------------------------------------------------------------*/ static int usb_linux_suspend(device_t dev) { @@ -320,6 +363,11 @@ return 0; } +/*------------------------------------------------------------------------* + * usb_linux_resume + * + * This function is the FreeBSD resume callback. Usually it does nothing. + *------------------------------------------------------------------------*/ static int usb_linux_resume(device_t dev) { @@ -333,6 +381,11 @@ return 0; } +/*------------------------------------------------------------------------* + * usb_linux_shutdown + * + * This function is the FreeBSD shutdown callback. Usually it does nothing. + *------------------------------------------------------------------------*/ static int usb_linux_shutdown(device_t dev) { @@ -349,6 +402,9 @@ * Linux emulation layer *------------------------------------------------------------------------*/ +/* The following function returns the maximum number of isochronous + * frames that we support per URB. It is not part of the Linux USB API. + */ static uint16_t usb_max_isoc_frames(struct usb_device *dev) { @@ -356,8 +412,12 @@ USB_MAX_HIGH_SPEED_ISOC_FRAMES : USB_MAX_FULL_SPEED_ISOC_FRAMES); } +/* This function is used to queue an URB after that it has been + * initialized. If it returns non-zero, it means that the URB was not + * queued. + */ int32_t -usb_submit_urb(struct urb *urb, gfp_t mem_flags) +usb_submit_urb(struct urb *urb, uint16_t mem_flags) { struct usb_host_endpoint *uhe; @@ -373,6 +433,10 @@ uhe = urb->pipe; + /* Check that we have got a FreeBSD USB transfer that will + * dequeue the URB structure and do the real transfer. If + * there are no USB transfers, then we return an error. + */ if (uhe->bsd_xfer[0] || uhe->bsd_xfer[1]) { @@ -392,6 +456,12 @@ return 0; } +/* + * This function is used to stop an URB after that it is been + * submitted, but before the "complete" callback has been called. On + * FreeBSD this function is always non-blocking, and will always call + * the "complete" callback with an error before it returns. + */ int32_t usb_unlink_urb(struct urb *urb) { @@ -428,6 +498,12 @@ } else { + /* If the URB is not on the URB list, then check if one of + * the FreeBSD USB transfer are processing the current + * URB. If so, re-start that transfer, which will lead to + * the termination of that URB: + */ + if (uhe->bsd_xfer[0] && (uhe->bsd_xfer[0]->priv_fifo == (void *)urb)) { @@ -445,6 +521,10 @@ return 0; } +/* This function must always be used to clear the stall. Stall is when + * an USB endpoint returns a stall message to the USB host controller. + * Until the stall is cleared, no data can be transferred. + */ int32_t usb_clear_halt(struct usb_device *dev, struct usb_host_endpoint *uhe) { @@ -477,6 +557,9 @@ UF_ENDPOINT_HALT, addr, NULL, 0, 1000); } +/* This is an internal function that is used to perform synchronous + * Linux USB transfers. + */ static int32_t usb_start_wait_urb(struct urb *urb, uint32_t timeout, uint32_t *p_actlen) { @@ -516,6 +599,12 @@ return err; } +/* The following function performs a control transfer sequence one any + * control, bulk or interrupt endpoint, specified by "uhe". A control + * transfer means that you transfer an 8-byte header first followed by + * a data-phase as indicated by the 8-byte header. The "timeout" is + * given in milliseconds. + */ int32_t usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *uhe, uint8_t request, uint8_t requesttype, @@ -537,6 +626,10 @@ type = (uhe->desc.bmAttributes & UE_XFERTYPE); addr = (uhe->desc.bEndpointAddress & UE_ADDR); + /* The FreeBSD USB stack supports standard control transfers + * on control endpoints only. For the other two endpoint types + * we need special handling. Check the endpoint type: + */ if (type == UE_CONTROL) { uhe_write = NULL; uhe_read = NULL; @@ -562,7 +655,7 @@ * here so that we don't transfer data * to/from the stack! * - * 0xFFFF is a magic value. + * 0xFFFF is a FreeBSD specific magic value. */ urb = usb_alloc_urb(0xFFFF, size); if (urb == NULL) return -ENOMEM; @@ -631,6 +724,11 @@ return err; } +/* The following function will select which alternate setting of an + * USB interface you plan to use. By default alternate setting with + * index zero is selected. Note that "iface_no" is not the interface + * index, but rather the value of "bInterfaceNumber". + */ int32_t usb_set_interface(struct usb_device *dev, uint8_t iface_no, uint8_t alt_index) { @@ -646,6 +744,14 @@ return err; } +/* The following function is an extension to the Linux USB API that + * allows you to set a maximum buffer size for a given USB endpoint. + * The maximum buffer size is per URB. If you don't call this function + * to set a maximum buffer size, the endpoint will not be functional. + * Note that for isochronous endpoints the maximum buffer size must be + * a non-zero dummy, hence this function will base the maximum buffer + * size on "wMaxPacketSize". + */ int32_t usb_setup_endpoint(struct usb_device *dev, struct usb_host_endpoint *uhe, uint32_t bufsize) { @@ -671,7 +777,9 @@ if (type == UE_ISOCHRONOUS) { - /* Isochronous is special */ + /* Isochronous transfers are special in that they don't + * fit into the BULK/INTR/CONTROL transfer model. + */ cfg[0].type = type; cfg[0].endpoint = addr & UE_ADDR; @@ -683,6 +791,8 @@ bcopy(cfg + 0, cfg + 1, sizeof(*cfg)); + /* Allocate and setup two generic FreeBSD USB transfers */ + if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, uhe->bsd_xfer, cfg, 2, uhe, &usb_global_lock)) @@ -705,6 +815,8 @@ bufsize = mfs; } + /* Allocate and setup one generic FreeBSD USB transfer */ + cfg[0].type = type; cfg[0].endpoint = addr & UE_ADDR; cfg[0].direction = addr & (UE_DIR_OUT|UE_DIR_IN); @@ -722,6 +834,10 @@ return 0; } +/* The following function is used to build up a per USB device + * structure tree, that mimics the Linux one. The root structure + * is returned by this function. + */ static struct usb_device * usb_linux_create_usb_device(struct usbd_device *udev, device_t dev) { @@ -742,6 +858,10 @@ uint8_t pass; uint8_t iface_no; + /* We do two passes. One pass for computing necessary memory + * size and one pass to initialize all the allocated + * memory structures. + */ for (pass = 0; pass < 2; pass++) { iface_no_curr = 0-1; @@ -750,8 +870,15 @@ nedesc = 0; desc = NULL; + /* Iterate over all the USB descriptors. Use the USB + * config descriptor pointer provided by the FreeBSD + * USB stack. + */ while ((desc = usbd_desc_foreach(cd, desc))) { + /* Build up a tree according to + * the descriptors we find: + */ switch (desc->bDescriptorType) { case UDESC_DEVICE: dd = (void *)desc; @@ -851,13 +978,22 @@ return p_ud; } +/* This function should always be used when you allocate an URB for + * use with the USB Linux stack. In case of an isochronous transfer + * you must specifiy the maximum number of "iso_packets" which you + * plan to transfer per URB. This function is always blocking, and + * "mem_flags" are not regarded like on Linux. + */ struct urb * -usb_alloc_urb(uint16_t iso_packets, gfp_t mem_flags) +usb_alloc_urb(uint16_t iso_packets, uint16_t mem_flags) { struct urb *urb; uint32_t size; if (iso_packets == 0xFFFF) { + /* FreeBSD specific magic value to ask for + * control transfer memory allocation: + */ size = sizeof(*urb) + sizeof(usb_device_request_t) + mem_flags; } else { size = sizeof(*urb) + (iso_packets * sizeof(urb->iso_frame_desc[0])); @@ -877,6 +1013,11 @@ return urb; } +/* The following function will return the Linux USB host endpoint + * structure that matches the given endpoint type and endpoint + * value. If no match is found, NULL is returned. This function is not + * part of the Linux USB API and is only used internally. + */ struct usb_host_endpoint * usb_find_host_endpoint(struct usb_device *dev, uint8_t type, uint8_t ep) { @@ -900,6 +1041,9 @@ ep &= mask; + /* Iterate over all the interfaces searching the selected + * alternate setting only, and all belonging endpoints. + */ for (ui = dev->bsd_iface_start; ui != dev->bsd_iface_end; ui++) { @@ -927,6 +1071,12 @@ return NULL; } +/* The following function returns a pointer to an alternate setting by + * index given a "usb_interface" pointer. If the alternate setting by + * index does not exist, NULL is returned. And alternate setting is a + * variant of an interface, but usually with slightly different + * characteristics. + */ struct usb_host_interface * usb_altnum_to_altsetting(const struct usb_interface *intf, uint8_t alt_index) { @@ -936,6 +1086,9 @@ return (intf->altsetting + alt_index); } +/* The following function searches up an USB interface by + * "bInterfaceNumber". If no match is found, NULL is returned. + */ struct usb_interface * usb_ifnum_to_if(struct usb_device *dev, uint8_t iface_no) { @@ -953,7 +1106,7 @@ } void * -usb_buffer_alloc(struct usb_device *dev, uint32_t size, gfp_t mem_flags, uint8_t *dma_addr) +usb_buffer_alloc(struct usb_device *dev, uint32_t size, uint16_t mem_flags, uint8_t *dma_addr) { return malloc(size, M_USBDEV, M_WAITOK | M_ZERO); } @@ -964,6 +1117,12 @@ return intf->bsd_priv_sc; } +/* The following function is used by the "USB_DRIVER_EXPORT()" macro, + * and is used to register a Linux USB driver, so that its + * "usb_device_id" structures gets searched a probe time. This + * function is not part of the Linux USB API, and is for internal use + * only. + */ void usb_linux_register(void *arg) { @@ -976,6 +1135,13 @@ return; } +/* The following function is used by the "USB_DRIVER_EXPORT()" macro, + * and is used to deregister a Linux USB driver. This function will + * ensure that all driver instances belonging to the Linux USB device + * driver in question, gets detached before the driver is + * unloaded. This function is not part of the Linux USB API, and is + * for internal use only. + */ void usb_linux_deregister(void *arg) { @@ -998,6 +1164,9 @@ return; } +/* The following function is only used by the FreeBSD USB stack, to + * cleanup and free memory after that a Linux USB device was attached. + */ void usb_linux_free_usb_device(struct usb_device *dev) { @@ -1039,6 +1208,10 @@ return; } +/* The following function can be used to initialize a custom URB. It + * is not recommended to use this function. Use "usb_alloc_urb()" + * instead. + */ void usb_init_urb(struct urb *urb) { @@ -1057,6 +1230,9 @@ return; } +/* The following function sets the per Linux USB interface private + * data pointer. It is used by most Linux USB device drivers. + */ void usb_set_intfdata(struct usb_interface *intf, void *data) { @@ -1064,6 +1240,9 @@ return; } +/* The following function will release all FreeBSD USB transfers + * associated with a Linux USB interface. It is for internal use only. + */ static void usb_linux_cleanup_interface(struct usb_device *dev, struct usb_interface *iface) { @@ -1087,6 +1266,9 @@ return; } +/* The following function is used by "usb_start_wait_urb()" to wake it + * up, when an USB transfer has finished. + */ static void usb_linux_wait_complete(struct urb *urb, struct pt_regs *pt_regs) { @@ -1110,6 +1292,11 @@ return; } +/* The following is the FreeBSD isochronous USB callback. Isochronous + * frames are USB packets transferred 1000 or 8000 times per second, + * depending on whether a full- or high- speed USB transfer is + * used. + */ static void usb_linux_isoc_callback(struct usbd_xfer *xfer) { @@ -1129,9 +1316,10 @@ urb->status = -EPIPE; /* stalled */ } - /* just in case: */ + /* Set zero for "actual_length" */ urb->actual_length = 0; + /* Set zero for "actual_length" */ for (x = 0; x < urb->number_of_packets; x++) { urb->iso_frame_desc[x].actual_length = 0; } @@ -1150,6 +1338,8 @@ if (urb->bsd_isread) { + /* copy in data with regard to the URB */ + offset = 0; for (x = 0; x < urb->number_of_packets; x++) { @@ -1217,6 +1407,8 @@ if (!(urb->bsd_isread)) { + /* copy out data with regard to the URB */ + offset = 0; for (x = 0; x < urb->number_of_packets; x++) { @@ -1229,8 +1421,12 @@ } } else { + /* compute the transfer length into the "offset" variable */ + offset = urb->number_of_packets * max_frame; + /* setup "frlengths" array */ + for (x = 0; x < urb->number_of_packets; x++) { uipd = urb->iso_frame_desc + x; xfer->frlengths[x] = max_frame; @@ -1246,6 +1442,12 @@ return; } +/* The following is the FreeBSD BULK/INTERRUPT and CONTROL USB + * callback. It dequeues Linux USB stack compatible URB's, transforms + * the URB fields into a FreeBSD USB transfer, and defragments the USB + * transfer as required. When the transfer is complete the "complete" + * callback is called. + */ static void usb_linux_non_isoc_callback(struct usbd_xfer *xfer) { @@ -1263,7 +1465,7 @@ urb->status = -EPIPE; } - /* just in case: */ + /* Set zero for "actual_length" */ urb->actual_length = 0; /* call callback */ @@ -1278,6 +1480,7 @@ tr_transferred: if (urb->bsd_isread) { + /* copy in data with regard to the URB */ usbd_copy_out(&(xfer->buf_data), 0, urb->bsd_data_ptr, xfer->actlen); } @@ -1333,7 +1536,9 @@ xfer->timeout = urb->timeout; if ((uhe->desc.bmAttributes & UE_XFERTYPE) == UE_CONTROL) { - /* we transfer the header first, then the data */ + /* transfer the control header first and then the data, + * if any, to a control endpoint: + */ usbd_copy_in(&(xfer->buf_data), 0, urb->setup_packet, sizeof(usb_device_request_t)); xfer->length = sizeof(usb_device_request_t); @@ -1364,6 +1569,7 @@ } if (!(urb->bsd_isread)) { + /* copy out data with regard to the URB */ usbd_copy_in(&(xfer->buf_data), 0, urb->bsd_data_ptr, max_bulk); } ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#4 (text+ko) ==== @@ -1,9 +1,7 @@ /* - * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa + * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. * - * All rights reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -47,7 +45,6 @@ typedef void * pm_message_t; typedef void (usb_complete_t)(struct urb *, struct pt_regs *); -typedef uint32_t gfp_t; #define USB_MAX_FULL_SPEED_ISOC_FRAMES (60 * 1) #define USB_MAX_HIGH_SPEED_ISOC_FRAMES (60 * 8) @@ -99,6 +96,12 @@ .match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = (vend), \ .idProduct = (prod) +/* The "usb_driver" structure holds the Linux USB device driver + * callbacks, and a pointer to device ID's which this entry should + * match against. Usually this entry is exposed to the USB emulation + * layer using the "USB_DRIVER_EXPORT()" macro, which is defined + * below. + */ struct usb_driver { const char *name; @@ -125,8 +128,9 @@ SYSUNINIT(id,SI_SUB_KLD,SI_ORDER_ANY,usb_linux_deregister,p_usb_drv) /* - * This is the same as: - * usb_device_descriptor_t + * The following structure is the same as "usb_device_descriptor_t" + * except that 16-bit values are "uint16_t" and not an array of "uint8_t". + * It is used by Linux USB device drivers. */ struct usb_device_descriptor { uint8_t bLength; @@ -147,8 +151,9 @@ } __packed; /* - * This is the same as: - * usb_interface_descriptor_t + * The following structure is the same as + * "usb_interface_descriptor_t". It is used by + * Linux USB device drivers. */ struct usb_interface_descriptor { uint8_t bLength; @@ -164,8 +169,9 @@ } __packed; /* - * This is the same as: - * usb_endpoint_descriptor_t + * The following structure is the same as "usb_endpoint_descriptor_t" + * except that 16-bit values are "uint16_t" and not an array of "uint8_t". + * It is used by Linux USB device drivers. */ struct usb_endpoint_descriptor { uint8_t bLength; @@ -277,6 +283,14 @@ #define PIPE_CONTROL UE_CONTROL #define PIPE_BULK UE_BULK +/* Whenever Linux references an USB endpoint: + * a) to initialize "urb->pipe" + * b) second argument passed to "usb_control_msg()" + * + * Then it uses one of the following macros. The "endpoint" argument + * is the physical endpoint value masked by 0xF. The "dev" argument + * is a pointer to "struct usb_device". + */ #define usb_sndctrlpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_CONTROL, (endpoint) | USB_DIR_OUT) @@ -301,6 +315,13 @@ #define usb_rcvintpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_INTERRUPT, (endpoint) | USB_DIR_IN) +/* The following four structures makes up a tree, where we have the + * leaf structure, "usb_host_endpoint", first, and the root structure, + * "usb_device", last. The four structures below mirror the structure + * of the USB descriptors belonging to an USB configuration. Please + * refer to the USB specification for a definition of "endpoints" and + * "interfaces". + */ struct usb_host_endpoint { struct usb_endpoint_descriptor desc; @@ -361,15 +382,27 @@ } __aligned(USB_HOST_ALIGN); /* - * URB support, for asynchronous request completions + * The following structure is used to extend "struct urb" when we are + * dealing with an isochronous endpoint. It contains information about + * the data offset and data length of an isochronous packet. + * The "actual_length" field is updated before the "complete" + * callback in the "urb" structure is called. */ struct usb_iso_packet_descriptor { - uint32_t offset; - uint16_t length; /* expected length */ + uint32_t offset; /* depreciated buffer offset + * (the packets are usually back to back) + */ + uint16_t length; /* expected length */ uint16_t actual_length; uint16_t status; }; +/* + * The following structure holds various information about an USB + * transfer. This structure is used for all kinds of USB transfers. + * + * URB is short for USB Request Block. + */ struct urb { TAILQ_ENTRY(urb) bsd_urb_list; @@ -407,9 +440,9 @@ struct usb_iso_packet_descriptor iso_frame_desc[0]; /* (in) ISO ONLY */ }; -extern LIST_HEAD(usb_linux_driver_list,usb_driver) usb_linux_driver_list; +/* various prototypes */ -int32_t usb_submit_urb(struct urb *urb, gfp_t mem_flags); +int32_t usb_submit_urb(struct urb *urb, uint16_t mem_flags); int32_t usb_unlink_urb(struct urb *urb); int32_t usb_clear_halt(struct usb_device *dev, struct usb_host_endpoint *uhe); int32_t usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *pipe, uint8_t request, uint8_t requesttype, uint16_t value, uint16_t index, void *data, uint16_t size, uint32_t timeout); @@ -417,11 +450,11 @@ int32_t usb_setup_endpoint(struct usb_device *dev, struct usb_host_endpoint *uhe, uint32_t bufsize); struct usb_host_endpoint *usb_find_host_endpoint(struct usb_device *dev, uint8_t type, uint8_t ep); -struct urb *usb_alloc_urb(uint16_t iso_packets, gfp_t mem_flags); +struct urb *usb_alloc_urb(uint16_t iso_packets, uint16_t mem_flags); struct usb_host_interface *usb_altnum_to_altsetting(const struct usb_interface *intf, uint8_t alt_index); struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, uint8_t iface_no); -void *usb_buffer_alloc(struct usb_device *dev, uint32_t size, gfp_t mem_flags, uint8_t *dma_addr); +void *usb_buffer_alloc(struct usb_device *dev, uint32_t size, uint16_t mem_flags, uint8_t *dma_addr); void *usb_get_intfdata(struct usb_interface *intf); void usb_buffer_free(struct usb_device *dev, uint32_t size, void *addr, uint8_t dma_addr); From owner-p4-projects@FreeBSD.ORG Tue May 22 03:11:24 2007 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 52FD016A469; Tue, 22 May 2007 03:11:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A38716A400 for ; Tue, 22 May 2007 03:11:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0A4E613C43E for ; Tue, 22 May 2007 03:11:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4M3BNcg016502 for ; Tue, 22 May 2007 03:11:23 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4M3BMuH016480 for perforce@freebsd.org; Tue, 22 May 2007 03:11:22 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 22 May 2007 03:11:22 GMT Message-Id: <200705220311.l4M3BMuH016480@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 120200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 May 2007 03:11:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=120200 Change 120200 by mjacob@mjexp-obrien on 2007/05/22 03:10:58 IFC Affected files ... .. //depot/projects/mjexp/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/mjexp/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/mjexp/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/mjexp/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/mjexp/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/mjexp/sys/dev/hptmv/ioctl.c#4 integrate .. //depot/projects/mjexp/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/mjexp/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/mjexp/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/mjexp/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/mjexp/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/nd6.c#8 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#11 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/mjexp/sys/sys/param.h#18 integrate Differences ... ==== //depot/projects/mjexp/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/mjexp/sys/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.6 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf32_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf32_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/mjexp/sys/boot/i386/libi386/smbios.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.6 2006/03/14 19:02:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.7 2007/05/21 18:48:18 jkim Exp $"); #include #include @@ -239,9 +239,9 @@ break; } if (f != 16 && z != 16) { - sprintf(uuid, "%02X%02X%02X%02X-" - "%02X%02X-%02X%02X-%02X%02X-" - "%02X%02X%02X%02X%02X%02X", + sprintf(uuid, "%02x%02x%02x%02x-" + "%02x%02x-%02x%02x-%02x%02x-" + "%02x%02x%02x%02x%02x%02x", idp[0], idp[1], idp[2], idp[3], idp[4], idp[5], idp[6], idp[7], idp[8], idp[9], idp[10], idp[11], idp[12], idp[13], idp[14], idp[15]); ==== //depot/projects/mjexp/sys/compat/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.24 2007/05/14 22:40:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $"); #include "opt_compat.h" @@ -138,7 +138,7 @@ "/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, "/libexec/ld-elf32.so.1", - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY, @@ -153,7 +153,7 @@ "/usr/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, "/libexec/ld-elf32.so.1", - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/mjexp/sys/contrib/pf/net/pf.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.43 2006/12/29 13:59:03 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.44 2007/05/21 20:08:59 dhartmei Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -6780,7 +6780,7 @@ struct pf_state *s = NULL; struct pf_ruleset *ruleset = NULL; struct pf_pdesc pd; - int off, terminal = 0, dirndx; + int off, terminal = 0, dirndx, rh_cnt = 0; #ifdef __FreeBSD__ PF_LOCK(); @@ -6844,6 +6844,18 @@ m = *m0; h = mtod(m, struct ip6_hdr *); +#if 1 + /* + * we do not support jumbogram yet. if we keep going, zero ip6_plen + * will do something bad, so drop the packet for now. + */ + if (htons(h->ip6_plen) == 0) { + action = PF_DROP; + REASON_SET(&reason, PFRES_NORM); /*XXX*/ + goto done; + } +#endif + pd.src = (struct pf_addr *)&h->ip6_src; pd.dst = (struct pf_addr *)&h->ip6_dst; PF_ACPY(&pd.baddr, dir == PF_OUT ? pd.src : pd.dst, AF_INET6); @@ -6863,9 +6875,38 @@ if (action == PF_DROP) REASON_SET(&reason, PFRES_FRAG); goto done; + case IPPROTO_ROUTING: { + struct ip6_rthdr rthdr; + + if (rh_cnt++) { + DPFPRINTF(PF_DEBUG_MISC, + ("pf: IPv6 more than one rthdr\n")); + action = PF_DROP; + REASON_SET(&reason, PFRES_IPOPTIONS); + log = 1; + goto done; + } + if (!pf_pull_hdr(m, off, &rthdr, sizeof(rthdr), NULL, + &reason, pd.af)) { + DPFPRINTF(PF_DEBUG_MISC, + ("pf: IPv6 short rthdr\n")); + action = PF_DROP; + REASON_SET(&reason, PFRES_SHORT); + log = 1; + goto done; + } + if (rthdr.ip6r_type == IPV6_RTHDR_TYPE_0) { + DPFPRINTF(PF_DEBUG_MISC, + ("pf: IPv6 rthdr0\n")); + action = PF_DROP; + REASON_SET(&reason, PFRES_IPOPTIONS); + log = 1; + goto done; + } + /* fallthrough */ + } case IPPROTO_AH: case IPPROTO_HOPOPTS: - case IPPROTO_ROUTING: case IPPROTO_DSTOPTS: { /* get next header and header length */ struct ip6_ext opt6; @@ -7032,7 +7073,15 @@ } done: - /* XXX handle IPv6 options, if not allowed. not implemented. */ + /* handle dangerous IPv6 extension headers. */ + if (action == PF_PASS && rh_cnt && + !((s && s->allow_opts) || r->allow_opts)) { + action = PF_DROP; + REASON_SET(&reason, PFRES_IPOPTIONS); + log = 1; + DPFPRINTF(PF_DEBUG_MISC, + ("pf: dropping packet with dangerous v6 headers\n")); + } if (s && s->tag) pf_tag_packet(m, pf_get_tag(m), s->tag); ==== //depot/projects/mjexp/sys/dev/firewire/firewire.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.93 2007/05/21 02:18:49 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.94 2007/05/21 12:17:54 simokawa Exp $ * */ @@ -1485,6 +1485,7 @@ int node, err, s, i, todo, todo2, trys; char nodes[63]; struct fw_device dfwdev; + union fw_self_id *fwsid; todo = 0; /* setup dummy fwdev */ @@ -1497,7 +1498,8 @@ /* We don't probe myself and linkdown nodes */ if (node == fc->nodeid) continue; - if (!fw_find_self_id(fc, node)->p0.link_active) { + fwsid = fw_find_self_id(fc, node); + if (!fwsid || !fwsid->p0.link_active) { if (firewire_debug) printf("node%d: link down\n", node); continue; ==== //depot/projects/mjexp/sys/dev/hptmv/ioctl.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/sys/dev/hptmv/ioctl.c,v 1.7 2007/05/20 16:49:09 mjacob Exp $ + * $FreeBSD: src/sys/dev/hptmv/ioctl.c,v 1.8 2007/05/21 09:26:47 mjacob Exp $ */ /* * ioctl.c ioctl interface implementation @@ -77,13 +77,16 @@ IAL_ADAPTER_T *pAdapTemp; int i, j; - for (i=1, pAdapTemp = gIal_Adapter; pAdapTemp; pAdapTemp = pAdapTemp->next, i++) { - for (j=0; jVDevices[j].u.disk) { - *controller = i; - *channel = j; - return; - } + *controller = *channel = 0; + + for (i=1, pAdapTemp = gIal_Adapter; pAdapTemp; pAdapTemp = pAdapTemp->next, i++) { + for (j=0; jVDevices[j].u.disk) { + *controller = i; + *channel = j; + return; + } + } } } @@ -151,7 +154,7 @@ } event_queue_add(&e); if (event==ET_DEVICE_REMOVED) { - int controller = 0, channel = 0; + int controller, channel; get_disk_location(&((PVDevice)param)->u.disk, &controller, &channel); hpt_printk(("Device removed: controller %d channel %d\n", controller, channel)); } ==== //depot/projects/mjexp/sys/dev/mxge/eth_z8e.dat.gz.uu#4 (text+ko) ==== @@ -29,1045 +29,1055 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/mxge/eth_z8e.dat.gz.uu,v 1.5 2007/05/08 14:19:43 gallatin Exp $ +$FreeBSD: src/sys/dev/mxge/eth_z8e.dat.gz.uu,v 1.6 2007/05/21 18:32:26 gallatin Exp $ ***************************************************************************/ begin 644 eth_z8e.dat.gz -M'XL("-`"/T8``V5T:%]Z.&4N9&%T`.Q:?6Q35Y8_=ASBI!GL0B`&`A@20B`) -M,1!45-'9=$HU5`M-^.CB-"P!35I"E^VZD&4,$V)CZ"I!3,E01)EMVF0U5.J, -M:)O54JDKM8,[9*3^T<3IBM5F)59XLVF4K4)Q&T-,\OSN_LY[?HG]\A(ZTTK[ -M#Y9NWKOWGG/N^;KGG'M?B+['SUQ7_WW0'_X>_A[^'OX>_A[^'O[^?W[?FBWT -MAU:BT8#5$:8[S6^\+B0,F\)D=?`ST>@\QLVM9#WB$+)O`5G$F=W-L(>DV-;U"CJ[&+^GD -M?-#+(0I<%#&-MFP6Y,MCW`'J:1L@7ULJKF\Q.;K1%P&R-5P2H)"48E>>XFRKTBT3$PO=&@3GGN)^T9R++>3_?7Y8EB`AU-XML\70_D7*`?P=N`WALW;MS#^.8R772#[U::( -MY=Q%,6SSDLEYG-)M$ID@P_YVC.7G*#B=86K>RC@BM^8;.;,K/'=.$@..7-O14CZ=]K; -M2`+O5`[VJL -M(/&;+2:+$WI3ULNJNP"X,&5?25KW1XEUHZGK/I*'N3E,1UWSD1S86-%QF++> -MU?!5W$=<.MP]"L_J?%::5X'9I?',^-',`\'$^KF`F8WY!IW<[X+7"*\/F$+` -MF&'WV6SSZXV\'Q^YK%OS8\"M@D^9F+[(K/V,?0MX:8#MU<%^R'`\#YQ2I@T8 -MG?S95NPCBT*K1:4%6)<*F^W4P99C;GV8'KD*NN;)=;.W&*QK3M!Z+$'KD(Z6 -M'W./PT:\C].2:%W0P9EX'CJ.:/(:[;4Q<\ZGB$7GQWQ%-!X@*]Y;QT41B>;= -M'<4XH:SV4V9(NDJ5DHBCC:\B>C0D7:%"HF4AZ0+V1AW/72OPFTQX^O+]9E-( -MVDKY9,%S$VUY58R&I'+`G:6?IHM;M7&R/_.J\(6D!HRU465<%I7Q^VBC:'?$ -MMO1K>-X26U_UB9!T`S"?DVC9W2$A%H"W3LE7GP;>.N\%2,"W@R'I$-7&S0S3 -M*<'/`7--@6_0[),< -MBS_'^"::ET6$:L1\+P?`AZ33C1*3,W6$I -MTTUH+G'&_1/6K\AR5XR/LV[=57C?-P8?4W0;IPS1XJX:#=#FT7&6P>U79#CC -M]HTILKB;5-G<)WA<"E`ZWCLDH]9 -M)0Z&O`T8ISF@?PWTPKP&Z$=`ZS9HU#$?BL0#Y:R4K]7C>H;BU -M&G!1ZHE>0/\]A;^>:!W@(B?CS=6,>PU\RGL]%OK+=!'I\41YS(>Q^+9Z$1[_ -M!Z+N^F[@L`W$N,TDI=F\_O3NX:L8^X2R3PJ)_;:[O@X-N'\G5"N1,^0]3;7'%OIY -MGX:D]T`3<"TUL-W>==%?L%_N=4G(:Y*2YZXJ>T'UY[VNY-BA5CX6M'0KT2RT -M#*L63T8#C^:%Z=TJCD-X+PK3;PL2[^5A.N]4)YGU%CP[%`T1XS\;[ -M<.6J:T)N/N^%7D=YSXM`.>(X58R.UEO%:%&VR*J])\8=G)MMZ,]&?"O`<\Y; -M]R@'S?%60/9SWL&[2_SE?#DW'"W`KY'MBZ-S1"3[^N_*8+/@]Y(U3.\9YW='`7)>VWO0R -MU4;4&F1NJT!='%PB\?NOV)Y8IW<$^X%K,N3W*&KH&&B>#M."L%;+A*2G>6_T -M3D,_9Y+^?'^"9EA8ZRU-*M^QIJ@88MK!IF]I`#!O7Q01T7P@]AJ/'1WCL9/P -M#:'R-?_DB)ER.;<&CX_18".E<=TQ&LC!&6#-#>9I)$"_&S$_]QS&2L)4%E/& -MS#0/_4T3,*"!_M8DG.=&S*M_A[%].AR/#L>O]<'?L/.H(M>3P.]`\R?6O:RC -M<55'H\N`USX=SI`.)S:5UWG9J3CS\E)QYI5H?;6>(Q?&*G0X53JA/ -MR,^V1GX1H$.^$XH/!M6\>Y>.-(H8?"`(^`Z-ON8["KSJ/T.J_\SKFH!!^=#E -MC!)T.02;#H>B3Q/.$:Q3*_N4MJ:M4?4;/B]H:X;A*QR3D_QS@-=2UYA?I*T! -MV@/L/\H9"?03>+VJWN=7I>IC_KY4?:5LQ\;[DNK.^*[3TM\ -MLN@?I-QT^'T:/R%#6F4,\EKK7'R^##7>Y9J`8><"=@#RWE5AE:"&I]@3YDZ1(M=2[C>)9;HL4S&3DI?D\,GWL9MKA+N:C%EG93 -M/W4W_H??][\T%_7&*,<-G,$6A/S]T)/PMP,6\2NJQI%<[TQQ1#0_;P>_9LCZ -M)=N@GW)[61XT$\8^%??$'M@`])Z'_G,E/.U*"]"^1!\VS^T4]V2&L6/L,Q$P -M<0S[&&OC7%1(ZODD-\BTIN&!^-S*<620''_M;#*!#\=:)>:`5KM9S5$R>'T[ -M(-9#QOJ&]"=BT(+,1!R+R-;G[8GX.P19,_MI@15]LS`[ -MKKPO1\R?-B@)VT08G]H<-]`&T"*)OJ3(,%*'<]("JXR:@OMAX=;QVH;6BX2RYX*-$/[DU8OUF -MV.*T:A,>PQJLBV_(*H^[E7J2QUF?/"ZC=D"_#?,LD_VKWL5G.3\QW$K>O5XS,+X?/^1P*^;+D8H]PW-!X9Z -MVHAZG*B#VRJ0<\>(>>NGA+W4./C%`*,&A,7%71YU?N&+L^W-,(V -M/LR^OFC[]<8(^%J4%S;OJ%=MLJB*UQ]I/A!^FV5@>:,;&0;Q?V&1)N]KRAEU -M86P&7NUJ'%SD3994G+RQ0?XCJAB2JY#UJ7``\]Y'VFH]>GHY><_^WH -MQY)DL*\WX3?[E'J@C-U]<+GO@0](G\L2<2P>@OO1>3@H?P< -MRE;OMY;8D_PYZCS^%Z*?EGS!=X]<4W`=>3T:03SZBIAGS/4F\+8DX2EW60S/ -M2 -MHTQ34O-6;:\(7',CI_49UP)+-V+-B%J7U7)N'ANDI5_@.8[GAQK-8!/37%J% -M?+F3:>G&ZV'_,9OD=QO,G1:!M!T&XVV(J6-A6MK+/":-7Q6!V;L8/LSK`<;9F0>>[QOS[-RHZ,X,OLU3YG:! -M[_N*7E/'#_E^C1QF)@5G9^.D/1+S9VV7J,I@KVPU3]+\_6 -M]/\`&>*`_7#2G_)-.CJ[C&59?@BRQ(UE6=YL+,OR#O`99]('Y+\#&I_*9M-E51<% -MKZ2NF[_/6!?Y7NCBCK$N\B\8ZR+_"F2^,U47^5V:+I"/;>+-6K'&0UQ+VW'V -MLZIPPPPW;(NI]G4>)NO7E'^3OQ>(-VO$[`AE,'S(>P?GTC!Q392Z1D&1\=XL -MJ`"OYPW&W>KWQ(*SJ7NVP#.I;^@&.$G?&V=L,]M@Q7Y5_RN>UO$1-M9_06QZ -M_:_(,=;_BA+6?YA6[$N-QRLV3\J$]8`C`K/FU_R/J^X!IV9^# -M/UUK76A\[X>S+#F7<)U0N`*^TX=WG$-7=LL!^EZJ/PDW& -MNBW,M9MH6?ZO%%X%O+?FNK?A9=5'#K%..KWV97S&$;UX\(XS[//)^'T -M@99[TM<+;R1H)-.5;!$CGUZ9H]"+*OIQO\UK'B7ZFE8>9#@>SWT)>(;3P5Q0]\[*OM2]L_)*:KZ#_H$G!TR7\5X` -M'KZSO\RPEV#OHO=4>Q?]*I6OHA)C>Q=MGM[>1?N,]U*1EVT=IJ(KJ7NIJ'5R -M+V$]92_1HW_*7D"M,.W>T_;7=]4)]@-X6J74.JB[-[*.>AS$W[E]&/]7/@>K -MNEK]]ZGRK7(;ZVJ5![KR&>MJU5EC7:U"_4.^J?MBU<<<]\$C?ROH^YI6_TB) -M_R.U`GYG$/]73<;_A;PG5BGUE!A!_+]$&9P+)G.`RR`'K"XQS@&K-QOG@-5[ -M5#]>W9KJQZL;)FT,/?TP.>#<(!4_@SSL5^U1?%_'RY"Q/8I1/-,Y8WL4YQG; -MH[@<>C\WU1[%6[];'BYN2,W#Q77?/0\7=QK;H/@S8QL4AU4;E.2DVJ`X-FF# -MU4/?UP8RV^`HM0]2R1=X0O]K3J;R45)OK/\2/_3?;JS_DK;I/ABDTK]-\/9"*ERI15W'M'/J.J5.\/>!,7^EFXS] -MHW17(M=\(#+U/E**^L>H-B]M3N"X%1[@/^?P#![G>\A2)?^!#Q&*2>P/[@:< -M5PS@/D^&X^]##-OEC),!;$Q/TQANC3,5+F.G\KT`\PR?*L.:K:JOK>E(];4U -M=9.^5FK1X?A3)!]<&J>PY-1:4_5:W9M38%\NR(>\7\N\T]!K5758UI6JP[)W)W4(_G\8'84&R75"U=':_:E\ -MN!S&.G*YH*.0L8Y<6Z??KR[L?PI-C9DNO^\MY4Y`V7L[)<22@#;/L=+%YS]A -MRZ.JT"6)[^#M#%?;J-S3VTZSGRYG/W5]IN9W03;O!*Q5@]71Y+LXH<&I=Q%^ -M7>Q8ZS"VVUJ7L=W6;E'MMM:?:K>U^U+]&WK]$VS7X!010_N=JNGS--&2KVC= -M8H4^^K-/FOC_)'A"QGW7%-MQ[_WPO3GNEN!73JH(./M/M?]!NT;U]X]X=I7=$,W].MVC<& -MP%Y)IG-*'0MJW[+P_OD#:&G\1%/Y66]!ONM2::RWST2#[:3Z%]MQ?=&#[D;X -MSF"0RA>H^VF]KOY87Z_>?:DY9J^D][?US;:HD;^M[]#\#34;T_U/W7Q0];MR -MQTAF59+6CIB>ZKC_K`?,9B76U]2VZ?OH#YF=]3WR:TD_]3OK,RT?W'SI8Y_SYX8,- -M+SCW_^QG+QPYXFSX.^=/GMRQ[G&GR[O"6^(\],2*NBS2(`^_L+]N1L#D_XTN -M.7N1Z)<7E5@TS-\KU?-DY:O=!41BS">"R_F[RF._9D;7./WD>8G_I^RQ#\7O -M(^1\D&)'+ZR`K\[9@SB1_+&(LFOMEOS.0QY?MHX#%KVWFR -MMET4-]^:0Y;V\_Q=[S$I;*[)LO_,7>ML5$< -M>;ZZ_8A!K,TB+DM"LIFLLJ=.0A)N0W;Y8./7V/AM9T6"\6O\&GN,#1AC@B%F -M;`S2`0J)%=@5"B2P4CX@7707Z7)23HKVB,B>.%T$?.`D:Y6[#(A$OIPWF@T. -M.,2>OM^_NKJGNKO:)G?WX2R5RE7_]Z^J_ETS/5U]^!OXMY.9-]E&=BFVP,;^ -M1/>W-VYTW]^FC\+Y890&%'R^RX^A@)J/_6L^UFL^YGL^]N;YN![G(P?EX_-' -M_C1*$@5SL@#R!2M0@$;!!A1<-PN@IV`$Y10*Y`N0TPH@6P"9`LALPEAM6HF" -M3]Z;(+=I'4H1"O;9FV!_TRC*:90/4*ZAP.8FR!5"IA`RA0;*>A0X7PBY0NQ3 -M"G%=+H3?A?"[$'X7PN="Y(5"V`0+*X)<$62*(%,$'XL0;Q'6=!'DB@90<)TO -M@K]%%U`^0H&_1;.,%<-F,7PLAEPQ9(HA4PP?B['NBQ%C,>2*(5>,.(NQ7R\& -M-B68E"7PL01^E8"O!#Z50&\),"Q!/"7$`[]*$%,I?"O%"B^%;Z7@+X7NTB,H -MX"^%OE+PA8%7&/K"\#L,'\+@"4-O&/;#L!^&_3#LA\$?ANXRV"\#?QGTE8&O -M#/;+H*\,]LM@OXQXH+<,]LMAOQSZRX%/.63*$6>Y=!? -MCCUL.6R4`YMRC$DY])1#SV;HV`SYS8AA,V0W0W8S_-J,SPV;,?:;,0Z;P5>! -M>5*!6"M@IP*\%;!5@<&I0$P5B*D",A48]PK8JH"?%9"I!/Z56%V5X*O$O*K$ -M+*^$7Y7@K41*H(AE@40T/(MQA+(`6_"1 -M^S1_GX./S&?C,R?F0;8"'Q5-"Z9Q?!P;$CZ\3X&/W2_A4W1*X"/I(3R*!D0] -M+NIV._^0+U+>R';R1L):_W:>2YWAM*2'I@73#%ENSB.GV[2XR"&$<=SRF\9< -M3ZU-VXV+?*+@T9;FD?R0XK7S2^NW\CSI!_V4U2Y^ -M7]3C]OH5_%D>7Y+"5I8"?YGFQ5^B^?"7Y;SX)R7+FKGQ-[SS7]@R5/-?I@7@;ZCFORRW -M"/Y&T/Q7\2R"OZ&:_TZ\P?@;0?/?%;<;__"G;OP-S_P/B_D?%O,_/&[OX>;7 -MQAX@^U3+^5-J:^ZVM9^3Z#K/DZ+/QM;)[_Y^3=UO,%NGO<<3=-<^3_1).;?< -MH#HM2_&5YXAZC:B=_9Z=:WGO9P=CZ#[]GIV -M;,%TR:ZP:<\E54P>FBLNF9;`YS!Y;VC/'T$3N&ZV\4S:Z]?.G9)MUWY+LNO: -M;_G[?7C:_%X\77L_!9Y>NA=/#]V%9U+.C:J8%'@Z<;GQK!B7]Y)N/"O$YY"* -MF*B+TG@:WOGIVI^Y[1JJ^2GZ57@:JOGIVBL&XVD$S4\/W8NGH9J?3DQJ/`W% -M_*R\)N\]W7A6GK?:E1^*>C*=WXQL*Y<8V>[\YK0U=]O.;PY=RF]&MCJ_N?HU -M=;_!;)WI_,;IGOS&^Z3\5IUCY3=#VD]638MZ3M0)?WXSLM7YC?W(+IDUY??_#%Y:`'YC;"K6:G.;T2K3ECM:H%G]35_?G-L -M>_*;8]>3W[S]/CP]^1GQT7=&\CJ4VIJ[;:U#B>ZL0^I3K4-/OZ;N-YBMTUZ'@NY:AZ)/ -M6H=UDU2G92FNND%1\\]U-]FO+M/W\?0=^FT]S[P4V\#H^_=/!NB[]_J1!,LY -MXOWNW9QX8?IOXU/\WM65F1EFZK^<'ON"Z>\=F,ZZ.G^3G?RM.4O/9=+]T,&_ -MI/L"]?_R]"FV4MP7V/;)J/>^P,!#_OL"+_XC[_N].4]\YJ:%.='_MJ<_:?4W -MW+#O(_SK9Q?AXZ]^0?<2[/L(9Q\T$V\_:$Z=^:TY/0F_4&;O3C0T.O<60#\! -MN@[Y3Z95>&;_'GXNGY2>*- -M?\L>O#KR!3N<8CGQ6?,K>AZD;?S-EZ?NP[MH*>\;X8_R/%?0*8)OGS^M_]_WA> -MGW`FK!*L(4:XPO<5-"YV_V_X<:VKD!Y`B4?90L*9OG6UU#>0X',5O!O!5_C&A38:=R``M[&,$H-2@L* -M/&J$3"-L-7Z$\AD*9+8]@@*_MH%O&WS:-HAR!`6\VTZAG$6!G6V?H$!FVRQC -M3?"G:1T*9)K@2Q/B:`)?$V)HNHB"&)K`VW0+908%=II7HT"F&3XUPY]FK*9F -MR#3#E^9K*.!K`58MP*H%L;:`MP5QM"".%L3<`O];X$_+!RC0WP*=K>!KA0^M -M\+L5_K:^CP(?6D%OA?U6V&^%WK9,%/"VP78;9G`;XFM#3&W@:X.>"'"+P$ZD -M'06Z(J!'H"\">Q'X&('-"'@CB+T=<;3#KW;$T`Z^=NAIOXP".QWPO0.Z.D#O -M@+X.V.N`?QV-*,"I`SAU0&?'!13@V8%QZX#]3N#9"?\Z(=,)F4[$VPG]G?"U -M$W*=D.N$'YV(K1-^=&)>=,&/KHTHX.L"-EW0VP4_NX!G%WBZ$'\7XN^"7_1X -M9S?&N1O\W=#=C3'N!G\W]'6#KQMQ1:$O"K^C\"$*GBCT1B$8A?TH[$=A/PK^ -M*'1'8;\'_#W0UP.^'MCO@;X>V.^!_1[P]$!O#^SWP'[/'&.]B+$7<[,7-GHK -M4*"[%WI[H;<7&/8"CU[(]$*F%_[T`I<8QBT&N1CD8O`K!AQCL!6;1(&MV!0* -M^/K@2Q_T]L'O/OC3!YX^S*\^C$\?QK'O/`K\Z@-_'W1OQSAM!_]VZ-L.ONWP -M?3OT;8??V^'#=N*!WG[8?XEJ^-`/'_HATP_?^V&C?P0%FC;&W_H.N8U:.L.NQ*>R-/H_)[23:FKMMR/0YT'59?JR1 -M]S$SXNI/BGY-W6^X^+^/T/76[9/M)]%LO^2^!/(8U=]'##T=U\LKK?;+(:HI -M;D?O=:[7P0!^3-M]\(5)_4FI7U/W&S+_G,3OQF8+]KJ$601[7>#FQ5I!UQ:G -M&[YX7-AY8G)AZ(G+C>76?,[CZ)0QW;K":F]]0F`[3[B"E\8DRV.;]RGPM/N] -M>(I^'YXVOQ?/I,`C*P!/+]V+IX?NPI/;5.#IQ*3`TXG+C6?C:P)/H5/&L['% -M:C<.B[HFC:?AG9^\3XVGH9J?HE^%IZ&:GP(/(VA^>ND!>!JJ^]LGHCXK\*3\D^VQS?L4>-K]7CQ%OP]/F]^+YYR8 -M7]D!>'KI7CP]=!>>W*8"3R:O=O-JJFV8$GCP^ -MD3^R/7%/QZ];>8IB3GWNHB<]=&UQNN&5G_/(ZS(]+G(>C4O\NN.?GHJX_8B+ -M_*?@T^Z/S^.7A`=A>3^8>*]I*ES2IMRSM>;2)_M8GK:>N,>[P,U?H2=HV@]273%QDO(VA]R?)+ -MC)>QV/I2\2TQ7D;0^G+P6'R\C,76EP\7]WA%9MWC92C65^0#:YPBUT7-KR_W -M/J?OH=/^4-N;[T6?YN]S[ZD%7_I:0IA+_;[KE9NF!=/2=JC/N\^V??;B9OOM -MQJICG&I+CWR]Z&BTVAT#HK;W,WPO:>L@N:#]J:`I]Z=^FN&5<^V_7;2`/;B' -M1[D/7YK'XX>T'U\J9GL<@N*6Z0E\WO;NS67]H(];N'>>%?6`O#]7^.+;STI^ -M^/:S?IH2?V>_KL#?MV=78.O;MR_-X\/?V;\O%;,"?U?<;OR[-WKW\F[\NYF% -M>_K\ -M[-`4^=FFR?G9<._M)9_]^=GRVYV?>T-6?C8\^_F>.:O=*S[']\RH\[.1'9R? -M.2T@/WMIAEB?HWCC]CI.U%O3A!]FK_/G1,$GR\GV/VJG"#1?#DA -M34O;H3YO3K!]]N8$VV]W3NC?0+6E1\X)_2(7]/.Y>9/5)^C^(=U[=&^3.LE^F>Y5=L -MX`^1699M'@9--R_GC;!E$NT&V;'E\D:9+M'XN3'/?,TT_'_!Z\__S)<=+P;[ -MLF-'L"\[CG%?9I@6VLE^_#7;L8':2;6-?R#:W0F6>?>PHTNV\V^RK,?.GX/U -M[OS1XGIW/A.L=VOWFX^<;8X_R92WZ>ZNN@ -M7YV_Q>@><'@_8\_.NF1^Y_4I=][VB=,_EGT"39=H_YX>WYWM0>-+]Y>OGF8L -M_#ACES(9W4.=.>4\A[QK0X(-G);.+:0S1A^[,CO+Z`Q_.C<1>V -MTMG*D84&W7J7QZY!6S;H>6>R*VPF3_)[Z;O>M65(-YT3F<+\X^<>S\_0/>F? -MC.TG6V2GG0D[4PFV(_!L]L7C&US]P^-C(K[!AB7B6\SN:S_<[DK;[N4?CNO@ -M_/WCNE[@NGO]$K@J[.SNOG\[(=O.:94=.1^*L^8OG[3.5-6PUI999UX/K;/. -M;=V-G+KKEG0^*=;,;N3E0>?\4>LY32O$./@+?%^@W%T#K& -MGUT>R@D?9/=USC#6]#2=#YL\UIU?/V^FD/]PK1C"_!]>S<_-?,7\](U[UKGZ -M]0NWS.F6?#V#%,83YO_L"M9,93ZU",93/I-OZEG7G1Q96<%W6 -M6=M#MYQW!%@^:5?G7V"6/WN8K7NI]T)T[MHU'!F*4F7\?.^3RSUCL8+&WM3W -MA.BW*"=7V6<-[&FW?P=#9T-B/A?27*8Q!VWTX]&#_#<8-W*8'I2+Z*R&V\M. -M7"2_S6,GUT#N@P3;LV&1<&KYFY-C>YG^=_<2>NXLKI>O,)W>H7*3#7_\ -M3^B#_R/FT3?I]VJIXV].IO5G,M*_YR&FO_OPM&X]C[WW(8KO?;0#QF00 -M&#+2_'U7)T3N_MY=WK[T[L'4FP)T/V&C/@8_ZSMH\RG$^WMET;L*\2&-CWOG/Z7-Q]7E^>=K%$WDCK7KJCKF1WF-A -MWC$W$"_:ZZF->AW5>8_,'_ -M*W^F/?[,2?ZPO)&B^_%G9=Y\T?_*'_*%^NY.[!MQ^[//&7]Y#.FM:Z&^/:&] -M@\M=N0;\'R;8]_P=8REZ#P'Y>[2=G]U8/\+X^TKX.C^&OF4G0BCME`O+GAPS -M(3OKY,.,YFDAI]&[]NA\L<@(EBWDS`S*CR.A!-O+KT-T/@SF_+BUAD;>SCWT -M_/.YL\\__PZ_=H]4@.^">`?%^#F=YU#:1UZC:SF]'X&?:YC1/,7W=>/WZ)T( -M%\GN%;3KL?KI=WVP.45VL*;'K7,Z1OAY&E@C#;#Q7H+]]#/+QAKP/O5K[CMR -MNLES>I+17H%\;Z/]-O:'*>1XK.T0N\^S,E++VX_D'EK)WM%3C;FSVO@[$ZG& -M2?M=!J#1;_G.@98WKXV?DVAO3*02;^BI.>17_AXGNJZ?X]?^_>TV+CPNCM\M -MQ+7_$,E],Y&)Z\^^"S];S7,*XM:8%??^E[A>K&UZ3Q=B>6QL!#@2?G/S+'?6 -M3%YEP'#X[CC]!O(*^NH&S12][R]%&,(VKI/M@W':Y^Y_@GP7X[R"YH,S-XYW -M9N9IB)=^ISB"F'0I)CV5>'T",>F("6-#_M'O,''M>I"_$X=?WPX4J>,[T*&* -MS]0I/IH_!UX@^NO"3SH?'.\#?R!Y\@5S"39Q@01.\.&HRFZN=EY[1U?33%J/<6OO@;5D8CV: -ME$?N3KPZ8*^[W$.A#+I.O8,853KRM$DZLZH4ZTA)QYB'S,-/_PS7^KEGCLXGTGO!8)?(U^R@X_2=<4ZK_]5['^.<+O)99$Y:T_U*O+?\0WI/=9H -M3H)]:>W+,M:^91[O7IV:R#-#!_+,+]GH[U*FH9O+NU>GY[_U>U9[KD"^0HW[ -M:-_BN(\66)_5GFJW\N#HI+,_/+SVK5"/K'WQ3]K[+G"A8AG'DG^5U\-]Y;@V[C1A_HZ;*P4';+_(%[7'@T],.[?7CD]9YTC\PJ=(W.0?]?Q[.PX>W:(SO0]^.ZE -M8?K=6WP-UW>F4<><>0+Z_R)#N\$RUF3B6AG'Y[\]D^23][VF93N'HT/1[E#- -M7RUG6_IV1+N?V;5W.+0O%MT9&HKNWAO=,]RWLY=32SJZ^NDPG)KUZT*$3N37 -M9:4O_S=W[Q\7Y77M"^\9!AS(R$PLZOBCR30U]\XY'Y+0<^Q[?,]K&MJ8]]C[ -M:J2MO2$WMI`4S\,,.&-#>\^Y_=P_GL_S[-]KK[WV6FO_>-;* -MNG_)#Q]<*DWB1.+(PMTY<\E/3R!MU.#U(5[C"^!]R;VLX)I99X-LW&K!7"HD7B+]ZA3>"UW:,NAR`A<;2JFL -M]#7I%'R"\I.OG4[FM$-^]YB+;&0[S4W?VIK%K.,*>":GM2_Q_*S@9EH'&RB/ -M7,:0[FY2._1Z(YP1+1'LID;M^Q5 -MRB>G2[V^%_125*:63Y/T6FB+I%?T(QYQ<[7UAX9OX!;Z"Q@QD_V2Z\?"99%] -MJY"ZU+X*Z#]8[\Y"OWH4=\X\\M-&LMNSFFSV%94)/VS(3;,`[A=-*A -MR,<(^9"1:[S"T?Z33!$^*)"'_"-26:&'0=_W`Q=+@H-<^D\K#)+>3SJ17+L5 -M/"CX!^;JE<< -M6UUX\":=(RR[^9#L8Y&O$6U"S@S%VH\1:Q)!BRY3Q'@5DD^AT`#O`#VV8TZ2 -MKQ#A[ZK\*B,[HMU+UM[':8^#UO;DFP]Y;A-Z`?(\"/VD-7">RK?77M;ZZ1J5 -M?_UWG,GL'U!80_7?@<9V"=W"5:W%`X:.BJMD-PLZ$.HD -M?;?@*78;^059$KJ/D^_2@C[>!3W23[H*Y=]]5=!;.^G"M-=!,'CS'U#U%M>0 -M!DLQPM%P4XEUW:"+)0QN?'+=H&LC^/]SR[0]!.D_<>-W,1\[D+8`:6WJGD8' -MS4_TNP1?T`CW%+UG+)Q&2KRHN&,$8=ZIQJ%[K&6@\CFB*Z1SFS7&=L]-W,SUA_ -M8MG"R/C['\V%$'OB\<>7KWK6]FB>,&)F?WI%SKWT\3?_:%NY?$W6$SE@X*DV -MQ,K/<;P\E71WVONPS20^^[/SM#Z@[T[V0AK>D$$O?$WR[O@S@Z[B0HUWX[O4 -MQY+2!1TDS,.<*L;X;^R3LOX1GS:OZ1\>]"]=*U:2;R@W>/DC/I[TD!NX -M-Y%LSKO$])/[R'<4V2@L'FJH$GZ>_.0'JHL5-T*WLOB8.QWZD+]X'3/6;.== -MH`O?H.L%RY'UTJ=W!9UE(!YRWR=E0E:0Y`?"A;PD2]L_BT/]N=0?Z",&Q25L -M1.I4G=6@8.T!GI-&?([0Q5*C\`#-A;A=VL1<."=Z[7>)D&/T'#BK11KUM)9L,/)\E -M')!,J1T6=MS,Y#L'X]!"_:>ZN#LS.SB8^4^`.9WVWC>LYSVVQXEO_.Q[Y./* -M]J3\=N9P1>!O'>'O9]_;T,.5ZR[&F\#QK^M9<`AZ/>#7.R^13^(ZYLUWT[]= -MQO)US.(,\"'R`]\:J&:MN=7L1'`;>#WY[_G9ON;\;0RZ?R*^OV;[[]36ILJ3 -M2T^QD^FGF.TQ$:X[Z3O!3GI.,&>7X#%ZS'NTX49==0RXM"C]UB3TWT#KWM8` -MY,C*?R$8OU9[E1D]*_]=?(NU'?KKS6FGM6;0V]/.2*:"CRD5!&-(P@U\&;3R -MF$MJ^4U=5+Z&\`&86I9*G#2#*B3,P$\V5\H%?GHI?SKAA_R!*:LOU0&V=.>0 -M@%VT0>.OK@F,X*4FSTHJ4UQDSC`8E8'+]177F('&3?`,D2YP[I8T6RSXN_`# -MZBHVT#]X]"]>[19FJIW"+"2S=PH_5C\;U7\W3R.[5C_+T`O?H=G:O@!XP\\@ -MTTP'U#T$OT:GF!,]?J)+L>?A0WXS]^8'(WR@NN=J]*C!0_,HZCG9:MX,'9.5 -M@X>9L(XU=9G)IZJI-=",L0JQVEZA@^H>#/C-X)EMA*.(>'V%*DL0/WO)6H)# -MRA=*(YO[2];ZR3=+<+1,?V825M2!/SJ=UUE"-WOQ -M.;23W1IL$WM,M0KDQ!4K4_=,G9?9YH>QQK1`]Z+UMY-X$.EM!2&6X,TC/KD% -M:]H7GS@Z1/MRF%/&&FMF%S$[N-ZL]C75DI*\WG)EGJY1YMM -MBMB?C4-;9VA_EANS.JII_R&Q/,.?6);.,7:#KA(DCW<=>7"_'2'PO -MI/3@")WA;SY8/4SKR\T.[KK=TV]TI/_`6@@:?+'2I]M8)=>M\G_06'OR?)X;U6$_MRC25SV1I2)O9RUX\']2S%#P6_RQ'(NI- -MI_5VRU72MTL?$/KB3C9'07VTSJ^8R>;0&A]Q]JP0UOL1Z_R-,UGJV'9?;);G -M0N5BG;;&SV[+_1;Y:BWU<%<D[B5@[6[F -M6.,;^(A=+^)T%L*E1<"A_EL;VOBW9#==_%.;]:CYDIA=W -M,DO+XZ)?[7).&AC!J[AIOH$V`#>U)WRM!Z]XG'E<\3QY%7.M;(9GU3ZVI"LH -MSQ67,?]NU+=[)K-TL[([O2O$VOL.SZK]J+OL_R:>70;\2-Y=UN<=:FRX4!ZDG46]_T#[EY0F]Y?">:K1'^!JSB[@2*[URA83K#Y6 -MMLB;]VG4LP/B`:#[HE:QQU9^[X-!A4N^5NZ';I.-R$*S:&&,]FJ_0?N!,X'O$RB3]\4K4>U;.H^R%JOQ:V)^8 -M7W$^JR/>Q5+%_SXW`LL<^G1 -MOJ%/HF_HH^B;ZLNQFU6*O;B)]:?2*'&[I=`SD^IXZ8B`$6,"_C"]EU56\H1- -M=1.L;8!(K@UKXG^J->%+MB30XF..=!A -M@N"%*;M7,2O65"E*B<,">9XB^WU%W0N2ZFMK+MCX5`NP$MT*P -M)0%&XCFT_W[%/D7`=\5N)'L1>)L0GP*Y;P$\Y*-*QY^V6Y1$AUVY8D_&>XZ/ -M;?$C/87>"$?UBUWQ%IO'DZ"S8*U37^#7O_`62YT8;6ZMCL4':,^(ZD/?IO2R -M;45CQ\\FYH2<3]L6TC[#Q-K=EB+6HR[NGF"Y11H<^#;&@GWB>-BV)U9=9=N% -MO0UG^7;HAY`Y#5;R8P,>O"?`GJT!35UBD[W!Q:RA.HUA'6GB_?8I6T$[X?&/ -MXZT!E'G6;JG8KNF"+S^U'G2(=39]KUA@X\%M>L51[5($H).+.I=Q>94 -M7P4?@SS-.B]E/ZTS%O>9>>BBG=7TAFV+^)^UZVM=W!IK+[!BFCBO$'>T=D\! -MO4QC;-L69B"?9HUU\GRE(8AO*_&:[?,U&RO1^41YQCU"5I=G3&S_3>1CP;%+75\)0%K#_^@1^Y'OY+F+58B]/I7;J4TBO-B_-/%N+^2 -M2;J^NEXZ;!N-DW*;]J-VRSM:R8.N5W)][-,TP7=%%!::13ZR%S -MM@M?['U2WEQ5YE25H@_8SJ'XIBU]IHS9H+2%ES"MM-\&MG7"K -MJ.LG;]\%B=M\%G?/-F8]7.`S).<"OZN8N9-5/47I-"<]=],>4=5Q+\FND4S3 -M@[3&%;IGU8&[4`YQ4]Z[/&2H6,=2R5\TX@7?\T__Z>#74YCUZ]N8'7WP^73% -M`M^B_UA7[PHYT>0HSO6[[XLY'$;[4,H[K*%X7.2 -M'1LD+#LV-.0R5K.=GZZ=QML&73LR?.P5L9]9CK"@*=+O-M&:XX*G#/EHKR(K -MGZ5+G;4L&_(H/:+_G],>5%3>O5/J?+RDU(UO`R]YV8:W$?.`UFHFT!N]+7AG -MX`TYM%7HQEBS6:$7&_L32PMCW:,B^J<]#6_Q?R=]2D=[*[ULIZ,%ZYXE-8P] -M&^3#MMO8I$[$.6OH?&[G_+'GFP7PKN0NM.!]\%!UTX' -M\"G6M1.;LSO%G?`*6@\DKLB0_=[B1MC($[<<4/OM0-AB4?'0.R -M"4;K(^0K`SS:/;5!UZZE1QQR#YG*!E`68X!YOFN%YOM=Z]=&](?2:H6>NJM4 -M\QT/V@E0N8JK-+YH:Q7ZB780MD@ZW?F$7-OL[)#[;Q(VDCUCX$N,H)&95(=C -MGJ21TDJUKRFRKV7I5*?L[ZZ%L>9RP=>@9U4#2KG.FN^='6#>:H4IF\L*TPNX -MIYM5%[4.]4Q0;ZB6\G^XD'G7_QTC^7:9U;SC]0O_5/1=0^ETQD4R%&M:A[:F -M5=;1?0?$(\X;\!./&TWCFTL=$E*@GCC_=7&:NMCRLBR;Y"7DTG45%WY-+DT0#O^7 -M:&-$ME&[],]KHW;IS=J09VZUOHFOU6J%CUSP;X?DV74_#+J88<2]Q2U\J.I9 -MH;:`V+==&`DJ:QMV%6;1O@F?6Z7/DQGK8$3 -MS+NLB7F#39AW6PZ`+[D5\"1G%P\)?.1")WR,Y,>6_.X56//TJ6L>LBOGRLL9 -M=+$,LC/7FCO$R`8>G;6$GLVT+$\T&G7^-71_! -M,PTTGA/#>9W8DPL:2]TC[I=M(TGEF3ZV.V/85=,<;7RU<^QM$7@],D?*%M15 -M-9XN%CZZ,N?IQQ__1]MW5_[DZ:=R'\U[XK$G5CR1M_:&>R4NN>:FNWCA/:I7 -M[YPX#=7YY;[-JVG0)WQRW5R>X;DC1/3DE_2UERUU>0'@G\97K7]S+H -M)_/%W41:TPO=_=4WA4P;8,3?]G2R5P5_XX/6/0+.0>LOA&ZU.>9./NC8 -M2??YY-QZ[1OJ^8^!N^KVR3L:KS:.WG4R2EE'\L!K&&"8DX,DNZ@LC2':]M,] -M#GD/]%7(H3SWQ'G2JT&)B]>@___2*/<:G&+_BJ^^5+=MG?@OH4?"^_IB>3:: -MU=CHKOU1/YY9T;DYZD&?5*;;[$C-TL=<*:0]8^&<> -ML"SC[E*WT.'T(IS!05>A@5`]OI=B+#+QSJ0QYDZK.*OB1D>ZM^>"1]1)?DOS -M,`^%CO7:A[6H7Z'_!:Z*L_HN.G,7_PQ?T=/XN[POTJ6=#K]LC]VPD+WK] -M.7F_[O4%VC\$/O9ZGE@#0U>.LR:M1%JV=KY-^K./O:;Z/WXUA_"!]$)-1^\W -MEF7VN\LR`L:M+.`NA'O#I&X8$3>F!]U#X -MO./UWX;/B4+J?L<>5;?98Q/['9O+TEY?/:27=R/VI/C8&SG:^@)]:J=ZHOKX -M'=73]PC?NW1^HQ!/35J1+-#_GL:(^'3!-[?36MC,&]:3C=9?>'RLXG1$GKEJV78?*P]&Q-O5>+^/=2^* -MB)\=BX;FF%C4M9*N*GH\[9MLPQP7=U_$';"]#]!_;>8:WFDKX+R3[4U5>6%' -M.=;==#^SB^T5]R[I7HNXL[F.[FS^4OC^NR>_D/8-_.)?.-0K]&-UKQYYCM#< -MIWIH#>_-&Q;W6T@_H3C2$PE/D?JPE#U['U#`9RF==&F:WY2?SIDC\_K8W@7T -MCK/>-#;2,#/!`%W`_YZ!X@V>(-KN9^YUIF0/PM#T*7?S!WD)<]1GCM%[=8"!VG,JM!_] -MAOBGE7S<8@UMY^^3;"S--1%=_9\D$:XF/U2<[?-Y9*_I*9(7G$&TOY -M:W2_]@W:_[%##D?]5VT#UM!!XMF7/7K)DWZU0-$;BVBO@/1$OCE[]J\O#^E; -MUG6QYV]!92`ZGT+>BW^JN7J$+DSWG@N5B;1;?X@@R;_ZGK&`5C=&O=M#Y)=W107Y+ -M+_O5&^8AIL>C\SQ).MRO#M']91_[-:,[RIY5WZ&X3YSGQ3TMG[S[_*O]%`9M -M7>!)/RE^:W@H7NK_O_J-*A-L&+/9J#OFOJ#M-I8"G3T.;U,WVW=-S".QO_OK -M;R/N=NY^V)85HO7UP[9.]NL="JTSC0_;N/N1MJ]7,YMB?,37&KC/D[66]G\N -M@:6NX2O?>W\3:_&%;[CJBF3<-ZKE.VJ#KUY6:[/6I\:C+X\V[SR/_<]CW -M>4L>Z98/VZ`'Z<5]XQ+17AW=.VO-O\_#C8_4"YK*HSN$Y\$ONF1[)8_4R?[O -M>X#Z@'SBOQ)OM3AW]-$]&&6@DGE6$7S[OLT3'Z%[>_0MSE[EWLLR)O<3EEGD -MWLLRV\:9S-*?N"Q-XF5?B>U)IB?X)&[?-#@_1QBT3OM%LOU?%S;T4!_$')K> -MBW!6*)W&LI!L;Z..XZA#A_<[LO]:/EF7C^W+IOK4-C`']_U(C:^2^47\5R/B -M*ZD^O&W]2?]LI72T=8#N%5/==#Z/L)W:CL'74^A,.]:_&.']TC<7C=DOU?,V -M<8]8[L?VB7U$\''DG[1;WC?THTRA=@Y,=U[5/%VJ;VY=)WOS!56O^H[6CJ@3 -M]:'L0:V]W#M(9WAK,?T[4Z'*"ZESO1G2]C-I[U>MUX1Z'Z6\/O96!OUK@_+0 -M:=X\PY/DO6)):V^)LQB2$5G7Q5EW8;3^CRLS/_+_G6CYH]Y#';TS_E;EZ!UD -M=\Y\R1O?ZE(&^%X^P/?374:^FA\HARQS7F,SZ9^R@ES>*];.QNRYW)T]K^`: -M2RJ@_Z/`.^BN$4]$?$GV/*J#[K0YK[.9!4(.O'U:TDOV(OK_FN00K=.DG'S[ -M`,HLXG1?'3!@GL;ULK>7B3KH_GH^/P<^.XML%7CSAYB\!_JVT`D[V=OY=%:` -M!S3\]A,J3:;[6+UQ20@,%-_TIC!HT((\.Y"7X[U,RQN17C@NG#XN;%/_U[8- -MNMYNULX6?.QM*\&.OLWG23F.0<+MB&.G-]A#_\?,1]XA\!=+Y-U\T(+T_UWR -M<'JL5S=[Y[O-T)S*:(_1F!5(+F*YF&MQP,=YHMO6GCZZ#VKFKC3A -MBT#(\$"(=]N8(= -M;#;]:X:Q[!)^$(*\[_5A\H/P*?E$UO>R=[(-ZYFAHIM9Z(RW(3B/_`(8JZ

    WSL9;&W6HKX4KJ3_!@SH/U[Z4X_OC%6[ZCWDBNE^ZNB#/+84UI)/NNG+ -M]M;:3UFK]2/1#LE1SZK^F]7MA^[#U+K[4'=*[+I+2-VT'^&U -MTEU[K#QGL,FA`>ZG.]CR'LR[WR/]4>P9EV3UB#O:EQD+W\T^S^A<:-#U[ORP -M?CFZ5V;QL7>SY1T(;0_DW:E45W0XLO/DO9EW=VCKU/[$[#RU+MOX\QK-X_CR -M_#S-/WF>[<[<)/;]Y3]9_L3JY3FVI<^M6GG7TX\_;EN\_-EG'_WGY4ELZ:I' -M5S[[1-X33Z^TV1;\?9;CZ;R[OK4@;PF8AV=)EX+<.EV[G3?OVL[;NMDGST`6M2.N">N(#JQA_(1[Q"]& -MGL:-T^C_B/TYT$\SPO_&G!+K]A>1O^*/S`!9?6LO^^2;9!,(<[,=\V9-)_(X -MS](YT_X]8\^9_A5E?V>7#]7SN[GRH>_(YQ.[?,;'_Z6/UOZ?6_ZC.3=_ODS[ -MIXK_]_;_+RG_4>K-'J(AZ!L=Y0/,"/K97SH,FKPF_DOH9FY?/ -MNPH&2(:?"H'^#D#GZ8!N8"I3F*45M+*XCP?)+@3=E?0BW+QZB)WT?T'GM)[6 -M;/"-#D%KC:9LE@(Y<9"[\I9R?=X"Q)U^6TF/?WM=6SSQ[T[V;W>I-/N"_!?B -ME-#'`.=IZ+*0&:<^QQR'[#[U6W6-3=_/J7K3`?+GTP!^U;"",=!Q/.`\3;+L -M[77I\71&1'O"D%%NP%58.XVOQSS:B_[L0=_W#;K^K1JR0_Q7A+GB`6Q[(;?< -MBW_$;B]#_G+D;W9XZ%^I.@ECVR'TI1ZPM4D]N^U.%8YFJ=.TT;]>*00#R>AN -MYA7KF9IIO%B#<=!U`/SK7\2>WRJN=_<0;H`3?2?S5M)>!=HY*-=9 -M!QZ@_TL!\T&T=1#U'RC#N&T<%GN1O),=S)?_=![('3N7#^;C`4T>@C<^I`-#VCZ4!J>>7C2\2S"@Q$]A%H/N?&@ -MGD,'\$"W.X3R[Z&I]U#V/91Y#V7>6X@G`T\F'I1[#[U^#WKM>]OPH/WW#N)I -MQQ-@[+`%#]H\C'*'4>8PRAQVX,G%`]@/H]SA4CQU>`#W8<&P/ -MVO0`1@_*>5#&@S(>P.A!?SW0HCPHY]F'QX,'\'JP*O($&3L">(]@3A]!FT<` -M(YT<'D&9(RAS!#`>J<>#/AY!N2,H=P3]?-^$![AY?P$>P/@^X'H?^=X'3.^C -MW@;@L`']:4">!L#5@#XU`+:&I7@`6P/R-Z#NAD8\R-^(^AJ1KQ'X:D1]C8"[ -M$3`T(D\CZFU$^XUHOQ'M-Z+]H\A_%'4?1?M'D?\HZCN*?$?1_E'4=PSM'T/[ -MQY#G&.H]AO:/H?UCJ/\8\',,98ZAG\?0SC'@Y1CJ/]:&!_@\AOH_P%KX`[3Q -M`7#S`<;D`]3S`>KY`'5\@/(?H`\?H.P'*/L!X/K`QQ@=DS9A')J0KPETTH2^ -M-J&=)N1M0EM-&+\F]*D)?6I"F2:,>Q/:.@XXCZ/,<>#_.+2)X\AW''1U')K: -M<Q)C?1+X.PEZ/(GR)Z'QG$0= -M)]$67;EO1CW-J*<9=32C?#-@;4;99I1M1KO-@)'^4*(3S!;D:P%_;0%-M:"= -M%N1M05LMQ`F!BQ;@K05E6M"W%K35`ARTHDPK<-"*\22.V4J:%^9J*^!J1=Y6 -MFJN8D/3OW6A;^E'S@U7OK]GLV'*+^(^ZF(\ZMQNAOC -M[*/YZ-U_4?I\T\JK8;]6EL)X5ZMOA,DNXL%B]5VIOO.I+\Z^4=BE__<^4:]! -M;4_ZI1L;I[LQ3O5O/C:?[.<*U3?B3QT&Y:*$7\-3C#1=[#0[BVQ#]#L"9H(W -M(MX?$1^!ET-Y(GU,/82/0XO4=[;Z3E?QHXUGO-H6X3E^''XBXW0WQHWB)S*? -MAA^_VL_X*/B)EJ:+G2;P,]I&!'Y$7!3\:/$1^'EOFXJ?B'H('^^M4-^%ZCM[ -M+'[LAG!;]O'T$QFGNS$N$C_V\?2C]M,>C7ZBI>EBIVGXL8^G'Q$7'3_V'\8/_8(^CEABA]MWB>H;=$<3QB'G\@XW8UQH_B)S*?A9TBE@X0H -M^(F6IHN=)O`SVD8$?D1<%/QH\1'X\9Q6\1-1#^'#LT]]>]1WG<9_")8(OI$P -MRC?ZY/S7^)QR4?61/C9-%SO-'EEN:%PYO996H/(0X?="#@B^JOQYUA]5B+'(4J_(]-]T*4TOA:N7_)YJM\'G4N&C_C5MT>; -MOVK^^'&P^-6VXJ/@/S)M//XCTF[`?V2Y\?CW1^`M/@;^H^49C_\H><;@?[2_ -M4?`_IL]1\#^FWV/QWU"J\85P_9'X;U@JPPVYZCM]+/[MX^E?;C?XCTV+@ -MWQZ-_B/+W03_]ECT'RW/3?!OCT;_H_V-C7][+/H?T^^Q^#]J&HM_^SCZ;U3I -MOU&E_T9!_Y0>NBC]B-,[DG]&A'5CPU*?BT@?]>M+<1IN1_G[C?&ZZ/%VIM6I -MZ7AJ^A@]3XV+X+G''/0.EZ7^'5NHOC/5MT9OHWJ/Z'<4_4F-OT%_NC'>'IE_ -M*"*_/A*OXW4YK3]J^@VZGM:WV.D1[:IM:K04K4_CTL;T*S+-A_58I&ZHT8^: -MEB[#'ZCX_"!-F[\:[XQH>XR^%='N&'WKQO@;\*GE'X_/,;I?%'R.3Q^/SW'I -M8_#IC^2-T?H4!9^C_1J+SR9/I"XY%I]-ZCJD::_Z+@SCTSZ>/L?H9V/;M4>C -M3S4^&C[MT>ASC*X8&Y_V6/0Y+GT\/NW1Z'.T3]'Q:8]"GR]\GP -M\2'UW1;F;](O.[W'\K?1L&YL6.-OH^D1_,V>$)V_C8G718\G_F:/Y.D]:OHX -M_B;B(OC;R862O]DC],F3=O4]3WW;;N1O]H3H_$WU"W\#?QL?;X_,'X6_V1-N -MSM_L"3?G;['2(]J]@;_=V*=Q:3'X&^&N.2,Z?Q-I-AEN5O'9;+F1OXVV/8Z_ -MC;8[CK^-C[\!G^/XFSWAYOS-GG!S_A8K?0P^Q_&W&_L4!9]1^!OAK*4N.G\3 -M::J>U^)6WW*]C/[1_E'D/(P(Z\:&Y3R,2!^=AQ07;1Z.B]=%CQ?_5X;7P"I, -MX^>A&A3:,S?SKGI_B*[7P_VFK;N%WVA6#^\;7_Q@CF75N8X=GU?"@@ -M[G^T56KG]`0W[0O2/2^"A_H0$/>MV_:'^R'3M?,+[1P%>=I][!UYCJ&>E0=>'=A^;6:_>_^Z@ -MOHOSRP)F$&/T1W&F'&@=ZF/%V_F^47S0_0>RU;F6\!&B>R.]A!>TX4$];71G -ME/`P0O;[T1;A8_<69B2<-&:GLV=!;PWY-.X?[M7^M?6QMFW`C4D=WSHYMA\V -MC1];#2>$#\(+\F#\_R55_;],Q<>I']*]&\*%Q,&IV1'G6P('VKC3N0ZUB3%L -M0[L':0SI?V"RDT@G`(.N4XM\[!^6C:.O-BJ3LXS&[=2*\3!J9TIH5_CT4,=Y -M"O)6A6E/CC&-5>YJNMXQ73V13BYJO]ZT#^1K+A0C;D;NF0=TIV80[N1CT^]J]!V@$/)HA[)>*L -MNV(`!]'?D7-GX;P.XC_>_4-&#_:BW<&X&K''/W[;MF/#*3O4,>H69[S?72& -M;"A1/M273_\RH;YHY*?!P.I7Z -MR=W95GE/XN,4NG^#>K^).N/0;K5V%Y+NY(^XWCVT2_"XT_M'_W=QY\PUZ=*9 -M*9M-K=;S2EG/Z2&]>H>?[N`IJ(MLARHE9(-ORU[Y[^=6"_6%[EFH=F3_GT'7 -MQZ;PG9_3XG_F.*OY(N(C[C^?+B7XU'L*2K7>RTA?!U3X"M(AKM)/RYB(9/"YL)*@U@G#[ZA.)I'F">[R6Z5]O"V'RD -MVK.1]*V.)>CFHTK"HQ:OMOU-Q.='YE?KP=A_E$OTYPO/$QI[JL=!XS*N?M#( -M1]E$OUJ\"ML>E6^T"YM8+L8\CW4`][^SUV[G532?-JYCIC55;+*<&[^SJW6V -MR3%J?Y2[S,$1=TX:ZFCV!N6KQ/WQLW$Z\TZENO-#0C?0:VY?21[MI%MD*RU283C3+3] -MP.YIO+J"\`&:1/AOM/LH@*6:^-K&'TM?#71'JYK\>9",LO*AQFJBO]_/U604 -M8*Q2S]I?)GD%>DR3/EA^WR+[^?O]\LZ_L&],X3K0U/]0Z;E=TO/OB\?9V-4C -MKBIL;UKR/\3M"]/A[W.I#M2U'/$1]H]E7FK/C'EASF=3=X_.BW:+@$7<:\)< -M4.<'S06:']K<(/DBYH68$^VVB#;[J"S)OWZGU82T^9`GJDSZ/9-R-2<->*ST -M%/P[C>,7DOY^Y\?85=$8`XXBMTEDIVJC3 -M?(L1/0022^MHS,OI3CK&6=QU5\>:Z(#&VUSTWQB-M[#SA7AJG\8;=4'^O94G -MX6T7=U,'79^PR/_Y4*>MT182]ZOSOL:F-MH"9$/X,V_P`49EZ*XUX1#]/1!G -MM=P+&@$>/ED0EE7[Q1QI@!SY>@JS82Q2D)ZCZ6SWI-`_!ON7`AZBM39\IY,\ -MB7'?SZ)X8YM;I;G9F<4L58V5TA]LUB3L=W!]I#[P@GU\CF^"V -M5>PKG>Q,&MW/P/\\//IP?4[X5_XMF/O.CI'SQX -MFB4?M?QTT/7I4HUFU/L\[?1O]I*@D^N"C.R)86RLC&_\V^][UM$=Y4^%/"<; -MTA/[Q^E3R:?^`3KXNW[U#O9I5?^C,C_4X/()'`D;2U]!_HC[GY^*_\LD37RZ$/U_ -M7L"SBGV5[JZ:0]Q#.C#1(L:A#3!>R]O`]$B_'3#LT70/E+'$#;$4TCGNW\!N -M1QM5&LU4"#KY@Y'NW0E\7J9[I'\HC@LP2T2[)\/?MTZC?.8`Z3"QT>531W]:ZRLP3H?_*QCO4_WPL*)__?7 -MH=ZYE?9E*$RV8.0=7!MPT+&([N%2&-]-9*<-_*=1ZI4=?FWL("O`-SN$O%;7 -M#HUR/I])T?)0'91/_I/7826;S2ACI?HEO=\Z&_D7A'GD'\2=^8:^R/E_)B>\ -M9OND_JYMS!9MON0'97'>$+,]6`S/]6YOIH9UW?QGM+'XXU8-4*Y^XK#E3NMF?RR: -M&&QG%X1A.[O@?S%LEC!L#L#VV5:<]+<' -MAO3\:<=.GI23L?NJ@;T]X(>.XUNOV=K6ZC-7W8QG^=ZYW\',Q+/H[=Q!-C8F -M&>__@G0C7Y-F7T.K:TG/)&Y>S^+(Q@?]5^BU^MF<]2Q^23[J'V+9YGSI0TBN -M@\].CEO!3-M0-[WOMSKYQAW,0+9`R*:'M.>18!QTG4W3VOD3.$V6..V\,XS3 -MLY^$<7JV1.+T;&$8IYW%?SE.S[:%<2KKNSE..^-CX[1S=ABGLJX8.$V(CM/. -M1[\<3CN+OR1.)TN -M>S@V3L_EAG$JZYH83L_]!KBTJ#BUQ,;IN?8OB5.SQ&E72QBG745AG'9]0^*T -MRQ[&Z?G4OQRG7?EAG,KZ;H[3KC=CX[2K,8Q365<,G$Z*CM/SB5\.I^=3;X;3 -MB>DPY]-9C'_A)EB/.U8]A$.R>ZVXSKMKE00C_<.![W3H;?=ULO,?URKQ1N[: -M$51QO;RS`VA/?@Z[N=.@V,7T4 -MWB'7LZH_T>X5H_]'8J'KN8/^%^QQ;),^40/RG\UN8@O!=",>IZ2:$IU*[:OKD7G8AI(5Y>2$3]D#8A2X1 -M)\O@/A]$?'V\'KD0F-$O%6-AZY[H2,BWJC&6Q`?",=W#ZGQ -MT'M[3!'Q76K\K8B?$Q%_6JZ;>^:%[<]V-ZIQBR+B]JMQ9"-:*RO6.RH]_!>D -MK0_KV=GITC9S-W3Y[%C_'P('/?6C?@;=V:G"CQ+HH"4XCX5*LE.1/FK_-H1T -MKK\W$3QCK^(N(QOWMSO[R-Y7@&F^\\B?'MEA05JR\*.7&V!DUU/SH[>FC\W. -M_1;OZF:]P@YO[AUDRZ.W!'D]TN[AYV1#V%PC?/U]OFC4'HY[JQ'KAH"G@/Y+ -M[WV*\GC[Q!Z?$67.DFV?:XF.M&LEY=DH5ZR5"R1N!9_Y?)M/_P\."N,;:YBJ -M#&EC)^S';&*T];FP?\5YY@Y)HY\+.QV[79KOMEZL?_].[+$`EW:$4\(^V!YI -M%W;M-OZT'?&I87N2.N&#IE^L;WH7:/GI/V"S3O/QUVM3Z\?ZYS:_I('/\ZC? -MB,N_T8Y2;XV:?UMXGT;FI['TJ;B.:;OT;I9&]G_(]HYJ[ZF>[$4T6`-,^H&Y -M^/#6:?+?:)K32_*#G/*2[0UA%VH]^IFXI9[2P?.-PB\$U?EGVXB^.$==&_?) -M/8=>X4M.VGJY6$=VQ*7OO8O%VAQ1YP;H^&+$^4>OZH/NXC[M7W'ZQUO8J[6A -M;W?0_W9]B:!A<\5;+"TKJ&>[\2;[YQ.$5_L?.E/.Q=X>S,7,:/CVL;[4_S7R -MJR^FK4&L;>KQ',#CP=-$\BQKB*6#;L7>O.;307'UT3E">B?K^WFM8F#"MI1+ -M$;X?=J,\'@^>)CRBG/*^L']2'YE&MA.X:\-2RL.+#&)_3-DB\XV#0<]=/75J -M/LJH2RYBMBCYXKBK6ZM/\%ZM/^3_`/FU?`;NZCVHYC.)=EWZ:.W&<]?/C6H^ -M2V1]$7D2%-<9\N'9IA09Q+D"=_4M1/ZH]GX'79=`6WUNR6VCQVU -M!Z/_DRS\%UF6T=Z'W".[O##.FO(]E%^H[8&0'$8X4]N_EC:R+CLB_$U2.%_S -M-QG#[@;5?9SL$/N=.;JOU]+>$L+2/B2_S"Z+,S#-;ERD[9JH_Q*?@MP6_FQ6 -M/&T./KI<_N=[)8Q%_3EC3O;N#62;6@=\73E.::C#[V/?.*#R=O*;2SZK:._8*FP9 -M*`'A5Z^;77V.;-#1/_^*ZTH^G4N#MY,MH@!/RD[CB2L*=?R'J -MNA_/0^37"+K^"KRA4_A'_9^'_:;YBZ#:6<(V[:X^*OF;O]3'-@HY&*]+!ZS^ -MZC!]^O=J](GO_9J?,'Q[?/IYA>IWLX]]==_8MKZ8JNX[!N0YC=\/^KL?ST/( -M']1\B6[4"SL!W7%6LL'R1<.>(;L/OI8:-`^I68U2ZE66$IR+K,(>S\1MA_+ -M!L*V'\EV#W?5G";;CZ&2+?GD"QG?=CX0&L);^!)1;8L;QMB!?-I.]NYH[6`G -M^4%V("?&SZ]:Y5A>S=3\FD;$0?^_K-J_]:NZQ]5"'ROJ&Y5I23EB/8#T%#[B -MV!%M+E]->MEV5?@ZN.KQL7[AFUJ>,UWUC)__C_WDZ9SE64\^E6O[_M+[A1.[ -M5-L3>G'V_00+];FR?A>=&_C^8)T2#-3S7N")\YTRE]0/0?U/1MBM-@Z*0\KOYX -MTI>E?"91,_"4;ZYFK>3C42S#G(A/T[Z5MIT -MFI$MHR6A8%Q62(]W',\*&83M1+Z:GR8[CBC71KZ_0,/N)<$"]Y(0#V:%6`+> -M%\CFR9+0!2[\IPQ+?Y*A`=Y$-A=^#/JM)1N,3PI_&)]EK?6QW?@F^POD#U3Z -M`64%J.=X5FB23=IA"#3>S&]75#F6T&'AF\ZNY[H$QHLF81YUE_*$5)[09>";NCH0E\J+XM-X`O)L.K\?9=(0GHOW7+[I\Q2>T#,?>>:A##WS -M$=[+-_4V(FX^PD'_C(YY_L3S&?[),QS$:T/E4]N4Y&D9X$<)SFML4C<;_)CH -MR(O5$)U9D=TK2NMDUYX##YTG=([)TTQM -MI_AD*\+3`?^F2NYZY#M\\M0V7F9%V%W(-_W,C;((3\O@"9MS^::2?)1'>#K" -M-0?XIA<=R'\:^1%^UOBF[7G(C_"T -M93QA9QO?M&,9\B,\'>%?MO--U0N0WX?\".]#^3?ZD!_A:=D\X:T4_MH9Z*:W -M.SH`<[V=)_S+?-3I`VX`\W[T[5\=O&QJ%^K* -MX9L.%/*$?Z]"G0A/1_A@/4]XKPGY$;8B[/'QA`8;\O<@OX-O.HJV/ZA#?H2G -M(WP%6I+?M07Z"=07?=*J')WR>%(H5OK+(GWF[#29;F'A](H7"P_08II9GL9>`G=M3/[F=Y6,.=` -M)[N>06M<;IKEESQFZ)G@YN7SR3\XTK[G'-+6NB(^7][#$M\YY-=9_3?N1]Z'NYPXI?GVRG\7;5A]&_4,'A;ZOYN4)M[D5 -MD5>DO7JXP*>O%OX.AII']P9*9[:3C1^T0?L*!FFGX'IJ2Y#\]IU?>$\>,YB' -M++J"YX0]B8!GW2EQ?D[U(]]4GK3<3G9DR!Y4A8+ZT)YG]:?4[TN'K]+^Y?5Y -M$?[.VVBM3SH@V2;*"H7(EJ([]A[&]3R,3U"S^45[D+2'T5:E\$DS8F>V!QE;?YZ9NQAA=SN@CZ"_(T[$.>U)PTZ[B4^>55B[FIE".SH\H;(9?CR9UU\] -MDTY[;MZ.(7:70_A-3JDIP#RHZLB^I8.EC+QZAN[`!H>O\4V& -M8NA&)MO_2S)SN(O60#QADH?K#+/QV'P2UX!3.2WSC!@1#_ZG6X2\LWULN`_O -MJ.>T@ZZ1N1@?Z;M+P1PMF^J)Z5.$VBB?ZJ]4I&UCVRKBZR,_`DT6BK32&4,% -M7[`X2JNG?7*$;:MTW!L88BACX-:._/H!OQY]S6]%',H^5SF@UELUV^9\A@G? -M&>0GB&@5:PL3'@/:P=P8>8?6&Y2/FV8,*:@#?#*73Y[A4\IFY(-7IO$9'6W* -MCMGH4Q"ZVXA-6_^U[@TRQ?A0'?].D!W-N\;H#IU_\LQV/\9'*9MEP9.2NXKV -M68--(9>T;;[D"SXHSMU=9)=5VI84-LZ3L@;(EQOIM*3/@H;F<-)E!S".`\RJ -M^<2IB6+#7-514Z3_FVUUI,^*-3_9HHQBMQPZLAXZ2)O00:2/]2#Z2GM81M(U -MY#Y=,*#I"S1O0R7+Y^"Q#;I")I\N>71.@T_G*IOZ>U3;:?=17N`L'6W%A48< -M\_'/+QK,=3B*<8CYN7G"_%NQ+/-CQ5>*KQU.'9 -M@W6Z%8\-SVRT7ZKM>_$!GJO:NLLK`]S@4[,1EU^J2%M8SA6\RXL5=,$UED+^ -M<,E/_(:GV&SG)82O82VWEEDH'_G#%3ZRL+9;W\6[-CB0CVRG`@/-76UL`_WC -M&F+&UD"[L%^/<>WAKY[)B&ZKJC1?V/F/_XR;R6_J^FMD-S7_J#TP07\/ROQ8 -MZW2J'_-X9(+UE<9<]U>!EUD[/$$7*[P;O+W5U\>6!)BSN6N8.7-X2.QAT+X? -MUETT?T9XIFW$-",3,G`O^2(,@2]N('O\(^HZ;42NTUIS>]CD(O:JM,__,?O_ -M,GDA^&KRR(A]2NTZ89<_43&6YBLC6)>M8ZDUPRS-/"1IFOPZ"1^6YRTLY%)L -M2#.0+Z?J86:O7L?F5&/MIOEO?#!@YLI%._FV-28_`UI.+,W7:/W!9VS,_[Q= -M?]1^GHW,Z/``;Z&)X8TW_D?@;1A\6>(N^V:X>S0:[B!34H`_ZY_`7\I?!?YT -M.D,L_(6,D,V;S]"I"F0YG3$X]_+KXKV6F6KTBL.9 -MS\_R\EEUE/>>?#J+\+%:R/76@0#KUL5].")DR:S/%.Y@Q)M^_#?,,/*\XUNY -MJ]GME>"A(Y-GI?3J=.T/Y"HE6O[X/NK3_Z;5 -MA[97W#B608RE1O^D%]!XC8X?QI+&<,,*KB1'T+_0RS"&097^:S%>RO/@YJX8:EHJ2'?$YF8''NJA -MC^A'H!=4:OY@@>,0Y$Y0S]*3>YBE>B5+(UN!0@>Z@K97LM3=*]FV:,&; -MO\*A#[;TB7NG@][@&6%3#&\^X?@D8(1Y#YE1RZ'L8@O09XXD\# -M/Y=9*MI/P1IZ3NU*P.T$CL;)W!#P5+-2A;U$A1WCLCMB7/Q/3W"/2&>(R?__ -M@GFS)_J\F319S!O(<+J_"-HXIXQ@_FQ6YX_3\2UM[G3KXJ=^N;D3_\7_87,G -MA>8.S1LQ?_Y#YT[")W_=A/M;E3+>>.%7,HC?2&\G5CYD_*#?,G4A)NT_`]4ZNS.AP -MT'F7L)T+^-XK\.O)[W3M*F:I)7^@9;.L@,NC[5G%ZJ/P<3K+:E#O+M"_!<)/ -M1H5><8<03[[;Z-ZN&;B@LTSP-KVRL\-'?DG?6M>CIW/MT"NS`G2'BNX$D%^% -M;IWET)+/&;.M(GQ;CM.^]6*$Z:Q0Z;<:Q'TKG>4YVC,WYS)C.?JFYEU`>7TZ -MB_!AB7`F[<.2GU/:G^-5'4UB#I?.LJ+_3<+O#/I9@3XCCXE\QHEW`;-L0QS5 -M@[?)LW*8ZIY+=6@;>D#0_=AI^Y6AUG'.=IT;*1]4X4Q88M==^NW -M4;^!<#&XZ5:;3V=N'CV7I?O"NEOSJ1TJH^87]W$(9EM!'$?X4?EO4,(O47[4 -M_YM/E@,MW9J',>L1]_WTT6W_B_MLZKBU0*+>,'8:C8`N-!HA>-\N\.F%7-!- -M$;XVRC&&H5U6@]@/':%QZ:2TW]*X5*S#F(B\MW:$X1=EQ7@J&`MQ9T(WI4SX -MJ!K`.$[C@49HH)SH%C3RUJHA/:TS*/Z]JT/ZBEY&?H=8V9/,4+,:.$>=W-HA -M?*V*<5R'L5L-V@7.*X`_R!K:QW?4*LRD()]/-Z4)]5EJIG&_]*&7\/\/;IJR -M1\,AP43W\\J0CKPV24.W^K4^Q\)GV5ML=MG=;![M*?&X676TS_A@'Q/KLR4O -M?,:]_A"CO2':]PYM_-LI2]8"7Y"[SB%F\1;XR6Z#W\N^8*%GP>?!^R$S#%)!C958/)HF*B -M2,P$1X.`@@1Q0%1,0$%)'GG16DU,U=M7[JOD+6Z26E^M.B2E5>P6J9VX8-@4 -M)A.9Z$1FNM\Y?1N[>Y@>Z085X_QAR=R>N=WWG'._\]US;M_#5-FL##_F3!RS -MRTTPAKO@93R1]WO";+-9<'DCO*WN[V$'2]^!H_29Y`??Q*)L[U']>XMYV60CWF76-"]DRS`9W!>(/,O -M$$[_=G,O\8ZY;Q+FX5'_)1[0_R4WOA?IM)?]0)!C>/K,VL'ZC]ZPT*I4_]$C -MI/_H43!^O8KQZT=H_/I1,'Z#BO$;1FC\!MGQIT]F6&ZO0'@TEQ.C_LKX,G)T -M^!PR\)GS*5>(SN=SJ,_G2)_/43Z?C3Z?XP8^@Q\9^XW&\"7PT#*'QEC,7Y^* -M[^N"3Y\:H(9G[-<:([?_F2V/,;,;RPA3U5V_8!-@%^B/[3?>`1S!@.^[8PTH -MT[H_L>]J!QW?7GW:=('9K!^'[ -MK&/'=UNP3[_\U*8/@7O.7&@.(>SFD"AE.IV\3);WVO05M%^=FGYEU[^LS<`_ -M;Z2*?F,B`_3+/Z])3;_R=25M1OYYT]3T.VBOH*A?_GG+5/0;:PR@MQ!UMA"[ -M.I`MJ+.#V`#C-X2HLX&XJ$`VH$[_<0'UKT[W<1\&TKTZO=\E:__(Y5E;=!ON -M(6*JN]N8\.@_ES-I)!TP+**!3$SCUL=WM6YJ(EI8[VJ/;.S0VCVIZ'.\K45N -MS3W0?ARDX`+>R?5S9W=;;4D:X>L`NCX&-,T$'+,WN''=/Q%^YP'[A3[#]7+GA<#S -ME@.OQ^_BN2%)A42+9XK!=U/P#!&Y-6>?+>83_&U?:$Q;:3/A]J74,D3G"HTY -M,2>1O0R_MP3Z/>#\I$PCZZ3O_ET$V23\#67`VF*.NDK-\32>D$!P70H87<&M -M$;=U5W#GV@`6+S1K%?+'>"RHH6F+1U^5_T@8[A>I/H]TT?6Y-)>C/J(.&80YO:0=>5\9]P8]=U6\7].30) -M%="GU05\!KYS&._I3][]QLX=Q;VL-Z^?JAVLP>,J;T5:(] -M#1R=>Y]WBR7O]TS/6-,*0CRA8(NZ7=8K#9T9YU<3;6XOT<(Z-(SUR?=ORF>9 -M!3UC6!IOO(![T\(W72!:S/?;W1VDZ0KN9T\C^TNX?1.1\YZ'-6M__GBP%>;^ -M#I!!=6WA>TS[6`^N8UXSWLGN)>&X)P!X0W+NV3(N1H>QQRO]9A/T.<7SFCE^ -M(&:Y]$(D:<887F74&?A^"*XW<*\`\@.FWQS'Y,I,93J*!\47BOKG]+Q+= -MR:ZOB6>;L%=@7K>)W)]#M+A?8-]&DOJI^11APV*.*K>UNU/E<,)C[,SP@A[8 -MO7')OS_GYNK,,BV=#I0Q]^Z`T[]\\?V`<%,9D"7&0(Y<V72'3V?\FX1CKY>3Y91D?\Z2Q3Y"E"?J:`G*] -M*M/G7HXDW/L%E5%9G$Q='2"K75:,^8+^-%Z0*_.5&<\ZP[@RUFJ.W'^>Z$[E -M_QUYD]D+/!MEBK*G>9>IG>X[@^,HV\Q64ZY8QZF4Y+D;>_%-QX`O7?R9TY3%ALH?>M3@>GI\O2=Y`P_AMF)9&B_9HL -M[M?<7T2B[!8GIZN('L#*R_GCER1B_5^JJ_^FY3;*-55 -MWWK0U670U670%;_/<^DJP&E.5__&O;.$>QM15YB;8M:;X[B\Q4K0E1MP^F6\ -MMYD<6`&ZZCU'O"*-B4[NH#%1 -M<-B/G&%Q9SXU.Q5V.>]*7R>(JYP(QGWM<9,:-_3CF`[%^/5 -M,BV,3XQ7G`-XO\3)QW?OY<[(.[*W0XMV(L1W_X[7_M56=$X4W[V7X[L.C1G/ -MZM3"YW;:/NVPN%W(G]!V[LR&2K-I@!=>FSO,N$G<(5F&.R3_R+A#HB7HY_QA -MLCE%/2;?=R+HY_S)-/%#]3*='J?.SR5E"7XN*4O>SSW@#?HYL9^[/U*]GWO@ -MA-3/)7F'[^>2XJ1^+HG6P=9,WZ/26JD_2_)0/Y=TC+9/ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 22 05:15:57 2007 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 5582916A421; Tue, 22 May 2007 05:15:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 05A1516A400 for ; Tue, 22 May 2007 05:15:57 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D3ECC13C458 for ; Tue, 22 May 2007 05:15:56 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4M5FuAe032994 for ; Tue, 22 May 2007 05:15:56 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4M5FuTn032984 for perforce@freebsd.org; Tue, 22 May 2007 05:15:56 GMT (envelope-from cdjones@FreeBSD.org) Date: Tue, 22 May 2007 05:15:56 GMT Message-Id: <200705220515.l4M5FuTn032984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 120202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 May 2007 05:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=120202 Change 120202 by cdjones@cdjones_iconoclast on 2007/05/22 05:15:14 Fix usage string format. Affected files ... .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#3 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#3 (text+ko) ==== @@ -193,7 +193,7 @@ usage(void) { - (void)fprintf(stderr, "%s%s%s\n", + (void)fprintf(stderr, "%s%s%s%s\n", "usage: jail [-i] [-J jid_file] [-M mem_limit] ", "[-S cpu_shares] [-s securelevel] [-l -u ", "username | -U username]", From owner-p4-projects@FreeBSD.ORG Tue May 22 08:18:51 2007 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 A850F16A484; Tue, 22 May 2007 08:18:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 546E316A480 for ; Tue, 22 May 2007 08:18:51 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.freebsd.org (Postfix) with ESMTP id 0AB2013C45A for ; Tue, 22 May 2007 08:18:50 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54a5f7b9.dip.t-dialin.net [84.165.247.185]) by redbull.bpaserver.net (Postfix) with ESMTP id 6442B2E137; Tue, 22 May 2007 10:18:47 +0200 (CEST) Received: from webmail.leidinger.net (webmail.Leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id F37D45B545F; Tue, 22 May 2007 10:18:30 +0200 (CEST) Received: (from www@localhost) by webmail.leidinger.net (8.13.8/8.13.8/Submit) id l4M8IUEH077033; Tue, 22 May 2007 10:18:30 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from pslux.cec.eu.int (pslux.cec.eu.int [158.169.9.14]) by webmail.leidinger.net (Horde MIME library) with HTTP; Tue, 22 May 2007 10:18:30 +0200 Message-ID: <20070522101830.t3yuycyqswosgw8k@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Tue, 22 May 2007 10:18:30 +0200 From: Alexander Leidinger To: Hans Petter Selasky References: <200705212003.l4LK3xH8094270@repoman.freebsd.org> In-Reply-To: <200705212003.l4LK3xH8094270@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (4.1.4) / FreeBSD-7.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.864, required 8, autolearn=not spam, BAYES_00 -15.00, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: Perforce Change Reviews Subject: Re: PERFORCE change 120191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 May 2007 08:18:52 -0000 Quoting Hans Petter Selasky (from Mon, 21 May =20 2007 20:03:59 GMT): > http://perforce.freebsd.org/chv.cgi?CH=3D120191 > > Change 120191 by hselasky@hselasky_mini_itx on 2007/05/21 20:03:52 > > =09Add tons of documentation to my Linux USB emulation layer. You use a non-standard comment style. If you want to improve this, you can have a look at =20 dev/sound/pcm/mixer.c. For example the function mixer_get_recroute() =20 or mix_setrecdevs() has doxygen-style documentation (but =20 mixer_get_recroute() is missing an explanation for the route =20 parameter). It's not hard, just some minor reformatting. It also =20 serves as an example of good function documentation. If you use this kind of markup, you will not only get the =20 call/include-graph on a doxygen run, but also a nice API =20 documentation. If you use the "@internal" keyword =20 (http://www.stack.nl/~dimitri/doxygen/commands.html#cmdinternal), you =20 can mark a function as internal to your stack, the rest will be the =20 official API to use the USB stack. A doxygen command reference is at =20 http://www.stack.nl/~dimitri/doxygen/commands.html and the complete =20 documentation is available at =20 http://www.stack.nl/~dimitri/doxygen/manual.html for reading. A =20 downloadable version is available too (see the menu on the right side). Bye, Alexander. --=20 The first rule of intelligent tinkering is to save all the parts. =09=09-- Paul Erlich http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID =3D B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID =3D 72077137 From owner-p4-projects@FreeBSD.ORG Tue May 22 15:53:01 2007 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 0BCD016A46B; Tue, 22 May 2007 15:53:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BD58E16A41F for ; Tue, 22 May 2007 15:53:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ABCF613C484 for ; Tue, 22 May 2007 15:53:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4MFr08n068503 for ; Tue, 22 May 2007 15:53:00 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4MFr0nm068495 for perforce@freebsd.org; Tue, 22 May 2007 15:53:00 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 22 May 2007 15:53:00 GMT Message-Id: <200705221553.l4MFr0nm068495@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 120219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 May 2007 15:53:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=120219 Change 120219 by gonzo@gonzo_jeeves on 2007/05/22 15:52:29 o Initial stuff for ADM5120: - Serial console - PCI bridge, reads/writes config registers, mostly a clone of gt_pci stuff. Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/ADM5120#1 add .. //depot/projects/mips2/src/sys/mips/conf/ADM5120.hints#1 add .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/console.c#1 add .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/dev/admpci.c#1 add .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/files.adm5120#2 edit .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/include/adm5120reg.h#1 add .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/std.adm5120#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/adm5120/files.adm5120#2 (text+ko) ==== @@ -1,0 +1,5 @@ +# $FreeBSD$ + +# ADM5120 on-board devices +mips/mips32/adm5120/console.c standard +mips/mips32/adm5120/dev/admpci.c optional admpci ==== //depot/projects/mips2/src/sys/mips/mips32/adm5120/std.adm5120#2 (text+ko) ==== @@ -1,4 +1,7 @@ # $FreeBSD$ # Standard include file for ADM5120 -cpu CPU_MIPS4KC +cpu CPU_MIPS4KC +files "../mips32/adm5120/files.adm5120" +device pci +device admpci From owner-p4-projects@FreeBSD.ORG Wed May 23 00:12:54 2007 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 4F35616A46B; Wed, 23 May 2007 00:12:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E118716A46E for ; Wed, 23 May 2007 00:12:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CF77913C4B8 for ; Wed, 23 May 2007 00:12:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4N0CriB065797 for ; Wed, 23 May 2007 00:12:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4N0Ap9q063346 for perforce@freebsd.org; Wed, 23 May 2007 00:10:51 GMT (envelope-from sam@freebsd.org) Date: Wed, 23 May 2007 00:10:51 GMT Message-Id: <200705230010.l4N0Ap9q063346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 120225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 May 2007 00:12:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=120225 Change 120225 by sam@sam_laptop on 2007/05/23 00:09:54 IFC @ 120224 (includes gcc42 really) Affected files ... .. //depot/projects/wifi/Makefile#16 integrate .. //depot/projects/wifi/Makefile.inc1#35 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#16 integrate .. //depot/projects/wifi/UPDATING#30 integrate .. //depot/projects/wifi/bin/csh/config.h#8 integrate .. //depot/projects/wifi/bin/csh/config_p.h#4 integrate .. //depot/projects/wifi/bin/rcp/rcp.c#4 integrate .. //depot/projects/wifi/contrib/csup/queue.h#2 integrate .. //depot/projects/wifi/contrib/gcc/BASE-VER#1 branch .. //depot/projects/wifi/contrib/gcc/COPYING#2 integrate .. //depot/projects/wifi/contrib/gcc/COPYING.LIB#2 integrate .. //depot/projects/wifi/contrib/gcc/ChangeLog#4 integrate .. //depot/projects/wifi/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/wifi/contrib/gcc/ChangeLog.0#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.1#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.2#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.3#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.4#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.5#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.6#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.7#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/wifi/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/wifi/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/wifi/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/wifi/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/wifi/contrib/gcc/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/gcc/README-fixinc#2 delete .. //depot/projects/wifi/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/wifi/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/wifi/contrib/gcc/addresses.h#1 branch .. //depot/projects/wifi/contrib/gcc/alias.c#2 integrate .. //depot/projects/wifi/contrib/gcc/alias.h#1 branch .. //depot/projects/wifi/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/wifi/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/wifi/contrib/gcc/ansidecl.h#3 delete .. //depot/projects/wifi/contrib/gcc/attribs.c#3 integrate .. //depot/projects/wifi/contrib/gcc/basic-block.h#2 integrate .. //depot/projects/wifi/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/wifi/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/wifi/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/wifi/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/wifi/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/wifi/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/wifi/contrib/gcc/builtins.c#4 integrate .. //depot/projects/wifi/contrib/gcc/builtins.def#2 integrate .. //depot/projects/wifi/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-common.c#4 integrate .. //depot/projects/wifi/contrib/gcc/c-common.def#2 integrate .. //depot/projects/wifi/contrib/gcc/c-common.h#3 integrate .. //depot/projects/wifi/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/wifi/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-decl.c#5 integrate .. //depot/projects/wifi/contrib/gcc/c-dump.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-format.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-format.h#1 branch .. //depot/projects/wifi/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/wifi/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/wifi/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-objc-common.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/wifi/contrib/gcc/c-omp.c#1 branch .. //depot/projects/wifi/contrib/gcc/c-opts.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-parse.in#3 delete .. //depot/projects/wifi/contrib/gcc/c-parser.c#1 branch .. //depot/projects/wifi/contrib/gcc/c-pch.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-ppoutput.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/wifi/contrib/gcc/c-pretty-print.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-pretty-print.h#2 integrate .. //depot/projects/wifi/contrib/gcc/c-semantics.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/wifi/contrib/gcc/c-typeck.c#4 integrate .. //depot/projects/wifi/contrib/gcc/c.opt#3 integrate .. //depot/projects/wifi/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/wifi/contrib/gcc/calls.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cfg.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgcleanup.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/wifi/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cfglayout.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgrtl.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/wifi/contrib/gcc/choose-temp.c#2 delete .. //depot/projects/wifi/contrib/gcc/collect2.c#3 integrate .. //depot/projects/wifi/contrib/gcc/collect2.h#2 integrate .. //depot/projects/wifi/contrib/gcc/combine.c#4 integrate .. //depot/projects/wifi/contrib/gcc/common.opt#3 integrate .. //depot/projects/wifi/contrib/gcc/concat.c#2 delete .. //depot/projects/wifi/contrib/gcc/conditions.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config.build#2 integrate .. //depot/projects/wifi/contrib/gcc/config.gcc#4 integrate .. //depot/projects/wifi/contrib/gcc/config.host#3 integrate .. //depot/projects/wifi/contrib/gcc/config.in#4 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha-protos.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.c#4 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.h#3 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.md#4 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/elf.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/ev4.md#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/ev5.md#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/ev6.md#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/freebsd.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/gnu.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/lib1funcs.asm#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/linux-elf.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/linux.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/netbsd.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/openbsd.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/osf.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/osf5.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/qrnnd.asm#3 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-crtfm#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-ieee#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-osf4#3 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-vms#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/unicosmk.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/va_list.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-cc.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-crt0-64.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-crt0.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-dwarf2.asm#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-dwarf2eh.asm#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-ld.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms-psxcrt0.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms64.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/vms_tramp.asm#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/x-vms#2 delete .. //depot/projects/wifi/contrib/gcc/config/alpha/xm-vms.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/arm-modes.def#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/arm.c#4 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.md#4 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/ecos-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/lib1funcs.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/netbsd-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/strongarm-coff.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/strongarm-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/strongarm-pe.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/t-arm-coff#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/t-linux#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/t-netbsd#3 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-semi#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-strongarm-pe#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-xscale-elf#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/uclinux-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/darwin-protos.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/wifi/contrib/gcc/config/darwin.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/freebsd-nthr.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/wifi/contrib/gcc/config/freebsd.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/frv/cmovd.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/cmovh.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/cmovw.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frv-abi.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frv-asm.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frv-modes.def#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frv-protos.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frv.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frv.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frv.md#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frvbegin.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/frvend.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/lib1funcs.asm#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/t-frv#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/athlon.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/cygwin.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/cygwin1.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/darwin.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/freebsd-aout.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/gmon-sol2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/gthr-win32.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386-modes.def#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386-protos.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.c#4 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.h#4 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.md#4 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/k6.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/linux-aout.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/lynx-ng.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/moss.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/pentium.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/pmmintrin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/ppro.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/sol2-c1.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sol2-gc1.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/svr3dbx.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/svr3gas.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/sysv3.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/sysv4-cpp.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-linux64#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-rtems-i386#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-sol2#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/udk.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/vsta.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/winnt.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/x-cygwin#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/xm-djgpp.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/xm-mingw32.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/xmmintrin.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/crti.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/crtn.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/fde-glibc.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/hpux.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64-c.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64-modes.def#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64intrin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/lib1funcs.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/t-hpux#3 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/unwind-ia64.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/interix3.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/linux-aout.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/lynx-ng.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/memset.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/openbsd-oldgas.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix41.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix43.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix51.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix52.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/altivec-defs.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/rs6000/altivec.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/altivec.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/beos.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-ldouble.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabi-ci.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabi-cn.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabi.asm#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabialtivec.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabispe.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/freebsd.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/host-darwin.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux64.h#4 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/linuxaltivec.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/ppc64-fp.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000-modes.def#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000-protos.h#4 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.c#4 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.h#4 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.md#4 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rtems.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/sol-ci.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/sol-cn.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/spe.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/spe.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/sysv4.h#4 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-aix43#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-aix52#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-beos#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-linux64#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-rtems#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/tramp.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/windiss.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rtems.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/s390/s390-modes.def#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/s390.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/s390/s390x.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/t-linux#1 branch .. //depot/projects/wifi/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/s390/tpf.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/sol2.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/aout.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/biarch64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/cypress.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/elf.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/hypersparc.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/lite.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/litecoff.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/liteelf.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/openbsd.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/openbsd64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/pbd.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/rtemself.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-bi.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-c1.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-gas-bi.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/sp64-aout.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sp86x-elf.h#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc-modes.def#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.c#4 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/sparclet.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/supersparc.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/wifi/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/t-sparclite#2 delete .. //depot/projects/wifi/contrib/gcc/config/sparc/ultra1_2.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/ultra3.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-darwin#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/wifi/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/wifi/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-linux-gnulibc1#2 delete .. //depot/projects/wifi/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/wifi/contrib/gcc/config/t-slibgcc-darwin#3 integrate .. //depot/projects/wifi/contrib/gcc/config/t-slibgcc-elf-ver#3 integrate .. //depot/projects/wifi/contrib/gcc/config/t-slibgcc-sld#3 integrate .. //depot/projects/wifi/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/wifi/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/wifi/contrib/gcc/config/usegas.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/wifi/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/wifi/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/wifi/contrib/gcc/config/x-linux#2 integrate .. //depot/projects/wifi/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/wifi/contrib/gcc/configure#4 integrate .. //depot/projects/wifi/contrib/gcc/configure.ac#4 integrate .. //depot/projects/wifi/contrib/gcc/conflict.c#2 integrate .. //depot/projects/wifi/contrib/gcc/convert.c#2 integrate .. //depot/projects/wifi/contrib/gcc/convert.h#2 integrate .. //depot/projects/wifi/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/wifi/contrib/gcc/coverage.c#3 integrate .. //depot/projects/wifi/contrib/gcc/coverage.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cp-demangle.c#3 delete .. //depot/projects/wifi/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/wifi/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog.1#2 delete .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog.2#2 delete .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/wifi/contrib/gcc/cp/Make-lang.in#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/NEWS#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/call.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/class.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/wifi/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/wifi/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/wifi/contrib/gcc/cp/cp-tree.def#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/cp-tree.h#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/cvt.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/cxx-pretty-print.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/decl.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/decl2.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/error.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/except.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/g++spec.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/init.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/lex.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/lex.h#2 delete .. //depot/projects/wifi/contrib/gcc/cp/mangle.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/method.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/name-lookup.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/name-lookup.h#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/parser.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/pt.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/search.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/semantics.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/tree.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/typeck.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cp/typeck2.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cplus-dem.c#2 delete .. //depot/projects/wifi/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/wifi/contrib/gcc/cppdefault.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cpperror.c#2 delete .. //depot/projects/wifi/contrib/gcc/cppexp.c#2 delete .. //depot/projects/wifi/contrib/gcc/cppfiles.c#4 delete .. //depot/projects/wifi/contrib/gcc/cpphash.c#2 delete .. //depot/projects/wifi/contrib/gcc/cpphash.h#3 delete .. //depot/projects/wifi/contrib/gcc/cppinit.c#3 delete .. //depot/projects/wifi/contrib/gcc/cpplex.c#2 delete .. //depot/projects/wifi/contrib/gcc/cpplib.c#3 delete .. //depot/projects/wifi/contrib/gcc/cpplib.h#2 delete .. //depot/projects/wifi/contrib/gcc/cppmacro.c#3 delete .. //depot/projects/wifi/contrib/gcc/cpppch.c#2 delete .. //depot/projects/wifi/contrib/gcc/cppspec.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cpptrad.c#2 delete .. //depot/projects/wifi/contrib/gcc/cppucnid.h#2 delete .. //depot/projects/wifi/contrib/gcc/cppucnid.pl#2 delete .. //depot/projects/wifi/contrib/gcc/cppucnid.tab#2 delete .. //depot/projects/wifi/contrib/gcc/crtstuff.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cse.c#4 integrate .. //depot/projects/wifi/contrib/gcc/cselib.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cselib.h#3 integrate .. //depot/projects/wifi/contrib/gcc/dbxout.c#3 integrate .. //depot/projects/wifi/contrib/gcc/dbxout.h#2 integrate .. //depot/projects/wifi/contrib/gcc/ddg.c#1 branch .. //depot/projects/wifi/contrib/gcc/ddg.h#1 branch .. //depot/projects/wifi/contrib/gcc/debug.c#2 integrate .. //depot/projects/wifi/contrib/gcc/debug.h#2 integrate .. //depot/projects/wifi/contrib/gcc/defaults.h#3 integrate .. //depot/projects/wifi/contrib/gcc/demangle.h#2 delete .. //depot/projects/wifi/contrib/gcc/df-core.c#1 branch .. //depot/projects/wifi/contrib/gcc/df-problems.c#1 branch .. //depot/projects/wifi/contrib/gcc/df-scan.c#1 branch .. //depot/projects/wifi/contrib/gcc/df.c#2 delete .. //depot/projects/wifi/contrib/gcc/df.h#2 integrate .. //depot/projects/wifi/contrib/gcc/dfp.c#1 branch .. //depot/projects/wifi/contrib/gcc/dfp.h#1 branch .. //depot/projects/wifi/contrib/gcc/diagnostic.c#2 integrate .. //depot/projects/wifi/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/wifi/contrib/gcc/diagnostic.h#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/c-tree.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/cfg.texi#1 branch .. //depot/projects/wifi/contrib/gcc/doc/compat.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/contrib.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/doc/contribute.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/cppinternals.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/extend.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/doc/fragments.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/gcov.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/gty.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/hostconfig.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/doc/implement-c.texi#1 branch .. //depot/projects/wifi/contrib/gcc/doc/include/fdl.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/include/gcc-common.texi#4 integrate .. //depot/projects/wifi/contrib/gcc/doc/include/gpl.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/include/texinfo.tex#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/invoke.texi#4 integrate .. //depot/projects/wifi/contrib/gcc/doc/libgcc.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/loop.texi#1 branch .. //depot/projects/wifi/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/md.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/doc/objc.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/options.texi#1 branch .. //depot/projects/wifi/contrib/gcc/doc/passes.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/portability.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/rtl.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/tm.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/doc/tree-ssa.texi#1 branch .. //depot/projects/wifi/contrib/gcc/doc/trouble.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/dojump.c#3 integrate .. //depot/projects/wifi/contrib/gcc/doloop.c#2 delete .. //depot/projects/wifi/contrib/gcc/dominance.c#2 integrate .. //depot/projects/wifi/contrib/gcc/domwalk.c#1 branch .. //depot/projects/wifi/contrib/gcc/domwalk.h#1 branch .. //depot/projects/wifi/contrib/gcc/double-int.c#1 branch .. //depot/projects/wifi/contrib/gcc/double-int.h#1 branch .. //depot/projects/wifi/contrib/gcc/dummy-checksum.c#1 branch .. //depot/projects/wifi/contrib/gcc/dummy-conditions.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 23 02:40:38 2007 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 F1AB416A46C; Wed, 23 May 2007 02:40:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF7FF16A469 for ; Wed, 23 May 2007 02:40:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A0A8813C46A for ; Wed, 23 May 2007 02:40:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4N2eb2I017642 for ; Wed, 23 May 2007 02:40:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4N2ebp4017635 for perforce@freebsd.org; Wed, 23 May 2007 02:40:37 GMT (envelope-from sam@freebsd.org) Date: Wed, 23 May 2007 02:40:37 GMT Message-Id: <200705230240.l4N2ebp4017635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 120231 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 May 2007 02:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=120231 Change 120231 by sam@sam_laptop on 2007/05/23 02:40:30 Fix some BAR recv issues: o discard retransmits o discard frames w/ seq# in front of the window (as can happen when the peer misses a BA and retransmits) Noticed by: Foo Tang Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ht.c#3 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.c#3 (text+ko) ==== @@ -547,13 +547,20 @@ off = IEEE80211_SEQ_SUB(rxseq, rap->rxa_start); if (off >= rap->rxa_wnd) { /* - * Outside the window, flush the reorder q. + * Outside the window, flush the reorder q if + * not pulling the sequence # backward. The + * latter is typically caused by a dropped BA. */ IEEE80211_NOTE(ic, IEEE80211_MSG_INPUT | IEEE80211_MSG_11N, ni, "recv BAR outside BA win <%u:%u> rxseq %u tid %u", rap->rxa_start, IEEE80211_SEQ_ADD(rap->rxa_start, rap->rxa_wnd), rxseq, tid); + ic->ic_stats.is_ampdu_bar_oow++; + if (rxseq < rap->rxa_start) { + /* XXX stat? */ + return; + } if (rap->rxa_qframes != 0) { ic->ic_stats.is_ampdu_rx_oor += rap->rxa_qframes; ampdu_rx_flush(ni, rap, rap->rxa_wnd); @@ -561,10 +568,6 @@ ("lost %u data, %u frames on ampdu rx q", rap->rxa_qbytes, rap->rxa_qframes)); } - ic->ic_stats.is_ampdu_bar_oow++; - /* XXX need better check for pulling seq# backward */ - if (rxseq < rap->rxa_start) - return; } else if (rap->rxa_qframes != 0) { /* * Dispatch packets up to rxseq. From owner-p4-projects@FreeBSD.ORG Wed May 23 14:54:54 2007 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 512BD16A41F; Wed, 23 May 2007 14:54:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D001516A468 for ; Wed, 23 May 2007 14:54:53 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B797713C45B for ; Wed, 23 May 2007 14:54:53 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4NEsrPs023232 for ; Wed, 23 May 2007 14:54:53 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4NEsr5U023223 for perforce@freebsd.org; Wed, 23 May 2007 14:54:53 GMT (envelope-from taleks@FreeBSD.org) Date: Wed, 23 May 2007 14:54:53 GMT Message-Id: <200705231454.l4NEsr5U023223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 120256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 May 2007 14:54:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=120256 Change 120256 by taleks@taleks_th on 2007/05/23 14:54:46 pxe_arp: added client entry to arp_table. pxe_core: small cosmetic changes + DHCP related function for future use. pxe_icmp: rewritten using pxe_ip. pxe_ip: added routing related functions, added pxe_ip_send() function for ip based protocols. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#10 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#4 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/Makefile#3 (text+ko) ==== @@ -12,7 +12,8 @@ # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -# debug flag -CFLAGS+= -DPXE_DEBUG +#debug flag +#CFLAGS+= -DPXE_DEBUG +#CFLAGS+= -DPXE_DEBUG_HELL .include ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#4 (text+ko) ==== @@ -5,7 +5,8 @@ #include "pxe_core.h" #include "pxe_mem.h" -static PXE_ARP_ENTRY arp_table[MAX_ARP_ENTRIES]; +/* last entry used for PXE client ip/mac */ +static PXE_ARP_ENTRY arp_table[MAX_ARP_ENTRIES + 1]; static PXE_ARP_PACK_DATA packet_to_send; static int arp_usage = 0; @@ -23,7 +24,7 @@ printf("pxe_arp_init() started.\n"); if (packet_to_send.hdr.hsize != 0) { - printf("Pxe_arp_init() already inited.\n"); + printf("pxe_arp_init() already initialized.\n"); return; } #endif @@ -37,9 +38,14 @@ packet_to_send.hdr.hsize = 6; /* Ethernet MAC size */ packet_to_send.hdr.psize = 4; /* ip4 size */ packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REQUEST); + /* filling source related data: client ip & MAC */ pxe_memcpy(pxe_get_mymac(), packet_to_send.body.src_hwaddr, 6); packet_to_send.body.src_paddr = pxe_get_myip32(); + + /* filling entry for own ip/mac*/ + pxe_memcpy(pxe_get_mymac(), arp_table[MAX_ARP_ENTRIES].mac, 6); + arp_table[MAX_ARP_ENTRIES].ip4.ip = pxe_get_myip32(); /* setting broadcast target address */ pxe_memset(packet_to_send.body.target_hwaddr, 0xff, 6); @@ -58,13 +64,13 @@ { int entry = 0; - for (; entry < MAX_ARP_ENTRIES; ++entry) { + for (; entry < MAX_ARP_ENTRIES + 1; ++entry) { if (arp_table[entry].ip4.ip == ip) return (const MAC_ADDR *)&(arp_table[entry].mac); } - return NULL; + return (NULL); } /* @@ -80,60 +86,69 @@ int pxe_arp_protocol(PXE_PACKET *pack, uint8_t function, void *data) { -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_arp_protocol() started.\n"); #endif - const PXE_ARP_PACK_DATA *arp_reply = (const PXE_ARP_PACK_DATA *)pack->raw_data; + PXE_ARP_PACK_DATA *arp_reply = (PXE_ARP_PACK_DATA *)pack->raw_data; + -#ifdef PXE_DEBUG if (arp_reply->hdr.operation == le2be16(PXE_ARPOP_REQUEST) ) { - uint8_t *mac = arp_reply->body.src_hwaddr; - uint8_t *mac2 = arp_reply->body.target_hwaddr; - PXE_IPADDR ip4; - PXE_IPADDR ip42; + uint8_t *mac_src = arp_reply->body.src_hwaddr; + uint8_t *mac_dst = arp_reply->body.target_hwaddr; + PXE_IPADDR ip4_src; + PXE_IPADDR ip4_dst; - ip4.ip = arp_reply->body.src_paddr; - ip42.ip = arp_reply->body.target_paddr; + ip4_src.ip = arp_reply->body.src_paddr; + ip4_dst.ip = arp_reply->body.target_paddr; - printf("arp request from %x:%x:%x:%x:%x:%x/%d.%d.%d.%d/%x\n\t to: %x:%x:%x:%x:%x:%x/%d.%d.%d.%d/%x\n", - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], - ip4.octet[0], ip4.octet[1], ip4.octet[2], ip4.octet[3], ip4.ip, - mac2[0], mac2[1], mac2[2], mac2[3], mac2[4], mac2[5], - ip42.octet[0], ip42.octet[1], ip42.octet[2], ip42.octet[3], ip42.ip +#ifdef PXE_DEBUG + printf("arp request from %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n\t to: %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n", + mac_src[0], mac_src[1], mac_src[2], mac_src[3], mac_src[4], mac_src[5], + ip4_src.octet[0], ip4_src.octet[1], ip4_src.octet[2], ip4_src.octet[3], + mac_dst[0], mac_dst[1], mac_dst[2], mac_dst[3], mac_dst[4], mac_dst[5], + ip4_dst.octet[0], ip4_dst.octet[1], ip4_dst.octet[2], ip4_dst.octet[3] ); +#endif + + /* somebody is looking for us */ + if (ip4_dst.ip == arp_table[MAX_ARP_ENTRIES].ip4.ip) { - printf("Sending arp reply."); + pxe_memcpy(arp_reply->body.src_hwaddr, packet_to_send.body.target_hwaddr, 6); + packet_to_send.body.target_paddr = arp_reply->body.src_paddr; + packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REPLY); - pxe_memcpy(arp_reply->body.src_hwaddr, packet_to_send.body.target_hwaddr, 6); - packet_to_send.body.target_paddr = arp_reply->body.src_paddr; - packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REPLY); - - PXE_PACKET pack; + PXE_PACKET pack; - pack.raw_size = sizeof(PXE_ARP_PACK_DATA); - pack.raw_data = &packet_to_send; - pack.raw_data = &packet_to_send; - pack.data = &packet_to_send.hdr; - pack.protocol = PXE_PROTOCOL_ARP; - pack.dest_mac = (const MAC_ADDR *)&packet_to_send.body.target_hwaddr[0]; - pack.flags = PXE_SINGLE; + pack.raw_size = sizeof(PXE_ARP_PACK_DATA); + pack.raw_data = &packet_to_send; + pack.data = &packet_to_send.hdr; + pack.data_size = sizeof(PXE_ARP_PACK_DATA) - MEDIAHDR_LEN_ETH; + pack.protocol = PXE_PROTOCOL_ARP; + pack.dest_mac = (const MAC_ADDR *)&packet_to_send.body.target_hwaddr[0]; + pack.flags = PXE_SINGLE; - if (!pxe_core_transmit(&pack)) { - printf("Reply to arp request failed.\n"); + if (!pxe_core_transmit(&pack)) { + printf("pxe_arp_protocol(): reply to arp request failed.\n"); + } + + /* cleaning packet_to_send back to initiakl state */ + pxe_memset(packet_to_send.body.target_hwaddr, 0xff, 6); + packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REQUEST); } - - /* cleaning packet_to_send back to initiakl state */ - pxe_memset(packet_to_send.body.target_hwaddr, 0xff, 6); - packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REQUEST); - return 0; - } + /* we may cache information about packet sender */ +#ifdef PXE_ARP_SNIFF + /* just to skip operation filter below */ + arp_reply->hdr.operation = le2be16(PXE_ARPOP_REPLY); #else - if (arp_reply->hdr.operation != le2be16(PXE_ARPOP_REPLY) ) /* we don't need answer for requests. May be. */ - return 0; + return (0); #endif + } + if (arp_reply->hdr.operation != le2be16(PXE_ARPOP_REPLY) ) /* we don't need anything except replies on that stage */ + return (0); + /* if arp_usage exceeds MAX_ARP_ENTRIES, occurs rewriting of earlier placed ARP entries. @@ -152,18 +167,18 @@ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] ); #endif - return 0; + return (0); } pxe_memcpy(&arp_reply->body.src_hwaddr, &arp_table[arp_usage % MAX_ARP_ENTRIES].mac, 6); arp_table[arp_usage % MAX_ARP_ENTRIES].ip4.ip = arp_reply->body.src_paddr; ++arp_usage; -#ifdef PXE_DEBUG - printf("arp reply: arp usage = %d\n", arp_usage); +#ifdef PXE_DEBUG_HELL + printf("pxe_arp_protocol(): arp usage = %d\n", arp_usage); #endif - return 0; /* inform pxe_get_packet() we don't need this packet more. */ + return (0); /* inform pxe_get_packet() we don't need this packet more. */ } /* @@ -227,7 +242,7 @@ while (1) { #ifdef PXE_DEBUG - printf("."); + twiddle(); #endif if (pxe_core_recv_packets()) { /* means some packet was received */ @@ -242,13 +257,13 @@ if (timeToDie == 0) { -#ifdef PXE_DEBUG - printf(".. request timeout\n"); +#ifdef PXE_DEBUG_HELL + printf("."); #endif --trysLeft; if (trysLeft == 0) { /* have not recieved anything, return nothing */ - printf("\nARP sending timeout.\n"); + printf("\npxe_arp_ip4mac(): ARP reply timeout.\n"); return (NULL); } @@ -260,7 +275,7 @@ } /* sleep(1); */ - delay(500000); + delay(1000000); --timeToDie; } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#4 (text+ko) ==== @@ -17,9 +17,12 @@ /* max MAC<->ip4 bindings to store */ #define MAX_ARP_ENTRIES 4 /* max try count to send/recieve ARP request/reply */ -#define PXE_MAX_ARP_TRY 5 +#define PXE_MAX_ARP_TRY 3 /* max timeout in seconds */ -#define PXE_TIME_TO_DIE 60 +#define PXE_TIME_TO_DIE 10 + +/* define to anable caching incoming packet sender information*/ +#define PXE_ARP_SNIFF typedef struct pxe_arp_entry { PXE_IPADDR ip4; ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#10 (text+ko) ==== @@ -17,7 +17,7 @@ */ /* NOTE: to think about using of this buffers */ -#define PXE_BUFFER_SIZE 0x2000 +#define PXE_BUFFER_SIZE 0x1000 #define PXE_TFTP_BUFFER_SIZE 512 static uint8_t scratch_buffer[PXE_BUFFER_SIZE]; static uint8_t data_buffer[PXE_BUFFER_SIZE]; @@ -67,6 +67,54 @@ return (status); } + +void +print_dhcp_options(uint8_t *opts) +{ + uint8_t *p=opts; + uint8_t code = opts[0]; + uint8_t len = 0; + + printf("DHCP options:\n"); + + while (code != 255) { + + ++p; + len = 1 + (*p); + printf("code %d, len %d: ", code, len); + + switch (code) { + case 0: /* pad */ + len = 0; + break; + + case 1: /* netmask */ + printf("netmask: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); + break; + + case 3: /* routers */ + printf("first router: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); + break; + + case 5: /* nameserver */ + printf("first nameserver: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); + break; + + default: + break; + }; + + printf("\n"); + p += len; + code = *p; + len = 0; + + if (p - opts > BOOTP_DHCPVEND) + break; + } +} + + /* * performs UNDI initialization call during pxe_core_init() * out: @@ -190,13 +238,13 @@ pxe_p->EntryPointSP.segment, pxe_p->EntryPointSP.offset); + __pxe_entry_seg = pxe->EntryPointSP.segment; + __pxe_entry_off = pxe->EntryPointSP.offset; + gci_p = (t_PXENV_GET_CACHED_INFO *) scratch_buffer; pxe_memset(gci_p, 0, sizeof(*gci_p)); gci_p->PacketType = PXENV_PACKET_TYPE_BINL_REPLY; - __pxe_entry_seg = pxe->EntryPointSP.segment; - __pxe_entry_off = pxe->EntryPointSP.offset; - if (!pxe_core_call(PXENV_GET_CACHED_INFO)) { } @@ -257,13 +305,22 @@ printf("my ip: %d.%d.%d.%d\n", nic_ip.octet[0], nic_ip.octet[1], nic_ip.octet[2], nic_ip.octet[3]); /* my MAC */ pxe_memcpy(&bootplayer.CAddr, &nic_mac, MAC_ADDR_LEN); - printf("my MAC: %x:%x:%x:%x:%x:%x\n", nic_mac[0], nic_mac[1], nic_mac[2], nic_mac[3], nic_mac[4], nic_mac[5]); + printf("my MAC: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", nic_mac[0], nic_mac[1], nic_mac[2], nic_mac[3], nic_mac[4], nic_mac[5]); + pxe_arp_init(); + pxe_icmp_init(); + + pxe_ip_route_init(0x0100a8c0); /* NOTE: setting default route 192.168.0.1 + * need to determiny gateway by getting info drom DHCP packets, + * but cached packets for some resons have no gip set. So, + * after implementing of UDP, need to return to this point and + * get info sending DHCP requests. + */ + #ifdef PXE_DEBUG printf("pxe_core_init(): ended.\n"); #endif - delay(5000000); return (1); } @@ -348,7 +405,7 @@ pxe_core_remove_isr() { - bzero(&v86, sizeof(v86)); + pxe_memset(&v86, 0, sizeof(v86)); v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.addr = (VTOPSEG(__isr_remove) << 16) | VTOPOFF(__isr_remove); @@ -386,7 +443,7 @@ /* * function code is taken from bangpxe_call(), /sys/boot/libi386/pxe.c - * needs pxe_srs.s wrapper and vm86int() support. + * needs pxe_isr.s wrapper and vm86int() support. * in: * func - PXE function number * out: @@ -397,7 +454,7 @@ pxe_core_call(int func) { -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_core_call(): func = 0x%x...", func); #endif pxe_memset(&v86, 0, sizeof(v86)); @@ -413,7 +470,7 @@ int call_status = v86.eax; int status = *((uint16_t *)scratch_buffer); -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("%s (0x%x)\n", (call_status == 0) ? "?OK" : "?NOK", status ); #endif @@ -461,7 +518,7 @@ (undi_send->XmitFlag == XMT_DESTADDR) ? "to" : "bcast", (*pack->dest_mac)[0], (*pack->dest_mac)[1], (*pack->dest_mac)[2], (*pack->dest_mac)[3], (*pack->dest_mac)[4], (*pack->dest_mac)[5], - undi_send->Protocol, pack->raw_size + undi_send->Protocol, pack->data_size ); #endif @@ -489,6 +546,9 @@ break; } + if (status) + ++packets_sent; + return (status); } @@ -557,7 +617,9 @@ int pxe_core_get_packet(int func, t_PXENV_UNDI_ISR *undi_isr ) { +#ifdef PXE_DEBUG_HELL printf("get_packet(): started with func %d\n", func); +#endif undi_isr->FuncFlag = func; int count = 0; @@ -567,14 +629,14 @@ undi_isr->Status = 0; if (!pxe_core_call(PXENV_UNDI_ISR)) { -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("get_packet(): failed.\n"); #endif } if (undi_isr->Status != 0) { /* something gone wrong */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("get_packet(): fail status = 0x%x.\n", undi_isr->Status); #endif return (0); @@ -582,15 +644,15 @@ if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_DONE) { /* nothing to de */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("get_packet(): all is already done.\n"); #endif - break; + return (0); } if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_BUSY) { /* NIC is busy, wait */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("get_packet(): device is busy.\n"); #endif ++count; @@ -604,7 +666,7 @@ if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_RECIEVE) { /* that's what we are waiting for */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("get_packet(): got packet!.\n"); #endif break; @@ -612,7 +674,7 @@ if (undi_isr->FuncFlag == PXENV_UNDI_ISR_OUT_TRANSMIT) { /* transmitted packet */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("get_packet(): transmit packet.\n"); #endif return (0); @@ -640,7 +702,6 @@ int protocol = 0; /* protocol */ int received = 0; /* bytes received to buffer */ - void *frame_data = NULL;/* pointer to frame data */ int frame_size = 0; /* size of frame */ int drop_flag = 0; int processed_packets = 0; @@ -666,7 +727,7 @@ packet_start: drop_flag = 0; - bzero(undi_isr, sizeof(*undi_isr)); + pxe_memset(undi_isr, 0, sizeof(t_PXENV_UNDI_ISR)); if (0 == pxe_core_get_packet(func, undi_isr)) { return (processed_packets); @@ -677,11 +738,11 @@ frame_size = undi_isr->FrameLength; if ( (frame_size == 0) && (buffer_size == 0)) { /* no packet, it seems 'all is done' */ - return (processed_packets); + return (processed_packets); } #ifdef PXE_DEBUG - printf("recv_packets(): size = %d, proto = %d, frame_length = %d\n.", buffer_size, protocol, frame_size); + printf("recv_packets(): size = %d, proto = %d, frame_length = %d bytes\n.", buffer_size, protocol, frame_size); #endif /* we are interested in ARP & IP packets */ @@ -699,7 +760,7 @@ pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, VTOPSEG(data_buffer), VTOPOFF(data_buffer), frame_size); } else { - printf("pxe_core_recv_packets(): not enough buffer size (%d bytes) for frame size %d bytes.", + printf("pxe_core_recv_packets(): not enough buffer size (%d bytes) for frame size %d bytes.\n", PXE_BUFFER_SIZE, frame_size); drop_flag = 1; /* drop this packet */ @@ -712,7 +773,7 @@ if (!drop_flag) { - PXE_IP_HDR *iphdr = (PXE_IP_HDR *)data_buffer; + PXE_IP_HDR *iphdr = (PXE_IP_HDR *)(data_buffer + MEDIAHDR_LEN_ETH); dummy_pack.protocol = protocol; dummy_pack.state = PXE_PACKET_STATE_USING; @@ -912,16 +973,26 @@ } /* + * commits choosed packet, free used structures + */ +void +pxe_core_commit(PXE_PACKET *pack) +{ + + pxe_mutex_own(&core_mutex, PXE_OWNER_CORE); + pack->state = PXE_PACKET_STATE_FREE; + pxe_mutex_free(&core_mutex, PXE_OWNER_CORE); +} + +/* * drops choosed packet */ void pxe_core_drop(PXE_PACKET *pack) { - pxe_mutex_own(&core_mutex, PXE_OWNER_CORE); - pack->state = PXE_PACKET_STATE_FREE; ++packets_dropped; - pxe_mutex_free(&core_mutex, PXE_OWNER_CORE); + pxe_core_commit(pack); } /* ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#6 (text+ko) ==== @@ -1,5 +1,6 @@ #include +#include "pxe_arp.h" #include "pxe_conv.h" #include "pxe_core.h" #include "pxe_icmp.h" @@ -7,7 +8,10 @@ /* used in echo replying */ -static pinging = 0; +static PXE_IPADDR pinging; /* ip to accept replies from */ +static uint16_t seq_number; /* next sequence number to accept */ +static uint16_t last_accepted = 0xffff; /* last sequence number accepted */ +static int echo_flags = 0; int pxe_icmp_callback(PXE_PACKET *pack, uint8_t function, void *data) @@ -28,20 +32,25 @@ /* icmp header*/ PXE_IP_HDR *iphdr = (PXE_IP_HDR *)pack->data; - size_t iphdr_len = (iphdr->ver_ihl & 0x0f) * 4; - size_t data_size = iphdr->length - iphdr_len - sizeof(PXE_IP_HDR); - PXE_ICMP_HDR *icmphdr = (PXE_ICMP_HDR *)(pack->data + sizeof(PXE_IP_HDR) + iphdr_len); + size_t iphdr_len = (iphdr->ver_ihl & 0x0f) * 4; + size_t data_size = be2le16(iphdr->length) - iphdr_len - sizeof(PXE_ICMP_HDR); + PXE_ICMP_HDR *icmphdr = (PXE_ICMP_HDR *)(pack->data + iphdr_len); +#ifdef PXE_DEBUG + printf("pxe_icmp_callback(): data size %d bytes, total %d bytes, type: %d\n", data_size, pack->data_size, icmphdr->type); +#endif /* TODO: verify checksum */ /* reply */ - PXE_PACKET *pack_out = NULL; - PXE_IP_HDR *reply_iphdr = NULL; - PXE_ICMP_HDR *reply_icmphdr = NULL; - size_t reply_size = sizeof(PXE_IP_HDR) + sizeof(PXE_ICMP_HDR) + data_size; + PXE_IP_HDR *reply_iphdr = NULL; + PXE_ICMP_HDR *reply_icmphdr = NULL; + size_t reply_size = sizeof(PXE_IP_HDR) + sizeof(PXE_ICMP_HDR) + + data_size; + uint16_t reply_number = be2le32(icmphdr->seq_num); + /* we are interested only in echo related packets*/ - switch(icmphdr->code) { + switch(icmphdr->type) { case PXE_ICMP_ECHO_REQUEST: case PXE_ICMP_ECHO_REPLY: /* case PXE_ICMP_DEST_UNREACHABLE: @@ -52,52 +61,61 @@ return (0); /* instruct pxe core to drop packet*/ }; - if (icmphdr->code == PXE_ICMP_ECHO_REPLY) { - if (pinging == be2le32(iphdr->src_ip)) - printf("\necho reply from %x, seq=%ld.", - iphdr->src_ip, icmphdr->seq_num); - else /* we are not interested in this reply*/ - printf("\nlame echo reply from %x, seq=%ld.", - iphdr->src_ip, icmphdr->seq_num); + + if (icmphdr->type == PXE_ICMP_ECHO_REPLY) { + + if ( (reply_number != seq_number) && (icmphdr->code != 0)) { +#ifdef PXE_DEBUG + printf("pxe_icmp_callback(): skipping %d sequence number, cause %d is expected\n", reply_number, seq_number); +#endif + return (0); /* ignore this packet */ + } + + uint16_t id = (uint16_t)(seq_number*seq_number); + if (icmphdr->packet_id != id) { + if (echo_flags) + printf("pxe_icmp_callback(): skipping packet cause id 0x%x, but 0x%x is expected\n", icmphdr->packet_id, id); + + return (0); + } + + if (pinging.ip == iphdr->src_ip) { + +/* uint16_t sum_orig = icmphdr->checksum; + icmphdr->checksum = 0; + uint16_t sum = ~pxe_ip_checksum(icmphdr, sizeof(PXE_ICMP_HDR) + data_size); + + printf("checksums: 0x%x %s 0x%x\n", sum_orig, (sum_orig == sum) ? "==" : "!=", sum ); +*/ + if (echo_flags) { + printf("pxe_ping(): echo reply from %d.%d.%d.%d, seq=%ld ", + pinging.octet[0], pinging.octet[1], + pinging.octet[2], pinging.octet[3], seq_number ); + } + + last_accepted = seq_number; /* notify pxe_ping() code that we received reply */ + } + return (0); } + /* all we need now is echo reply */ - pack_out = pxe_core_alloc_packet(reply_size); - if (pack_out == NULL) { - /* TO THINK: failed to allocate packet, - * may be it's better to use - * statically allocated packet. - */ - return (0); - } + /* using buffer of recieved packet to avoid additional memory copy operations */ - reply_iphdr = (PXE_IP_HDR *)pack_out->data; - reply_icmphdr = (PXE_ICMP_HDR *)(reply_iphdr + 1); + reply_iphdr = (PXE_IP_HDR *)pack->data; + reply_icmphdr = (PXE_ICMP_HDR *)(pack->data + iphdr_len); reply_icmphdr->type = PXE_ICMP_ECHO_REPLY; - - /* copying same values */ - reply_icmphdr->code = icmphdr->code; - reply_icmphdr->seq_num = icmphdr->seq_num; - reply_icmphdr->packet_id = icmphdr->packet_id; reply_icmphdr->checksum = 0; reply_icmphdr->checksum = - ~(le2be16(pxe_ip_checksum(reply_icmphdr, sizeof(PXE_ICMP_HDR)))); - - pxe_ip_hdr(pack_out->data, iphdr->src_ip, 0x01, reply_size, 0); - - /* copying all data from request packet to reply packet, - * starting after headers - */ - pxe_memcpy(reply_icmphdr + 1, pack->data + iphdr_len + sizeof(PXE_ICMP_HDR), - data_size); + ~pxe_ip_checksum(reply_icmphdr, sizeof(PXE_ICMP_HDR) + data_size); + + if (!pxe_ip_send(pack->data, iphdr->src_ip, 0x01, pack->data_size, 1) && echo_flags) { + printf("pxe_ping(): failed to send echo reply.\n"); + } - pxe_core_transmit(pack_out); -/* pxe_core_commit(pack); - return (1); /* instruct core we are interested in it, so save data */ - return (0); /* drop it, we don't need this packet more. * this is a little bit ugly, may be * using of more return codes will be more flexible @@ -108,7 +126,7 @@ pxe_icmp_init() { - /* register protocol in pxe protocols table. */ + /* register protocol in pxe_core protocols table. */ /* 0x01 - ICMP protocol */ pxe_core_register(0x01, pxe_icmp_callback); @@ -116,61 +134,81 @@ } int -pxe_ping(PXE_IPADDR *ip, int count) +pxe_ping(PXE_IPADDR *ip, int count, int flags) { - int scount = 0; - - /* creating packet */ + seq_number = 0; + last_accepted = 0xffff; + echo_flags = flags; + + + /* creating data storage for packet */ + uint8_t data[sizeof(PXE_IP_HDR) + sizeof(PXE_ICMP_HDR) + 32]; + size_t pack_size = sizeof(PXE_IP_HDR) + sizeof(PXE_ICMP_HDR) + 32; - PXE_PACKET *pack = pxe_core_alloc_packet(pack_size); PXE_IP_HDR *iphdr = NULL; PXE_ICMP_HDR *icmphdr = NULL; + uint32_t wait_time = 0; + int scount = 0; - if (pack == NULL) { /* failed to alloc packet */ - return (0); - } + if (flags) + printf("pxe_ping(): pinging %d.%d.%d.%d, 32 bytes\n", ip->octet[0], ip->octet[1], ip->octet[2], ip->octet[3]); + + pinging.ip = ip->ip; - printf("\nping: %x, bytes=32", ip->ip); - pinging = ip->ip; - - iphdr = (PXE_IP_HDR *)pack->data; - icmphdr = (PXE_ICMP_HDR *)(pack->data + sizeof(PXE_IP_HDR)); + iphdr = (PXE_IP_HDR *)data; + icmphdr = (PXE_ICMP_HDR *)(data + sizeof(PXE_IP_HDR)); /* base icmp header side*/ icmphdr->type = PXE_ICMP_ECHO_REQUEST; - icmphdr->code = 1; + icmphdr->code = 0; -/* icmphdr->seq_num = scount; - icmphdr->packet_id = scount*scount; -*/ + while (seq_number < count) { -/* icmphdr->checksum = 0; - reply_icmphdr->checksum = - ~(le2be16(pxe_ip_checksum(icmphdr, sizeof(pxe_icmp)))); -*/ + ++seq_number; + + icmphdr->seq_num = le2be16(seq_number); + icmphdr->packet_id = (uint16_t)(seq_number*seq_number); /* is this good idea? */ - /* ip header side */ - pxe_create_ip_hdr(pack->data, ip->ip, 0x01, pack_size, 0); - - - while (scount < count) { - - icmphdr->seq_num = scount; - icmphdr->packet_id = scount*scount; /* is this good idea? */ - /* recalc for every packet */ icmphdr->checksum = 0; icmphdr->checksum = - ~(le2be16(pxe_ip_checksum(icmphdr, sizeof(PXE_ICMP_HDR)))); + ~(pxe_ip_checksum(icmphdr, sizeof(PXE_ICMP_HDR) + 32)); + + if (!pxe_ip_send(data, ip->ip, 0x01, pack_size, 1) && echo_flags) { + printf("pxe_ping(): failed to send echo reply.\n"); + } + + /* echo reply waiting */ + wait_time = 0; + + while (wait_time < PXE_ICMP_TIMEOUT) { + + twiddle(); + wait_time += 10; + + if (!pxe_core_recv_packets()) { + delay(10000); + } + + if (last_accepted == seq_number) { + if (flags) + printf("< %d ms\n", wait_time); - pxe_core_transmit(pack); + ++scount; + break; + } - /* TODO: timeout checking */ + } - ++scount; + if ( (last_accepted != seq_number) && flags) + printf("ping timeout.\n"); + + /* wait a little, to avoid ICMP flood */ + delay(500000); } - pinging = 0; - + pinging.ip = 0; + echo_flags = 0; + return (scount); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.h#5 (text+ko) ==== @@ -11,13 +11,15 @@ /* ICMP header */ typedef struct pxe_icmp_hdr { - uint8_t type; /* type of ICMP packet */ - uint8_t code; /* code, used to identify session */ - uint16_t checksum; /* ICMP header checksum */ - uint16_t packet_id; /* for echo */ - uint16_t seq_num; /* for echo */ + uint8_t type; /* type of ICMP packet */ + uint8_t code; /* code, used to identify session */ + uint16_t checksum; /* ICMP header checksum */ + uint16_t packet_id; /* for echo */ + uint16_t seq_num; /* for echo */ } __packed PXE_ICMP_HDR; +/* timeout in milliseconds */ +#define PXE_ICMP_TIMEOUT 5000 /* pxe_ping - send icmp echo request packets to host * in: * ip - host ip address ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#5 (text+ko) ==== @@ -1,5 +1,163 @@ +#include "pxe_core.h" #include "pxe_ip.h" +#include "pxe_icmp.h" + +static PXE_IP_ROUTE_ENTRY route_table[PXE_MAX_ROUTES]; +static int all_routes = 0; +static uint16_t packet_id = 1; +void +pxe_ip_route_init(uint32_t def_gw) +{ + + if (all_routes) /* already inited */ + return; + + /* add default gw */ + pxe_ip_route_default(def_gw); + all_routes += 1; + + PXE_IPADDR myip; + myip.ip = pxe_get_myip32(); + + /* make route for local network */ + uint32_t mask = pxe_ip_get_netmask(myip.ip); + + if (mask == 0) { + printf("pxe_ip_route_init(): my ip is class D or class E, don't know how understand this.\n"); + return; + } + + pxe_ip_route_add(myip.ip, mask, 0); +} + + +uint32_t +pxe_ip_get_netmask(uint32_t ip) +{ + uint8_t net_class = (ip & 0x000000F0) >> 4; + + if ( (net_class & 0x0c) == 0x0c) { /* class C */ + return (0x00ffffff); + } + else if ((net_class & 0x08) == 0x08) { /* class B */ + return (0x0000ffff); + } + else if ((net_class & 0x08) == 0x00) { /* class A */ + return (0x000000ff); + } + + /* D & E classes are not supported yet... */ + return (0); +} + +int +pxe_ip_route_add(uint32_t net, uint32_t mask, uint32_t gw) +{ + PXE_IPADDR net_ip, gw_ip; + + net_ip.ip = (net & mask); + gw_ip.ip = gw; + + printf("pxe_ip_route_add(): adding net %d.%d.%d.%d mask %8.8x gw ", + net_ip.octet[0], net_ip.octet[1], net_ip.octet[2], net_ip.octet[3], le2be32(mask) + ); + + if (gw) + printf("%d.%d.%d.%d\n", gw_ip.octet[0], gw_ip.octet[1], gw_ip.octet[2], gw_ip.octet[3]); + else + printf("pxenet0\n"); + + if (all_routes == PXE_MAX_ROUTES) { + printf("pxe_ip_route_add(): failed, cause routing table is full.\n"); + return (0); + } + + if (gw && (pxe_ping(&gw_ip, 3, 0) == 0) ) { + printf("pxe_ip_route_add(): failed, cause gateway is unreachable.\n"); + return (1); + } + + route_table[all_routes].net = (net & mask); + route_table[all_routes].mask = mask; + route_table[all_routes].gw = gw; + + ++all_routes; + + return (1); +} + +int +pxe_ip_route_del(uint32_t net, uint32_t mask, uint32_t gw) +{ + PXE_IPADDR net_ip, gw_ip; + int route_index = 1; + + net_ip.ip = (net & mask); + gw_ip.ip = gw; + + printf("pxe_ip_route_add(): deleting net %d.%d.%d.%d mask %8.8x gw %d.%d.%d.%d\n", + net_ip.octet[0], net_ip.octet[1], net_ip.octet[2], net_ip.octet[3], le2be32(mask), + gw_ip.octet[0], gw_ip.octet[1], gw_ip.octet[2], gw_ip.octet[3] + ); + + + for ( ; route_index < all_routes; ++route_index) { + + if ((route_table[route_index].net == net_ip.ip) && + (route_table[route_index].gw == gw) && + (route_table[route_index].mask == mask)) + { + + --all_routes; + + if (route_index == all_routes) + return (1); + + /* shift routes */ + int shift_index = route_index; + + for ( ; shift_index < all_routes; ++shift_index) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 23 19:34:46 2007 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 CD9AC16A468; Wed, 23 May 2007 19:34:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 79C2316A41F for ; Wed, 23 May 2007 19:34:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6AC4813C45D for ; Wed, 23 May 2007 19:34:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4NJYjVP094254 for ; Wed, 23 May 2007 19:34:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4NJYjYF094244 for perforce@freebsd.org; Wed, 23 May 2007 19:34:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 23 May 2007 19:34:45 GMT Message-Id: <200705231934.l4NJYjYF094244@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 120273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 May 2007 19:34:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=120273 Change 120273 by hselasky@hselasky_mini_itx on 2007/05/23 19:34:39 When we are writing data to a Mass Storage Device, short write transfers should not be treated like errors. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#17 (text+ko) ==== @@ -780,7 +780,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_OUT, .bufsize = UMASS_BULK_SIZE, - .flags = USBD_USE_DMA, + .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &umass_t_bbb_data_write_callback, .timeout = 0, /* overwritten later */ }, @@ -875,7 +875,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_OUT, .bufsize = UMASS_BULK_SIZE, - .flags = USBD_USE_DMA, + .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &umass_t_cbi_data_write_callback, .timeout = 0, /* overwritten later */ }, @@ -1635,6 +1635,11 @@ sc->sc_transfer.data_ptr += xfer->actlen; sc->sc_transfer.actlen += xfer->actlen; + if (xfer->actlen < xfer->length) { + /* short transfer */ + sc->sc_transfer.data_rem = 0; + } + tr_setup: DPRINTF(sc, UDMASS_BBB, "max_bulk=%d, data_rem=%d\n", max_bulk, sc->sc_transfer.data_rem); @@ -2134,6 +2139,11 @@ sc->sc_transfer.data_ptr += xfer->actlen; sc->sc_transfer.actlen += xfer->actlen; + if (xfer->actlen < xfer->length) { + /* short transfer */ + sc->sc_transfer.data_rem = 0; + } + tr_setup: DPRINTF(sc, UDMASS_CBI, "max_bulk=%d, data_rem=%d\n", max_bulk, sc->sc_transfer.data_rem); From owner-p4-projects@FreeBSD.ORG Wed May 23 22:21:29 2007 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 DB01816A421; Wed, 23 May 2007 22:21:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 74D3C16A400 for ; Wed, 23 May 2007 22:21:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6545B13C45A for ; Wed, 23 May 2007 22:21:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4NMLScS065021 for ; Wed, 23 May 2007 22:21:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4NMJMR5062839 for perforce@freebsd.org; Wed, 23 May 2007 22:19:22 GMT (envelope-from marcel@freebsd.org) Date: Wed, 23 May 2007 22:19:22 GMT Message-Id: <200705232219.l4NMJMR5062839@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 120286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 May 2007 22:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=120286 Change 120286 by marcel@marcel_jnpr on 2007/05/23 22:18:31 IFC @120283 Affected files ... .. //depot/projects/e500/Makefile#2 integrate .. //depot/projects/e500/Makefile.inc1#2 integrate .. //depot/projects/e500/ObsoleteFiles.inc#2 integrate .. //depot/projects/e500/UPDATING#2 integrate .. //depot/projects/e500/bin/csh/config.h#2 integrate .. //depot/projects/e500/bin/csh/config_p.h#2 integrate .. //depot/projects/e500/bin/mv/mv.1#2 integrate .. //depot/projects/e500/bin/rcp/rcp.c#2 integrate .. //depot/projects/e500/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/e500/contrib/csup/queue.h#2 integrate .. //depot/projects/e500/contrib/gcc/BASE-VER#1 branch .. //depot/projects/e500/contrib/gcc/COPYING#2 integrate .. //depot/projects/e500/contrib/gcc/COPYING.LIB#2 integrate .. //depot/projects/e500/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/e500/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/e500/contrib/gcc/ChangeLog.0#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.1#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.2#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.3#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.4#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.5#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.6#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.7#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/e500/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/e500/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/e500/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/e500/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/e500/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/gcc/README-fixinc#2 delete .. //depot/projects/e500/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/e500/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/e500/contrib/gcc/addresses.h#1 branch .. //depot/projects/e500/contrib/gcc/alias.c#2 integrate .. //depot/projects/e500/contrib/gcc/alias.h#1 branch .. //depot/projects/e500/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/e500/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/e500/contrib/gcc/ansidecl.h#2 delete .. //depot/projects/e500/contrib/gcc/attribs.c#2 integrate .. //depot/projects/e500/contrib/gcc/basic-block.h#2 integrate .. //depot/projects/e500/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/e500/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/e500/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/e500/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/e500/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/e500/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/e500/contrib/gcc/builtins.c#2 integrate .. //depot/projects/e500/contrib/gcc/builtins.def#2 integrate .. //depot/projects/e500/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-common.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-common.def#2 integrate .. //depot/projects/e500/contrib/gcc/c-common.h#2 integrate .. //depot/projects/e500/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/e500/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-dump.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-format.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-format.h#1 branch .. //depot/projects/e500/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/e500/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/e500/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/e500/contrib/gcc/c-omp.c#1 branch .. //depot/projects/e500/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-parse.in#2 delete .. //depot/projects/e500/contrib/gcc/c-parser.c#1 branch .. //depot/projects/e500/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/e500/contrib/gcc/c-pretty-print.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-pretty-print.h#2 integrate .. //depot/projects/e500/contrib/gcc/c-semantics.c#2 integrate .. //depot/projects/e500/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/e500/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/e500/contrib/gcc/c.opt#2 integrate .. //depot/projects/e500/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/e500/contrib/gcc/calls.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfg.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/e500/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/e500/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/e500/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/e500/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/e500/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/e500/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/e500/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/e500/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/e500/contrib/gcc/choose-temp.c#2 delete .. //depot/projects/e500/contrib/gcc/collect2.c#2 integrate .. //depot/projects/e500/contrib/gcc/collect2.h#2 integrate .. //depot/projects/e500/contrib/gcc/combine.c#2 integrate .. //depot/projects/e500/contrib/gcc/common.opt#2 integrate .. //depot/projects/e500/contrib/gcc/concat.c#2 delete .. //depot/projects/e500/contrib/gcc/conditions.h#2 integrate .. //depot/projects/e500/contrib/gcc/config.build#2 integrate .. //depot/projects/e500/contrib/gcc/config.gcc#2 integrate .. //depot/projects/e500/contrib/gcc/config.host#2 integrate .. //depot/projects/e500/contrib/gcc/config.in#2 integrate .. //depot/projects/e500/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/alpha-protos.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/alpha.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/alpha.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/alpha.md#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/elf.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/ev4.md#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/ev5.md#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/ev6.md#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/freebsd.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/gnu.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/lib1funcs.asm#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/linux-elf.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/linux.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/netbsd.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/openbsd.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/osf.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/osf5.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/qrnnd.asm#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-crtfm#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-ieee#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-osf4#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-vms#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/unicosmk.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/va_list.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-cc.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-crt0-64.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-crt0.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-dwarf2.asm#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-dwarf2eh.asm#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-ld.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms-psxcrt0.c#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms64.h#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/vms_tramp.asm#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/x-vms#2 delete .. //depot/projects/e500/contrib/gcc/config/alpha/xm-vms.h#2 delete .. //depot/projects/e500/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/arm-modes.def#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/ecos-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/lib1funcs.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/netbsd-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/strongarm-coff.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/strongarm-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/strongarm-pe.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/t-arm-coff#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/t-linux#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-semi#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-strongarm-pe#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/t-xscale-elf#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/uclinux-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/e500/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/e500/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/e500/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/e500/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/e500/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/e500/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/freebsd-nthr.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/frv/cmovd.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/cmovh.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/cmovw.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frv-abi.h#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frv-asm.h#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frv-modes.def#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frv-protos.h#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frv.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frv.h#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frv.md#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frvbegin.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/frvend.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/lib1funcs.asm#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/t-frv#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/e500/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/e500/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/e500/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/e500/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/e500/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/athlon.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/cygwin.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/darwin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/emmintrin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/freebsd-aout.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/gmon-sol2.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386-modes.def#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/k6.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/linux-aout.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/lynx-ng.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/moss.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/pentium.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/pmmintrin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/ppro.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/sol2-c1.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sol2-gc1.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/svr3dbx.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/svr3gas.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/sysv3.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/sysv4-cpp.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-linux64#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/t-sol2#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/udk.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/vsta.h#2 delete .. //depot/projects/e500/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/winnt.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/x-cygwin#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/e500/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/xm-djgpp.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/xm-mingw32.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/i386/xmmintrin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/crti.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/crtn.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/fde-glibc.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ia64-c.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ia64-modes.def#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/ia64/ia64intrin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/lib1funcs.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/e500/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/e500/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/e500/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/unwind-ia64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/e500/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/interix3.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/e500/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/e500/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/e500/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/linux-aout.h#2 delete .. //depot/projects/e500/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/lynx-ng.h#2 delete .. //depot/projects/e500/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/e500/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/e500/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/e500/contrib/gcc/config/memset.c#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/e500/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/e500/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/openbsd-oldgas.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/aix52.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/altivec-defs.h#2 delete .. //depot/projects/e500/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/altivec.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/eabi-ci.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/eabi-cn.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/eabialtivec.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/eabispe.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/linuxaltivec.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/e500/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/ppc64-fp.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rs6000-c.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rs6000-modes.def#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/sol-ci.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/sol-cn.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/spe.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/spe.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-beos#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/tramp.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/windiss.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/e500/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/e500/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/rtems.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/e500/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/e500/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/e500/contrib/gcc/config/s390/s390-modes.def#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/s390/s390x.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/t-linux#1 branch .. //depot/projects/e500/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/e500/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/e500/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/e500/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/e500/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/e500/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/e500/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/e500/contrib/gcc/config/sol2.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/aout.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/biarch64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/cypress.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/elf.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/hypersparc.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/lite.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/litecoff.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/liteelf.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/openbsd.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/openbsd64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/pbd.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/rtemself.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sol2-64.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sol2-bi.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sol2-c1.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/sp64-aout.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sp86x-elf.h#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/sparc-modes.def#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sparc.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/sparclet.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/supersparc.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/e500/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/t-sparclite#2 delete .. //depot/projects/e500/contrib/gcc/config/sparc/ultra1_2.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/ultra3.md#2 integrate .. //depot/projects/e500/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/t-darwin#2 integrate .. //depot/projects/e500/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/e500/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/e500/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/e500/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/e500/contrib/gcc/config/t-linux-gnulibc1#2 delete .. //depot/projects/e500/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/e500/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/e500/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/e500/contrib/gcc/config/t-slibgcc-sld#2 integrate .. //depot/projects/e500/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/e500/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/e500/contrib/gcc/config/usegas.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/e500/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/e500/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/e500/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/e500/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/e500/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/e500/contrib/gcc/config/x-linux#2 integrate .. //depot/projects/e500/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/e500/contrib/gcc/configure#2 integrate .. //depot/projects/e500/contrib/gcc/configure.ac#2 integrate .. //depot/projects/e500/contrib/gcc/conflict.c#2 integrate .. //depot/projects/e500/contrib/gcc/convert.c#2 integrate .. //depot/projects/e500/contrib/gcc/convert.h#2 integrate .. //depot/projects/e500/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/e500/contrib/gcc/coverage.c#2 integrate .. //depot/projects/e500/contrib/gcc/coverage.h#2 integrate .. //depot/projects/e500/contrib/gcc/cp-demangle.c#2 delete .. //depot/projects/e500/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/e500/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/e500/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/e500/contrib/gcc/cp/ChangeLog.1#2 delete .. //depot/projects/e500/contrib/gcc/cp/ChangeLog.2#2 delete .. //depot/projects/e500/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/e500/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/e500/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/e500/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/e500/contrib/gcc/cp/NEWS#2 integrate .. //depot/projects/e500/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/e500/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/e500/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/e500/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/e500/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/e500/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/e500/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/e500/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/e500/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/except.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/e500/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/lex.h#2 delete .. //depot/projects/e500/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/e500/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/e500/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/e500/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/e500/contrib/gcc/cplus-dem.c#2 delete .. //depot/projects/e500/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/e500/contrib/gcc/cppdefault.c#2 integrate .. //depot/projects/e500/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/e500/contrib/gcc/cpperror.c#2 delete .. //depot/projects/e500/contrib/gcc/cppexp.c#2 delete .. //depot/projects/e500/contrib/gcc/cppfiles.c#2 delete .. //depot/projects/e500/contrib/gcc/cpphash.c#2 delete .. //depot/projects/e500/contrib/gcc/cpphash.h#2 delete .. //depot/projects/e500/contrib/gcc/cppinit.c#2 delete .. //depot/projects/e500/contrib/gcc/cpplex.c#2 delete .. //depot/projects/e500/contrib/gcc/cpplib.c#2 delete .. //depot/projects/e500/contrib/gcc/cpplib.h#2 delete .. //depot/projects/e500/contrib/gcc/cppmacro.c#2 delete .. //depot/projects/e500/contrib/gcc/cpppch.c#2 delete .. //depot/projects/e500/contrib/gcc/cppspec.c#2 integrate .. //depot/projects/e500/contrib/gcc/cpptrad.c#2 delete .. //depot/projects/e500/contrib/gcc/cppucnid.h#2 delete .. //depot/projects/e500/contrib/gcc/cppucnid.pl#2 delete .. //depot/projects/e500/contrib/gcc/cppucnid.tab#2 delete .. //depot/projects/e500/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/e500/contrib/gcc/cse.c#2 integrate .. //depot/projects/e500/contrib/gcc/cselib.c#2 integrate .. //depot/projects/e500/contrib/gcc/cselib.h#2 integrate .. //depot/projects/e500/contrib/gcc/dbxout.c#2 integrate .. //depot/projects/e500/contrib/gcc/dbxout.h#2 integrate .. //depot/projects/e500/contrib/gcc/ddg.c#1 branch .. //depot/projects/e500/contrib/gcc/ddg.h#1 branch .. //depot/projects/e500/contrib/gcc/debug.c#2 integrate .. //depot/projects/e500/contrib/gcc/debug.h#2 integrate .. //depot/projects/e500/contrib/gcc/defaults.h#2 integrate .. //depot/projects/e500/contrib/gcc/demangle.h#2 delete .. //depot/projects/e500/contrib/gcc/df-core.c#1 branch .. //depot/projects/e500/contrib/gcc/df-problems.c#1 branch .. //depot/projects/e500/contrib/gcc/df-scan.c#1 branch .. //depot/projects/e500/contrib/gcc/df.c#2 delete .. //depot/projects/e500/contrib/gcc/df.h#2 integrate .. //depot/projects/e500/contrib/gcc/dfp.c#1 branch .. //depot/projects/e500/contrib/gcc/dfp.h#1 branch .. //depot/projects/e500/contrib/gcc/diagnostic.c#2 integrate .. //depot/projects/e500/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/e500/contrib/gcc/diagnostic.h#2 integrate .. //depot/projects/e500/contrib/gcc/doc/c-tree.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/cfg.texi#1 branch .. //depot/projects/e500/contrib/gcc/doc/compat.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/contribute.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/cppinternals.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/fragments.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/gcov.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/gty.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/implement-c.texi#1 branch .. //depot/projects/e500/contrib/gcc/doc/include/fdl.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/include/gpl.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/include/texinfo.tex#2 integrate .. //depot/projects/e500/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/libgcc.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/loop.texi#1 branch .. //depot/projects/e500/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/md.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/objc.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/options.texi#1 branch .. //depot/projects/e500/contrib/gcc/doc/passes.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/portability.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/rtl.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/e500/contrib/gcc/doc/tree-ssa.texi#1 branch .. //depot/projects/e500/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/e500/contrib/gcc/dojump.c#2 integrate .. //depot/projects/e500/contrib/gcc/doloop.c#2 delete .. //depot/projects/e500/contrib/gcc/dominance.c#2 integrate .. //depot/projects/e500/contrib/gcc/domwalk.c#1 branch .. //depot/projects/e500/contrib/gcc/domwalk.h#1 branch .. //depot/projects/e500/contrib/gcc/double-int.c#1 branch .. //depot/projects/e500/contrib/gcc/double-int.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 23 22:44:03 2007 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 6887C16A468; Wed, 23 May 2007 22:44:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4663716A41F for ; Wed, 23 May 2007 22:44:03 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 397DF13C469 for ; Wed, 23 May 2007 22:44:03 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4NMi32D086883 for ; Wed, 23 May 2007 22:44:03 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4NMi38r086877 for perforce@freebsd.org; Wed, 23 May 2007 22:44:03 GMT (envelope-from marcel@freebsd.org) Date: Wed, 23 May 2007 22:44:03 GMT Message-Id: <200705232244.l4NMi38r086877@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 120290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 May 2007 22:44:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=120290 Change 120290 by marcel@marcel_macbsd on 2007/05/23 22:43:35 Fix buildworld. Affected files ... .. //depot/projects/e500/sys/boot/uboot/common/main.c#2 edit .. //depot/projects/e500/sys/boot/uboot/lib/Makefile#2 edit Differences ... ==== //depot/projects/e500/sys/boot/uboot/common/main.c#2 (text+ko) ==== @@ -115,11 +115,6 @@ setheap((void *)end, (void *)(end + 512*1024)); /* - * Initialise the block cache - */ - bcache_init(32, 512); /* 16k XXX tune this */ - - /* * March through the device switch probing for things. */ for (i = 0; devsw[i] != NULL; i++) ==== //depot/projects/e500/sys/boot/uboot/lib/Makefile#2 (text+ko) ==== @@ -33,12 +33,12 @@ ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine defs: - ${.CURDIR}/../../${MACHINE_ARCH}/uboot/defs.sh \ - ${.CURDIR}/../../${MACHINE_ARCH}/uboot > u-boot_defs.h + sh ${.CURDIR}/../../${MACHINE_ARCH}/uboot/defs.sh \ + ${.CURDIR}/../../${MACHINE_ARCH}/uboot > u-boot_defs.h calls: - ${.CURDIR}/../common/calls.sh \ - ${.CURDIR}/../gnu/_exports.h > u-boot_calls.h + sh ${.CURDIR}/../common/calls.sh \ + ${.CURDIR}/../gnu/_exports.h > u-boot_calls.h CLEANFILES+= machine u-boot_defs.h u-boot_calls.h From owner-p4-projects@FreeBSD.ORG Thu May 24 04:26:24 2007 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 1654916A421; Thu, 24 May 2007 04:26:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7D8BD16A468 for ; Thu, 24 May 2007 04:26:23 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 70B4E13C457 for ; Thu, 24 May 2007 04:26:23 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4O4QNt1016186 for ; Thu, 24 May 2007 04:26:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4O4QNB6016168 for perforce@freebsd.org; Thu, 24 May 2007 04:26:23 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 May 2007 04:26:23 GMT Message-Id: <200705240426.l4O4QNB6016168@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 120296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 04:26:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=120296 Change 120296 by marcel@marcel_macbsd on 2007/05/24 04:25:21 Port to -CURRENT. Affected files ... .. //depot/projects/e500/sys/dev/uart/uart.h#2 edit .. //depot/projects/e500/sys/dev/uart/uart_dev_quicc.c#2 edit Differences ... ==== //depot/projects/e500/sys/dev/uart/uart.h#2 (text+ko) ==== @@ -65,6 +65,7 @@ struct uart_class; extern struct uart_class uart_ns8250_class __attribute__((weak)); +extern struct uart_class uart_quicc_class __attribute__((weak)); extern struct uart_class uart_sab82532_class __attribute__((weak)); extern struct uart_class uart_z8530_class __attribute__((weak)); ==== //depot/projects/e500/sys/dev/uart/uart_dev_quicc.c#2 (text+ko) ==== @@ -146,7 +146,7 @@ static void quicc_init(struct uart_bas *bas, int, int, int, int); static void quicc_term(struct uart_bas *bas); static void quicc_putc(struct uart_bas *bas, int); -static int quicc_poll(struct uart_bas *bas); +static int quicc_rxready(struct uart_bas *bas); static int quicc_getc(struct uart_bas *bas, struct mtx *); static struct uart_ops uart_quicc_ops = { @@ -154,7 +154,7 @@ .init = quicc_init, .term = quicc_term, .putc = quicc_putc, - .poll = quicc_poll, + .rxready = quicc_rxready, .getc = quicc_getc, }; @@ -195,30 +195,35 @@ static int quicc_poll(struct uart_bas *bas) { - volatile char *buf; - int c; - uint16_t sc, rb; + uint16_t rb; rb = quicc_read2(bas, QUICC_PRAM_SCC_RBASE(bas->chan - 1)); - if ((sc = quicc_read2(bas, rb)) & 0x8000) - return (-1); - - buf = (void *)quicc_read4(bas, rb + 4); - c = *buf; - quicc_write2(bas, rb, sc | 0x8000); - return (c); + return ((quicc_read2(bas, rb) & 0x8000) ? 0 : 1); } static int quicc_getc(struct uart_bas *bas, struct mtx *hwmtx) { + volatile char *buf; int c; + uint16_t rb, sc; - do { + uart_lock(hwmtx); + + rb = quicc_read2(bas, QUICC_PRAM_SCC_RBASE(bas->chan - 1)); + + while ((sc = quicc_read2(bas, rb)) & 0x8000) { + uart_unlock(hwmtx); + DELAY(4); uart_lock(hwmtx); - c = quicc_poll(bas); - uart_unlock(hwmtx); - } while (c == -1); + } + + buf = (void *)quicc_read4(bas, rb + 4); + c = *buf; + quicc_write(bas, rb, sc | 0x8000); + + uart_unlock(hwmtx); + return (c); } From owner-p4-projects@FreeBSD.ORG Thu May 24 04:49:55 2007 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 E29C316A468; Thu, 24 May 2007 04:49:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8515C16A421 for ; Thu, 24 May 2007 04:49:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5F82813C45D for ; Thu, 24 May 2007 04:49:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4O4nssZ047829 for ; Thu, 24 May 2007 04:49:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4O4nsId047820 for perforce@freebsd.org; Thu, 24 May 2007 04:49:54 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 May 2007 04:49:54 GMT Message-Id: <200705240449.l4O4nsId047820@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 120298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 04:49:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=120298 Change 120298 by marcel@marcel_macbsd on 2007/05/24 04:49:27 -Wno-error bogons. Affected files ... .. //depot/projects/e500/sys/dev/uart/uart_dev_quicc.c#3 edit Differences ... ==== //depot/projects/e500/sys/dev/uart/uart_dev_quicc.c#3 (text+ko) ==== @@ -193,7 +193,7 @@ } static int -quicc_poll(struct uart_bas *bas) +quicc_rxready(struct uart_bas *bas) { uint16_t rb; @@ -220,7 +220,7 @@ buf = (void *)quicc_read4(bas, rb + 4); c = *buf; - quicc_write(bas, rb, sc | 0x8000); + quicc_write2(bas, rb, sc | 0x8000); uart_unlock(hwmtx); From owner-p4-projects@FreeBSD.ORG Thu May 24 04:54:01 2007 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 DDEF216A46E; Thu, 24 May 2007 04:54:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8C59516A46C for ; Thu, 24 May 2007 04:54:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7EBE313C458 for ; Thu, 24 May 2007 04:54:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4O4s0dl051916 for ; Thu, 24 May 2007 04:54:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4O4rx3t051901 for perforce@freebsd.org; Thu, 24 May 2007 04:53:59 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 May 2007 04:53:59 GMT Message-Id: <200705240453.l4O4rx3t051901@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 120299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 04:54:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=120299 Change 120299 by marcel@marcel_macbsd on 2007/05/24 04:53:42 PPC_BUS_SPACE_MEM & PPC_BUS_SPACE_IO are no more. There's no difference between I/O space and memory mapped I/O, but we do have big-endian & little- endian to worry about. Affected files ... .. //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#3 edit .. //depot/projects/e500/sys/powerpc/powermac/grackle.c#2 edit .. //depot/projects/e500/sys/powerpc/powermac/macio.c#2 edit .. //depot/projects/e500/sys/powerpc/powermac/uninorth.c#2 edit .. //depot/projects/e500/sys/powerpc/psim/iobus.c#2 edit Differences ... ==== //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#3 (text+ko) ==== @@ -415,10 +415,7 @@ OF_get_addr_props(bridge, &naddr, &nsize, &pci); } - /* Default to memory mapped I/O. */ - *tag = PPC_BUS_SPACE_MEM; - if (spc == OFW_PCI_PHYS_HI_SPACE_IO) - *tag = PPC_BUS_SPACE_IO; + *tag = &bs_le_tag; return (bus_space_map(*tag, addr, size, 0, handle)); } ==== //depot/projects/e500/sys/powerpc/powermac/grackle.c#2 (text+ko) ==== @@ -361,7 +361,6 @@ struct grackle_softc *sc; struct resource *rv; struct rman *rm; - bus_space_tag_t bt; int needactivate; needactivate = flags & RF_ACTIVE; @@ -372,18 +371,15 @@ switch (type) { case SYS_RES_MEMORY: rm = &sc->sc_mem_rman; - bt = PPC_BUS_SPACE_MEM; break; case SYS_RES_IOPORT: rm = &sc->sc_io_rman; - bt = PPC_BUS_SPACE_IO; break; case SYS_RES_IRQ: return (bus_alloc_resource(bus, type, rid, start, end, count, flags)); - break; default: device_printf(bus, "unknown resource request from %s\n", @@ -399,7 +395,7 @@ } rman_set_rid(rv, *rid); - rman_set_bustag(rv, bt); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { ==== //depot/projects/e500/sys/powerpc/powermac/macio.c#2 (text+ko) ==== @@ -369,7 +369,6 @@ int needactivate; struct resource *rv; struct rman *rm; - bus_space_tag_t tagval; u_long adjstart, adjend, adjcount; struct macio_devinfo *dinfo; struct resource_list_entry *rle; @@ -408,8 +407,6 @@ adjcount = adjend - adjstart; rm = &sc->sc_mem_rman; - - tagval = PPC_BUS_SPACE_MEM; break; case SYS_RES_IRQ: @@ -431,7 +428,6 @@ return (resource_list_alloc(&dinfo->mdi_resources, bus, child, type, rid, start, end, count, flags)); - break; default: device_printf(bus, "unknown resource request from %s\n", @@ -449,7 +445,7 @@ } rman_set_rid(rv, *rid); - rman_set_bustag(rv, tagval); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { ==== //depot/projects/e500/sys/powerpc/powermac/uninorth.c#2 (text+ko) ==== @@ -345,7 +345,6 @@ struct uninorth_softc *sc; struct resource *rv; struct rman *rm; - bus_space_tag_t bt; int needactivate; needactivate = flags & RF_ACTIVE; @@ -356,18 +355,16 @@ switch (type) { case SYS_RES_MEMORY: rm = &sc->sc_mem_rman; - bt = PPC_BUS_SPACE_MEM; break; case SYS_RES_IOPORT: rm = &sc->sc_io_rman; - bt = PPC_BUS_SPACE_IO; break; case SYS_RES_IRQ: return (bus_alloc_resource(bus, type, rid, start, end, count, flags)); - break; + default: device_printf(bus, "unknown resource request from %s\n", device_get_nameunit(child)); @@ -382,7 +379,7 @@ } rman_set_rid(rv, *rid); - rman_set_bustag(rv, bt); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { ==== //depot/projects/e500/sys/powerpc/psim/iobus.c#2 (text+ko) ==== @@ -322,15 +322,13 @@ case SYS_RES_MEMORY: case SYS_RES_IOPORT: rm = &sc->sc_mem_rman; - tagval = PPC_BUS_SPACE_MEM; break; case SYS_RES_IRQ: return (bus_alloc_resource(bus, type, rid, start, end, count, - flags)); - break; + flags)); default: device_printf(bus, "unknown resource request from %s\n", - device_get_nameunit(child)); + device_get_nameunit(child)); return (NULL); } @@ -342,7 +340,7 @@ } rman_set_rid(rv, *rid); - rman_set_bustag(rv, tagval); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { From owner-p4-projects@FreeBSD.ORG Thu May 24 04:59:10 2007 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 B5BE116A421; Thu, 24 May 2007 04:59:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42F8116A400 for ; Thu, 24 May 2007 04:59:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 356E313C447 for ; Thu, 24 May 2007 04:59:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4O4x99R056251 for ; Thu, 24 May 2007 04:59:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4O4x9PV056222 for perforce@freebsd.org; Thu, 24 May 2007 04:59:09 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 May 2007 04:59:09 GMT Message-Id: <200705240459.l4O4x9PV056222@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 120300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 04:59:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=120300 Change 120300 by marcel@marcel_macbsd on 2007/05/24 04:58:15 mem.c (/dev/mem) is CPU independent. We need to implement mem_valid() for Book-E. This fixes the module build. Affected files ... .. //depot/projects/e500/sys/conf/files.powerpc#3 edit .. //depot/projects/e500/sys/powerpc/aim/mem.c#3 delete .. //depot/projects/e500/sys/powerpc/booke/mem.c#2 delete .. //depot/projects/e500/sys/powerpc/powerpc/mem.c#3 add Differences ... ==== //depot/projects/e500/sys/conf/files.powerpc#3 (text+ko) ==== @@ -65,7 +65,6 @@ powerpc/aim/interrupt.c optional aim powerpc/aim/locore.S optional aim no-obj powerpc/aim/machdep.c optional aim -powerpc/aim/mem.c optional mem aim powerpc/aim/nexus.c optional aim powerpc/aim/ofw_machdep.c optional aim powerpc/aim/ofwmagic.S optional aim @@ -79,7 +78,6 @@ powerpc/booke/interrupt.c optional e500 powerpc/booke/locore.S optional e500 no-obj powerpc/booke/machdep.c optional e500 -powerpc/booke/mem.c optional mem e500 powerpc/booke/pmap.c optional e500 powerpc/booke/support.S optional e500 powerpc/booke/swtch.S optional e500 @@ -119,6 +117,7 @@ powerpc/powerpc/gdb_machdep.c optional gdb powerpc/powerpc/in_cksum.c optional inet powerpc/powerpc/intr_machdep.c standard +powerpc/powerpc/mem.c optional mem powerpc/powerpc/mmu_if.m optional aim powerpc/powerpc/mmu_oea.c optional aim powerpc/powerpc/mp_machdep.c optional smp aim From owner-p4-projects@FreeBSD.ORG Thu May 24 08:18:53 2007 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 9EB4A16A469; Thu, 24 May 2007 08:18:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7AE9416A400 for ; Thu, 24 May 2007 08:18:53 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 663F313C465 for ; Thu, 24 May 2007 08:18:53 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4O8IrpH034443 for ; Thu, 24 May 2007 08:18:53 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4O8IkHu034353 for perforce@freebsd.org; Thu, 24 May 2007 08:18:46 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 24 May 2007 08:18:46 GMT Message-Id: <200705240818.l4O8IkHu034353@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 120307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 08:18:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=120307 Change 120307 by rdivacky@rdivacky_witten on 2007/05/24 08:10:52 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/profile.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_futex.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.amd64#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.i386#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/if_em.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/support.s#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/proc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_sig.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_sx.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_prof.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_witness.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/linux/Makefile#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_lagg.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/route.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/nd6.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/audit/audit.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/cache.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/acct.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/lock_profile.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/param.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/sx.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/systm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/vmmeter.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_fault.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_page.c#4 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.586 2007/05/20 22:33:41 jeff Exp $"); /* * Manages physical address maps. @@ -1149,7 +1149,7 @@ */ m->right = *free; *free = m; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); return 1; } @@ -1459,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ */ #include "opt_ddb.h" ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/busdma_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); /* * ARM bus dma support routines @@ -1003,7 +1003,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + vm_offset_t lastaddr = 0; #ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -1079,7 +1079,7 @@ return; } -static __inline void +static void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.6 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf32_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf32_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/genassym.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.9 2007/05/23 13:21:57 cognet Exp $"); #include #include #include @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.26 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $"); #include #include @@ -547,7 +547,7 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tf = td->td_frame; - __greg_t *gr = mcp->__gregs; + const __greg_t *gr = mcp->__gregs; tf->tf_r0 = gr[_REG_R0]; tf->tf_r1 = gr[_REG_R1]; ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/pmap.c#3 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.79 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $"); #include #include #include @@ -431,10 +431,10 @@ l1->l1_kva = l1pt; l1->l1_domain_use_count = 0; - l1->l1_domain_first = 0; + l1->l1_domain_first = 1; for (i = 0; i < PMAP_DOMAINS; i++) - l1->l1_domain_free[i] = i + 1; + l1->l1_domain_free[i] = i + 2; /* * Copy the kernel's L1 entries to each new L1. @@ -2910,7 +2910,7 @@ /* * remove a page rom the kernel pagetables */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { struct l2_bucket *l2b; ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.30 2007/01/17 00:53:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.31 2007/05/23 13:19:00 cognet Exp $"); #include #include @@ -55,12 +55,11 @@ #include #include #include -#include -#include #include #include #include +#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.21 2007/03/27 06:29:19 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.22 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -77,7 +77,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/asm.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -80,7 +80,7 @@ #ifdef GPROF # define _PROF_PROLOGUE \ - mov ip, lr; bl _mcount + mov ip, lr; bl __mcount #else # define _PROF_PROLOGUE #endif ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/pmap.h#2 (text+ko) ==== @@ -44,7 +44,7 @@ * 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/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,8 +237,8 @@ /* * Definitions for MMU domains */ -#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */ -#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */ +#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */ +#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ /* * The new pmap ensures that page-tables are always mapping Write-Thru. ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,9 +61,9 @@ #define MCOUNT \ __asm__(".text"); \ __asm__(".align 0"); \ - __asm__(".type _mcount ,%function"); \ - __asm__(".global _mcount"); \ - __asm__("_mcount:"); \ + __asm__(".type __mcount ,%function"); \ + __asm__(".global __mcount"); \ + __asm__("__mcount:"); \ /* \ * Preserve registers that are trashed during mcount \ */ \ ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/ep80219_machdep.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.6 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.7 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/iq31244_machdep.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.27 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.28 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.4 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.5 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/i386/libi386/smbios.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.6 2006/03/14 19:02:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.7 2007/05/21 18:48:18 jkim Exp $"); #include #include @@ -239,9 +239,9 @@ break; } if (f != 16 && z != 16) { - sprintf(uuid, "%02X%02X%02X%02X-" - "%02X%02X-%02X%02X-%02X%02X-" - "%02X%02X%02X%02X%02X%02X", + sprintf(uuid, "%02x%02x%02x%02x-" + "%02x%02x-%02x%02x-%02x%02x-" + "%02x%02x%02x%02x%02x%02x", idp[0], idp[1], idp[2], idp[3], idp[4], idp[5], idp[6], idp[7], idp[8], idp[9], idp[10], idp[11], idp[12], idp[13], idp[14], idp[15]); ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam.c#2 (text+ko) ==== @@ -27,11 +27,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.10 2006/04/18 21:53:39 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11 2007/05/23 13:27:37 cognet Exp $"); #include #ifdef _KERNEL -#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_all.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.49 2006/08/21 13:24:50 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.50 2007/05/23 13:27:37 cognet Exp $"); #include @@ -727,8 +727,6 @@ #endif -#include - #if !defined(SCSI_NO_SENSE_STRINGS) #define SST(asc, ascq, action, desc) \ asc, ascq, action, desc ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.63 2007/05/01 17:10:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.64 2007/05/23 13:32:21 cognet Exp $"); #include "opt_compat.h" @@ -48,8 +48,6 @@ #include #include #include -#include -#include #include #include #include @@ -67,7 +65,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.24 2007/05/14 22:40:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $"); #include "opt_compat.h" @@ -138,7 +138,7 @@ "/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, "/libexec/ld-elf32.so.1", - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY, @@ -153,7 +153,7 @@ "/usr/libexec/ld-elf.so.1", &ia32_freebsd_sysvec, "/libexec/ld-elf32.so.1", - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_futex.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.9 2007/03/30 01:07:28 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.10 2007/05/23 08:33:05 kib Exp $"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); #endif @@ -275,7 +275,7 @@ #ifdef DEBUG if (ldebug(sys_futex)) printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, " - "val = %d, uaddr2 = %p, val3 = %d\n", + "val = %x, uaddr2 = %p, val3 = %x\n", td->td_proc->p_pid, args->uaddr, args->op, args->val, args->uaddr2, args->val3); #endif @@ -287,8 +287,11 @@ * negative as errors */ op_ret = futex_atomic_op(td, args->val3, args->uaddr2); +#ifdef DEBUG + if (ldebug(sys_futex)) + printf("futex_atomic_op ret %d\n", op_ret); +#endif if (op_ret < 0) { - /* XXX: We don't handle the EFAULT yet. */ if (op_ret != -EFAULT) { futex_put(f); @@ -302,7 +305,6 @@ FUTEX_SYSTEM_UNLOCK; return (EFAULT); - } ret = futex_wake(f, args->val, NULL, 0); @@ -328,7 +330,7 @@ args->op); break; } - return 0; + return (0); } static struct futex * @@ -463,8 +465,10 @@ oparg = 1 << oparg; #ifdef DEBUG - printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, " - "uaddr = %p\n", op, cmp, oparg, cmparg, uaddr); + if (ldebug(sys_futex)) + printf("futex_atomic_op: op = %d, cmp = %d, oparg = %x, " + "cmparg = %x, uaddr = %p\n", + op, cmp, oparg, cmparg, uaddr); #endif /* XXX: linux verifies access here and returns EFAULT */ @@ -486,31 +490,26 @@ break; default: ret = -ENOSYS; + break; } - if (!ret) - switch (cmp) { - case FUTEX_OP_CMP_EQ: - ret = (oldval == cmparg); - break; - case FUTEX_OP_CMP_NE: - ret = (oldval != cmparg); - break; - case FUTEX_OP_CMP_LT: - ret = (oldval < cmparg); - break; - case FUTEX_OP_CMP_GE: - ret = (oldval >= cmparg); - break; - case FUTEX_OP_CMP_LE: - ret = (oldval <= cmparg); - break; - case FUTEX_OP_CMP_GT: - ret = (oldval > cmparg); - break; - default: - ret = -ENOSYS; - } + if (ret) + return (ret); - return (ret); + switch (cmp) { + case FUTEX_OP_CMP_EQ: + return (oldval == cmparg); + case FUTEX_OP_CMP_NE: + return (oldval != cmparg); + case FUTEX_OP_CMP_LT: + return (oldval < cmparg); + case FUTEX_OP_CMP_GE: + return (oldval >= cmparg); + case FUTEX_OP_CMP_LE: + return (oldval <= cmparg); + case FUTEX_OP_CMP_GT: + return (oldval > cmparg); + default: + return (-ENOSYS); + } } ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ndis/kern_windrv.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.13 2005/11/02 18:01:04 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.14 2007/05/20 22:03:57 jeff Exp $"); #include #include @@ -883,9 +883,9 @@ struct gdt gtable; uint16_t ltable; - mtx_lock_spin(&sched_lock); + t = curthread; - t = curthread; + mtx_lock_spin(&dt_lock); /* Grab location of existing GDT. */ @@ -904,7 +904,7 @@ x86_setldt(>able, ltable); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&dt_lock); return; } @@ -918,9 +918,9 @@ struct x86desc *l; struct thread *t; - mtx_lock_spin(&sched_lock); + t = curthread; - t = curthread; + mtx_lock_spin(&dt_lock); /* Grab location of existing GDT. */ @@ -952,7 +952,7 @@ x86_setldt(>able, ltable); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&dt_lock); /* Whew. */ ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1209 2007/05/17 01:29:55 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1210 2007/05/22 12:00:31 mav Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1585,6 +1585,8 @@ net/if_tun.c optional tun net/if_tap.c optional tap net/if_vlan.c optional vlan +net/mppcc.c optional netgraph_mppc_compression +net/mppcd.c optional netgraph_mppc_compression net/netisr.c standard net/ppp_deflate.c optional ppp_deflate net/ppp_tty.c optional ppp ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.amd64#3 (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.amd64,v 1.101 2007/04/06 04:51:50 kan Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.103 2007/05/23 15:45:51 kib Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -231,10 +231,11 @@ amd64/linux32/linux32_locore.s optional compat_linux32 \ dependency "linux32_assym.h" amd64/linux32/linux32_machdep.c optional compat_linux32 -amd64/linux32/linux32_support.s optional compat_linux32 +amd64/linux32/linux32_support.s optional compat_linux32 \ + dependency "linux32_assym.h" amd64/linux32/linux32_sysent.c optional compat_linux32 amd64/linux32/linux32_sysvec.c optional compat_linux32 -compat/linux/linux_emul.c optional compat_linux32 +compat/linux/linux_emul.c optional compat_linux32 compat/linux/linux_file.c optional compat_linux32 compat/linux/linux_futex.c optional compat_linux32 compat/linux/linux_getcwd.c optional compat_linux32 ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.i386#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.574 2007/04/06 11:29:52 nyan Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.576 2007/05/23 15:45:51 kib Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -345,7 +345,8 @@ dependency "linux_assym.h" i386/linux/linux_machdep.c optional compat_linux i386/linux/linux_ptrace.c optional compat_linux -i386/linux/linux_support.s optional compat_linux +i386/linux/linux_support.s optional compat_linux \ + dependency "linux_assym.h" i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.pc98#3 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.352 2007/04/06 11:30:31 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.354 2007/05/23 15:45:51 kib Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -221,7 +221,8 @@ dependency "linux_assym.h" i386/linux/linux_machdep.c optional compat_linux i386/linux/linux_ptrace.c optional compat_linux -i386/linux/linux_support.s optional compat_linux +i386/linux/linux_support.s optional compat_linux \ + dependency "linux_assym.h" i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 (text+ko) ==== @@ -195,9 +195,10 @@ return (-1); } + /* XXX: This can change in the future. */ + st->grd_dirent->d_type = DT_DIR; st->grd_dirent->d_reclen = (ushort_t)reclen; st->grd_dirent->d_namlen = namlen; - /* TODO: d_type */ if (uiomove((caddr_t)st->grd_dirent, reclen, UIO_READ, uiop)) return (EFAULT); @@ -232,7 +233,6 @@ st->grd_dirent->d_ino = ino; (void) strncpy(st->grd_dirent->d_name, name, st->grd_namlen); - /* TODO: d_type */ /* * Inter-entry offsets are invalid, so we assume a record size of ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 (text+ko) ==== @@ -1773,6 +1773,7 @@ } static struct task zfs_start_task; +static struct root_hold_token *zfs_root_token; static void zfs_start(void *context __unused, int pending __unused) @@ -1783,6 +1784,7 @@ zfs_init(); zvol_init(); printf("ZFS storage pool version " ZFS_VERSION_STRING "\n"); + root_mount_rel(zfs_root_token); } static int @@ -1793,6 +1795,7 @@ error = EOPNOTSUPP; switch (type) { case MOD_LOAD: + zfs_root_token = root_mount_hold("ZFS"); printf("WARNING: ZFS is considered to be an experimental " "feature in FreeBSD.\n"); TASK_INIT(&zfs_start_task, 0, zfs_start, NULL); @@ -1820,4 +1823,4 @@ zfs_modevent, 0 }; -DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_MOUNT_ROOT, SI_ORDER_ANY); +DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 (text+ko) ==== @@ -158,6 +158,7 @@ cn.cn_namelen = strlen(name); cn.cn_nameiop = DELETE; cn.cn_flags = ISLASTCN | SAVENAME; + cn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; cn.cn_cred = kcred; cn.cn_thread = curthread; vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread); @@ -249,6 +250,7 @@ scn.cn_namelen = strlen(sname); scn.cn_nameiop = DELETE; scn.cn_flags = ISLASTCN | SAVENAME; + scn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; scn.cn_cred = kcred; scn.cn_thread = td; vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY, td); @@ -262,6 +264,7 @@ tcn.cn_namelen = strlen(tname); tcn.cn_nameiop = RENAME; tcn.cn_flags = ISLASTCN | SAVENAME; + tcn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY; tcn.cn_cred = kcred; tcn.cn_thread = td; vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY, td); ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/pf/net/pf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.43 2006/12/29 13:59:03 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.44 2007/05/21 20:08:59 dhartmei Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -6780,7 +6780,7 @@ struct pf_state *s = NULL; struct pf_ruleset *ruleset = NULL; struct pf_pdesc pd; - int off, terminal = 0, dirndx; + int off, terminal = 0, dirndx, rh_cnt = 0; #ifdef __FreeBSD__ PF_LOCK(); @@ -6844,6 +6844,18 @@ m = *m0; h = mtod(m, struct ip6_hdr *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 24 16:13:42 2007 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 7E52616A4C6; Thu, 24 May 2007 16:13:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 19F6816A47D for ; Thu, 24 May 2007 16:13:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 07FD813C4AD for ; Thu, 24 May 2007 16:13:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4OGDev6098916 for ; Thu, 24 May 2007 16:13:40 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4OGDeBX098907 for perforce@freebsd.org; Thu, 24 May 2007 16:13:40 GMT (envelope-from imp@freebsd.org) Date: Thu, 24 May 2007 16:13:40 GMT Message-Id: <200705241613.l4OGDeBX098907@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 120317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 16:13:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=120317 Change 120317 by imp@imp_lighthouse on 2007/05/24 16:13:30 More support for the CENTIPAD Also, add ifdefs for KB9202B need to connect to build somehow... Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#17 (text) ==== @@ -62,7 +62,7 @@ AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; #endif -#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) +#if defined(BOOT_KB920X) AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | AT91C_PIO_PC20; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | @@ -136,7 +136,11 @@ AT91C_BASE_EBI->EBI_CSA = value; AT91C_BASE_SDRC->SDRC_CR = +#ifdef KB9202_B + AT91C_SDRC_NC_10 | +#else AT91C_SDRC_NC_9 | +#endif AT91C_SDRC_NR_13 | AT91C_SDRC_NB_4_BANKS | AT91C_SDRC_CAS_2 | From owner-p4-projects@FreeBSD.ORG Thu May 24 16:47:27 2007 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 E4FE916A469; Thu, 24 May 2007 16:47:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B0F6D16A400 for ; Thu, 24 May 2007 16:47:26 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9E25E13C45A for ; Thu, 24 May 2007 16:47:26 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4OGlQVw038846 for ; Thu, 24 May 2007 16:47:26 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4OGlPZ2038819 for perforce@freebsd.org; Thu, 24 May 2007 16:47:25 GMT (envelope-from lulf@FreeBSD.org) Date: Thu, 24 May 2007 16:47:25 GMT Message-Id: <200705241647.l4OGlPZ2038819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 16:47:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=120322 Change 120322 by lulf@lulf_vimes on 2007/05/24 16:47:07 - Integrate from Lukas. - RAID5 Rebuild now works in the new event system. - Beeing able to check parity comes in next commit. - Also fixes small issues i got with gcc 4.2 Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/Makefile#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/Makefile.inc1#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.i386#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.mk#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#9 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#7 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#4 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#5 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#8 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/Makefile#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/proc.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_lock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_prof.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/acct.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/callout.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lockf.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/param.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sx.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/systm.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/swap_pager.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/uma_core.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/uma_int.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_contig.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_glue.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_meter.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $ +# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $ # # The user-driven targets are: # @@ -17,9 +17,14 @@ # kernel - buildkernel + installkernel. # doxygen - Build API documentation of the kernel, needs doxygen. # update - Convenient way to update your source tree (cvs). -# check-old - Print a list of old files/directories in the system. -# delete-old - Delete obsolete files and directories interactively. -# delete-old-libs - Delete obsolete libraries interactively. +# check-old - List obsolete directories/files/libraries. +# check-old-dirs - List obsolete directories. +# check-old-files - List obsolete files. +# check-old-libs - List obsolete libraries. +# delete-old - Delete obsolete directories/files/libraries. +# delete-old-dirs - Delete obsolete directories. +# delete-old-files - Delete obsolete files. +# delete-old-libs - Delete obsolete libraries. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -70,8 +75,10 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildenvvars buildkernel buildworld check-old \ - checkdpadd clean cleandepend cleandir delete-old delete-old-libs \ +TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ + check-old check-old-dirs check-old-files check-old-libs \ + checkdpadd clean cleandepend cleandir \ + delete-old delete-old-dirs delete-old-files delete-old-libs \ depend distribute distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ installkernel.debug reinstallkernel reinstallkernel.debug \ ==== //depot/projects/soc2007/lulf/gvinum_fixup/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -994,21 +994,31 @@ # libraries: cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 _prereq_libs; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ ${MAKE} -f Makefile.inc1 _generic_libs; +# +# static libgcc.a prerequisite for shared libc +# +_prereq_libs= gnu/lib/libgcc + # These dependencies are not automatically generated: # -# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all -# shared libraries for ELF. +# gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before +# all shared libraries for ELF. # -_startup_libs= gnu/lib/csu gnu/lib/libgcc +_startup_libs= gnu/lib/csu .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) _startup_libs+= lib/csu/${MACHINE_ARCH}-elf .else _startup_libs+= lib/csu/${MACHINE_ARCH} .endif +_startup_libs+= gnu/lib/libgcc +_startup_libs+= lib/libc + +gnu/lib/libgcc__L: lib/libc__L _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ @@ -1016,7 +1026,7 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/libpthread \ + lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ @@ -1068,6 +1078,18 @@ lib/libradius__L: lib/libmd__L .endif +.for _lib in ${_prereq_libs} +${_lib}__PL: .PHONY +.if exists(${.CURDIR}/${_lib}) + ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_lib}; \ + ${MAKE} DIRPRFX=${_lib}/ obj; \ + ${MAKE} DIRPRFX=${_lib}/ depend; \ + ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ + ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install +.endif +.endfor + .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) @@ -1091,6 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} @@ -1114,7 +1137,10 @@ .include -.if make(delete-old) || make(delete-old-libs) || make(check-old) +.if make(check-old) || make(check-old-dirs) || \ + make(check-old-files) || make(check-old-libs) || \ + make(delete-old) || make(delete-old-dirs) || \ + make(delete-old-files) || make(delete-old-libs) # # check for / delete old files section @@ -1135,18 +1161,14 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" -.for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @for file in ${OLD_FILES}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}"; \ fi; \ - fi -.endfor + done # Remove catpages without corresponding manpages. @3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1161,11 +1183,11 @@ check-old-files: @echo ">>> Checking for old files" -.for file in ${OLD_FILES} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @for file in ${OLD_FILES}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ @@ -1179,51 +1201,42 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @for file in ${OLD_LIBS}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}"; \ fi; \ - fi -.endfor + done @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @for file in ${OLD_LIBS}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done delete-old-dirs: @echo ">>> Removing old directories" -.for dir in ${OLD_DIRS} -# Don't fail if an old directory isn't empty. - @if [ -d "${DESTDIR}/${dir}" ]; then \ - rmdir -v "${DESTDIR}/${dir}" || true; \ - else \ - if [ -L "${DESTDIR}/${dir}" ]; then \ - echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + @for dir in ${OLD_DIRS}; do \ + if [ -d "${DESTDIR}/$${dir}" ]; then \ + rmdir -v "${DESTDIR}/$${dir}" || true; \ + elif [ -L "${DESTDIR}/$${dir}" ]; then \ + echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \ fi; \ - fi -.endfor + done @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" -.for dir in ${OLD_DIRS} - @if [ -d "${DESTDIR}/${dir}" ]; then \ - echo "${DESTDIR}/${dir}"; \ - else \ - if [ -L "${DESTDIR}/${dir}" ]; then \ - echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + @for dir in ${OLD_DIRS}; do \ + if [ -d "${DESTDIR}/$${dir}" ]; then \ + echo "${DESTDIR}/$${dir}"; \ + elif [ -L "${DESTDIR}/$${dir}" ]; then \ + echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \ fi; \ - fi -.endfor + done delete-old: delete-old-files delete-old-dirs @echo "To remove old libraries run '${MAKE} delete-old-libs'." ==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#3 (text+ko) ==== @@ -554,8 +554,7 @@ gvinum_parityop(int argc, char **argv, int rebuild) { struct gctl_req *req; - int flags, i, rv; - off_t offset; + int flags, i; const char *errstr; char *op, *msg; @@ -592,7 +591,17 @@ return; } - do { + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, op); + gctl_ro_param(req, "flags", sizeof(int), &flags); + gctl_ro_param(req, "plex", -1, argv[0]); + + errstr = gctl_issue(req); + if (errstr) + warnx("%s\n", errstr); + gctl_free(req); +/* do { rv = 0; req = gctl_get_handle(); gctl_ro_param(req, "class", -1, "VINUM"); @@ -621,16 +630,16 @@ } fflush(stdout); - /* Clear the -f flag. */ + Clear the -f flag. flags &= ~GV_FLAG_F; - } while (rv >= 0); + } while (rv >= 0);*/ - if ((rv == 2) && (flags & GV_FLAG_V)) { +/* if ((rv == 2) && (flags & GV_FLAG_V)) { if (rebuild) printf("Rebuilt parity on %s\n", argv[0]); else printf("%s has correct parity\n", argv[0]); - } + }*/ } void ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.amd64#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.22 2005/11/28 17:51:30 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.24 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.arm#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.31 2006/07/24 22:09:47 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.33 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.271 2006/01/29 03:32:19 nyan Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.273 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.ia64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.67 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.69 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.173 2006/01/29 03:32:19 nyan Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.175 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.powerpc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.283 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.285 2007/05/16 17:23:54 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.sparc64#2 (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.sparc64,v 1.40 2007/05/16 17:23:54 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/Makefile.sun4v#2 (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.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $ +# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.3 2007/05/16 17:23:54 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1424 2007/05/09 15:55:45 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1427 2007/05/16 17:19:47 scottl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -669,6 +669,7 @@ options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4) options NETGRAPH_BPF options NETGRAPH_BRIDGE +options NETGRAPH_CAR options NETGRAPH_CISCO options NETGRAPH_DEFLATE options NETGRAPH_DEVICE @@ -790,6 +791,7 @@ device wlan_tkip #802.11 TKIP support device wlan_xauth #802.11 external authenticator support device wlan_acl #802.11 MAC ACL support +device wlan_amrr #AMRR transmit rate control algorithm device token #Generic TokenRing device fddi #Generic FDDI device arcnet #Generic Arcnet @@ -1627,6 +1629,7 @@ device mlx # Mylex DAC960 device amr # AMI MegaRAID device mfi # LSI MegaRAID SAS +device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG # ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1204 2007/05/09 07:07:24 scottl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1210 2007/05/22 12:00:31 mav Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -340,6 +340,8 @@ contrib/pf/netinet/in4_cksum.c optional pf inet crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp crypto/blowfish/bf_skey.c optional crypto | ipsec ipsec_esp +crypto/camellia/camellia.c optional crypto | ipsec ipsec_esp +crypto/camellia/camellia-api.c optional crypto | ipsec ipsec_esp crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmb crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmb crypto/rc4/rc4.c optional netgraph_mppc_encryption @@ -754,6 +756,7 @@ dev/mfi/mfi_pci.c optional mfi pci dev/mfi/mfi_disk.c optional mfi dev/mfi/mfi_linux.c optional mfi compat_linux +dev/mfi/mfi_cam.c optional mfip scbus dev/mii/acphy.c optional miibus | acphy dev/mii/amphy.c optional miibus | amphy dev/mii/bmtphy.c optional miibus | bmtphy @@ -1423,7 +1426,7 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_core.c optional sched_core kern/sched_ule.c optional sched_ule -kern/serdev_if.m optional puc | scc +kern/serdev_if.m standard kern/subr_acl_posix1e.c standard kern/subr_autoconf.c standard kern/subr_blist.c standard @@ -1582,6 +1585,8 @@ net/if_tun.c optional tun net/if_tap.c optional tap net/if_vlan.c optional vlan +net/mppcc.c optional netgraph_mppc_compression +net/mppcd.c optional netgraph_mppc_compression net/netisr.c standard net/ppp_deflate.c optional ppp_deflate net/ppp_tty.c optional ppp @@ -1740,6 +1745,7 @@ netgraph/ng_base.c optional netgraph netgraph/ng_bpf.c optional netgraph_bpf netgraph/ng_bridge.c optional netgraph_bridge +netgraph/ng_car.c optional netgraph_car netgraph/ng_cisco.c optional netgraph_cisco netgraph/ng_deflate.c optional netgraph_deflate netgraph/ng_device.c optional netgraph_device @@ -1821,10 +1827,12 @@ netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet netinet/tcp_output.c optional inet +netinet/tcp_reass.c optional inet netinet/tcp_sack.c optional inet netinet/tcp_subr.c optional inet netinet/tcp_syncache.c optional inet netinet/tcp_timer.c optional inet +netinet/tcp_timewait.c optional inet netinet/tcp_usrreq.c optional inet netinet/udp_usrreq.c optional inet netinet/libalias/alias.c optional libalias | netgraph_nat @@ -1842,6 +1850,7 @@ netinet6/esp_input.c optional ipsec ipsec_esp netinet6/esp_output.c optional ipsec ipsec_esp netinet6/esp_rijndael.c optional ipsec ipsec_esp +netinet6/esp_camellia.c optional ipsec ipsec_esp netinet6/frag6.c optional inet6 netinet6/icmp6.c optional inet6 netinet6/in6.c optional inet6 ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif @@ -46,7 +46,7 @@ # a very small subset of float registers for integer divides. # .if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata INLINE_LIMIT?= 15000 .endif ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.pre.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -90,7 +90,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/soc2007/lulf/gvinum_fixup/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.217 2007/03/21 03:42:49 sam Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -79,7 +79,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -93,7 +93,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.587 2007/05/06 17:04:34 piso Exp $ +# $FreeBSD: src/sys/conf/options,v 1.588 2007/05/15 16:43:01 mav Exp $ # # On the handling of kernel options # @@ -442,6 +442,7 @@ NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h NETGRAPH_BPF opt_netgraph.h NETGRAPH_BRIDGE opt_netgraph.h +NETGRAPH_CAR opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h NETGRAPH_DEFLATE opt_netgraph.h NETGRAPH_DEVICE opt_netgraph.h ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.5 2007/05/09 05:37:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.7 2007/05/15 23:29:57 marcel Exp $"); #include #include @@ -592,6 +592,13 @@ if (null != NULL) kobj_delete((kobj_t)null, M_GEOM); + /* + * Support automatic commit by filling in the gpp_geom + * parameter. + */ + gpp->gpp_parms |= G_PART_PARM_GEOM; + gpp->gpp_geom = gp; + /* Provide feedback if so requested. */ if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); @@ -899,20 +906,20 @@ const char *p; enum g_part_ctl ctlreq; unsigned int i, mparms, oparms, parm; + int auto_commit, close_on_error; int error, modifies; G_PART_TRACE((G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, verb)); g_topology_assert(); ctlreq = G_PART_CTL_NONE; - modifies = 0; + modifies = 1; mparms = 0; oparms = G_PART_PARM_FLAGS | G_PART_PARM_OUTPUT | G_PART_PARM_VERSION; switch (*verb) { case 'a': if (!strcmp(verb, "add")) { ctlreq = G_PART_CTL_ADD; - modifies = 1; mparms |= G_PART_PARM_GEOM | G_PART_PARM_SIZE | G_PART_PARM_START | G_PART_PARM_TYPE; oparms |= G_PART_PARM_INDEX | G_PART_PARM_LABEL; @@ -922,9 +929,9 @@ if (!strcmp(verb, "commit")) { ctlreq = G_PART_CTL_COMMIT; mparms |= G_PART_PARM_GEOM; + modifies = 0; } else if (!strcmp(verb, "create")) { ctlreq = G_PART_CTL_CREATE; - modifies = 1; mparms |= G_PART_PARM_PROVIDER | G_PART_PARM_SCHEME; oparms |= G_PART_PARM_ENTRIES; } @@ -932,34 +939,28 @@ case 'd': if (!strcmp(verb, "delete")) { ctlreq = G_PART_CTL_DELETE; - modifies = 1; mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; } else if (!strcmp(verb, "destroy")) { ctlreq = G_PART_CTL_DESTROY; - modifies = 1; mparms |= G_PART_PARM_GEOM; } break; case 'm': if (!strcmp(verb, "modify")) { ctlreq = G_PART_CTL_MODIFY; - modifies = 1; mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; oparms |= G_PART_PARM_LABEL | G_PART_PARM_TYPE; } else if (!strcmp(verb, "move")) { ctlreq = G_PART_CTL_MOVE; - modifies = 1; mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; } break; case 'r': if (!strcmp(verb, "recover")) { ctlreq = G_PART_CTL_RECOVER; - modifies = 1; mparms |= G_PART_PARM_GEOM; } else if (!strcmp(verb, "resize")) { ctlreq = G_PART_CTL_RESIZE; - modifies = 1; mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; } break; @@ -967,6 +968,7 @@ if (!strcmp(verb, "undo")) { ctlreq = G_PART_CTL_UNDO; mparms |= G_PART_PARM_GEOM; + modifies = 0; } break; } @@ -1045,6 +1047,8 @@ error = g_part_parm_uint(p, &gpp.gpp_entries); break; case G_PART_PARM_FLAGS: + if (p[0] == '\0') + continue; error = g_part_parm_str(p, &gpp.gpp_flags); break; case G_PART_PARM_GEOM: @@ -1054,7 +1058,9 @@ error = g_part_parm_uint(p, &gpp.gpp_index); break; case G_PART_PARM_LABEL: - error = g_part_parm_str(p, &gpp.gpp_label); + /* An empty label is always valid. */ + gpp.gpp_label = p; + error = 0; break; case G_PART_PARM_OUTPUT: error = 0; /* Write-only parameter */ @@ -1094,6 +1100,8 @@ } /* Obtain permissions if possible/necessary. */ + close_on_error = 0; + table = NULL; /* Suppress uninit. warning. */ if (modifies && (gpp.gpp_parms & G_PART_PARM_GEOM)) { table = gpp.gpp_geom->softc; if (table != NULL && !table->gpt_opened) { @@ -1105,6 +1113,7 @@ return; } table->gpt_opened = 1; + close_on_error = 1; } } @@ -1143,6 +1152,22 @@ error = g_part_ctl_undo(req, &gpp); break; } + + /* Implement automatic commit. */ + if (!error) { + auto_commit = (modifies && + (gpp.gpp_parms & G_PART_PARM_FLAGS) && + strchr(gpp.gpp_flags, 'C') != NULL) ? 1 : 0; + if (auto_commit) { + KASSERT(gpp.gpp_parms & G_PART_PARM_GEOM, (__func__)); + error = g_part_ctl_commit(req, &gpp); + } + } + + if (error && close_on_error) { + g_access(LIST_FIRST(&gpp.gpp_geom->consumer), -1, -1, -1); + table->gpt_opened = 0; + } } static int ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#9 (text+ko) ==== @@ -74,7 +74,7 @@ gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL, NULL); } -static void +void gv_start(struct bio *bp) { struct g_geom *gp; @@ -333,10 +333,10 @@ #if 0 } else if (!strcmp(verb, "move")) { gv_move(gp, req); +#endif - } else if (!strcmp(verb, "parityop")) { - gv_parityop(gp, req); -#endif + } else if (!strcmp(verb, "rebuildparity")) { + gv_rebuild_parity(sc, req); } else if (!strcmp(verb, "remove")) { gv_remove(gp, req); @@ -568,6 +568,19 @@ "%d\n", err); break; + case GV_EVENT_REBUILD: + printf("VINUM: event 'rebuild'\n"); + /* + * Start the rebuild. The gv_plex_done will + * handle issuing of the remaining rebuild bio's + * until it's finished. + */ + /* XXX: Should check plex state here. */ + p = ev->arg1; + p->synced = 0; + gv_issue_next_parity_bio(p); + break; + case GV_EVENT_THREAD_EXIT: printf("VINUM: event 'thread exit'\n"); g_free(ev); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#7 (text+ko) ==== @@ -81,7 +81,7 @@ int gv_consumer_is_open(struct g_consumer *); int gv_provider_is_open(struct g_provider *); int gv_object_type(struct gv_softc *, char *); -void gv_parse_config(struct gv_softc *, u_char *); +void gv_parse_config(struct gv_softc *, char *); int gv_sd_to_drive(struct gv_sd *, struct gv_drive *); int gv_sd_to_plex(struct gv_sd *, struct gv_plex *); void gv_update_plex_config(struct gv_plex *); @@ -95,6 +95,7 @@ void gv_drive_tasted(struct gv_softc *, struct g_provider *); void gv_drive_lost(struct gv_softc *, struct gv_drive *); void gv_setup_objects(struct gv_softc *); +void gv_start(struct bio *); void gv_done(struct bio *); void gv_volume_start(struct gv_softc *, struct bio *); @@ -110,4 +111,7 @@ int gv_stripe_active(struct gv_plex *, struct bio *); +void gv_issue_next_parity_bio(struct gv_plex *); +void gv_rebuild_parity(struct gv_softc *, struct gctl_req *); + #endif /* !_GEOM_VINUM_H_ */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#3 (text+ko) ==== @@ -176,6 +176,8 @@ g_topology_lock(); error = g_access(cp, -1, -1, 0); + /* XXX: Unlock? */ + out: gctl_set_param(req, "rv", &rv, sizeof(rv)); } @@ -356,26 +358,88 @@ return (0); } -static int -gv_rebuild_plex(struct gv_plex *p) +struct gv_bio * +gv_new_rebuild_bio(struct gv_plex *p, off_t offset) { struct gv_sync_args *sync; + struct bio *bp; + struct gv_volume *v; + struct gv_plex *p; + struct g_consumer *cp; + u_char *buf; + off_t i; + int error; + + KASSERT(p != NULL, ("gv_rebuild_plex: NULL p")); + + buf = NULL; + bp = NULL; + v = p->vol_sc; - if (gv_consumer_is_open(p->geom)) - return (EBUSY); + if (!= NULL) + /* Check if any of our subdisks drives have consumers open. */ + /* XXX: Not provider since our mirror might block us. */ +/* if (gv_provider_is_open(v->provider)) + return (EBUSY);*/ - if (p->flags & GV_PLEX_SYNCING) +/* if (p->flags & GV_PLEX_SYNCING) return (EINPROGRESS); - p->flags |= GV_PLEX_SYNCING; + p->flags |= GV_PLEX_SYNCING;*/ sync = g_malloc(sizeof(*sync), M_WAITOK | M_ZERO); sync->to = p; sync->syncsize = GV_DFLT_SYNCSIZE; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 24 17:54:59 2007 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 4192216A469; Thu, 24 May 2007 17:54:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D344116A421 for ; Thu, 24 May 2007 17:54:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C2B7113C448 for ; Thu, 24 May 2007 17:54:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4OHswED004579 for ; Thu, 24 May 2007 17:54:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4OHswmn004567 for perforce@freebsd.org; Thu, 24 May 2007 17:54:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 24 May 2007 17:54:58 GMT Message-Id: <200705241754.l4OHswmn004567@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 120326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 17:54:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=120326 Change 120326 by hselasky@hselasky_mini_itx on 2007/05/24 17:54:45 Improve starting of isochronous transfers when the isochronous pipe is empty, hence some USB devices does not like when there is excess data per timeslot. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#30 (text+ko) ==== @@ -2534,9 +2534,14 @@ buf_offset = (nframes - xfer->pipe->isoc_next) & (EHCI_VIRTUAL_FRAMELIST_COUNT-1); - if (buf_offset < xfer->nframes) { - /* not in use yet, schedule it a few frames ahead */ - /* data underflow */ + if ((LIST_FIRST(&(xfer->pipe->list_head)) == NULL) || + (buf_offset < xfer->nframes)) + { + /* If there is data underflow or the pipe queue is + * empty we schedule the transfer a few frames ahead + * of the current frame position. Else two + * isochronous transfers might overlap. + */ xfer->pipe->isoc_next = (nframes + 3) & (EHCI_VIRTUAL_FRAMELIST_COUNT-1); DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); @@ -2790,9 +2795,14 @@ buf_offset = (nframes - xfer->pipe->isoc_next) & (EHCI_VIRTUAL_FRAMELIST_COUNT-1); - if (buf_offset < xfer->nframes) { - /* not in use yet, schedule it a few frames ahead */ - /* data underflow */ + if ((LIST_FIRST(&(xfer->pipe->list_head)) == NULL) || + (buf_offset < xfer->nframes)) + { + /* If there is data underflow or the pipe queue is + * empty we schedule the transfer a few frames ahead + * of the current frame position. Else two + * isochronous transfers might overlap. + */ xfer->pipe->isoc_next = (nframes + 3) & (EHCI_VIRTUAL_FRAMELIST_COUNT-1); DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#24 (text+ko) ==== @@ -1946,16 +1946,15 @@ nframes = le32toh(hw_ptr->hcca.hcca_frame_number); usbd_page_dma_enter(&(sc->sc_hw_page)); - /* check if the frame index is within - * the window where the frames will be - * inserted and if the delay until start - * is too long - */ - if ((((nframes - xfer->pipe->isoc_next) & 0xFFFF) < xfer->nframes) || + if ((LIST_FIRST(&(xfer->pipe->list_head)) == NULL) || + (((nframes - xfer->pipe->isoc_next) & 0xFFFF) < xfer->nframes) || (((xfer->pipe->isoc_next - nframes) & 0xFFFF) >= 128)) { - /* not in use yet, schedule it a few frames ahead */ - /* data underflow */ + /* If there is data underflow or the pipe queue is + * empty we schedule the transfer a few frames ahead + * of the current frame position. Else two + * isochronous transfers might overlap. + */ xfer->pipe->isoc_next = (nframes + 3) & 0xFFFF; DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#25 (text+ko) ==== @@ -2048,9 +2048,14 @@ buf_offset = (nframes - xfer->pipe->isoc_next) & (UHCI_VFRAMELIST_COUNT-1); - if (buf_offset < xfer->nframes) { - /* not in use yet, schedule it a few frames ahead */ - /* data underflow */ + if ((LIST_FIRST(&(xfer->pipe->list_head)) == NULL) || + (buf_offset < xfer->nframes)) + { + /* If there is data underflow or the pipe queue is + * empty we schedule the transfer a few frames ahead + * of the current frame position. Else two + * isochronous transfers might overlap. + */ xfer->pipe->isoc_next = (nframes + 3) & (UHCI_VFRAMELIST_COUNT-1); DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } From owner-p4-projects@FreeBSD.ORG Thu May 24 19:27:54 2007 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 A074316A4D6; Thu, 24 May 2007 19:27:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 51D8316A4D1 for ; Thu, 24 May 2007 19:27:54 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 406F013C483 for ; Thu, 24 May 2007 19:27:54 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4OJRsut088127 for ; Thu, 24 May 2007 19:27:54 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4OJRrSd088118 for perforce@freebsd.org; Thu, 24 May 2007 19:27:53 GMT (envelope-from lulf@FreeBSD.org) Date: Thu, 24 May 2007 19:27:53 GMT Message-Id: <200705241927.l4OJRrSd088118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 19:27:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=120331 Change 120331 by lulf@lulf_carrot on 2007/05/24 19:27:25 - Add paritycheck as well. - Change name of gv_rebuild_parity to gv_parityop. - Replace old parityop with this one. - Change userland utility to include rebuild flag. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#4 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#10 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#8 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#5 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#9 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#4 (text+ko) ==== @@ -594,6 +594,7 @@ req = gctl_get_handle(); gctl_ro_param(req, "class", -1, "VINUM"); gctl_ro_param(req, "verb", -1, op); + gctl_ro_param(req, "rebuild", sizeof(int), &rebuild); gctl_ro_param(req, "flags", sizeof(int), &flags); gctl_ro_param(req, "plex", -1, argv[0]); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#10 (text+ko) ==== @@ -335,8 +335,9 @@ gv_move(gp, req); #endif - } else if (!strcmp(verb, "rebuildparity")) { - gv_rebuild_parity(sc, req); + } else if (!strcmp(verb, "rebuildparity") || + !strcmp(verb, "checkparity")) { + gv_parityop(sc, req); } else if (!strcmp(verb, "remove")) { gv_remove(gp, req); @@ -568,7 +569,14 @@ "%d\n", err); break; - case GV_EVENT_REBUILD: + case GV_EVENT_PARITY_REBUILD: + /* Start parity check. */ + p = ev->arg1; + p->synced = 0; + gv_issue_next_parity_bio(p, 0); + break; + + case GV_EVENT_PARITY_CHECK: printf("VINUM: event 'rebuild'\n"); /* * Start the rebuild. The gv_plex_done will @@ -578,7 +586,7 @@ /* XXX: Should check plex state here. */ p = ev->arg1; p->synced = 0; - gv_issue_next_parity_bio(p); + gv_issue_next_parity_bio(p, 1); break; case GV_EVENT_THREAD_EXIT: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#8 (text+ko) ==== @@ -33,7 +33,7 @@ void gv_save_config(struct gv_softc *); /* geom_vinum_init.c */ -void gv_parityop(struct g_geom *, struct gctl_req *); +/*void gv_parityop(struct g_geom *, struct gctl_req *);*/ void gv_start_obj(struct g_geom *, struct gctl_req *); /* geom_vinum_list.c */ @@ -111,7 +111,7 @@ int gv_stripe_active(struct gv_plex *, struct bio *); -void gv_issue_next_parity_bio(struct gv_plex *); -void gv_rebuild_parity(struct gv_softc *, struct gctl_req *); +void gv_issue_next_parity_bio(struct gv_plex *, int); +void gv_parityop(struct gv_softc *, struct gctl_req *); #endif /* !_GEOM_VINUM_H_ */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#5 (text+ko) ==== @@ -474,7 +474,7 @@ * XXX: Should perhaps be another place. */ void -gv_issue_next_parity_bio(struct gv_plex *p) +gv_issue_next_parity_bio(struct gv_plex *p, int rebuild) { struct bio *bp; @@ -493,7 +493,8 @@ bp->bio_data = g_malloc(p->stripesize, M_WAITOK | M_ZERO); /* bp->bio_cflags |= GV_BIO_REBUILD;*/ bp->bio_cflags |= GV_BIO_CHECK; - bp->bio_cflags |= GV_BIO_PARITY; + if (rebuild) + bp->bio_cflags |= GV_BIO_PARITY; bp->bio_cflags |= GV_BIO_MALLOC; bp->bio_length = p->stripesize; @@ -502,6 +503,7 @@ printf("VINUM: rebuild of %s finished\n", p->name); g_free(bp->bio_data); g_destroy_bio(bp); + p->synced = 0; return; } @@ -520,9 +522,10 @@ static void gv_parity_completed(struct gv_plex *p, struct bio *bp) { - int error; + int error, rebuild; error = bp->bio_error; + rebuild = bp->bio_cflags & GV_BIO_PARITY; if (bp->bio_cflags & GV_BIO_MALLOC) g_free(bp->bio_data); g_destroy_bio(bp); @@ -530,21 +533,21 @@ /* Clean up what we allocated. */ /* XXX: Check for error type. */ if (error) { - printf("VINUM: Error rebuilding %s at %lld\n", p->name, + printf("VINUM: Parity operation error on %s at %lld\n", p->name, p->synced); return; } - printf("VINUM: Finished parity write at %lld\n", p->synced); + printf("VINUM: Parity operation at %lld finished\n", p->synced); /* Send down next. It will determine if we need to itself. */ - gv_issue_next_parity_bio(p); + gv_issue_next_parity_bio(p, rebuild); } void -gv_rebuild_parity(struct gv_softc *sc, struct gctl_req *req) +gv_parityop(struct gv_softc *sc, struct gctl_req *req) { struct gv_plex *p; - int *flags, type; + int *flags, *rebuild, type; char *plex; plex = gctl_get_param(req, "plex", NULL); @@ -559,6 +562,12 @@ return; } + rebuild = gctl_get_paraml(req, "rebuild", sizeof(*rebuild)); + if (rebuild == NULL) { + gctl_error(req, "no operation given"); + return; + } + type = gv_object_type(sc, plex); if (type != GV_TYPE_PLEX) { gctl_error(req, "'%s' is not a plex", plex); @@ -580,5 +589,8 @@ /* Put it in the event queue. */ /* XXX: The state of the plex might have changed when this event is * picked up ... We should really check this afterwards. */ - gv_post_event(sc, GV_EVENT_REBUILD, p, NULL, NULL); + if (*rebuild) + gv_post_event(sc, GV_EVENT_PARITY_REBUILD, p, NULL, NULL); + else + gv_post_event(sc, GV_EVENT_PARITY_CHECK, p, NULL, NULL); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#9 (text+ko) ==== @@ -190,7 +190,8 @@ #define GV_EVENT_SET_VOL_STATE 15 #define GV_EVENT_SET_PLEX_STATE 16 #define GV_EVENT_RESET_CONFIG 17 -#define GV_EVENT_REBUILD 18 +#define GV_EVENT_PARITY_REBUILD 18 +#define GV_EVENT_PARITY_CHECK 19 struct gv_event { int type; From owner-p4-projects@FreeBSD.ORG Thu May 24 21:42:12 2007 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 2528516A49A; Thu, 24 May 2007 21:42:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE67016A496 for ; Thu, 24 May 2007 21:42:11 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C9F4F13C44C for ; Thu, 24 May 2007 21:42:11 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4OLgBJK026916 for ; Thu, 24 May 2007 21:42:11 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4OLg98K026890 for perforce@freebsd.org; Thu, 24 May 2007 21:42:09 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 24 May 2007 21:42:09 GMT Message-Id: <200705242142.l4OLg98K026890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 May 2007 21:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=120347 Change 120347 by thompsa@thompsa_heff on 2007/05/24 21:41:28 IFC for the clock_lock fix. Affected files ... .. //depot/projects/wifi/MAINTAINERS#16 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/asn1.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ocsp/ocsp.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pem/pem.h#4 integrate .. //depot/projects/wifi/etc/network.subr#11 integrate .. //depot/projects/wifi/lib/libutil/flopen.c#2 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#24 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#21 integrate .. //depot/projects/wifi/share/man/man4/bge.4#12 integrate .. //depot/projects/wifi/share/man/man4/ng_car.4#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/support.S#7 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/wifi/sys/arm/arm/genassym.c#7 integrate .. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/wifi/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/wifi/sys/arm/conf/AVILA#3 integrate .. //depot/projects/wifi/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/wifi/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#17 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425_npe.c#4 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/wifi/sys/cam/cam.c#4 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_all.c#6 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/wifi/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/wifi/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/wifi/sys/conf/files.amd64#23 integrate .. //depot/projects/wifi/sys/conf/files.i386#27 integrate .. //depot/projects/wifi/sys/conf/files.pc98#18 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/dnlc.c#4 delete .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/wifi/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/wifi/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#24 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/wifi/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/wifi/sys/i386/i386/support.s#6 integrate .. //depot/projects/wifi/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/wifi/sys/kern/kern_clock.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_sig.c#18 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#22 integrate .. //depot/projects/wifi/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/wifi/sys/modules/linux/Makefile#7 integrate .. //depot/projects/wifi/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/wifi/sys/net/route.c#10 integrate .. //depot/projects/wifi/sys/netinet/tcp.h#13 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#30 integrate .. //depot/projects/wifi/sys/security/audit/audit.c#5 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/wifi/sys/sys/lock_profile.h#4 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#25 integrate .. //depot/projects/wifi/tools/regression/usr.sbin/sa/prime.sh#2 integrate Differences ... ==== //depot/projects/wifi/MAINTAINERS#16 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.144 2007/04/26 21:30:16 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -51,7 +51,7 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -em(4) tackerman Pre-commit review requested. +em(4) jfv Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. ==== //depot/projects/wifi/crypto/openssl/crypto/asn1/asn1.h#3 (text+ko) ==== @@ -903,22 +903,22 @@ /* Used to implement other functions */ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x); #define ASN1_dup_of(type,i2d,d2i,x) \ - ((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x) + ((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x))) #define ASN1_dup_of_const(type,i2d,d2i,x) \ - ((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x) + ((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x))) void *ASN1_item_dup(const ASN1_ITEM *it, void *x); #ifndef OPENSSL_NO_FP_API void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x); #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \ - ((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x) + ((type *)ASN1_d2i_fp((void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x))) void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x); int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x); #define ASN1_i2d_fp_of(type,i2d,out,x) \ - ((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x) + (ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x))) #define ASN1_i2d_fp_of_const(type,i2d,out,x) \ - ((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x) + (ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x))) int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x); int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags); #endif @@ -928,13 +928,13 @@ #ifndef OPENSSL_NO_BIO void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x); #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \ - ((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x) + ((type *)ASN1_d2i_bio( (void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x))) void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x); int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x); #define ASN1_i2d_bio_of(type,i2d,out,x) \ - ((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x) + (ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x))) #define ASN1_i2d_bio_of_const(type,i2d,out,x) \ - ((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x) + (ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x))) int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x); int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a); int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a); @@ -978,7 +978,7 @@ ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_OCTET_STRING **oct); #define ASN1_pack_string_of(type,obj,i2d,oct) \ - ((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct) + (ASN1_pack_string((obj), (i2d_of_void *)(i2d), (oct))) ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct); void ASN1_STRING_set_default_mask(unsigned long mask); ==== //depot/projects/wifi/crypto/openssl/crypto/ocsp/ocsp.h#3 (text+ko) ==== @@ -469,7 +469,7 @@ ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d, void *data, STACK_OF(ASN1_OBJECT) *sk); #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \ -((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk) +(ASN1_STRING_encode((s), (i2d_of_void *)(i2d), (data), (STACK_OF(ASN1_OBJECT) *)(sk))) X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim); ==== //depot/projects/wifi/crypto/openssl/crypto/pem/pem.h#4 (text+ko) ==== @@ -220,19 +220,20 @@ #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\ { \ -return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \ -} +return((type *)PEM_ASN1_read( \ + (d2i_of_void *)d2i_##asn1,str,fp,(void **)x,cb,u)); \ +} #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \ int PEM_write_##name(FILE *fp, type *x) \ { \ -return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \ +return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \ } #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \ int PEM_write_##name(FILE *fp, const type *x) \ { \ -return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \ +return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \ } #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \ @@ -240,7 +241,7 @@ unsigned char *kstr, int klen, pem_password_cb *cb, \ void *u) \ { \ - return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \ + return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \ } #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \ @@ -248,7 +249,7 @@ unsigned char *kstr, int klen, pem_password_cb *cb, \ void *u) \ { \ - return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \ + return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \ } #endif @@ -256,33 +257,34 @@ #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \ type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\ { \ -return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \ +return((type *)PEM_ASN1_read_bio( \ + (d2i_of_void *)d2i_##asn1,str,bp,(void **)x,cb,u)); \ } #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \ int PEM_write_bio_##name(BIO *bp, type *x) \ { \ -return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \ +return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \ } #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \ int PEM_write_bio_##name(BIO *bp, const type *x) \ { \ -return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \ +return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \ } #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \ { \ - return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \ + return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \ } #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \ { \ - return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \ + return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \ } #define IMPLEMENT_PEM_write(name, type, str, asn1) \ @@ -546,12 +548,12 @@ void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x, pem_password_cb *cb, void *u); #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \ -((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u) +((type *)PEM_ASN1_read_bio((d2i_of_void *)d2i,name,bp,(void **)x,cb,u)) int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x, const EVP_CIPHER *enc,unsigned char *kstr,int klen, pem_password_cb *cb, void *u); #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \ - ((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u) + (PEM_ASN1_write_bio)((i2d_of_void *)i2d,name,bp,(char *)x,enc,kstr,klen,cb,u) STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u); int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc, ==== //depot/projects/wifi/etc/network.subr#11 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.179 2007/03/29 21:42:19 ache Exp $ +# $FreeBSD: src/etc/network.subr,v 1.180 2007/05/23 00:18:44 thompsa Exp $ # # @@ -265,7 +265,7 @@ # Returns 0 if the interface exists and 1 otherwise. ifexists() { - ifconfig $1 > /dev/null 2>&1 + ifconfig -n $1 > /dev/null 2>&1 } # ipv4_up if ==== //depot/projects/wifi/lib/libutil/flopen.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/flopen.c,v 1.4 2007/05/10 15:01:42 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/flopen.c,v 1.7 2007/05/23 12:09:33 des Exp $"); #include #include @@ -41,7 +41,7 @@ int flopen(const char *path, int flags, ...) { - int fd, operation, serrno; + int fd, operation, serrno, trunc; struct stat sb, fsb; mode_t mode; @@ -62,6 +62,9 @@ if (flags & O_NONBLOCK) operation |= LOCK_NB; + trunc = (flags & O_TRUNC); + flags &= ~O_TRUNC; + for (;;) { if ((fd = open(path, flags, mode)) == -1) /* non-existent or no access */ @@ -91,6 +94,13 @@ close(fd); continue; } + if (trunc && ftruncate(fd, 0) != 0) { + /* can't happen [tm] */ + serrno = errno; + close(fd); + errno = serrno; + return (-1); + } return (fd); } } ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.8#24 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.137 2007/04/17 00:35:09 thompsa Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.138 2007/05/22 17:41:09 thompsa Exp $ .\" .Dd April 10, 2007 .Dt IFCONFIG 8 @@ -39,6 +39,7 @@ .Op Fl L .Op Fl k .Op Fl m +.Op Fl n .Ar interface .Op Cm create .Op Ar address_family @@ -1622,6 +1623,13 @@ the current user. This information is not printed by default, as it may be considered sensitive. +.Pp +If the network interface driver is not present in the kernel then +.Nm +will attempt to load it. +The +.Fl n +flag disables this behavior. .Pp Only the super-user may modify the configuration of a network interface. .Sh NOTES ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.130 2007/03/24 20:26:54 yar Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.131 2007/05/22 17:41:09 thompsa Exp $"; #endif /* not lint */ #include @@ -89,6 +89,7 @@ int clearaddr; int newaddr = 1; int verbose; +int noload; int supmedia = 0; int printkeys = 0; /* Print keying material for interfaces. */ @@ -150,10 +151,10 @@ struct option *p; size_t iflen; - all = downonly = uponly = namesonly = verbose = 0; + all = downonly = uponly = namesonly = noload = verbose = 0; /* Parse leading line options */ - strlcpy(options, "adklmuv", sizeof(options)); + strlcpy(options, "adklmnuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -173,6 +174,9 @@ case 'm': /* show media choices in status */ supmedia = 1; break; + case 'n': /* suppress module loading */ + noload++; + break; case 'u': /* restrict scan to "up" interfaces */ uponly++; break; @@ -898,6 +902,10 @@ char ifkind[35], *dp; const char *cp; + /* loading suppressed by the user */ + if (noload) + return; + /* turn interface and unit into module name */ strcpy(ifkind, "if_"); for (cp = name, dp = ifkind + 3; ==== //depot/projects/wifi/share/man/man4/bge.4#12 (text+ko) ==== @@ -29,9 +29,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bge.4,v 1.31 2007/01/30 09:47:31 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.32 2007/05/22 19:35:34 jkim Exp $ .\" -.Dd January 30, 2007 +.Dd May 22, 2007 .Dt BGE 4 .Os .Sh NAME @@ -205,14 +205,11 @@ SysKonnect SK-9D41 (1000baseSX) .El .Sh LOADER TUNABLES -Tunables can be set at the +The following tunable can be set at the .Xr loader 8 prompt before booting the kernel, or stored in .Xr loader.conf 5 . .Bl -tag -width indent -.It Va hw.bge.fake_autoneg -Set to 1 for special handling of the BCM5704 HW. -Disabled by default. .It Va hw.bge.allow_asf Allow the ASF feature for cooperating with IPMI. Can cause system lockup problems on a small number of systems. ==== //depot/projects/wifi/share/man/man4/ng_car.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_car.4,v 1.2 2007/05/16 12:00:22 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ng_car.4,v 1.3 2007/05/22 18:14:35 brueffer Exp $ .\" .Dd March 11, 2007 .Dt NG_CAR 4 @@ -40,9 +40,9 @@ .Pp .Bl -bullet -compact .It -Single rate three color marker as described on RFC 2697, +Single rate three color marker as described in RFC 2697, .It -Two rate three color marker as described on RFC 2698, +Two rate three color marker as described in RFC 2698, .It RED-like rate limit algorithm used by Cisco, .It @@ -75,7 +75,7 @@ Each hook can operate in one of the following modes: .Bl -tag -width indent .It Dv NG_CAR_SINGLE_RATE -Single rate three color marker as described on RFC 2697. +Single rate three color marker as described in RFC 2697. Committed burst packets are counted as green, extended burst packets are counted as yellow and exceeding packets are counted as red. Committed burst getting refilled with CIR (Committed Information Rate) speed. @@ -157,7 +157,7 @@ .It Dv NGM_CAR_CLR_STATS Pq Li clrstats Clear node statistics. .It Dv NGM_CAR_GETCLR_STATS Pq Li getclrstats -Atomicaly return and clear node statistics. +Atomically return and clear node statistics. .El .Sh SHUTDOWN This node shuts down upon receipt of a ==== //depot/projects/wifi/sys/amd64/amd64/support.S#7 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ */ #include "opt_ddb.h" @@ -671,49 +671,6 @@ incl %eax ret -/*****************************************************************************/ -/* linux_futex support */ -/*****************************************************************************/ - -futex_fault: - movq $0,PCB_ONFAULT(%rcx) - movq $-EFAULT,%rax - ret - -ENTRY(futex_xchgl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - - movq $VM_MAXUSER_ADDRESS-4,%rax - cmpq %rax,%rsi - ja futex_fault - -#ifdef SMP - lock -#endif - xchgl %edi,(%rsi) - movl %edi,(%rdx) - xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) - ret - -ENTRY(futex_addl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - - movq $VM_MAXUSER_ADDRESS-4,%rax - cmpq %rax,%rsi - ja futex_fault - -#ifdef SMP - lock -#endif - xaddl %edi,(%rsi) - movl %edi,(%rdx) - xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) - ret - /* * Support for BB-profiling (gcc -a). The kernbb program will extract * the data from the kernel. ==== //depot/projects/wifi/sys/arm/arm/genassym.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.9 2007/05/23 13:21:57 cognet Exp $"); #include #include #include @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/wifi/sys/arm/arm/vm_machdep.c#16 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.30 2007/01/17 00:53:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.31 2007/05/23 13:19:00 cognet Exp $"); #include #include @@ -55,12 +55,11 @@ #include #include #include -#include -#include #include #include #include +#include #include #include #include ==== //depot/projects/wifi/sys/arm/at91/kb920x_machdep.c#4 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.21 2007/03/27 06:29:19 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.22 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -77,7 +77,6 @@ #include #include -#include #include #include #include ==== //depot/projects/wifi/sys/arm/conf/AVILA#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/arm/conf/AVILA,v 1.3 2007/02/26 02:04:24 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.4 2007/05/24 16:27:48 sam Exp $ machine arm ident AVILA @@ -30,7 +30,7 @@ options STARTUP_PAGETABLE_ADDR=0x10000000 include "../xscale/ixp425/std.avila" #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. +hints "AVILA.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale @@ -137,3 +137,13 @@ #device crypto #device cryptodev #device hifn # NB: Soekris minipci card known to work + +#device usb +#options USB_DEBUG +#device uhci +#device ohci +#device ehci +#device ugen +#device umass +#device scbus # SCSI bus (required for SCSI) +#device da # Direct Access (disks) ==== //depot/projects/wifi/sys/arm/xscale/i80321/ep80219_machdep.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.6 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.7 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#17 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.27 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.28 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/wifi/sys/arm/xscale/ixp425/avila_ata.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.3 2007/03/14 18:05:04 jhay Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.4 2007/05/24 16:15:20 sam Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,17 +120,14 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, board_type, ide_gpin, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_gptype, ide_irq; - board_type = 0; sc->sc_dev = dev; /* NB: borrow from parent */ sc->sc_iot = sa->sc_iot; sc->sc_exp_ioh = sa->sc_exp_ioh; - if (EXP_BUS_READ_4(sc, EXP_TIMING_CS2_OFFSET) != 0) - board_type = 1; /* Avila board */ - - if (board_type == 1) { + if (EXP_BUS_READ_4(sc, EXP_TIMING_CS2_OFFSET) != 0) { + /* Avila board */ if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS1_HWBASE, IXP425_EXP_BUS_CS1_SIZE, 0, &sc->sc_ioh)) panic("%s: unable to map Expansion Bus CS1 window", @@ -140,10 +137,12 @@ panic("%s: unable to map Expansion Bus CS2 window", __func__); ide_gpin = AVILA_IDE_GPIN; + ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING); ide_irq = AVILA_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; } else { + /* Pronghorn */ if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS3_HWBASE, IXP425_EXP_BUS_CS3_SIZE, 0, &sc->sc_ioh)) panic("%s: unable to map Expansion Bus CS3 window", @@ -153,6 +152,7 @@ panic("%s: unable to map Expansion Bus CS4 window", __func__); ide_gpin = PRONGHORN_IDE_GPIN; + ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH); ide_irq = PRONGHORN_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; alt_t_off = EXP_TIMING_CS4_OFFSET; @@ -187,11 +187,10 @@ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPOER, GPIO_CONF_READ_4(sa, IXP425_GPIO_GPOER) | (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.4 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.5 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/wifi/sys/arm/xscale/ixp425/if_npe.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.5 2007/02/10 15:43:58 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -550,11 +550,27 @@ struct npe_softc * sc = device_get_softc(dev); int unit = device_get_unit(dev); int error, i; + uint32_t imageid; - /* load NPE firmware and start it running */ - error = ixpnpe_init(sc->sc_npe, "npe_fw", npeconfig[unit].imageid); - if (error != 0) - return error; + /* + * Load NPE firmware and start it running. We assume + * that minor version bumps remain compatible so probe + * the firmware image starting with the expected version + * and then bump the minor version up to the max. + */ + imageid = npeconfig[unit].imageid; + for (;;) { + error = ixpnpe_init(sc->sc_npe, "npe_fw", imageid); + if (error == 0) + break; + /* ESRCH is returned when the requested image is not present */ + if (error != ESRCH) + return error; + /* bump the minor version up to the max possible */ + if (NPEIMAGE_MINOR(imageid) == 0xff) + return error; + imageid++; + } if (bus_space_map(sc->sc_iot, npeconfig[unit].regbase, npeconfig[unit].regsize, 0, &sc->sc_ioh)) { ==== //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.5 2007/03/14 19:03:07 jhay Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.6 2007/05/24 16:25:49 sam Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -236,17 +236,14 @@ rman_manage_region(&sc->sc_mem_rman, 0, ~0) != 0) panic("ixp425_attach: failed to set up IRQ rman"); - device_add_child(dev, "pcib", 0); - device_add_child(dev, "ixpclk", 0); - device_add_child(dev, "ixpwdog", 0); - device_add_child(dev, "ixpiic", 0); - device_add_child(dev, "uart", 0); - /* XXX these are optional, what if they are not configured? */ - device_add_child(dev, "ixpqmgr", 0); - device_add_child(dev, "npe", 0); /* NPE-B */ - device_add_child(dev, "npe", 1); /* NPE-C */ - device_add_child(dev, "ata_avila", 0); /* XXX */ - device_add_child(dev, "led_avila", 0); + BUS_ADD_CHILD(dev, 0, "pcib", 0); + BUS_ADD_CHILD(dev, 0, "ixpclk", 0); + BUS_ADD_CHILD(dev, 0, "ixpiic", 0); + /* XXX move to hints? */ + BUS_ADD_CHILD(dev, 0, "ixpwdog", 0); + + /* attach wired devices via hints */ + bus_enumerate_hinted_children(dev); if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) @@ -261,6 +258,60 @@ return (0); } +static void +ixp425_hinted_child(device_t bus, const char *dname, int dunit) +{ + device_t child; + struct ixp425_ivar *ivar; + + child = BUS_ADD_CHILD(bus, 0, dname, dunit); + ivar = IXP425_IVAR(child); + resource_int_value(dname, dunit, "addr", &ivar->addr); + resource_int_value(dname, dunit, "irq", &ivar->irq); +} + +static device_t +ixp425_add_child(device_t dev, int order, const char *name, int unit) +{ + device_t child; + struct ixp425_ivar *ivar; + + child = device_add_child_ordered(dev, order, name, unit); + if (child == NULL) + return NULL; + ivar = malloc(sizeof(struct ixp425_ivar), M_DEVBUF, M_NOWAIT); + if (ivar == NULL) { + device_delete_child(dev, child); + return NULL; + } + ivar->addr = 0; + ivar->irq = -1; + device_set_ivars(child, ivar); + return child; +} + +static int +ixp425_read_ivar(device_t bus, device_t child, int which, u_char *result) +{ + struct ixp425_ivar *ivar = IXP425_IVAR(child); + + switch (which) { + case IXP425_IVAR_ADDR: + if (ivar->addr != 0) { + *(uint32_t *)result = ivar->addr; + return 0; + } + break; + case IXP425_IVAR_IRQ: + if (ivar->irq != -1) { + *(int *)result = ivar->irq; + return 0; + } + break; + } + return EINVAL; +} + static struct resource * ixp425_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -268,51 +319,46 @@ struct ixp425_softc *sc = device_get_softc(dev); struct rman *rmanp; struct resource *rv; - uint32_t vbase; - int isuart = (start == 0 && end == ~0); /* XXX how to do this right? */ + uint32_t vbase, addr; + int irq; - rv = NULL; - switch (type) { case SYS_RES_IRQ: rmanp = &sc->sc_irq_rman; - if (isuart) { - if (device_get_unit(dev) == 0) - start = IXP425_INT_UART0; - else - start = IXP425_INT_UART1; - end = start; - } + /* override per hints */ + if (BUS_READ_IVAR(dev, child, IXP425_IVAR_IRQ, &irq) == 0) + start = end = irq; + rv = rman_reserve_resource(rmanp, start, end, count, + flags, child); + if (rv != NULL) + rman_set_rid(rv, *rid); break; case SYS_RES_MEMORY: rmanp = &sc->sc_mem_rman; - if (isuart) { - if (device_get_unit(dev) == 0) - start = IXP425_UART0_HWBASE; + /* override per hints */ + if (BUS_READ_IVAR(dev, child, IXP425_IVAR_ADDR, &addr) == 0) { + start = addr; + end = start + 0x1000; /* XXX */ + } + if (getvbase(start, end - start, &vbase)) + return NULL; + rv = rman_reserve_resource(rmanp, start, end, count, + flags, child); + if (rv != NULL) { + rman_set_rid(rv, *rid); + if (strcmp(device_get_name(child), "uart") == 0) + rman_set_bustag(rv, &ixp425_a4x_bs_tag); else - start = IXP425_UART1_HWBASE; - end = start + 0x1000; + rman_set_bustag(rv, sc->sc_iot); + rman_set_bushandle(rv, vbase); } - if (getvbase(start, end - start, &vbase)) - return (rv); break; - default: - return (rv); + rv = NULL; + break; } - - rv = rman_reserve_resource(rmanp, start, end, count, flags, child); - if (rv != NULL) { - rman_set_rid(rv, *rid); - if (type == SYS_RES_MEMORY) { - rman_set_bustag(rv, - isuart ? &ixp425_a4x_bs_tag : sc->sc_iot); - rman_set_bushandle(rv, vbase); - } - } - - return (rv); + return rv; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 25 00:04:09 2007 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 CBF3316A4A0; Fri, 25 May 2007 00:04:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8534716A485 for ; Fri, 25 May 2007 00:04:08 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 750A213C484 for ; Fri, 25 May 2007 00:04:08 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4P048sN058387 for ; Fri, 25 May 2007 00:04:08 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4P048FU058381 for perforce@freebsd.org; Fri, 25 May 2007 00:04:08 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 25 May 2007 00:04:08 GMT Message-Id: <200705250004.l4P048FU058381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 00:04:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=120353 Change 120353 by thompsa@thompsa_heff on 2007/05/25 00:03:39 Add wlan_scan_* to the lint build. Affected files ... .. //depot/projects/wifi/sys/conf/NOTES#39 edit Differences ... ==== //depot/projects/wifi/sys/conf/NOTES#39 (text+ko) ==== @@ -792,6 +792,8 @@ device wlan_xauth #802.11 external authenticator support device wlan_acl #802.11 MAC ACL support device wlan_amrr #AMRR transmit rate control algorithm +device wlan_scan_ap #802.11 AP mode scanning +device wlan_scan_sta #802.11 STA mode scanning device token #Generic TokenRing device fddi #Generic FDDI device arcnet #Generic Arcnet From owner-p4-projects@FreeBSD.ORG Fri May 25 02:39:20 2007 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 9A04F16A46F; Fri, 25 May 2007 02:39:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2864316A46C for ; Fri, 25 May 2007 02:39:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 15A2013C46C for ; Fri, 25 May 2007 02:39:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4P2dKcB008133 for ; Fri, 25 May 2007 02:39:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4P2beQj006900 for perforce@freebsd.org; Fri, 25 May 2007 02:37:40 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 25 May 2007 02:37:40 GMT Message-Id: <200705250237.l4P2beQj006900@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 120359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 02:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=120359 Change 120359 by kmacy@kmacy_storage:opentoe_work on 2007/05/25 02:36:37 IFC Affected files ... .. //depot/projects/opentoe/MAINTAINERS#3 integrate .. //depot/projects/opentoe/Makefile#3 integrate .. //depot/projects/opentoe/Makefile.inc1#3 integrate .. //depot/projects/opentoe/ObsoleteFiles.inc#7 integrate .. //depot/projects/opentoe/UPDATING#7 integrate .. //depot/projects/opentoe/bin/csh/config.h#2 integrate .. //depot/projects/opentoe/bin/csh/config_p.h#2 integrate .. //depot/projects/opentoe/bin/df/df.c#3 integrate .. //depot/projects/opentoe/bin/mv/mv.1#2 integrate .. //depot/projects/opentoe/bin/rcp/rcp.c#2 integrate .. //depot/projects/opentoe/bin/sh/var.c#2 integrate .. //depot/projects/opentoe/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/opentoe/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/opentoe/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/opentoe/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/opentoe/contrib/csup/queue.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/BASE-VER#1 branch .. //depot/projects/opentoe/contrib/gcc/COPYING#2 integrate .. //depot/projects/opentoe/contrib/gcc/COPYING.LIB#2 integrate .. //depot/projects/opentoe/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/opentoe/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/opentoe/contrib/gcc/ChangeLog.0#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.1#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.2#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.3#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.4#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.5#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.6#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.7#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/opentoe/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/opentoe/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/opentoe/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/opentoe/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/opentoe/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/gcc/README-fixinc#2 delete .. //depot/projects/opentoe/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/opentoe/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/opentoe/contrib/gcc/addresses.h#1 branch .. //depot/projects/opentoe/contrib/gcc/alias.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/alias.h#1 branch .. //depot/projects/opentoe/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/ansidecl.h#2 delete .. //depot/projects/opentoe/contrib/gcc/attribs.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/basic-block.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/builtins.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/builtins.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-common.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-common.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-common.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-dump.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-format.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-format.h#1 branch .. //depot/projects/opentoe/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/opentoe/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/opentoe/contrib/gcc/c-omp.c#1 branch .. //depot/projects/opentoe/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-parse.in#2 delete .. //depot/projects/opentoe/contrib/gcc/c-parser.c#1 branch .. //depot/projects/opentoe/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-pretty-print.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-pretty-print.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-semantics.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/c.opt#2 integrate .. //depot/projects/opentoe/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/calls.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfg.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/opentoe/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/choose-temp.c#2 delete .. //depot/projects/opentoe/contrib/gcc/collect2.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/collect2.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/combine.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/common.opt#2 integrate .. //depot/projects/opentoe/contrib/gcc/concat.c#2 delete .. //depot/projects/opentoe/contrib/gcc/conditions.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config.build#2 integrate .. //depot/projects/opentoe/contrib/gcc/config.gcc#2 integrate .. //depot/projects/opentoe/contrib/gcc/config.host#2 integrate .. //depot/projects/opentoe/contrib/gcc/config.in#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/alpha-protos.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/alpha.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/alpha.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/alpha.md#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/elf.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/ev4.md#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/ev5.md#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/ev6.md#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/freebsd.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/gnu.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/lib1funcs.asm#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/linux-elf.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/linux.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/netbsd.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/openbsd.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/osf.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/osf5.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/qrnnd.asm#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-crtfm#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-ieee#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-osf4#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-vms#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/unicosmk.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/va_list.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-cc.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-crt0-64.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-crt0.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-dwarf2.asm#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-dwarf2eh.asm#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-ld.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms-psxcrt0.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms64.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/vms_tramp.asm#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/x-vms#2 delete .. //depot/projects/opentoe/contrib/gcc/config/alpha/xm-vms.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/arm-modes.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/ecos-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/lib1funcs.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/netbsd-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/strongarm-coff.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/strongarm-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/strongarm-pe.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/t-arm-coff#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/t-linux#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-semi#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-strongarm-pe#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/t-xscale-elf#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/uclinux-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/opentoe/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/freebsd-nthr.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/frv/cmovd.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/cmovh.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/cmovw.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frv-abi.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frv-asm.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frv-modes.def#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frv-protos.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frv.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frv.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frv.md#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frvbegin.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/frvend.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/lib1funcs.asm#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/t-frv#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/athlon.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/cygwin.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/darwin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/emmintrin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/freebsd-aout.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/gmon-sol2.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386-modes.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/k6.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/linux-aout.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/lynx-ng.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/moss.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/pentium.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/pmmintrin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/ppro.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/sol2-c1.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sol2-gc1.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/svr3dbx.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/svr3gas.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/sysv3.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/sysv4-cpp.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-linux64#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/t-sol2#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/udk.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/vsta.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/winnt.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/x-cygwin#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/opentoe/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/xm-djgpp.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/xm-mingw32.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/i386/xmmintrin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/crti.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/crtn.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/fde-glibc.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64-c.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64-modes.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/ia64/ia64intrin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/lib1funcs.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/unwind-ia64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/interix3.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/linux-aout.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/lynx-ng.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/memset.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/openbsd-oldgas.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix52.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/altivec-defs.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/altivec.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/eabi-ci.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/eabi-cn.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/eabialtivec.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/eabispe.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/linuxaltivec.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/ppc64-fp.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs6000-c.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs6000-modes.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/sol-ci.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/sol-cn.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/spe.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/spe.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-beos#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/tramp.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/windiss.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/opentoe/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/rtems.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/s390/s390-modes.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/s390/s390x.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/t-linux#1 branch .. //depot/projects/opentoe/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sol2.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/aout.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/biarch64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/cypress.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/elf.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/hypersparc.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/lite.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/litecoff.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/liteelf.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/openbsd.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/openbsd64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/pbd.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/rtemself.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2-64.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2-bi.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2-c1.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/sp64-aout.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sp86x-elf.h#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/sparc-modes.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sparc.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/sparclet.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/supersparc.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/opentoe/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/t-sparclite#2 delete .. //depot/projects/opentoe/contrib/gcc/config/sparc/ultra1_2.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/sparc/ultra3.md#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/t-darwin#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/opentoe/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/opentoe/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/t-linux-gnulibc1#2 delete .. //depot/projects/opentoe/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/opentoe/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/t-slibgcc-sld#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/opentoe/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/usegas.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/opentoe/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/opentoe/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/opentoe/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/opentoe/contrib/gcc/config/x-linux#2 integrate .. //depot/projects/opentoe/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/opentoe/contrib/gcc/configure#2 integrate .. //depot/projects/opentoe/contrib/gcc/configure.ac#2 integrate .. //depot/projects/opentoe/contrib/gcc/conflict.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/convert.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/convert.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/coverage.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/coverage.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp-demangle.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/opentoe/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog.1#2 delete .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog.2#2 delete .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/opentoe/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/NEWS#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/opentoe/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/except.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/lex.h#2 delete .. //depot/projects/opentoe/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cplus-dem.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cppdefault.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/cpperror.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cppexp.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cppfiles.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cpphash.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cpphash.h#2 delete .. //depot/projects/opentoe/contrib/gcc/cppinit.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cpplex.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cpplib.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cpplib.h#2 delete .. //depot/projects/opentoe/contrib/gcc/cppmacro.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cpppch.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cppspec.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cpptrad.c#2 delete .. //depot/projects/opentoe/contrib/gcc/cppucnid.h#2 delete .. //depot/projects/opentoe/contrib/gcc/cppucnid.pl#2 delete .. //depot/projects/opentoe/contrib/gcc/cppucnid.tab#2 delete .. //depot/projects/opentoe/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cse.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cselib.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/cselib.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/dbxout.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/dbxout.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/ddg.c#1 branch .. //depot/projects/opentoe/contrib/gcc/ddg.h#1 branch .. //depot/projects/opentoe/contrib/gcc/debug.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/debug.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/defaults.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/demangle.h#2 delete .. //depot/projects/opentoe/contrib/gcc/df-core.c#1 branch .. //depot/projects/opentoe/contrib/gcc/df-problems.c#1 branch .. //depot/projects/opentoe/contrib/gcc/df-scan.c#1 branch .. //depot/projects/opentoe/contrib/gcc/df.c#2 delete .. //depot/projects/opentoe/contrib/gcc/df.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/dfp.c#1 branch .. //depot/projects/opentoe/contrib/gcc/dfp.h#1 branch .. //depot/projects/opentoe/contrib/gcc/diagnostic.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/opentoe/contrib/gcc/diagnostic.h#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/c-tree.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/cfg.texi#1 branch .. //depot/projects/opentoe/contrib/gcc/doc/compat.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/contribute.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/cppinternals.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/fragments.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/gcov.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/gty.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/implement-c.texi#1 branch .. //depot/projects/opentoe/contrib/gcc/doc/include/fdl.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/include/gpl.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/include/texinfo.tex#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/libgcc.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/loop.texi#1 branch .. //depot/projects/opentoe/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/md.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/objc.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/options.texi#1 branch .. //depot/projects/opentoe/contrib/gcc/doc/passes.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/portability.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/rtl.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/doc/tree-ssa.texi#1 branch .. //depot/projects/opentoe/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/opentoe/contrib/gcc/dojump.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 25 13:34:22 2007 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 8334716A46C; Fri, 25 May 2007 13:34:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 478FF16A421 for ; Fri, 25 May 2007 13:34:22 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 35AFF13C484 for ; Fri, 25 May 2007 13:34:22 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4PDYMCr048899 for ; Fri, 25 May 2007 13:34:22 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4PDYL1R048890 for perforce@freebsd.org; Fri, 25 May 2007 13:34:21 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 25 May 2007 13:34:21 GMT Message-Id: <200705251334.l4PDYL1R048890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 13:34:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=120381 Change 120381 by lulf@lulf_carrot on 2007/05/25 13:34:04 - Add error handling to the parity checking. - Call gv_access before we issue bio's since we need to actually get permission to read/write to the consumers. - Reset access counters when calling gv_parity_completed. - Add topology locking where needed. Might change the scheme for this later. - Make gv_access availiable to other functions. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#11 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#9 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#6 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#11 (text+ko) ==== @@ -116,7 +116,7 @@ mtx_unlock(&sc->queue_mtx); } -static int +int gv_access(struct g_provider *pp, int dr, int dw, int de) { struct g_geom *gp; ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#9 (text+ko) ==== @@ -96,6 +96,7 @@ void gv_drive_lost(struct gv_softc *, struct gv_drive *); void gv_setup_objects(struct gv_softc *); void gv_start(struct bio *); +int gv_access(struct g_provider *, int, int, int); void gv_done(struct bio *); void gv_volume_start(struct gv_softc *, struct bio *); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#6 (text+ko) ==== @@ -367,11 +367,12 @@ pbp->bio_inbed++; if (pbp->bio_inbed == pbp->bio_children) { + printf("Error is %d\n", pbp->bio_error); /* XXX: Should this be done here? Probably to be done later, but * just for testing. */ - if (pbp->bio_cmd == BIO_WRITE && (pbp->bio_cflags & GV_BIO_PARITY)) { + if (pbp->bio_cmd == BIO_WRITE && + (pbp->bio_cflags & GV_BIO_CHECK)) { /* Schedule a new bio down to rebuild parity. */ - printf("Finished with rebuild at %lld\n", p->synced); gv_parity_completed(p, pbp); } else g_io_deliver(pbp, pbp->bio_error); @@ -477,20 +478,30 @@ gv_issue_next_parity_bio(struct gv_plex *p, int rebuild) { struct bio *bp; + int error; KASSERT(p != NULL, ("gv_issue_next_parity_bio: NULL p")); + g_topology_lock(); + error = gv_access(p->vol_sc->provider, 1, 1, 0); + if (error) { + printf("VINUM: unable to access provider\n"); + goto bad; + } bp = g_new_bio(); if (bp == NULL) { printf("VINUM: rebuild of %s failed creating bio: " "out of memory\n", p->name); - return; + gv_access(p->vol_sc->provider, -1, -1, 0); + goto bad; } + g_topology_unlock(); bp->bio_cmd = BIO_WRITE; bp->bio_done = NULL; bp->bio_data = g_malloc(p->stripesize, M_WAITOK | M_ZERO); + bp->bio_error = 0; /* bp->bio_cflags |= GV_BIO_REBUILD;*/ bp->bio_cflags |= GV_BIO_CHECK; if (rebuild) @@ -498,22 +509,16 @@ bp->bio_cflags |= GV_BIO_MALLOC; bp->bio_length = p->stripesize; - if (p->synced >= p->size) { - /* We're finished. */ - printf("VINUM: rebuild of %s finished\n", p->name); - g_free(bp->bio_data); - g_destroy_bio(bp); - p->synced = 0; - return; - } - /* We still have more parity to build. */ bp->bio_offset = p->synced; /* Now we need to find the correct subdisk to send it to. */ - p->synced += p->stripesize; - printf("VINUM: Issuing bio with offset %lld\n", bp->bio_offset); + printf("VINUM: Issuing bio at offset 0x%jx\n", + (intmax_t)bp->bio_offset); gv_plex_start(p, bp); /* Send it down to the plex. */ + return; +bad: + g_topology_unlock(); } /* @@ -530,14 +535,33 @@ g_free(bp->bio_data); g_destroy_bio(bp); + g_topology_lock(); + gv_access(p->vol_sc->provider, -1, -1, 0); + g_topology_unlock(); /* Clean up what we allocated. */ /* XXX: Check for error type. */ if (error) { - printf("VINUM: Parity operation error on %s at %lld\n", p->name, - p->synced); + if (error == EAGAIN) { + printf("VINUM: Parity incorrect at offset 0x%jx\n", + (intmax_t)p->synced); + if (!rebuild) + return; + } + printf("VINUM: Parity check on %s failed at 0x%jx errno %d\n", + p->name, (intmax_t)p->synced, error); + } else { + p->synced += p->stripesize; + } + printf("VINUM: Parity operation at 0x%jx finished\n", + (intmax_t)p->synced); + + + if (p->synced >= p->size) { + /* We're finished. */ + printf("VINUM: Parity operation on %s finished\n", p->name); + p->synced = 0; return; } - printf("VINUM: Parity operation at %lld finished\n", p->synced); /* Send down next. It will determine if we need to itself. */ gv_issue_next_parity_bio(p, rebuild); From owner-p4-projects@FreeBSD.ORG Fri May 25 13:40:31 2007 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 C786E16A46B; Fri, 25 May 2007 13:40:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A62416A468 for ; Fri, 25 May 2007 13:40:30 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 610D813C489 for ; Fri, 25 May 2007 13:40:30 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4PDeUvk054166 for ; Fri, 25 May 2007 13:40:30 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4PDeTWA054159 for perforce@freebsd.org; Fri, 25 May 2007 13:40:29 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 25 May 2007 13:40:29 GMT Message-Id: <200705251340.l4PDeTWA054159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 13:40:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=120382 Change 120382 by lulf@lulf_vimes on 2007/05/25 13:39:59 - Remove error printout not needed anymore. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#7 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#7 (text+ko) ==== @@ -367,7 +367,6 @@ pbp->bio_inbed++; if (pbp->bio_inbed == pbp->bio_children) { - printf("Error is %d\n", pbp->bio_error); /* XXX: Should this be done here? Probably to be done later, but * just for testing. */ if (pbp->bio_cmd == BIO_WRITE && From owner-p4-projects@FreeBSD.ORG Fri May 25 14:48:17 2007 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 5BDE016A468; Fri, 25 May 2007 14:48:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E678916A400 for ; Fri, 25 May 2007 14:48:16 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D4A4313C468 for ; Fri, 25 May 2007 14:48:16 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4PEmGvP021541 for ; Fri, 25 May 2007 14:48:16 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4PEmG6q021535 for perforce@freebsd.org; Fri, 25 May 2007 14:48:16 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 25 May 2007 14:48:16 GMT Message-Id: <200705251448.l4PEmG6q021535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 14:48:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120385 Change 120385 by lulf@lulf_carrot on 2007/05/25 14:48:02 - Make sure the lock is not held. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#8 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#8 (text+ko) ==== @@ -481,6 +481,8 @@ KASSERT(p != NULL, ("gv_issue_next_parity_bio: NULL p")); + /* Make sure we don't have the lock. */ + g_topology_assert_not(); g_topology_lock(); error = gv_access(p->vol_sc->provider, 1, 1, 0); if (error) { @@ -534,6 +536,8 @@ g_free(bp->bio_data); g_destroy_bio(bp); + /* Make sure we don't have the lock. */ + g_topology_assert_not(); g_topology_lock(); gv_access(p->vol_sc->provider, -1, -1, 0); g_topology_unlock(); From owner-p4-projects@FreeBSD.ORG Fri May 25 16:15:12 2007 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 C979D16A46C; Fri, 25 May 2007 16:15:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 920E816A400 for ; Fri, 25 May 2007 16:15:11 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8063B13C468 for ; Fri, 25 May 2007 16:15:11 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4PGFBMJ008144 for ; Fri, 25 May 2007 16:15:11 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4PGFBjJ008131 for perforce@freebsd.org; Fri, 25 May 2007 16:15:11 GMT (envelope-from fli@FreeBSD.org) Date: Fri, 25 May 2007 16:15:11 GMT Message-Id: <200705251615.l4PGFBjJ008131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 16:15:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=120388 Change 120388 by fli@fli_genesis on 2007/05/25 16:14:49 - Make the hash table self-growing - New pre-allocation scheme - Various minor optimizations Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#3 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#3 (text+ko) ==== @@ -76,7 +76,7 @@ * the return value. Two keys differing by one or two bits will have * totally different hash values. */ -static uint32_t +static inline uint32_t hash(const void *key, size_t length, uint32_t initval) { uint32_t a, b, c; /* internal state */ @@ -224,25 +224,82 @@ * This chunk is then split into `entries' number of table entries and put * on the free list. */ +static inline struct hashentry * +alloc_he(struct hashtbl *ht) +{ + struct he_pool *hep; + struct hashentry *he; + uint32_t len; + + if (!SLIST_EMPTY(&ht->ht_free)) { + hep = SLIST_FIRST(&ht->ht_free); + SLIST_REMOVE_HEAD(&ht->ht_free, hep_next); + return ((struct hashentry *)hep); + } + + hep = SLIST_FIRST(&ht->ht_new); + if (hep == NULL || hep->hep_pos >= hep->hep_size) { + len = 1 << ht->ht_alloc_size; + hep = malloc(sizeof(struct he_pool) + (sizeof(struct hashentry) * len)); + hep->hep_size = len; + hep->hep_pos = 0; + SLIST_INSERT_HEAD(&ht->ht_new, hep, hep_next); + + if (ht->ht_alloc_size < 16) + ht->ht_alloc_size++; + } + + he = (struct hashentry *)((char *)hep + sizeof(struct he_pool)); + he = &he[hep->hep_pos]; + hep->hep_pos++; + return (he); +} + +/* + * Return an hashentry object for further use + */ +static inline void +free_he(struct hashtbl *ht, struct hashentry *he) +{ + struct he_pool *hep; + + /* This cast is safe as long as he_pool is smaller than hashentry */ + hep = (struct he_pool *)he; + SLIST_INSERT_HEAD(&ht->ht_free, hep, hep_next); +} + +/* + * Self-grow hash table, called if the number of collisions are too large + */ static void -pre_alloc(struct hashtbl *ht) +grow(struct hashtbl *ht) { - struct hashentry *chunk; - int i, entries; - - entries = ht->ht_entries == 0 ? (ht->ht_tblsz / 2) : ht->ht_entries; + struct hashbkt *buckets; + struct hashentry *he, *he2; + size_t i, len; + uint32_t hval; - ht->ht_chunk = realloc(ht->ht_chunk, - sizeof(struct hashentry *) * (ht->ht_chunks + 1)); + len = ht->ht_tblsz; + ht->ht_tblsz *= 2; + ht->ht_mask = ht->ht_tblsz - 1; - chunk = ht->ht_chunk[ht->ht_chunks]; - chunk = malloc(sizeof(struct hashentry) * entries); + buckets = malloc(sizeof(struct hashbkt) * ht->ht_tblsz); + for (i = 0; i < ht->ht_tblsz; i++) { + TAILQ_INIT(&buckets[i].hb_table); + buckets[i].hb_len = 0; + } - for (i = 0; i < entries; i++) { - TAILQ_INSERT_TAIL(&ht->ht_free, &chunk[i], he_next); + for (i = 0; i < len; i++) { + TAILQ_FOREACH_SAFE(he, &ht->ht_buckets[i].hb_table, he_next, he2) { + hval = he->he_hash & ht->ht_mask; + TAILQ_REMOVE(&ht->ht_buckets[i].hb_table, he, he_next); + TAILQ_INSERT_TAIL(&buckets[hval].hb_table, he, he_next); + buckets[hval].hb_len++; + } } - ht->ht_chunk[ht->ht_chunks++] = chunk; + free(ht->ht_buckets); + ht->ht_buckets = buckets; } /* @@ -251,22 +308,24 @@ * len - table entries, should be a power of 2 */ int -hashtbl_init(struct hashtbl *ht, size_t len) +hashtbl_init(struct hashtbl *ht, size_t len, size_t grow, size_t col) { size_t i; - bzero(ht, sizeof(struct hashtbl)); - ht->ht_table = malloc(sizeof(*ht->ht_table) * len); + ht->ht_buckets = malloc(sizeof(struct hashbkt) * len); ht->ht_tblsz = len; + ht->ht_grow = grow; + ht->ht_col = col; ht->ht_mask = len - 1; - ht->ht_entries = 0; + ht->ht_alloc_size = 0; + SLIST_INIT(&ht->ht_new); + SLIST_INIT(&ht->ht_free); for (i = 0; i < len; i++) { - TAILQ_INIT(&ht->ht_table[i]); + TAILQ_INIT(&ht->ht_buckets[i].hb_table); + ht->ht_buckets[i].hb_len = 0; } - TAILQ_INIT(&ht->ht_free); - pre_alloc(ht); return (0); } @@ -277,18 +336,18 @@ hashtbl_destroy(struct hashtbl *ht) { struct hashentry *he; + struct he_pool *hep, *hep2; size_t i; for (i = 0; i < ht->ht_tblsz; i++) { - TAILQ_FOREACH(he, &ht->ht_table[i], he_next) { + TAILQ_FOREACH(he, &ht->ht_buckets[i].hb_table, he_next) { free(he->he_key); } } - - for (i = 0; i < ht->ht_chunks; i++) { - free(ht->ht_chunk[i]); + SLIST_FOREACH_SAFE(hep, &ht->ht_new, hep_next, hep2) { + free(hep); } - free(ht->ht_table); + free(ht->ht_buckets); } /* @@ -303,7 +362,7 @@ { struct hashentry *he; - TAILQ_FOREACH(he, &ht->ht_table[hval], he_next) { + TAILQ_FOREACH(he, &ht->ht_buckets[hval].hb_table, he_next) { if (keylen == he->he_keylen) { if (memcmp(key, he->he_key, keylen) == 0) break; @@ -327,25 +386,27 @@ uint32_t hval; struct hashentry *he; - hval = hash(key, keylen, time(NULL)); - hval &= ht->ht_mask; - - he = find(ht, hval, key, keylen); + hval = hash(key, keylen, 0); + he = find(ht, hval & ht->ht_mask, key, keylen); if (he != NULL) return (-1); - if (TAILQ_EMPTY(&ht->ht_free)) { - pre_alloc(ht); - } + he = alloc_he(ht); - he = TAILQ_FIRST(&ht->ht_free); - TAILQ_REMOVE(&ht->ht_free, he, he_next); + he->he_hash = hval; + hval &= ht->ht_mask; he->he_key = malloc(keylen); memcpy(he->he_key, key, keylen); he->he_keylen = keylen; he->he_data = data; - TAILQ_INSERT_TAIL(&ht->ht_table[hval], he, he_next); + TAILQ_INSERT_TAIL(&ht->ht_buckets[hval].hb_table, he, he_next); + ht->ht_buckets[hval].hb_len++; + + /* Attempt to grow table if needed */ + if ((ht->ht_grow > ht->ht_tblsz) && + (ht->ht_buckets[hval].hb_len >= ht->ht_col)) + grow(ht); return (0); } @@ -364,16 +425,14 @@ uint32_t hval; struct hashentry *he; - hval = hash(key, keylen, time(NULL)); + hval = hash(key, keylen, 0); hval &= ht->ht_mask; he = find(ht, hval, key, keylen); if (he != NULL) { - hval = hash(key, keylen, time(NULL)); - hval &= ht->ht_mask; - TAILQ_REMOVE(&ht->ht_table[hval], he, he_next); + TAILQ_REMOVE(&ht->ht_buckets[hval].hb_table, he, he_next); free(he->he_key); - TAILQ_INSERT_TAIL(&ht->ht_free, he, he_next); + free_he(ht, he); return (0); } return (-1); @@ -394,7 +453,7 @@ uint32_t hval; struct hashentry *he; - hval = hash(key, keylen, time(NULL)); + hval = hash(key, keylen, 0); hval &= ht->ht_mask; he = find(ht, hval, key, keylen); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#3 (text+ko) ==== @@ -34,25 +34,45 @@ */ struct hashentry { TAILQ_ENTRY(hashentry) he_next; /* Next entry */ + uint32_t he_hash; /* Hash key */ void *he_key; /* Key */ size_t he_keylen; /* Key length */ void *he_data; /* Data object pointer */ }; /* + * Hash bucket + */ +struct hashbkt { + TAILQ_HEAD(, hashentry) hb_table; + uint8_t hb_len; +}; + +/* + * Pre-allocated hashentry objects + */ +struct he_pool { + SLIST_ENTRY(he_pool) hep_next; + uint32_t hep_pos; + uint32_t hep_size; + /* sizeof(struct hashentry) * hep_size bytes follows */ +}; + +/* * Hash table */ struct hashtbl { - TAILQ_HEAD(, hashentry) *ht_table; /* Bucket array */ + struct hashbkt *ht_buckets; /* Bucket array */ size_t ht_tblsz; /* Size of table */ + size_t ht_grow; /* Allowed grow size */ + size_t ht_col; /* Allowed collisions */ uint32_t ht_mask; - struct hashentry **ht_chunk; /* Chunk array */ - TAILQ_HEAD(, hashentry) ht_free; /* Free list */ - size_t ht_entries; /* Entries per chunk */ - size_t ht_chunks; /* Number of chunks */ + uint8_t ht_alloc_size; + SLIST_HEAD(, he_pool) ht_new; /* new hashentry objs */ + SLIST_HEAD(, he_pool) ht_free; /* free hashentry objs */ }; -int hashtbl_init(struct hashtbl *, size_t); +int hashtbl_init(struct hashtbl *, size_t, size_t, size_t); void hashtbl_destroy(struct hashtbl *); int hashtbl_add(struct hashtbl *, void *, size_t, void *); int hashtbl_del(struct hashtbl *, void *, size_t); From owner-p4-projects@FreeBSD.ORG Fri May 25 19:58:02 2007 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 364C516A488; Fri, 25 May 2007 19:58:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DAE0D16A484 for ; Fri, 25 May 2007 19:58:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CD63C13C48C for ; Fri, 25 May 2007 19:58:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4PJw1hx021634 for ; Fri, 25 May 2007 19:58:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4PJw107021625 for perforce@freebsd.org; Fri, 25 May 2007 19:58:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 25 May 2007 19:58:01 GMT Message-Id: <200705251958.l4PJw107021625@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 120398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 19:58:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=120398 Change 120398 by hselasky@hselasky_mini_itx on 2007/05/25 19:57:40 Fix a showstopper or panic source in vm_contig.c. Affected files ... .. //depot/projects/usb/src/sys/vm/vm_contig.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/vm/vm_contig.c#6 (text+ko) ==== @@ -400,7 +400,10 @@ static vm_pindex_t np = 0; static vm_pindex_t start = 0; vm_pindex_t startl = 0; - int i, pass, pqtype; + vm_pindex_t temp; + int i, pqtype; + uint8_t pass; + uint8_t j; size = npages << PAGE_SHIFT; if (size == 0) @@ -485,7 +488,18 @@ pqtype != PQ_CACHE) { if (m->queue == PQ_ACTIVE || m->queue == PQ_INACTIVE) { - if (vm_contig_launder_page(m) != 0) + /* NOTE: The function + * "vm_config_launder_page()" + * can sleep. To ensure that + * this function operates + * coherently we need to + * suspend/resume the "start" + * variable: + */ + temp = start; + j = vm_contig_launder_page(m) ? 1 : 0; + start = temp; + if (j) goto cleanup_freed; pqtype = m->queue - m->pc; if (pqtype != PQ_FREE && @@ -520,7 +534,7 @@ goto retry_page; } /* - * We've found a contiguous chunk that meets are requirements. + * We've found a contiguous chunk that meets our requirements. */ np = npages; startl = start; From owner-p4-projects@FreeBSD.ORG Fri May 25 21:14:48 2007 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 045FD16A469; Fri, 25 May 2007 21:14:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0FA916A41F for ; Fri, 25 May 2007 21:14:47 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe02.swip.net [212.247.154.33]) by mx1.freebsd.org (Postfix) with ESMTP id 2D63A13C4BD for ; Fri, 25 May 2007 21:14:46 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] Received: from [88.88.46.79] (account mc467741@c2i.net HELO [192.168.0.102]) by mailfe02.swip.net (CommuniGate Pro SMTP 5.1.7) with ESMTPA id 503658112 for perforce@freebsd.org; Fri, 25 May 2007 22:14:42 +0200 From: Hans Petter Selasky To: Perforce Change Reviews Date: Fri, 25 May 2007 22:14:32 +0200 User-Agent: KMail/1.9.5 References: <200705251958.l4PJw107021625@repoman.freebsd.org> In-Reply-To: <200705251958.l4PJw107021625@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200705252214.32090.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 120398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 May 2007 21:14:48 -0000 On Friday 25 May 2007 21:58, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=120398 > > Change 120398 by hselasky@hselasky_mini_itx on 2007/05/25 19:57:40 > > Fix a showstopper or panic source in vm_contig.c. > > Affected files ... > > .. //depot/projects/usb/src/sys/vm/vm_contig.c#6 edit > > Differences ... > It would be really nice if the case of a single page could be optimized, hence the new USB stack only allocates single pages at a time. --HPS From owner-p4-projects@FreeBSD.ORG Sat May 26 03:05:00 2007 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 6822A16A474; Sat, 26 May 2007 03:05:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1E86916A473 for ; Sat, 26 May 2007 03:05:00 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0C81013C4AD for ; Sat, 26 May 2007 03:05:00 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4Q34xQR037403 for ; Sat, 26 May 2007 03:04:59 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4Q34xQY037391 for perforce@freebsd.org; Sat, 26 May 2007 03:04:59 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 26 May 2007 03:04:59 GMT Message-Id: <200705260304.l4Q34xQY037391@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 120413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 03:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=120413 Change 120413 by mjacob@mjexp on 2007/05/26 03:03:58 Remove some stale ioctls that were poorly thought out. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#28 edit .. //depot/projects/mjexp/sys/dev/isp/isp_ioctl.h#3 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#28 (text+ko) ==== @@ -307,11 +307,6 @@ { ispsoftc_t *isp; int nr, retval = ENOTTY; -#if __FreeBSD_version < 500000 - int s = splcam(); -#else - GIANT_REQUIRED; -#endif isp = isplist; while (isp) { @@ -321,9 +316,6 @@ isp = isp->isp_osinfo.next; } if (isp == NULL) { -#if __FreeBSD_version < 500000 - splx(s); -#endif return (ENXIO); } @@ -354,10 +346,12 @@ break; case ISP_FORCE_CRASH_DUMP: if (IS_FC(isp)) { + ISP_LOCK(isp); isp_freeze_loopdown(isp, "ispioctl(ISP_FORCE_CRASH_DUMP)"); isp_fw_dump(isp); isp_reinit(isp); + ISP_UNLOCK(isp); retval = 0; } break; @@ -380,37 +374,35 @@ retval = EINVAL; break; } - /* - * XXX: Current - */ - if (nr == ISP_ROLE_BOTH) { - isp_prt(isp, ISP_LOGERR, "dual roles not supported"); - retval = EINVAL; - break; - } *(int *)addr = isp->isp_role; isp->isp_role = nr; /* FALLTHROUGH */ case ISP_RESETHBA: + ISP_LOCK(isp); isp_reinit(isp); + ISP_UNLOCK(isp); retval = 0; break; case ISP_RESCAN: if (IS_FC(isp)) { + ISP_LOCK(isp); if (isp_fc_runstate(isp, 5 * 1000000)) { retval = EIO; } else { retval = 0; } + ISP_UNLOCK(isp); } break; case ISP_FC_LIP: if (IS_FC(isp)) { + ISP_LOCK(isp); if (isp_control(isp, ISPCTL_SEND_LIP, 0)) { retval = EIO; } else { retval = 0; } + ISP_UNLOCK(isp); } break; case ISP_FC_GETDINFO: @@ -446,6 +438,7 @@ sp->isp_stat_version = ISP_STATS_VERSION; sp->isp_type = isp->isp_type; sp->isp_revision = isp->isp_revision; + ISP_LOCK(isp); sp->isp_stats[ISP_INTCNT] = isp->isp_intcnt; sp->isp_stats[ISP_INTBOGUS] = isp->isp_intbogus; sp->isp_stats[ISP_INTMBOXC] = isp->isp_intmboxc; @@ -454,10 +447,12 @@ sp->isp_stats[ISP_FPHCCMCPLT] = isp->isp_fphccmplt; sp->isp_stats[ISP_RSCCHIWAT] = isp->isp_rscchiwater; sp->isp_stats[ISP_FPCCHIWAT] = isp->isp_fpcchiwater; + ISP_UNLOCK(isp); retval = 0; break; } case ISP_CLR_STATS: + ISP_LOCK(isp); isp->isp_intcnt = 0; isp->isp_intbogus = 0; isp->isp_intmboxc = 0; @@ -466,6 +461,7 @@ isp->isp_fphccmplt = 0; isp->isp_rscchiwater = 0; isp->isp_fpcchiwater = 0; + ISP_UNLOCK(isp); retval = 0; break; case ISP_FC_GETHINFO: @@ -489,92 +485,6 @@ retval = 0; break; } - case ISP_GET_FC_PARAM: - { - struct isp_fc_param *f = (struct isp_fc_param *) addr; - - if (IS_SCSI(isp)) { - break; - } - f->parameter = 0; - if (strcmp(f->param_name, "framelength") == 0) { - f->parameter = FCPARAM(isp)->isp_maxfrmlen; - retval = 0; - break; - } - if (strcmp(f->param_name, "exec_throttle") == 0) { - f->parameter = FCPARAM(isp)->isp_execthrottle; - retval = 0; - break; - } - if (strcmp(f->param_name, "fullduplex") == 0) { - if (FCPARAM(isp)->isp_fwoptions & ICBOPT_FULL_DUPLEX) - f->parameter = 1; - retval = 0; - break; - } - if (strcmp(f->param_name, "loopid") == 0) { - f->parameter = FCPARAM(isp)->isp_loopid; - retval = 0; - break; - } - retval = EINVAL; - break; - } - case ISP_SET_FC_PARAM: - { - struct isp_fc_param *f = (struct isp_fc_param *) addr; - uint32_t param = f->parameter; - - if (IS_SCSI(isp)) { - break; - } - f->parameter = 0; - if (strcmp(f->param_name, "framelength") == 0) { - if (param != 512 && param != 1024 && param != 1024) { - retval = EINVAL; - break; - } - FCPARAM(isp)->isp_maxfrmlen = param; - retval = 0; - break; - } - if (strcmp(f->param_name, "exec_throttle") == 0) { - if (param < 16 || param > 255) { - retval = EINVAL; - break; - } - FCPARAM(isp)->isp_execthrottle = param; - retval = 0; - break; - } - if (strcmp(f->param_name, "fullduplex") == 0) { - if (param != 0 && param != 1) { - retval = EINVAL; - break; - } - if (param) { - FCPARAM(isp)->isp_fwoptions |= - ICBOPT_FULL_DUPLEX; - } else { - FCPARAM(isp)->isp_fwoptions &= - ~ICBOPT_FULL_DUPLEX; - } - retval = 0; - break; - } - if (strcmp(f->param_name, "loopid") == 0) { - if (param < 0 || param > 125) { - retval = EINVAL; - break; - } - FCPARAM(isp)->isp_loopid = param; - retval = 0; - break; - } - retval = EINVAL; - break; - } case ISP_TSK_MGMT: { int needmarker; @@ -629,7 +539,9 @@ if (needmarker) { isp->isp_sendmarker |= 1; } + ISP_LOCK(isp); retval = isp_control(isp, ISPCTL_RUN_MBOXCMD, &mbs); + ISP_UNLOCK(isp); if (retval) retval = EIO; } @@ -638,9 +550,6 @@ default: break; } -#if __FreeBSD_version < 500000 - splx(s); -#endif return (retval); } ==== //depot/projects/mjexp/sys/dev/isp/isp_ioctl.h#3 (text+ko) ==== @@ -154,29 +154,6 @@ #define ISP_TOPO_FPORT 4 /* F-port */ #define ISP_FC_GETHINFO _IOR(ISP_IOC, 12, struct isp_hba_device) -/* - * Set some internal parameters. This doesn't take effect until - * the chip is reset. - * - * Each parameter is generalized to be a name string with an integer value. - * - * Known parameters are: - * - * Name Value Range - * - * "framelength" 512,1024,2048 - * "exec_throttle" 16..255 - * "fullduplex" 0,1 - * "loopid" 0..125 - */ - -struct isp_fc_param { - char param_name[16]; /* null terminated */ - uint32_t parameter; -}; - -#define ISP_GET_FC_PARAM _IOWR(ISP_IOC, 98, struct isp_fc_param) -#define ISP_SET_FC_PARAM _IOWR(ISP_IOC, 99, struct isp_fc_param) /* * Various Reset Goodies From owner-p4-projects@FreeBSD.ORG Sat May 26 06:06:42 2007 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 E94C416A421; Sat, 26 May 2007 06:06:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 88A7916A400 for ; Sat, 26 May 2007 06:06:41 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 75B6413C447 for ; Sat, 26 May 2007 06:06:41 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4Q66fNY026577 for ; Sat, 26 May 2007 06:06:41 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4Q66fOk026560 for perforce@freebsd.org; Sat, 26 May 2007 06:06:41 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 26 May 2007 06:06:41 GMT Message-Id: <200705260606.l4Q66fOk026560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 120417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 06:06:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=120417 Change 120417 by cdjones@cdjones_iconoclast on 2007/05/26 06:05:42 Fix KASSERT failure (we don't need j_pager_proc anyways), bump jail struct version, and fix jtune usage. Affected files ... .. //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_jail.c#3 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/sys/jail.h#3 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#4 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jtune/jtune.c#2 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -271,7 +271,7 @@ error = copyin(uap->jail, &j, sizeof(j)); if (error) return (error); - if (j.version != 0) + if (j.version != 1) return (EINVAL); MALLOC(pr, struct prison *, sizeof(*pr), M_PRISON, M_WAITOK | M_ZERO); @@ -333,8 +333,6 @@ if (kthread_create(jpager_td, pr, (void *) j_pager_proc, 0, 0, "jpager %d", pr->pr_id)) goto e_dropprref; - KASSERT(j_pager_proc != NULL, ("NULL j_pager_proc")); - pr->pr_pager = j_pager_proc; error = jail_attach(td, &jaa); if (error) @@ -609,6 +607,7 @@ mem_used += vmspace_resident_count(p->p_vmspace); } mem_used *= PAGE_SIZE; + pr->pr_mem_usage = mem_used; return mem_used; } ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/sys/jail.h#3 (text+ko) ==== @@ -89,7 +89,6 @@ void **pr_slots; /* (p) additional data */ u_int32_t pr_sched_shares; /* (p) jail priority */ u_int pr_estcpu; /* (p) est. cpu of jail */ - struct proc *pr_pager; /* (c) pager pid */ int *pr_pager_flags_ptr; /* (p) communication to pager */ size_t pr_mem_limit; /* (p) memory allocation limit */ size_t pr_mem_usage; /* (p) memory in use */ ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#4 (text+ko) ==== @@ -121,7 +121,7 @@ if (chdir(path) != 0) err(1, "chdir: %s", path); memset(&j, 0, sizeof(j)); - j.version = 0; + j.version = 1; j.path = path; j.hostname = argv[1]; if (inet_aton(argv[2], &in) == 0) ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jtune/jtune.c#2 (text+ko) ==== @@ -141,7 +141,7 @@ usage() { (void)fprintf(stderr, "%s\n", - "usage: jtune -j jid_id [-m mem_limit] [-s cpu_shares]"); + "usage: jtune -j jid_id [-i] [-m mem_limit] [-s cpu_shares]"); exit(0); } From owner-p4-projects@FreeBSD.ORG Sat May 26 09:03:17 2007 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 4E89216A46F; Sat, 26 May 2007 09:03:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 10BA016A46D for ; Sat, 26 May 2007 09:03:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DBDF413C45D for ; Sat, 26 May 2007 09:03:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4Q93GIT097597 for ; Sat, 26 May 2007 09:03:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4Q93G8m097588 for perforce@freebsd.org; Sat, 26 May 2007 09:03:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 26 May 2007 09:03:16 GMT Message-Id: <200705260903.l4Q93G8m097588@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 120419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 09:03:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120419 Change 120419 by hselasky@hselasky_mini_itx on 2007/05/26 09:02:35 The first step towards Video For Linux v2.0 support on FreeBSD. Some modifications have been made hence the initial Video For Linux v2.0 headers were very Linux specific, and used some not so compatible compiler features like unnamed unions. Have a look. Comments are welcome. Affected files ... .. //depot/projects/usb/src/sys/sys/videodev.h#1 add .. //depot/projects/usb/src/sys/sys/videokern.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat May 26 09:27:48 2007 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 77CEB16A46C; Sat, 26 May 2007 09:27:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1FFC416A41F for ; Sat, 26 May 2007 09:27:48 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 100F713C465 for ; Sat, 26 May 2007 09:27:48 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4Q9RlSV021619 for ; Sat, 26 May 2007 09:27:47 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4Q9RlgR021613 for perforce@freebsd.org; Sat, 26 May 2007 09:27:47 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 26 May 2007 09:27:47 GMT Message-Id: <200705260927.l4Q9RlgR021613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 09:27:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120420 Change 120420 by lulf@lulf_carrot on 2007/05/26 09:27:08 - Remove some whitespaces i did on lukas' code. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#9 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#9 (text+ko) ==== @@ -310,7 +310,6 @@ break; case BIO_WRITE: - /* XXX can this ever happen? */ if (wp == NULL) { completed = bp->bio_completed; @@ -358,14 +357,12 @@ } pbp = bp->bio_parent; - if (pbp->bio_error == 0) pbp->bio_error = bp->bio_error; pbp->bio_completed += completed; /* When the original request is finished, we deliver it. */ pbp->bio_inbed++; - if (pbp->bio_inbed == pbp->bio_children) { /* XXX: Should this be done here? Probably to be done later, but * just for testing. */ From owner-p4-projects@FreeBSD.ORG Sat May 26 10:43:19 2007 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 8FFE916A421; Sat, 26 May 2007 10:43:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6419916A41F for ; Sat, 26 May 2007 10:43:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 543FE13C44C for ; Sat, 26 May 2007 10:43:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QAhJRI093548 for ; Sat, 26 May 2007 10:43:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QAhIZA093538 for perforce@freebsd.org; Sat, 26 May 2007 10:43:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 26 May 2007 10:43:18 GMT Message-Id: <200705261043.l4QAhIZA093538@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 120421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 10:43:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=120421 Change 120421 by hselasky@hselasky_mini_itx on 2007/05/26 10:43:11 Remove unused code and formatting nits. Affected files ... .. //depot/projects/usb/src/sys/sys/videodev.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/sys/videodev.h#2 (text+ko) ==== @@ -191,8 +191,7 @@ /* * D R I V E R C A P A B I L I T I E S */ -struct v4l2_capability -{ +struct v4l2_capability { uint8_t driver[16]; /* i.e. "bttv" */ uint8_t card[32]; /* i.e. "Hauppauge WinTV" */ uint8_t bus_info[32]; /* "PCI:" + pci_name(pci_dev) */ @@ -218,8 +217,7 @@ /* * V I D E O I M A G E F O R M A T */ -struct v4l2_pix_format -{ +struct v4l2_pix_format { uint32_t width; uint32_t height; uint32_t pixelformat; @@ -280,8 +278,7 @@ /* * F O R M A T E N U M E R A T I O N */ -struct v4l2_fmtdesc -{ +struct v4l2_fmtdesc { uint32_t index; /* Format number */ enum v4l2_buf_type type; /* buffer type */ uint32_t flags; @@ -303,14 +300,12 @@ V4L2_FRMSIZE_TYPE_STEPWISE = 3, }; -struct v4l2_frmsize_discrete -{ +struct v4l2_frmsize_discrete { uint32_t width; /* Frame width [pixel] */ uint32_t height; /* Frame height [pixel] */ }; -struct v4l2_frmsize_stepwise -{ +struct v4l2_frmsize_stepwise { uint32_t min_width; /* Minimum frame width [pixel] */ uint32_t max_width; /* Maximum frame width [pixel] */ uint32_t step_width; /* Frame width step size [pixel] */ @@ -319,8 +314,7 @@ uint32_t step_height; /* Frame height step size [pixel] */ }; -struct v4l2_frmsizeenum -{ +struct v4l2_frmsizeenum { uint32_t index; /* Frame size number */ uint32_t pixel_format; /* Pixel format */ uint32_t type; /* Frame size type the device @@ -338,22 +332,19 @@ /* * F R A M E R A T E E N U M E R A T I O N */ -enum v4l2_frmivaltypes -{ +enum v4l2_frmivaltypes { V4L2_FRMIVAL_TYPE_DISCRETE = 1, V4L2_FRMIVAL_TYPE_CONTINUOUS = 2, V4L2_FRMIVAL_TYPE_STEPWISE = 3, }; -struct v4l2_frmival_stepwise -{ +struct v4l2_frmival_stepwise { struct v4l2_fract min; /* Minimum frame interval [s] */ struct v4l2_fract max; /* Maximum frame interval [s] */ struct v4l2_fract step; /* Frame interval step size [s] */ }; -struct v4l2_frmivalenum -{ +struct v4l2_frmivalenum { uint32_t index; /* Frame format index */ uint32_t pixel_format; /* Pixel format */ uint32_t width; /* Frame width */ @@ -376,8 +367,7 @@ /* * T I M E C O D E */ -struct v4l2_timecode -{ +struct v4l2_timecode { uint32_t type; #define V4L2_TC_TYPE_24FPS 1 #define V4L2_TC_TYPE_25FPS 2 @@ -398,8 +388,7 @@ uint8_t userbits[4]; }; -struct v4l2_jpegcompression -{ +struct v4l2_jpegcompression { uint32_t jpeg_markers; /* Which markers should go into the JPEG * output. Unless you exactly know what @@ -434,16 +423,14 @@ /* * M E M O R Y - M A P P I N G B U F F E R S */ -struct v4l2_requestbuffers -{ +struct v4l2_requestbuffers { uint32_t count; enum v4l2_buf_type type; enum v4l2_memory memory; uint32_t reserved[2]; }; -struct v4l2_buffer -{ +struct v4l2_buffer { uint32_t index; enum v4l2_buf_type type; uint32_t bytesused; @@ -475,8 +462,7 @@ /* * O V E R L A Y P R E V I E W */ -struct v4l2_framebuffer -{ +struct v4l2_framebuffer { uint32_t capability; /* read only */ #define V4L2_FBUF_CAP_EXTERNOVERLAY 0x0001 #define V4L2_FBUF_CAP_CHROMAKEY 0x0002 @@ -492,14 +478,12 @@ struct v4l2_pix_format fmt; }; -struct v4l2_clip -{ +struct v4l2_clip { struct v4l2_rect c; struct v4l2_clip __user *next; }; -struct v4l2_window -{ +struct v4l2_window { struct v4l2_rect w; enum v4l2_field field; uint32_t chromakey; @@ -511,8 +495,7 @@ /* * C A P T U R E P A R A M E T E R S */ -struct v4l2_captureparm -{ +struct v4l2_captureparm { uint32_t capability; /* Supported modes */ uint32_t capturemode; /* Current mode */ #define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ @@ -523,8 +506,7 @@ uint32_t reserved[4]; }; -struct v4l2_outputparm -{ +struct v4l2_outputparm { uint32_t capability; /* Supported modes */ uint32_t outputmode; /* Current mode */ struct v4l2_fract timeperframe; /* Time per frame in seconds */ @@ -632,8 +614,7 @@ #define V4L2_STD_ALL (V4L2_STD_525_60 | \ V4L2_STD_625_50) -struct v4l2_standard -{ +struct v4l2_standard { uint32_t index; v4l2_std_id id; uint8_t name[24]; @@ -645,8 +626,7 @@ /* * V I D E O I N P U T S */ -struct v4l2_input -{ +struct v4l2_input { uint32_t index; /* Which input */ uint8_t name[32]; /* Label */ uint32_t type; /* Type of input */ @@ -679,8 +659,7 @@ /* * V I D E O O U T P U T S */ -struct v4l2_output -{ +struct v4l2_output { uint32_t index; /* Which output */ uint8_t name[32]; /* Label */ uint32_t type; /* Type of output */ @@ -698,14 +677,12 @@ /* * C O N T R O L S */ -struct v4l2_control -{ +struct v4l2_control { uint32_t id; int32_t value; }; -struct v4l2_ext_control -{ +struct v4l2_ext_control { uint32_t id; uint32_t reserved2[2]; union { @@ -715,8 +692,7 @@ } u; } __packed; -struct v4l2_ext_controls -{ +struct v4l2_ext_controls { uint32_t ctrl_class; #define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ @@ -730,8 +706,7 @@ }; /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -struct v4l2_queryctrl -{ +struct v4l2_queryctrl { uint32_t id; enum v4l2_ctrl_type type; uint8_t name[32]; /* Whatever */ @@ -744,8 +719,7 @@ }; /* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ -struct v4l2_querymenu -{ +struct v4l2_querymenu { uint32_t id; uint32_t index; uint8_t name[32]; /* Whatever */ @@ -995,8 +969,7 @@ /* * T U N I N G */ -struct v4l2_tuner -{ +struct v4l2_tuner { uint32_t index; uint8_t name[32]; enum v4l2_tuner_type type; @@ -1010,8 +983,7 @@ uint32_t reserved[4]; }; -struct v4l2_modulator -{ +struct v4l2_modulator { uint32_t index; uint8_t name[32]; uint32_t capability; @@ -1044,8 +1016,7 @@ #define V4L2_TUNER_MODE_LANG1 0x0003 #define V4L2_TUNER_MODE_LANG1_LANG2 0x0004 -struct v4l2_frequency -{ +struct v4l2_frequency { uint32_t tuner; enum v4l2_tuner_type type; uint32_t frequency; @@ -1055,8 +1026,7 @@ /* * A U D I O */ -struct v4l2_audio -{ +struct v4l2_audio { uint32_t index; uint8_t name[32]; uint32_t capability; @@ -1071,8 +1041,7 @@ /* Flags for the 'mode' field */ #define V4L2_AUDMODE_AVL 0x00001 -struct v4l2_audioout -{ +struct v4l2_audioout { uint32_t index; uint8_t name[32]; uint32_t capability; @@ -1136,8 +1105,7 @@ */ /* Raw VBI */ -struct v4l2_vbi_format -{ +struct v4l2_vbi_format { uint32_t sampling_rate; /* in 1 Hz */ uint32_t offset; uint32_t samples_per_line; @@ -1159,8 +1127,7 @@ * notice in the definitive implementation. */ -struct v4l2_sliced_vbi_format -{ +struct v4l2_sliced_vbi_format { uint16_t service_set; /* service_lines[0][...] specifies lines 0-23 (1-23 used) * of the first field @@ -1189,8 +1156,7 @@ V4L2_SLICED_VPS | \ V4L2_SLICED_WSS_625) -struct v4l2_sliced_vbi_cap -{ +struct v4l2_sliced_vbi_cap { uint16_t service_set; /* service_lines[0][...] specifies lines 0-23 (1-23 used) * of the first field @@ -1204,8 +1170,7 @@ uint32_t reserved[3]; /* must be 0 */ }; -struct v4l2_sliced_vbi_data -{ +struct v4l2_sliced_vbi_data { uint32_t id; uint32_t field; /* 0: first field, 1: second field */ uint32_t line; /* 1-23 */ @@ -1219,11 +1184,9 @@ /* Stream data format */ -struct v4l2_format -{ +struct v4l2_format { enum v4l2_buf_type type; - union - { + union { /* V4L2_BUF_TYPE_VIDEO_CAPTURE: */ struct v4l2_pix_format pix; /* V4L2_BUF_TYPE_VIDEO_OVERLAY: */ @@ -1240,11 +1203,9 @@ /* Stream type-dependent parameters */ -struct v4l2_streamparm -{ +struct v4l2_streamparm { enum v4l2_buf_type type; - union - { + union { struct v4l2_captureparm capture; struct v4l2_outputparm output; uint8_t raw_data[200]; /* user-defined */ @@ -1283,10 +1244,7 @@ #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) #define VIDIOC_S_FMT _IOWR ('V', 5, struct v4l2_format) -#ifdef __KERNEL__ -#define VIDIOC_G_MPEGCOMP _IOR ('V', 6, struct v4l2_mpeg_compression) -#define VIDIOC_S_MPEGCOMP _IOW ('V', 7, struct v4l2_mpeg_compression) -#endif + #define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) #define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) From owner-p4-projects@FreeBSD.ORG Sat May 26 11:31:18 2007 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 5206B16A46B; Sat, 26 May 2007 11:31:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E970116A41F for ; Sat, 26 May 2007 11:31:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D9F9113C45B for ; Sat, 26 May 2007 11:31:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QBVHcC040639 for ; Sat, 26 May 2007 11:31:17 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QBVHsT040632 for perforce@freebsd.org; Sat, 26 May 2007 11:31:17 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 26 May 2007 11:31:17 GMT Message-Id: <200705261131.l4QBVHsT040632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 11:31:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=120422 Change 120422 by rpaulo@rpaulo_epsilon on 2007/05/26 11:31:01 The temperature values/names were wrong. By inspecting Hardware Monitor for Mac OS X, I figured it out how to correctly fetch the temperature and also what are the appropriate names for the keys. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#2 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#2 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#1 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#2 $ * */ @@ -75,7 +75,7 @@ static int asmc_fan_getvalue(device_t, const char *, int); static int asmc_temp_getvalue(device_t, const char *); static int asmc_sms_read(device_t, const char *, int16_t *); -static int asms_sms_calibrate(device_t); +static void asms_sms_calibrate(device_t); /* * Model functions. @@ -373,7 +373,7 @@ { struct asmc_softc *sc = device_get_softc(dev); int i, error = 1; - uint8_t buf[2]; + uint8_t buf[4]; /* * Wait up to 5 seconds for SMS initialization. @@ -399,7 +399,16 @@ device_printf(dev, "more than %d fans were detected. Please " "report this.", ASMC_MAXFANS); sc->sc_nfan = ASMC_MAXFANS; - } + } + + if (bootverbose) { + /* + * XXX: The number of keys is a 32 bit buffer, but + * right now Apple only uses the last 8 bit. + */ + asmc_key_read(dev, ASMC_NKEYS, buf, 4); + device_printf(dev, "number of keys: %d\n", buf[3]); + } return error; } @@ -605,9 +614,7 @@ if (asmc_key_read(dev, key, buf, 2) < 0) return -1; - temp = buf[0] | ((buf[1] >> 6) * 25); - - return temp; + return buf[0]; } static int @@ -651,7 +658,7 @@ return error; } -static int +static void asms_sms_calibrate(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#1 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#2 $ * */ @@ -80,6 +80,9 @@ #define ASMC_CMDREAD 0x10 #define ASMC_CMDWRITE 0x11 +/* Number of keys */ +#define ASMC_NKEYS "#KEY" /* RO; 4 bytes */ + /* * Fan control via SMC. */ @@ -120,16 +123,17 @@ * */ -#define ASMC_MB_TEMPS { "TB0T", "TC0D", "TC0P", "Th0H", "Th1H", \ - "Ts0P", NULL } +#define ASMC_MB_TEMPS { "TB0T", "TN0P", "TN1P", "Th0H", "Th1H", \ + "TM0P", NULL } #define ASMC_MB_TEMPNAMES { "enclosure", "northbridge1", \ "northbridge2", "heatsink1", \ "heatsink2", "memory", } -#define ASMC_MB_TEMPDESCS { "Enclosure Bottom", "Northbridge Point 1", \ +#define ASMC_MB_TEMPDESCS { "Enclosure Bottomside", \ + "Northbridge Point 1", \ "Northbridge Point 2", "Heatsink 1", \ "Heatsink 2", "Memory Bank A", } -#define ASMC_MM_TEMPS { "TC0D", "TC0P", NULL } +#define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL } #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ "Northbridge Point 2" } From owner-p4-projects@FreeBSD.ORG Sat May 26 11:44:35 2007 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 C78C516A469; Sat, 26 May 2007 11:44:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 546B316A41F for ; Sat, 26 May 2007 11:44:34 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 45B7613C4BE for ; Sat, 26 May 2007 11:44:34 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QBiYnS054217 for ; Sat, 26 May 2007 11:44:34 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QBiYuY054211 for perforce@freebsd.org; Sat, 26 May 2007 11:44:34 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 26 May 2007 11:44:34 GMT Message-Id: <200705261144.l4QBiYuY054211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 11:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=120423 Change 120423 by rpaulo@rpaulo_epsilon on 2007/05/26 11:44:03 Remove unused variable temp. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#3 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#2 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#3 $ * */ @@ -608,7 +608,6 @@ static int asmc_temp_getvalue(device_t dev, const char *key) { - int temp; uint8_t buf[2]; if (asmc_key_read(dev, key, buf, 2) < 0) From owner-p4-projects@FreeBSD.ORG Sat May 26 12:38:40 2007 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 A9B0B16A41F; Sat, 26 May 2007 12:38:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 60CFB16A46C for ; Sat, 26 May 2007 12:38:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3947B13C484 for ; Sat, 26 May 2007 12:38:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QCceDi003893 for ; Sat, 26 May 2007 12:38:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QCcdGl003887 for perforce@freebsd.org; Sat, 26 May 2007 12:38:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 26 May 2007 12:38:39 GMT Message-Id: <200705261238.l4QCcdGl003887@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 120425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 12:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=120425 Change 120425 by hselasky@hselasky_mini_itx on 2007/05/26 12:38:30 Improve spelling. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * - * usb_cdev.c - An abstraction layer for creation of devices under /dev/... + * usb_cdev.c - An abstraction layer for creating of devices under /dev/... * */ From owner-p4-projects@FreeBSD.ORG Sat May 26 12:50:56 2007 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 59B3816A46F; Sat, 26 May 2007 12:50:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 06E0E16A421 for ; Sat, 26 May 2007 12:50:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D40AA13C448 for ; Sat, 26 May 2007 12:50:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QCotag023715 for ; Sat, 26 May 2007 12:50:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QCot5a023704 for perforce@freebsd.org; Sat, 26 May 2007 12:50:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 26 May 2007 12:50:55 GMT Message-Id: <200705261250.l4QCot5a023704@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 120426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 12:50:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=120426 Change 120426 by hselasky@hselasky_mini_itx on 2007/05/26 12:50:12 More spelling. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * - * usb_cdev.c - An abstraction layer for creating of devices under /dev/... + * usb_cdev.c - An abstraction layer for creating devices under /dev/... * */ From owner-p4-projects@FreeBSD.ORG Sat May 26 13:26:40 2007 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 1339A16A468; Sat, 26 May 2007 13:26:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D81A416A400 for ; Sat, 26 May 2007 13:26:39 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C855513C448 for ; Sat, 26 May 2007 13:26:39 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QDQdhS060377 for ; Sat, 26 May 2007 13:26:39 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QDQdrb060368 for perforce@freebsd.org; Sat, 26 May 2007 13:26:39 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 26 May 2007 13:26:39 GMT Message-Id: <200705261326.l4QDQdrb060368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 13:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=120427 Change 120427 by lulf@lulf_carrot on 2007/05/26 13:26:35 - Add support for 'start ' command again with the new event system. However, only rebuilding degraded plexes is possible at the time. To test this i need attach/detach routines, so I'm going to work on this next. - Remove weird comments and put comments where they should be. - Rework the gv_issue_next* to be called gv_send_parity_bio, and change it parameters so that it can be used for both user initiated rebuild and on rebuilding a degraded plex. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#5 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#12 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#10 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#4 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#10 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#10 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#5 (text+ko) ==== ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#12 (text+ko) ==== @@ -348,11 +348,9 @@ } else if (!strcmp(verb, "resetconfig")) { gv_post_event(sc, GV_EVENT_RESET_CONFIG, sc, NULL, NULL); -#if 0 } else if (!strcmp(verb, "start")) { gv_start_obj(gp, req); -#endif } else if (!strcmp(verb, "setstate")) { gv_setstate(gp, req); } else @@ -570,23 +568,46 @@ break; case GV_EVENT_PARITY_REBUILD: - /* Start parity check. */ + /* + * Start the rebuild. The gv_plex_done will + * handle issuing of the remaining rebuild bio's + * until it's finished. + */ + printf("VINUM: event 'rebuild'\n"); p = ev->arg1; + if (p->state != GV_PLEX_UP) { + printf("VINUM: plex %s is not " + "completely accessible", p->name); + break; + } p->synced = 0; - gv_issue_next_parity_bio(p, 0); + gv_send_parity_bio(p, GV_BIO_CHECK | + GV_BIO_PARITY, 0); break; case GV_EVENT_PARITY_CHECK: - printf("VINUM: event 'rebuild'\n"); - /* - * Start the rebuild. The gv_plex_done will - * handle issuing of the remaining rebuild bio's - * until it's finished. - */ - /* XXX: Should check plex state here. */ + /* Start parity check. */ + printf("VINUM: event 'check'\n"); p = ev->arg1; + if (p->state != GV_PLEX_UP) { + printf("VINUM: plex %s is not " + "completely accessible", p->name); + break; + } p->synced = 0; - gv_issue_next_parity_bio(p, 1); + gv_send_parity_bio(p, GV_BIO_CHECK, 0); + break; + + case GV_EVENT_START_PLEX: + printf("VINUM: event 'start'\n"); + p = ev->arg1; + gv_start_plex(p); + break; + + case GV_EVENT_START_VOLUME: + printf("VINUM: event 'start'\n"); + v = ev->arg1; + /*gv_start_volume(v);*/ break; case GV_EVENT_THREAD_EXIT: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#10 (text+ko) ==== @@ -35,6 +35,7 @@ /* geom_vinum_init.c */ /*void gv_parityop(struct g_geom *, struct gctl_req *);*/ void gv_start_obj(struct g_geom *, struct gctl_req *); +int gv_start_plex(struct gv_plex *); /* geom_vinum_list.c */ void gv_ld(struct g_geom *, struct gctl_req *, struct sbuf *); @@ -112,7 +113,7 @@ int gv_stripe_active(struct gv_plex *, struct bio *); -void gv_issue_next_parity_bio(struct gv_plex *, int); +void gv_send_parity_bio(struct gv_plex *, int, off_t); void gv_parityop(struct gv_softc *, struct gctl_req *); #endif /* !_GEOM_VINUM_H_ */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#4 (text+ko) ==== @@ -40,15 +40,9 @@ #include #include -#if 0 -static int gv_init_plex(struct gv_plex *); -void gv_init_td(void *); -static int gv_rebuild_plex(struct gv_plex *); -void gv_rebuild_td(void *); -static int gv_start_plex(struct gv_plex *); static int gv_start_vol(struct gv_volume *); static int gv_sync(struct gv_volume *); -void gv_sync_td(void *); +static int gv_rebuild_plex(struct gv_plex *); struct gv_sync_args { struct gv_volume *v; @@ -58,131 +52,6 @@ }; void -gv_parityop(struct g_geom *gp, struct gctl_req *req) -{ - struct gv_softc *sc; - struct gv_plex *p; - struct bio *bp; - struct g_consumer *cp; - int error, *flags, type, *rebuild, rv; - char *plex; - - rv = -1; - - plex = gctl_get_param(req, "plex", NULL); - if (plex == NULL) { - gctl_error(req, "no plex given"); - goto out; - } - - flags = gctl_get_paraml(req, "flags", sizeof(*flags)); - if (flags == NULL) { - gctl_error(req, "no flags given"); - goto out; - } - - rebuild = gctl_get_paraml(req, "rebuild", sizeof(*rebuild)); - if (rebuild == NULL) { - gctl_error(req, "no rebuild op given"); - goto out; - } - - sc = gp->softc; - type = gv_object_type(sc, plex); - switch (type) { - case GV_TYPE_PLEX: - break; - case GV_TYPE_VOL: - case GV_TYPE_SD: - case GV_TYPE_DRIVE: - default: - gctl_error(req, "'%s' is not a plex", plex); - goto out; - } - - p = gv_find_plex(sc, plex); - if (p->state != GV_PLEX_UP) { - gctl_error(req, "plex %s is not completely accessible", - p->name); - goto out; - } - if (p->org != GV_PLEX_RAID5) { - gctl_error(req, "plex %s is not a RAID5 plex", p->name); - goto out; - } - - cp = p->consumer; - error = g_access(cp, 1, 1, 0); - if (error) { - gctl_error(req, "cannot access consumer"); - goto out; - } - g_topology_unlock(); - - /* Reset the check pointer when using -f. */ - if (*flags & GV_FLAG_F) - p->synced = 0; - - bp = g_new_bio(); - if (bp == NULL) { - gctl_error(req, "cannot create BIO - out of memory"); - g_topology_lock(); - error = g_access(cp, -1, -1, 0); - goto out; - } - bp->bio_cmd = BIO_WRITE; - bp->bio_done = NULL; - bp->bio_data = g_malloc(p->stripesize, M_WAITOK | M_ZERO); - bp->bio_cflags |= GV_BIO_CHECK; - if (*rebuild) - bp->bio_cflags |= GV_BIO_PARITY; - bp->bio_offset = p->synced; - bp->bio_length = p->stripesize; - - /* Schedule it down ... */ - g_io_request(bp, cp); - - /* ... and wait for the result. */ - error = biowait(bp, "gwrite"); - g_free(bp->bio_data); - g_destroy_bio(bp); - - if (error) { - /* Incorrect parity. */ - if (error == EAGAIN) - rv = 1; - - /* Some other error happened. */ - else - gctl_error(req, "Parity check failed at offset 0x%jx, " - "errno %d", (intmax_t)p->synced, error); - - /* Correct parity. */ - } else - rv = 0; - - gctl_set_param(req, "offset", &p->synced, sizeof(p->synced)); - - /* Advance the checkpointer if there was no error. */ - if (rv == 0) - p->synced += p->stripesize; - - /* End of plex; reset the check pointer and signal it to the caller. */ - if (p->synced >= p->size) { - p->synced = 0; - rv = -2; - } - - g_topology_lock(); - error = g_access(cp, -1, -1, 0); - - /* XXX: Unlock? */ - -out: - gctl_set_param(req, "rv", &rv, sizeof(rv)); -} - -void gv_start_obj(struct g_geom *gp, struct gctl_req *req) { struct gv_softc *sc; @@ -190,7 +59,7 @@ struct gv_plex *p; int *argc, *initsize; char *argv, buf[20]; - int err, i, type; + int i, type; argc = gctl_get_paraml(req, "argc", sizeof(*argc)); initsize = gctl_get_paraml(req, "initsize", sizeof(*initsize)); @@ -211,32 +80,16 @@ switch (type) { case GV_TYPE_VOL: v = gv_find_vol(sc, argv); - err = gv_start_vol(v); - if (err) { - if (err == EINPROGRESS) { - gctl_error(req, "cannot start volume " - "'%s': already in progress", argv); - } else { - gctl_error(req, "cannot start volume " - "'%s'; errno: %d", argv, err); - } - return; - } + if (v != NULL) + gv_post_event(sc, GV_EVENT_START_VOLUME, v, + NULL, NULL); break; case GV_TYPE_PLEX: p = gv_find_plex(sc, argv); - err = gv_start_plex(p); - if (err) { - if (err == EINPROGRESS) { - gctl_error(req, "cannot start plex " - "'%s': already in progress", argv); - } else { - gctl_error(req, "cannot start plex " - "'%s'; errno: %d", argv, err); - } - return; - } + if (p != NULL) + gv_post_event(sc, GV_EVENT_START_PLEX, p, NULL, + NULL); break; case GV_TYPE_SD: @@ -252,7 +105,7 @@ } } -static int +int gv_start_plex(struct gv_plex *p) { struct gv_volume *v; @@ -265,19 +118,20 @@ error = 0; v = p->vol_sc; - if ((v != NULL) && (v->plexcount > 1)) - error = gv_sync(v); + if ((v != NULL) && (v->plexcount > 1)); +/* error = gv_sync(v);*/ else if (p->org == GV_PLEX_RAID5) { if (p->state == GV_PLEX_DEGRADED) error = gv_rebuild_plex(p); - else - error = gv_init_plex(p); +/* else + error = gv_init_plex(p);*/ } return (error); } -static int +#if 0 +int gv_start_vol(struct gv_volume *v) { struct gv_plex *p; @@ -357,91 +211,25 @@ return (0); } +#endif -struct gv_bio * -gv_new_rebuild_bio(struct gv_plex *p, off_t offset) +static int +gv_rebuild_plex(struct gv_plex *p) { - struct gv_sync_args *sync; - struct bio *bp; - struct gv_volume *v; - struct gv_plex *p; - struct g_consumer *cp; - u_char *buf; - off_t i; - int error; - KASSERT(p != NULL, ("gv_rebuild_plex: NULL p")); + if (gv_provider_is_open(p->vol_sc->provider)) + return (EBUSY); - buf = NULL; - bp = NULL; - v = p->vol_sc; - - if (!= NULL) - /* Check if any of our subdisks drives have consumers open. */ - /* XXX: Not provider since our mirror might block us. */ -/* if (gv_provider_is_open(v->provider)) - return (EBUSY);*/ - -/* if (p->flags & GV_PLEX_SYNCING) + if (p->flags & GV_PLEX_SYNCING) return (EINPROGRESS); - p->flags |= GV_PLEX_SYNCING;*/ - - sync = g_malloc(sizeof(*sync), M_WAITOK | M_ZERO); - sync->to = p; - sync->syncsize = GV_DFLT_SYNCSIZE; - -/* p->synced = 0;*/ -/* cp = p->consumer; - - g_topology_lock(); - error = g_access(cp, 1, 1, 0); - if (error) { - g_topology_unlock(); - printf("GEOM_VINUM: rebuild of %s failed to access consumer: " - "%d\n", p->name, error); - return (GV_ERR_REBUILD); - } - g_topology_unlock(); -*/ - buf = g_malloc(sync->syncsize, M_WAITOK); - - printf("GEOM_VINUM: rebuild of %s started\n", p->name); - i = 0; - -/* for (i = 0; i < p->size; i += (p->stripesize * (p->sdcount - 1))) {*/ -/* - if (i + sync->syncsize > p->size) - sync->syncsize = p->size - i; -*/ - bp = g_new_bio(); - if (bp == NULL) { - printf("GEOM_VINUM: rebuild of %s failed creating bio: " - "out of memory\n", p->name); - return (NULL); - } - bp->bio_cmd = BIO_WRITE; - bp->bio_done = NULL; - bp->bio_data = buf; - bp->bio_cflags |= GV_BIO_REBUILD; - bp->bio_offset = offset; - bp->bio_length = p->stripesize; - -/* g_topology_lock(); - g_access(cp, -1, -1, 0); - gv_save_config_all(p->vinumconf); - g_topology_unlock(); -*/ -/* p->flags &= ~GV_PLEX_SYNCING; + p->flags |= GV_PLEX_SYNCING; p->synced = 0; -*/ - /* Successful initialization. */ -/* if (!error) - printf("GEOM_VINUM: rebuild of %s finished\n", p->name);*/ - - return (bp); + gv_send_parity_bio(p, GV_BIO_REBUILD, 0); + return (0); } +#if 0 static int gv_init_plex(struct gv_plex *p) { ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#10 (text+ko) ==== @@ -46,6 +46,7 @@ static int gv_normal_parity(struct gv_plex *, struct bio *, struct gv_raid5_packet *); static void gv_parity_completed(struct gv_plex *, struct bio *); +static void gv_rebuild_completed(struct gv_plex *, struct bio *); static struct bio * gv_plexbuffer(struct gv_plex *, struct bio *, caddr_t, off_t, off_t, int *); @@ -364,12 +365,13 @@ /* When the original request is finished, we deliver it. */ pbp->bio_inbed++; if (pbp->bio_inbed == pbp->bio_children) { - /* XXX: Should this be done here? Probably to be done later, but - * just for testing. */ + /* Hand it over for checking or delivery. */ if (pbp->bio_cmd == BIO_WRITE && - (pbp->bio_cflags & GV_BIO_CHECK)) { - /* Schedule a new bio down to rebuild parity. */ + (pbp->bio_cflags & GV_BIO_CHECK)) { gv_parity_completed(p, pbp); + } else if (pbp->bio_cmd == BIO_WRITE && + (pbp->bio_cflags & GV_BIO_REBUILD)) { + gv_rebuild_completed(p, pbp); } else g_io_deliver(pbp, pbp->bio_error); } @@ -466,17 +468,16 @@ } /* - * Create a new bio struct for the next parity rebuild. It is assumed that a bio - * from the last rebuild-parity is given as argument. - * XXX: Should perhaps be another place. + * Create a new bio struct for the next parity rebuild. Used both by internal + * rebuild of degraded plexes as well as user initiated rebuilds/checks. */ void -gv_issue_next_parity_bio(struct gv_plex *p, int rebuild) +gv_send_parity_bio(struct gv_plex *p, int flags, off_t offset) { struct bio *bp; int error; - KASSERT(p != NULL, ("gv_issue_next_parity_bio: NULL p")); + KASSERT(p != NULL, ("gv_send_parity_bio: NULL p")); /* Make sure we don't have the lock. */ g_topology_assert_not(); @@ -498,18 +499,27 @@ bp->bio_cmd = BIO_WRITE; bp->bio_done = NULL; - bp->bio_data = g_malloc(p->stripesize, M_WAITOK | M_ZERO); bp->bio_error = 0; -/* bp->bio_cflags |= GV_BIO_REBUILD;*/ - bp->bio_cflags |= GV_BIO_CHECK; - if (rebuild) - bp->bio_cflags |= GV_BIO_PARITY; + bp->bio_length = p->stripesize; + + /* + * Check if it's a rebuild of a degraded plex or a user request of + * parity rebuild. + */ + if (flags & GV_BIO_REBUILD) + bp->bio_data = g_malloc(GV_DFLT_SYNCSIZE, M_WAITOK); + else if (flags & GV_BIO_CHECK) + bp->bio_data = g_malloc(p->stripesize, M_WAITOK | M_ZERO); + else { + printf("VINUM: invalid flags given\n"); + return; + } + + bp->bio_cflags = flags; bp->bio_cflags |= GV_BIO_MALLOC; - bp->bio_length = p->stripesize; /* We still have more parity to build. */ - bp->bio_offset = p->synced; - /* Now we need to find the correct subdisk to send it to. */ + bp->bio_offset = offset; printf("VINUM: Issuing bio at offset 0x%jx\n", (intmax_t)bp->bio_offset); @@ -525,10 +535,13 @@ static void gv_parity_completed(struct gv_plex *p, struct bio *bp) { - int error, rebuild; + int error, flags; error = bp->bio_error; - rebuild = bp->bio_cflags & GV_BIO_PARITY; + flags = bp->bio_cflags; + flags &= ~GV_BIO_MALLOC; + + /* Clean up what we allocated. */ if (bp->bio_cflags & GV_BIO_MALLOC) g_free(bp->bio_data); g_destroy_bio(bp); @@ -538,13 +551,11 @@ g_topology_lock(); gv_access(p->vol_sc->provider, -1, -1, 0); g_topology_unlock(); - /* Clean up what we allocated. */ - /* XXX: Check for error type. */ if (error) { if (error == EAGAIN) { printf("VINUM: Parity incorrect at offset 0x%jx\n", (intmax_t)p->synced); - if (!rebuild) + if (!(flags & GV_BIO_PARITY)) return; } printf("VINUM: Parity check on %s failed at 0x%jx errno %d\n", @@ -564,7 +575,52 @@ } /* Send down next. It will determine if we need to itself. */ - gv_issue_next_parity_bio(p, rebuild); + gv_send_parity_bio(p, flags, p->synced); +} + +/* + * Handle a finished plex rebuild bio. + */ +static void +gv_rebuild_completed(struct gv_plex *p, struct bio *bp) +{ + int error, flags; + off_t offset; + + error = bp->bio_error; + flags = bp->bio_cflags; + offset = bp->bio_offset; + flags &= ~GV_BIO_MALLOC; + + /* Clean up what we allocated. */ + if (bp->bio_cflags & GV_BIO_MALLOC) + g_free(bp->bio_data); + g_destroy_bio(bp); + + /* Make sure we don't have the lock. */ + g_topology_assert_not(); + g_topology_lock(); + gv_access(p->vol_sc->provider, -1, -1, 0); + g_topology_unlock(); + if (error) { + printf("VINUM: rebuild of %s failed at offset %jd errno: %d\n", + p->name, (intmax_t)offset, error); + return; + } + + offset += (p->stripesize * (p->sdcount - 1)); + printf("VINUM: rebuild at 0x%jx finished\n", (intmax_t)offset); + if (offset >= p->size) { + /* We're finished. */ + printf("VINUM: rebuild of %s finished\n", p->name); + gv_save_config(p->vinumconf); + p->flags &= ~GV_PLEX_SYNCING; + p->synced = 0; + return; + } + + /* Send down next. It will determine if we need to itself. */ + gv_send_parity_bio(p, flags, offset); } void ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#10 (text+ko) ==== @@ -192,6 +192,8 @@ #define GV_EVENT_RESET_CONFIG 17 #define GV_EVENT_PARITY_REBUILD 18 #define GV_EVENT_PARITY_CHECK 19 +#define GV_EVENT_START_PLEX 20 +#define GV_EVENT_START_VOLUME 21 struct gv_event { int type; From owner-p4-projects@FreeBSD.ORG Sat May 26 23:00:21 2007 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 97FBB16A475; Sat, 26 May 2007 23:00:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62EAE16A473 for ; Sat, 26 May 2007 23:00:21 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3B85913C44C for ; Sat, 26 May 2007 23:00:21 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QN0LrE024306 for ; Sat, 26 May 2007 23:00:21 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QN0Kjk024296 for perforce@freebsd.org; Sat, 26 May 2007 23:00:20 GMT (envelope-from ivoras@FreeBSD.org) Date: Sat, 26 May 2007 23:00:20 GMT Message-Id: <200705262300.l4QN0Kjk024296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 120434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 23:00:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=120434 Change 120434 by ivoras@ivoras_finstall on 2007/05/26 23:00:14 FreeBSD "bobblehead" logo Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/glade/logo.png#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat May 26 23:02:25 2007 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 C868016A468; Sat, 26 May 2007 23:02:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7531B16A400 for ; Sat, 26 May 2007 23:02:24 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6568913C447 for ; Sat, 26 May 2007 23:02:24 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QN2ORo026753 for ; Sat, 26 May 2007 23:02:24 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QN2ODE026744 for perforce@freebsd.org; Sat, 26 May 2007 23:02:24 GMT (envelope-from ivoras@FreeBSD.org) Date: Sat, 26 May 2007 23:02:24 GMT Message-Id: <200705262302.l4QN2ODE026744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 120435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 23:02:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=120435 Change 120435 by ivoras@ivoras_finstall on 2007/05/26 23:02:14 - Add window icon decoration (bobblehead) - Add "Help" dialog and corresponding infrastructure Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/basewin.py#2 edit .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#7 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/helpdialog.glade#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#6 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/ndisks.glade#2 edit .. //depot/projects/soc2007/ivoras_finstall/installer/help/generic.txt#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/helpdialog.py#1 add Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/basewin.py#2 (text+ko) ==== @@ -1,3 +1,4 @@ +import os.path from types import MethodType import gtk, gtk.gdk, gtk.glade @@ -38,10 +39,11 @@ return dict - def _load_label(self, file_name): + def _load_label(self, label, file_name, dir="text"): """Returns the content of a text/* file with formatting replacements so it looks decent when Pango renders it""" - return file("text/%s" % file_name).read().replace("\n", " ").replace("
    ", "\n").replace("\n ", "\n") + label.set_text(file("%s/%s" % (dir, file_name)).read().replace("\n", " ").replace("
    ", "\n").replace("\n ", "\n")) + label.set_use_markup(True) def _clear_container(self, cont): ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#7 (text+ko) ==== @@ -3,6 +3,7 @@ import gtk, gtk.gdk, gtk.glade from basewin import BaseWin +from helpdialog import HelpDialog class MainWin(BaseWin): @@ -100,10 +101,14 @@ self._load_tile_nr(self.step_current) + def on_button_help_clicked(self, obj): + help = HelpDialog(self.step_track[self.step_current]["tile"]) + help.window.show() + + # Handlers for "intro" tile def intro_on_load(self): - self["label2"].set_text(self._load_label("intro.txt")) - self["label2"].set_use_markup(True) + self._load_label(self["label2"], "intro.txt") return True @@ -119,8 +124,7 @@ # Handlers for "ndisks" def ndisks_on_load(self): - self["label2"].set_text(self._load_label("ndisks.txt")) - self["label2"].set_use_markup(True) + self._load_label(self["label2"], "ndisks.txt") return True ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#6 (text+ko) ==== @@ -11,6 +11,7 @@ GTK_WIN_POS_CENTER 750 450 + logo.png ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/ndisks.glade#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -47,9 +47,11 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 True + 6 2 From owner-p4-projects@FreeBSD.ORG Sat May 26 23:05:29 2007 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 1A8C816A479; Sat, 26 May 2007 23:05:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ABE5B16A400 for ; Sat, 26 May 2007 23:05:28 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8385113C447 for ; Sat, 26 May 2007 23:05:28 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QN5SMj031009 for ; Sat, 26 May 2007 23:05:28 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QN5Sun031003 for perforce@freebsd.org; Sat, 26 May 2007 23:05:28 GMT (envelope-from ivoras@FreeBSD.org) Date: Sat, 26 May 2007 23:05:28 GMT Message-Id: <200705262305.l4QN5Sun031003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 120436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 May 2007 23:05:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=120436 Change 120436 by ivoras@ivoras_finstall on 2007/05/26 23:04:44 Help button and window icon Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#7 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#7 (text+ko) ====