From owner-p4-projects@FreeBSD.ORG Sun Oct 7 14:07:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 086E316A420; Sun, 7 Oct 2007 14:07:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6D3416A41B for ; Sun, 7 Oct 2007 14:07:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90C5713C467 for ; Sun, 7 Oct 2007 14:07:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97E7IgS057377 for ; Sun, 7 Oct 2007 14:07:18 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97E5hbk057328 for perforce@freebsd.org; Sun, 7 Oct 2007 14:05:43 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 7 Oct 2007 14:05:43 GMT Message-Id: <200710071405.l97E5hbk057328@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 127276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 14:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=127276 Change 127276 by rdivacky@rdivacky_witten on 2007/10/07 14:05:42 IFC... a massive one I changed some code. In next commits merges from my other branches will follow so dont mind if this is broken. Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mptable_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/apicvar.h#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#27 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#50 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#25 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#25 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#24 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#25 integrate .. //depot/projects/linuxolator/src/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/intr.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/locore.S#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/trap.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#8 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/ohci_atmelarm.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/CRB#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/KB920X#4 integrate .. //depot/projects/linuxolator/src/sys/arm/include/armreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/linuxolator/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/intr.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/include/kdb.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/include/pmap.h#5 integrate .. //depot/projects/linuxolator/src/sys/arm/include/profile.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/pte.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_wdog.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npe.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#5 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#6 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/Makefile#5 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#5 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#6 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.h#4 integrate .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#5 integrate .. //depot/projects/linuxolator/src/sys/boot/common/module.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit.h#4 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_record.h#4 integrate .. //depot/projects/linuxolator/src/sys/cam/README.quirks#1 branch .. //depot/projects/linuxolator/src/sys/cam/cam.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_sim.c#3 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_low.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/linuxolator/src/sys/coda/00READ#2 delete .. //depot/projects/linuxolator/src/sys/coda/README#2 delete .. //depot/projects/linuxolator/src/sys/coda/TODO#2 delete .. //depot/projects/linuxolator/src/sys/coda/cnode.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_fbsd.c#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_io.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_kernel.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_namecache.c#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_namecache.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_opstats.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_psdev.c#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_psdev.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_subr.c#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_subr.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_venus.c#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_venus.h#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_vfsops.c#2 delete .. //depot/projects/linuxolator/src/sys/coda/coda_vfsops.h#3 delete .. //depot/projects/linuxolator/src/sys/coda/coda_vnops.c#4 delete .. //depot/projects/linuxolator/src/sys/coda/coda_vnops.h#3 delete .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#25 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#17 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#65 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#16 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#25 integrate .. //depot/projects/linuxolator/src/sys/conf/files#28 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#12 integrate .. //depot/projects/linuxolator/src/sys/conf/files.arm#5 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#11 integrate .. //depot/projects/linuxolator/src/sys/conf/files.ia64#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files.pc98#9 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#8 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.mk#3 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/linuxolator/src/sys/conf/options#24 integrate .. //depot/projects/linuxolator/src/sys/conf/options.amd64#3 integrate .. //depot/projects/linuxolator/src/sys/conf/options.arm#5 integrate .. //depot/projects/linuxolator/src/sys/conf/options.i386#3 integrate .. //depot/projects/linuxolator/src/sys/conf/options.ia64#2 integrate .. //depot/projects/linuxolator/src/sys/conf/options.pc98#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/linuxolator/src/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 delete .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pfsync.h#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_mtag.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_ruleset.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/linuxolator/src/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/linuxolator/src/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/linuxolator/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/linuxolator/src/sys/ddb/db_ps.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/advansys.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adwcam.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/aha.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/amd/amd.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/asr/asr.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/awi/awivar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#12 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ce/if_ce.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/coretemp/coretemp.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_vsc7323.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/linuxolator/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/linuxolator/src/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/dc/if_dc.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/de/if_de.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_eisa.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/README#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em_hw.c#4 delete .. //depot/projects/linuxolator/src/sys/dev/em/if_em_hw.h#4 delete .. //depot/projects/linuxolator/src/sys/dev/em/if_em_osdep.h#4 delete .. //depot/projects/linuxolator/src/sys/dev/en/midway.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/boot_font.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/creator.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/gallant12x22.h#2 delete .. //depot/projects/linuxolator/src/sys/dev/fb/gfb.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/hptmv/entry.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iir/iir.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_smbios.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/isc_cam.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/isc_sm.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/isc_soc.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/isc_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/iscsi.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/iscsi.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iscsi/initiator/iscsivar.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#15 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_library.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#17 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/led/led.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/led/led.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/md/md.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_ioctl.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/mii/mii.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#9 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mly/mly.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#16 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/eth_z8e.dat.gz.uu#4 delete .. //depot/projects/linuxolator/src/sys/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 delete .. //depot/projects/linuxolator/src/sys/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfe.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nxge/if_nxge.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/if_nxge.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/build-version.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/version.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-debug.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-defs.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-list.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-os-pal.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-os-template.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xge-queue.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-channel.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-config.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-device.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-driver.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-event.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-fifo.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-mgmt.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-mgmtaux.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-mm.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-regs.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-ring.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-stats.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal-types.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/include/xgehal.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xge-osdep.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xge-queue.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-channel.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-config.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-device.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-driver.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-fifo.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-mm.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-ring.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgehal/xgehal-stats.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/nxge/xgell-version.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#22 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_if.m#5 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_pci.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcib_if.m#5 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcib_private.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcivar.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2661reg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/clone.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/clone.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/als4000.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cmi.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10k1.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx-pcm.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#19 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_volume.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/unit.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/unit.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/version.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/stge/if_stge.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/streams/streams.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/trm/trm.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_kbd_sun.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/dsbr100io.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uark.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umass.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_mem.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/wds/wd7000.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/linuxolator/src/sys/fs/coda/README#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/TODO#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/cnode.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/bpb.h#5 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/linuxolator/src/sys/fs/tmpfs/tmpfs_vnops.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 7 14:12:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 598AD16A41B; Sun, 7 Oct 2007 14:12:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB72916A418 for ; Sun, 7 Oct 2007 14:12:35 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id 9B01C13C48E for ; Sun, 7 Oct 2007 14:12:35 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id D08B3668D6C for ; Sun, 7 Oct 2007 16:12:34 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6czXpEhkV+xR for ; Sun, 7 Oct 2007 16:12:29 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id DD89A668D6B for ; Sun, 7 Oct 2007 16:12:29 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l97ECTYq045113 for perforce@FreeBSD.org; Sun, 7 Oct 2007 16:12:29 +0200 (CEST) (envelope-from rdivacky) Date: Sun, 7 Oct 2007 16:12:29 +0200 From: Roman Divacky To: Perforce Change Reviews Message-ID: <20071007141229.GA45106@freebsd.org> References: <200710071405.l97E5hbk057328@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200710071405.l97E5hbk057328@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Subject: Re: PERFORCE change 127276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 14:12:36 -0000 On Sun, Oct 07, 2007 at 02:05:43PM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=127276 > > Change 127276 by rdivacky@rdivacky_witten on 2007/10/07 14:05:42 > > IFC... a massive one I changed some code. In next commits merges from > my other branches will follow so dont mind if this is broken. I managed to commit another changes too... :( From owner-p4-projects@FreeBSD.ORG Sun Oct 7 14:22:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9A8316A469; Sun, 7 Oct 2007 14:22:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FE5616A421 for ; Sun, 7 Oct 2007 14:22:49 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C70E13C467 for ; Sun, 7 Oct 2007 14:22:49 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97EMn1g058287 for ; Sun, 7 Oct 2007 14:22:49 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97EMaeK058273 for perforce@freebsd.org; Sun, 7 Oct 2007 14:22:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 7 Oct 2007 14:22:36 GMT Message-Id: <200710071422.l97EMaeK058273@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 127277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 14:22:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=127277 Change 127277 by rdivacky@rdivacky_witten on 2007/10/07 14:21:55 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/smp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/locore.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/conf/AVILA#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/conf/CRB#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/endian.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/common/module.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/NOTES#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/options#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/an/if_an.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/awi/awi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/if_em.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/if_em.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfivar.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/if_axereg.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/geom_event.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/geode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/support.s#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/smp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/isa/isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/init_main.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_acct.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_clock.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_exec.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_fork.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_kse.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_switch.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_sx.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_synch.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_thread.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/sched_ule.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_lock.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_smp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_trap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_witness.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/sys_process.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/Makefile#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/ixgbe/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/zyd/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/bpf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/bpf_filter.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_bridge.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_lagg.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_media.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_stf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/in_gif.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctputil.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctputil.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/pci/agp_i810.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/pci/agp_via.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/powerpc/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sbus/sbusreg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/callout.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/lock_profile.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/mbuf.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/mount.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/param.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/pciio.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/proc.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/socket.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/user.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/vmmeter.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_contig.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_fault.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_glue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_map.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_map.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_object.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_object.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_page.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_phys.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_phys.h#2 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $ */ #include @@ -81,6 +81,7 @@ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ jmp swact +END(cpu_throw) /* * cpu_switch(old, new, mtx) @@ -256,7 +257,8 @@ movq %rax,%dr7 1: ret - +END(cpu_switch) + /* * savectx(pcb) * Update pcb, saving current processor state. @@ -314,3 +316,4 @@ popfq ret +END(savectx) ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -74,7 +74,6 @@ ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); -ASSYM(P_SFLAG, offsetof(struct proc, p_sflag)); ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); @@ -181,6 +180,7 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/legacy.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -207,6 +207,9 @@ struct legacy_device *atdev = DEVTOAT(child); switch (which) { + case LEGACY_IVAR_PCIDOMAIN: + *result = 0; + break; case LEGACY_IVAR_PCIBUS: *result = atdev->lg_pcibus; break; @@ -223,6 +226,8 @@ struct legacy_device *atdev = DEVTOAT(child); switch (which) { + case LEGACY_IVAR_PCIDOMAIN: + return EINVAL; case LEGACY_IVAR_PCIBUS: atdev->lg_pcibus = value; break; ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $"); #include "opt_hwpmc_hooks.h" @@ -1061,7 +1061,7 @@ printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $"); /* * Manages physical address maps. @@ -1722,7 +1722,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field, page_req; + int bit, field; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1755,8 +1755,7 @@ } } /* No free items, allocate another chunk */ - page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; - m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -1775,7 +1774,7 @@ PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); m = vm_page_alloc(NULL, colour, - VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { PV_STAT(pmap_collect_active++); pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/support.S#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $ */ #include "opt_ddb.h" @@ -69,7 +69,8 @@ rep stosb ret - +END(bzero) + /* Address: %rdi */ ENTRY(pagezero) movq $-PAGE_SIZE,%rdx @@ -84,6 +85,7 @@ jne 1b sfence ret +END(pagezero) ENTRY(bcmp) movq %rdx,%rcx @@ -101,6 +103,7 @@ setne %al movsbl %al,%eax ret +END(bcmp) /* * bcopy(src, dst, cnt) @@ -144,7 +147,8 @@ movsq cld ret - +END(bcopy) + /* * Note: memcpy does not support overlapping copies */ @@ -159,6 +163,7 @@ rep movsb ret +END(memcpy) /* * pagecopy(%rdi=from, %rsi=to) @@ -185,6 +190,7 @@ jne 2b sfence ret +END(pagecopy) /* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ @@ -196,6 +202,7 @@ rep stosw ret +END(fillw) /*****************************************************************************/ /* copyout and fubyte family */ @@ -267,6 +274,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyout) /* * copyin(from_user, to_kernel, len) - MP SAFE @@ -312,6 +320,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyin) /* * casuword32. Compare and set user integer. Returns -1 or the current value. @@ -340,6 +349,7 @@ movq PCPU(CURPCB),%rcx movq $0,PCB_ONFAULT(%rcx) ret +END(casuword32) /* * casuword. Compare and set user word. Returns -1 or the current value. @@ -369,6 +379,7 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq $0,PCB_ONFAULT(%rcx) ret +END(casuword) /* * Fetch (load) a 64-bit word, a 32-bit word, a 16-bit word, or an 8-bit @@ -388,6 +399,8 @@ movq (%rdi),%rax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword64) +END(fuword) ENTRY(fuword32) movq PCPU(CURPCB),%rcx @@ -400,6 +413,7 @@ movl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword32) /* * fuswintr() and suswintr() are specialized variants of fuword16() and @@ -412,6 +426,8 @@ ENTRY(fuswintr) movq $-1,%rax ret +END(suswintr) +END(fuswintr) ENTRY(fuword16) movq PCPU(CURPCB),%rcx @@ -424,6 +440,7 @@ movzwl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword16) ENTRY(fubyte) movq PCPU(CURPCB),%rcx @@ -436,6 +453,7 @@ movzbl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fubyte) ALIGN_TEXT fusufault: @@ -464,6 +482,8 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword64) +END(suword) ENTRY(suword32) movq PCPU(CURPCB),%rcx @@ -478,6 +498,7 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword32) ENTRY(suword16) movq PCPU(CURPCB),%rcx @@ -492,6 +513,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(suword16) ENTRY(subyte) movq PCPU(CURPCB),%rcx @@ -507,6 +529,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(subyte) /* * copyinstr(from, to, maxlen, int *lencopied) - MP SAFE @@ -575,7 +598,7 @@ movq %r8,(%r9) 1: ret - +END(copyinstr) /* * copystr(from, to, maxlen, int *lencopied) - MP SAFE @@ -612,6 +635,7 @@ movq %r8,(%rcx) 7: ret +END(copystr) /* * Handling of special amd64 registers and descriptor tables etc @@ -639,6 +663,7 @@ pushq %rax MEXITCOUNT lretq +END(lgdt) /*****************************************************************************/ /* setjump, longjump */ @@ -656,6 +681,7 @@ movq %rdx,56(%rdi) /* save rip */ xorl %eax,%eax /* return(0); */ ret +END(setjmp) ENTRY(longjmp) movq 0(%rdi),%rbx /* restore rbx */ @@ -670,6 +696,7 @@ xorl %eax,%eax /* return(1); */ incl %eax ret +END(longjmp) /* * Support for BB-profiling (gcc -a). The kernbb program will extract ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.3 2007/02/18 06:33:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.4 2007/09/15 18:47:01 alc Exp $"); #include #include @@ -50,9 +50,9 @@ *flags = UMA_SLAB_PRIV; if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else - pflags = VM_ALLOC_SYSTEM; + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; for (;;) { @@ -82,5 +82,7 @@ pa = DMAP_TO_PHYS((vm_offset_t)mem); dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); + m->wire_count--; vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, 1); } ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.483 2007/07/01 21:47:45 njl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484 2007/09/26 20:05:06 brueffer Exp $ cpu HAMMER ident GENERIC @@ -30,7 +30,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols -options SCTP # Stream Transmission Control Protocol +options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/asm.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -77,6 +77,8 @@ #define ENTRY(x) _ENTRY(x) #endif +#define END(x) .size x, . - x + #define RCSID(x) .text; .asciz x #undef __FBSDID ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/asmacros.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/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.33 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -57,6 +57,8 @@ #define NON_GPROF_ENTRY(name) GEN_ENTRY(name) #define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */ +#define END(name) .size name, . - name + #ifdef GPROF /* * __mcount is like [.]mcount except that doesn't require its caller to set ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/legacyvar.h#2 (text+ko) ==== @@ -23,19 +23,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $ + * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $ */ #ifndef _MACHINE_LEGACYVAR_H_ #define _MACHINE_LEGACYVAR_H_ enum legacy_device_ivars { + LEGACY_IVAR_PCIDOMAIN, LEGACY_IVAR_PCIBUS }; #define LEGACY_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type) +LEGACY_ACCESSOR(pcidomain, PCIDOMAIN, uint32_t) LEGACY_ACCESSOR(pcibus, PCIBUS, uint32_t) #undef LEGACY_ACCESSOR ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/smp.h#3 (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.90 2007/05/19 05:01:43 kan Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.91 2007/09/20 20:38:43 attilio Exp $ * */ @@ -34,7 +34,6 @@ extern int mp_naps; extern int boot_cpu_id; extern struct pcb stoppcbs[]; -extern struct mtx smp_tlb_mtx; extern int cpu_apic_ids[]; /* IPI handlers */ ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/vmparam.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.48 2007/06/03 23:18:29 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $ */ @@ -101,12 +101,13 @@ #define VM_PHYSSEG_MAX 31 /* - * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool + * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool * from which physical pages are allocated and VM_FREEPOOL_DIRECT is * the pool from which physical pages for page tables and small UMA * objects are allocated. */ -#define VM_NFREEPOOL 2 +#define VM_NFREEPOOL 3 +#define VM_FREEPOOL_CACHE 2 #define VM_FREEPOOL_DEFAULT 0 #define VM_FREEPOOL_DIRECT 1 ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.233 2007/07/23 09:42:30 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.234 2007/09/14 01:12:39 attilio Exp $"); /* * Routines to handle clock hardware. @@ -565,7 +565,7 @@ i8254_init(void) { - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE); set_timer_freq(timer_freq, hz); } ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.15 2007/03/29 02:11:46 julian Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.16 2007/09/18 19:50:32 dwmalone Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -242,6 +242,19 @@ l_ulonglong st_ino; } __packed; +struct l_statfs64 { + l_int f_type; + l_int f_bsize; + uint64_t f_blocks; + uint64_t f_bfree; + uint64_t f_bavail; + uint64_t f_files; + uint64_t f_ffree; + l_fsid_t f_fsid; + l_int f_namelen; + l_int f_spare[6]; +} __packed; + struct l_new_utsname { char sysname[LINUX_MAX_UTSNAME]; char nodename[LINUX_MAX_UTSNAME]; ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 7 14:43:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9F8716A41B; Sun, 7 Oct 2007 14:43:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CA9A16A417 for ; Sun, 7 Oct 2007 14:43:27 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A7AF13C455 for ; Sun, 7 Oct 2007 14:43:27 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97EhRS6059873 for ; Sun, 7 Oct 2007 14:43:27 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97EhBfh059827 for perforce@freebsd.org; Sun, 7 Oct 2007 14:43:11 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 7 Oct 2007 14:43:11 GMT Message-Id: <200710071443.l97EhBfh059827@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 127279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 14:43:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=127279 Change 127279 by rdivacky@rdivacky_witten on 2007/10/07 14:42:41 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/smp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/intr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/locore.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/trap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/AVILA#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/CRB#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/KB920X#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/armreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/endian.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pmap.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pte.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/module.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.arm#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#10 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.amd64#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.i386#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options.ia64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/an/if_an.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/awi/awi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/coretemp/coretemp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/if_em.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/if_em.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/isc_cam.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/isc_sm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/isc_soc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/isc_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/iscsi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/iscsi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iscsi/initiator/iscsivar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/re/if_re.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/streams/streams.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rum.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ural.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ufoma.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ums.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom_event.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/NOTES#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/geode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/support.s#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/trap.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/smp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/isa/clock.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/isa/isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/ia64_cpu.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/intr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/sapicvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_main.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_acct.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_clock.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#16 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_fork.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_kse.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_poll.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_proc.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_switch.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_sx.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_synch.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_thr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_thread.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sched_ule.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_bus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_lock.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_smp.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_trap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_witness.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_process.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#52 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/Makefile#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/coretemp/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/cxgb/Makefile#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/iscsi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/iscsi/initiator/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/ixgbe/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/zyd/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/bpf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/bpf_filter.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/bpfdesc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/bridgestp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/bridgestp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_bridge.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_lagg.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_lagg.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_media.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_stf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/netisr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_gif.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_input.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_ipsec.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_peeloff.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_fsm.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_syncache.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_var.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/spx_debug.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/agp_i810.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/agp_via.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_rl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_xl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/viapm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/interruptvar.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/trap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powermac/hrowpicvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/interrupt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/uma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sbus/sbusreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/ata.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/callout.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/lock_profile.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mbuf.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mount.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mutex.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/param.h#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/pciio.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/proc.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/socket.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#11 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/thr.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/user.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/vmmeter.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/device_pager.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/phys_pager.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/swap_pager.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_contig.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_fault.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_glue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_map.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_meter.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_object.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_object.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageq.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pager.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_phys.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_phys.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.127 2007/07/04 23:27:38 peter Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -85,7 +85,8 @@ fpclassify.3 isnormal.3 MLINKS+=frexp.3 frexpf.3 frexp.3 frexpl.3 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \ - fts.3 fts_read.3 fts.3 fts_set.3 + fts.3 fts_read.3 fts.3 fts_set.3 fts.3 fts_set_clientptr.3 \ + fts.3 fts_get_clientptr.3 fts.3 fts_get_stream.3 MLINKS+=ftw.3 nftw.3 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \ getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \ ==== //depot/projects/soc2007/rdivacky/linux_at/lib/libc/sys/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.8 2007/06/05 08:24:34 des Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.9 2007/08/22 01:56:35 davidxu Exp $ */ /* @@ -303,6 +303,7 @@ thr_create; thr_exit; thr_kill; + thr_kill2; thr_new; thr_self; thr_set_name; @@ -917,6 +918,8 @@ __sys_thr_exit; _thr_kill; __sys_thr_kill; + _thr_kill2; + __sys_thr_kill2; _thr_new; __sys_thr_new; _thr_self; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $ */ #include @@ -81,6 +81,7 @@ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ jmp swact +END(cpu_throw) /* * cpu_switch(old, new, mtx) @@ -256,7 +257,8 @@ movq %rax,%dr7 1: ret - +END(cpu_switch) + /* * savectx(pcb) * Update pcb, saving current processor state. @@ -314,3 +316,4 @@ popfq ret +END(savectx) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -74,7 +74,6 @@ ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); -ASSYM(P_SFLAG, offsetof(struct proc, p_sflag)); ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); @@ -181,6 +180,7 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/legacy.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -207,6 +207,9 @@ struct legacy_device *atdev = DEVTOAT(child); switch (which) { + case LEGACY_IVAR_PCIDOMAIN: + *result = 0; + break; case LEGACY_IVAR_PCIBUS: *result = atdev->lg_pcibus; break; @@ -223,6 +226,8 @@ struct legacy_device *atdev = DEVTOAT(child); switch (which) { + case LEGACY_IVAR_PCIDOMAIN: + return EINVAL; case LEGACY_IVAR_PCIBUS: atdev->lg_pcibus = value; break; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.40 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $"); #include "opt_hwpmc_hooks.h" @@ -1060,12 +1060,8 @@ if (retval != 0) printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); -#ifdef SMP - /* Last, setup the cpu topology now that we have probed CPUs */ - mp_topology(); -#endif } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.286 2007/06/04 23:56:07 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.287 2007/08/02 21:17:58 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -186,26 +186,14 @@ mp_topology(void) { struct cpu_group *group; - u_int regs[4]; - int logical_cpus; int apic_id; int groups; int cpu; /* Build the smp_topology map. */ /* Nothing to do if there is no HTT support. */ - if ((cpu_feature & CPUID_HTT) == 0) + if (hyperthreading_cpus <= 1) return; - logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16; - if (logical_cpus <= 1) - return; - /* Nothing to do if reported cores are physical cores. */ - if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) { - cpuid_count(4, 0, regs); - if ((regs[0] & 0x1f) != 0 && - logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1) - return; - } group = &mp_groups[0]; groups = 1; for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) { @@ -215,7 +203,8 @@ * If the current group has members and we're not a logical * cpu, create a new group. */ - if (group->cg_count != 0 && (apic_id % logical_cpus) == 0) { + if (group->cg_count != 0 && + (apic_id % hyperthreading_cpus) == 0) { group++; groups++; } @@ -420,6 +409,9 @@ } set_interrupt_apic_ids(); + + /* Last, setup the cpu topology now that we have probed CPUs */ + mp_topology(); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $"); /* * Manages physical address maps. @@ -1722,7 +1722,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field, page_req; + int bit, field; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1755,8 +1755,7 @@ } } /* No free items, allocate another chunk */ - page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; - m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -1775,7 +1774,7 @@ PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); m = vm_page_alloc(NULL, colour, - VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { PV_STAT(pmap_collect_active++); pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/support.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $ */ #include "opt_ddb.h" @@ -69,7 +69,8 @@ rep stosb ret - +END(bzero) + /* Address: %rdi */ ENTRY(pagezero) movq $-PAGE_SIZE,%rdx @@ -84,6 +85,7 @@ jne 1b sfence ret +END(pagezero) ENTRY(bcmp) movq %rdx,%rcx @@ -101,6 +103,7 @@ setne %al movsbl %al,%eax ret +END(bcmp) /* * bcopy(src, dst, cnt) @@ -144,7 +147,8 @@ movsq cld ret - +END(bcopy) + /* * Note: memcpy does not support overlapping copies */ @@ -159,6 +163,7 @@ rep movsb ret +END(memcpy) /* * pagecopy(%rdi=from, %rsi=to) @@ -185,6 +190,7 @@ jne 2b sfence ret +END(pagecopy) /* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ @@ -196,6 +202,7 @@ rep stosw ret +END(fillw) /*****************************************************************************/ /* copyout and fubyte family */ @@ -267,6 +274,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyout) /* * copyin(from_user, to_kernel, len) - MP SAFE @@ -312,6 +320,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyin) /* * casuword32. Compare and set user integer. Returns -1 or the current value. @@ -340,6 +349,7 @@ movq PCPU(CURPCB),%rcx movq $0,PCB_ONFAULT(%rcx) ret +END(casuword32) /* * casuword. Compare and set user word. Returns -1 or the current value. @@ -369,6 +379,7 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq $0,PCB_ONFAULT(%rcx) ret +END(casuword) /* * Fetch (load) a 64-bit word, a 32-bit word, a 16-bit word, or an 8-bit @@ -388,6 +399,8 @@ movq (%rdi),%rax movq $0,PCB_ONFAULT(%rcx) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 7 17:27:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99EA516A41A; Sun, 7 Oct 2007 17:27:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0553516A418 for ; Sun, 7 Oct 2007 17:27:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E565313C465 for ; Sun, 7 Oct 2007 17:27:24 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97HROni085732 for ; Sun, 7 Oct 2007 17:27:24 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97HRN8V085729 for perforce@freebsd.org; Sun, 7 Oct 2007 17:27:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 7 Oct 2007 17:27:23 GMT Message-Id: <200710071727.l97HRN8V085729@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 127283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 17:27:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=127283 Change 127283 by rdivacky@rdivacky_witten on 2007/10/07 17:26:54 IFrdivacky_at an attempt to bring in working *at syscalls. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#28 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#14 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#26 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#25 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#15 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#26 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#26 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#66 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#14 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#6 edit .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#5 edit .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#7 edit .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/md/md.c#6 edit .. //depot/projects/linuxolator/src/sys/dev/streams/streams.c#5 edit .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_fcntl.c#4 edit .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#24 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#12 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#25 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#24 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#24 integrate .. //depot/projects/linuxolator/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_acct.c#9 edit .. //depot/projects/linuxolator/src/sys/kern/kern_alq.c#6 edit .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exec.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kse.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#10 edit .. //depot/projects/linuxolator/src/sys/kern/kern_linker.c#9 edit .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#13 edit .. //depot/projects/linuxolator/src/sys/kern/link_elf.c#6 edit .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#8 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_cons.c#6 edit .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_vnops.c#8 edit .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#11 edit .. //depot/projects/linuxolator/src/sys/sys/eventhandler.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/fcntl.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/file.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/imgact.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/namei.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sem.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/stat.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#9 integrate .. //depot/projects/linuxolator/src/sys/sys/syscallsubr.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/time.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/vnode.h#10 edit .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#28 (text+ko) ==== @@ -579,8 +579,6 @@ #define LINUX_F_WRLCK 1 #define LINUX_F_UNLCK 2 -#define LINUX_AT_FDCWD -100 - /* * mount flags */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#14 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#26 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.30 2007/09/18 19:50:32 dwmalone Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -911,26 +911,43 @@ }; struct linux_openat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; +<<<< char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mknodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; +<<<< char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)]; }; struct linux_fchownat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; + char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; + char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; char user_l_[PADL_(uid_t)]; uid_t user; char user_r_[PADR_(uid_t)]; char group_l_[PADL_(gid_t)]; gid_t group; char group_r_[PADR_(gid_t)]; +<<<< char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_futimesat_args { @@ -946,41 +963,87 @@ }; struct linux_unlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; +<<<< char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_renameat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; +<<<< }; struct linux_linkat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; +<<<< }; struct linux_symlinkat_args { +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 + register_t dummy; +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; +<<<< char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; +<<<< }; struct linux_readlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; +<<<< char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; char bufsiz_l_[PADL_(l_int)]; l_int bufsiz; char bufsiz_r_[PADR_(l_int)]; }; struct linux_fchmodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; +<<<< char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)]; }; struct linux_faccessat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; +>>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/linux32/linux32_proto.h#33 +==== THEIRS //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#9 + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; +==== YOURS //rdivacky_witten/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; +<<<< char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_pselect6_args { ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#25 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.33 2007/09/18 19:50:32 dwmalone Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.30 2007/09/18 19:50:32 dwmalone Exp */ #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#15 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -789,7 +790,7 @@ */ if ((error = exec_shell_imgact(imgp)) == 0) { linux_emul_convpath(FIRST_THREAD_IN_PROC(imgp->proc), - imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0); + imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0, AT_FDCWD); if (rpath != NULL) { len = strlen(rpath) + 1; ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#26 (text+ko) ==== @@ -465,7 +465,7 @@ 292 AUE_NULL STD { int linux_inotify_add_watch(void); } 293 AUE_NULL STD { int linux_inotify_rm_watch(void); } 294 AUE_NULL STD { int linux_migrate_pages(void); } -295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, char *filename, \ +295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, const char *filename, \ l_int flags, l_int mode); } 296 AUE_NULL STD { int linux_mkdirat(l_int dfd, char *pathname, l_int mode); } 297 AUE_NULL STD { int linux_mknodat(l_int dfd, char *filename, l_int mode, \ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#26 (text+ko) ==== @@ -67,6 +67,7 @@ #include #endif #include +#include int linux_creat(struct thread *td, struct linux_creat_args *args) @@ -81,14 +82,14 @@ printf(ARGS(creat, "%s, %d"), path, args->mode); #endif error = kern_open(td, path, UIO_SYSSPACE, O_WRONLY | O_CREAT | O_TRUNC, - args->mode, -1); + args->mode); LFREEPATH(path); return (error); } -int -linux_common_open(struct thread *td, char *path, int l_flags, int mode, int dirfd) +static int +linux_common_open(struct thread *td, int dirfd, char *path, int l_flags, int mode) { struct proc *p = td->td_proc; struct file *fp; @@ -130,7 +131,10 @@ bsd_flags |= O_NOFOLLOW; /* XXX LINUX_O_NOATIME: unable to be easily implemented. */ - error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode, dirfd); + if (dirfd != -1) + error = kern_openat(td, dirfd, path, UIO_SYSSPACE, bsd_flags, mode); + else + error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode); if (!error) { fd = td->td_retval[0]; /* @@ -179,8 +183,26 @@ int linux_openat(struct thread *td, struct linux_openat_args *args) { - /* this is going to be replaced in the next commit */ - return (ENOSYS); + char *path; + int dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + if (args->flags & LINUX_O_CREAT) + LCONVPATH_AT(td, args->filename, &path, 1, dfd); + else + LCONVPATH_AT(td, args->filename, &path, 0, dfd); + +#ifdef DEBUG + if (ldebug(openat)) + printf(ARGS(openat, "%i, %s, 0x%x, 0x%x"), args->dfd, + path, args->flags, args->mode); +#endif + + return linux_common_open(td, dfd, path, args->flags, args->mode); } int @@ -199,7 +221,7 @@ path, args->flags, args->mode); #endif - return linux_common_open(td, path, args->flags, args->mode, -1); + return linux_common_open(td, -1, path, args->flags, args->mode); } int @@ -542,7 +564,7 @@ if (ldebug(access)) printf(ARGS(access, "%s, %d"), path, args->flags); #endif - error = kern_access(td, path, UIO_SYSSPACE, args->flags, -1); + error = kern_access(td, path, UIO_SYSSPACE, args->flags); LFREEPATH(path); return (error); @@ -558,19 +580,19 @@ if (args->mode & ~(F_OK | X_OK | W_OK | R_OK)) return (EINVAL); - LCONVPATHEXIST(td, args->filename, &path); + if (args->dfd == LINUX_AT_FDCWD) + dfd = -1; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &path, dfd); #ifdef DEBUG if (ldebug(access)) printf(ARGS(access, "%s, %d"), path, args->mode); #endif - if (args->dfd == LINUX_AT_FDCWD) - dfd = -1; - else - dfd = args->dfd; - - error = kern_access(td, path, UIO_SYSSPACE, args->mode, dfd); + error = kern_accessat(td, dfd, path, UIO_SYSSPACE, args->mode); LFREEPATH(path); return (error); @@ -603,9 +625,37 @@ int linux_unlinkat(struct thread *td, struct linux_unlinkat_args *args) { - return (ENOSYS); + char *path; + int error, dfd; + struct stat st; + + if (args->flag & ~LINUX_AT_REMOVEDIR) + return (EINVAL); + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->pathname, &path, dfd); + +#ifdef DEBUG + if (ldebug(unlinkat)) + printf(ARGS(unlinkat, "%s"), path); +#endif + + if (args->flag & LINUX_AT_REMOVEDIR) + error = kern_rmdirat(td, dfd, path, UIO_SYSSPACE); + else + error = kern_unlinkat(td, dfd, path, UIO_SYSSPACE); + if (error == EPERM && !(args->flag & LINUX_AT_REMOVEDIR)) + /* Introduce POSIX noncompliant behaviour of Linux */ + if (kern_statat(td, dfd, path, UIO_SYSSPACE, &st) == 0) + if (S_ISDIR(st.st_mode)) + error = EISDIR; + LFREEPATH(path); + return (error); } - int linux_chdir(struct thread *td, struct linux_chdir_args *args) { @@ -643,7 +693,24 @@ int linux_fchmodat(struct thread *td, struct linux_fchmodat_args *args) { - return (ENOSYS); + char *path; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &path, dfd); + +#ifdef DEBUG + if (ldebug(fchmodat)) + printf(ARGS(fchmodat, "%s, %d"), path, args->mode); +#endif + + error = kern_chmodat(td, dfd, path, UIO_SYSSPACE, args->mode); + LFREEPATH(path); + return (error); } int @@ -666,7 +733,23 @@ int linux_mkdirat(struct thread *td, struct linux_mkdirat_args *args) { - return (ENOSYS); + char *path; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHCREAT_AT(td, args->pathname, &path, dfd); + +#ifdef DEBUG + if (ldebug(mkdirat)) + printf(ARGS(mkdirat, "%s, %d"), path, args->mode); +#endif + error = kern_mkdirat(td, dfd, path, UIO_SYSSPACE, args->mode); + LFREEPATH(path); + return (error); } int @@ -694,7 +777,7 @@ LCONVPATHEXIST(td, args->from, &from); /* Expand LCONVPATHCREATE so that `from' can be freed on errors */ - error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1, AT_FDCWD); if (to == NULL) { LFREEPATH(from); return (error); @@ -713,7 +796,35 @@ int linux_renameat(struct thread *td, struct linux_renameat_args *args) { - return (ENOSYS); + char *from, *to; + int error, olddfd, newdfd; + + if (args->olddfd == LINUX_AT_FDCWD) + olddfd = AT_FDCWD; + else + olddfd = args->olddfd; + + if (args->newdfd == LINUX_AT_FDCWD) + newdfd = AT_FDCWD; + else + newdfd = args->newdfd; + + LCONVPATHEXIST_AT(td, args->oldname, &from, olddfd); + /* Expand LCONVPATHCREATE so that `from' can be freed on errors */ + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1, newdfd); + if (to == NULL) { + LFREEPATH(from); + return (error); + } + +#ifdef DEBUG + if (ldebug(renameat)) + printf(ARGS(renameat, "%s, %s"), from, to); +#endif + error = kern_renameat(td, olddfd, from, newdfd, to, UIO_SYSSPACE); + LFREEPATH(from); + LFREEPATH(to); + return (error); } int @@ -724,7 +835,7 @@ LCONVPATHEXIST(td, args->path, &path); /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ - error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1, AT_FDCWD); if (to == NULL) { LFREEPATH(path); return (error); @@ -743,7 +854,31 @@ int linux_symlinkat(struct thread *td, struct linux_symlinkat_args *args) { - return (ENOSYS); + char *path, *to; + int error, dfd; + + if (args->newdfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->newdfd; + + LCONVPATHEXIST_AT(td, args->oldname, &path, dfd); + /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1, dfd); + if (to == NULL) { + LFREEPATH(path); + return (error); + } + +#ifdef DEBUG + if (ldebug(symlinkat)) + printf(ARGS(symlinkat, "%s, %s"), path, to); +#endif + + error = kern_symlinkat(td, path, dfd, to, UIO_SYSSPACE); + LFREEPATH(path); + LFREEPATH(to); + return (error); } int @@ -768,9 +903,27 @@ int linux_readlinkat(struct thread *td, struct linux_readlinkat_args *args) { - return (ENOSYS); + char *name; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->path, &name, dfd); + +#ifdef DEBUG + if (ldebug(readlinkat)) + printf(ARGS(readlinkat, "%s, %p, %d"), name, (void *)args->buf, + args->bufsiz); +#endif + + error = kern_readlinkat(td, dfd, name, UIO_SYSSPACE, args->buf, + UIO_USERSPACE, args->bufsiz); + LFREEPATH(name); + return (error); } - int linux_truncate(struct thread *td, struct linux_truncate_args *args) { @@ -811,7 +964,7 @@ LCONVPATHEXIST(td, args->path, &path); /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ - error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1, AT_FDCWD); if (to == NULL) { LFREEPATH(path); return (error); @@ -830,7 +983,44 @@ int linux_linkat(struct thread *td, struct linux_linkat_args *args) { - return (ENOSYS); + char *path, *to; + int error, olddfd, newdfd; + + /* + * don't laugh they really introduced flags argument + * which is forbidden to use ;) + */ + if (args->flags != 0) + return (EINVAL); + + if (args->olddfd == LINUX_AT_FDCWD) + olddfd = AT_FDCWD; + else + olddfd = args->olddfd; + + if (args->newdfd == LINUX_AT_FDCWD) + newdfd = AT_FDCWD; + else + newdfd = args->newdfd; + + LCONVPATHEXIST_AT(td, args->oldname, &path, olddfd); + /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1, newdfd); + if (to == NULL) { + LFREEPATH(path); + return (error); + } + +#ifdef DEBUG + if (ldebug(linkat)) + printf(ARGS(linkat, "%i, %s, %i, %s, %i"), args->olddfd, path, + args->newdfd, to, args->flags); +#endif + + error = kern_linkat(td, olddfd, newdfd, path, to, UIO_SYSSPACE, FOLLOW); + LFREEPATH(path); + LFREEPATH(to); + return (error); } int @@ -1299,6 +1489,35 @@ } int +linux_fchownat(struct thread *td, struct linux_fchownat_args *args) +{ + char *path; + int error, dfd; + + if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) + return (EINVAL); + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &path, dfd); + +#ifdef DEBUG + if (ldebug(fchownat)) + printf(ARGS(fchownat, "%s, %d, %d"), path, args->uid, args->gid); +#endif + + if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) + error = kern_lchownat(td, dfd, path, UIO_SYSSPACE, args->uid, args->gid); + else + error = kern_chownat(td, dfd, path, UIO_SYSSPACE, args->uid, args->gid); + LFREEPATH(path); + return (error); +} + +int linux_lchown(struct thread *td, struct linux_lchown_args *args) { char *path; @@ -1314,16 +1533,3 @@ LFREEPATH(path); return (error); } - -int -linux_futimesat(struct thread *td, struct linux_futimesat_args *args) -{ - return (ENOSYS); -} - -int -linux_fchownat(struct thread *td, struct linux_fchownat_args *args) -{ - return (ENOSYS); -} - ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#4 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#5 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#66 (text+ko) ==== @@ -88,6 +88,7 @@ #include #endif +#include #include #include #include @@ -836,7 +837,44 @@ LFREEPATH(fname); return (error); } -#endif /* __i386__ || __amd64__ */ + +int +linux_futimesat(struct thread *td, struct linux_futimesat_args *args) +{ + l_timeval ltv[2]; + struct timeval tv[2], *tvp = NULL; + char *fname; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &fname, dfd); + +#ifdef DEBUG + if (ldebug(futimesat)) + printf(ARGS(futimesat, "%s, *"), fname); +#endif + + if (args->utimes != NULL) { + if ((error = copyin(args->utimes, ltv, sizeof ltv))) { + LFREEPATH(fname); + return (error); + } + tv[0].tv_sec = ltv[0].tv_sec; + tv[0].tv_usec = ltv[0].tv_usec; + tv[1].tv_sec = ltv[1].tv_sec; + tv[1].tv_usec = ltv[1].tv_usec; + tvp = tv; + } + + error = kern_utimesat(td, dfd, fname, UIO_SYSSPACE, tvp, UIO_SYSSPACE); + LFREEPATH(fname); + return (error); +} +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ #define __WCLONE 0x80000000 @@ -962,7 +1000,9 @@ /* FALLTHROUGH */ case S_IFREG: error = kern_open(td, path, UIO_SYSSPACE, - O_WRONLY | O_CREAT | O_TRUNC, args->mode, -1); + O_WRONLY | O_CREAT | O_TRUNC, args->mode); + if (error == 0) + kern_close(td, td->td_retval[0]); break; default: @@ -976,7 +1016,53 @@ int linux_mknodat(struct thread *td, struct linux_mknodat_args *args) { - return (ENOSYS); + char *path; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHCREAT_AT(td, args->filename, &path, dfd); + +#ifdef DEBUG + if (ldebug(mknodat)) + printf(ARGS(mknodat, "%s, %d, %d"), path, args->mode, args->dev); +#endif + + switch (args->mode & S_IFMT) { + case S_IFIFO: + case S_IFSOCK: + error = kern_mkfifoat(td, dfd, path, UIO_SYSSPACE, args->mode); + break; + + case S_IFCHR: + case S_IFBLK: + error = kern_mknodat(td, dfd, path, UIO_SYSSPACE, args->mode, + args->dev); + break; + + case S_IFDIR: + error = EPERM; + break; + + case 0: + args->mode |= S_IFREG; + /* FALLTHROUGH */ + case S_IFREG: + error = kern_openat(td, dfd, path, UIO_SYSSPACE, + O_WRONLY | O_CREAT | O_TRUNC, args->mode); + if (error == 0) + kern_close(td, td->td_retval[0]); + break; + + default: + error = EINVAL; + break; + } + LFREEPATH(path); + return (error); } /* ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#14 (text+ko) ==== @@ -58,6 +58,7 @@ #endif #include +#include #include @@ -125,7 +126,27 @@ if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) return; temp = td->td_retval[0]; - if (kern_open(td, path, UIO_SYSSPACE, O_RDONLY, 0, -1) != 0) + if (kern_open(td, path, UIO_SYSSPACE, O_RDONLY, 0) != 0) + return; + fd = td->td_retval[0]; + td->td_retval[0] = temp; + translate_fd_major_minor(td, fd, buf); + fdclose(fdp, fdp->fd_ofiles[fd], fd, td); +} + +static void +translate_path_major_minor_at(struct thread *td, char *path, struct stat *buf, + int dfd) +{ + struct proc *p = td->td_proc; + struct filedesc *fdp = p->p_fd; + int fd; + int temp; + + if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) + return; + temp = td->td_retval[0]; + if (kern_openat(td, dfd, path, UIO_SYSSPACE, O_RDONLY, 0) != 0) return; fd = td->td_retval[0]; td->td_retval[0] = temp; @@ -584,56 +605,39 @@ return (error); } -/* XXX: racy? */ int linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) { - int error; - char *path, *newpath; - int fd, dfd; + char *path; + int error, dfd; struct stat buf; - /* open the file */ - path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(args->pathname, path, MAXPATHLEN, NULL); - if (error) { - free(path, M_TEMP); - return (EFAULT); - } + if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) + return (EINVAL); + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; - LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE); - free(path, M_TEMP); + LCONVPATHEXIST_AT(td, args->pathname, &path, dfd); #ifdef DEBUG if (ldebug(fstatat64)) - printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, newpath, args->flag); + printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, path, args->flag); #endif - if (args->dfd == LINUX_AT_FDCWD) - dfd = -1; + if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) + error = kern_lstatat(td, dfd, path, UIO_SYSSPACE, &buf); else - dfd = args->dfd; - - error = kern_open(td, newpath, UIO_SYSSPACE, O_RDONLY, 0, dfd); - if (error) { - LFREEPATH(newpath); - return (error); - } - /* file opened */ - fd = td->td_retval[0]; - td->td_retval[0] = 0; - - /* do the actual fstat */ - - error = kern_fstat(td, fd, &buf); - translate_fd_major_minor(td, fd, &buf); + error = kern_statat(td, dfd, path, UIO_SYSSPACE, &buf); + + translate_path_major_minor_at(td, args->pathname, &buf, dfd); if (!error) error = stat64_copyout(&buf, args->statbuf); + LFREEPATH(path); - /* close the opened file */ - kern_close(td, fd); - LFREEPATH(newpath); - return (0); + return (error); } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#6 (text+ko) ==== @@ -29,6 +29,7 @@ #include "opt_compat.h" +#include #include #include #include ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_util.c#4 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -65,16 +66,17 @@ * named file, i.e. we check if the directory it should be in exists. */ int -linux_emul_convpath(td, path, pathseg, pbuf, cflag) +linux_emul_convpath(td, path, pathseg, pbuf, cflag, dfd) struct thread *td; - char *path; + const char *path; enum uio_seg pathseg; char **pbuf; int cflag; + int dfd; { - return (kern_alternate_path(td, linux_emul_path, path, pathseg, pbuf, - cflag)); + return kern_alternate_path(td, linux_emul_path, path, pathseg, pbuf, + cflag, dfd); } void ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#6 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 7 18:18:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 568AD16A41B; Sun, 7 Oct 2007 18:18:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E04A416A418 for ; Sun, 7 Oct 2007 18:18:22 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCCEF13C448 for ; Sun, 7 Oct 2007 18:18:22 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97IIM6l089883 for ; Sun, 7 Oct 2007 18:18:22 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97IIMuf089880 for perforce@freebsd.org; Sun, 7 Oct 2007 18:18:22 GMT (envelope-from fli@FreeBSD.org) Date: Sun, 7 Oct 2007 18:18:22 GMT Message-Id: <200710071818.l97IIMuf089880@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 127286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 18:18:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127286 Change 127286 by fli@fli_genesis on 2007/10/07 18:17:44 - Keep track of active probe/annonuce contexts so that we are able to properly destroy them if the underlying interface disappears. - Fix simultanesous probe tie-breaking which was broken. - Nuke stale code (that was #if 0:oed out) Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#10 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.h#6 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#10 (text+ko) ==== @@ -72,6 +72,7 @@ if (error != 0) goto dbr_init_fail; TAILQ_INIT(&dbr->dbr_ilist); + TAILQ_INIT(&dbr->dbr_paclist); MDNS_INIT_SET(dbr, dbr_magic); var_init(&dbr->dbr_vars, mif->mif_glob->g_evl, dbr); @@ -95,11 +96,16 @@ { struct md_if *mif; struct dbr_ident *dbi, *dbi2; + struct dbr_pac *pac, *pac2; MDNS_INIT_ASSERT(dbr, dbr_magic); RW_WLOCK(dbr, dbr_lock); mif = dbr->dbr_ctx; + TAILQ_FOREACH_SAFE(pac, &dbr->dbr_paclist, pac_next, pac2) { + dbr_pac_destroy(pac); + } + TAILQ_FOREACH_SAFE(dbi, &dbr->dbr_ilist, dbi_next, dbi2) { ident_del(dbr, dbi); } @@ -207,12 +213,6 @@ res_update(dir, names, vtd_len); } free(names); - -#if 0 - dprintf(DEBUG_DBR, - "Database record r=%x, (%ls) updated, flags=%x, clones=%d", - dr, dr->dr_names[dr->dr_cur], dr->dr_flags, dr->dr_clones); -#endif } /* @@ -1172,45 +1172,6 @@ ds = ds2; } } - -#if 0 - TAILQ_FOREACH(ds, &dsh->ds_clone.head, ds_clone.next) { - if (i == dsh->ds_clones || i == reslen) - break; - if (ds->ds_data != NULL) - free(ds->ds_data); - ds->ds_data = _wcsdup(res[i]); - - p = mdns_res_encode(dir->dir_class, dir->dir_type, res[i], - MDNS_ENC_WCHAR, wcslen(res[i]), &rlen); - if (p == NULL) { - dprintf(DEBUG_DBR, "Failed to encode resource"); - continue; - } - error = record_res_setdata(&ds->ds_res, REC_RESOWN, p, rlen); - if (error != 0) { - - } - i++; - } - - /* More results than clones, expand */ - if (reslen > i) { - diff = reslen - i; - while (diff-- > 0) { - res_add(dr, dir, dsh, res[i]); - i++; - } - } - /* More clones than results, shrink */ - else if (dsh->ds_clones >= i) { - diff = dsh->ds_clones - i; - while (diff-- >= 0) { - ds = TAILQ_LAST(&dsh->ds_clone.head, clone_head); - res_del(ds); - } - } -#endif } /* @@ -1653,6 +1614,7 @@ if (prc == NULL) return; + prt = record_type_first(prc); if (prt == NULL) return; @@ -1710,6 +1672,12 @@ else if (rr->rr_len > prr->rr_len) outcome = 2; } + + if (outcome != 0) + break; + + rr = record_res_next(rr); + prr = record_res_next(prr); } if (prr != NULL && rr == NULL) outcome = 1; @@ -1724,6 +1692,9 @@ } if (outcome != 0) break; + + rc = record_class_next(rc); + prc = record_class_next(prc); } /* @@ -1740,13 +1711,16 @@ else if (prt == NULL && rt != NULL) outcome = 2; + if (outcome == 0) { dprintf(DEBUG_DBR, "Tie after tie-breaking on %ls, " "records should be equal", dr->dr_name); } if (outcome == 1) { dprintf(DEBUG_DBR, "Lost tie-breaking on %ls", dr->dr_name); + RW_WLOCK(dbr, dbr_lock); col_probe(dr); + RW_UNLOCK(dbr, dbr_lock); } else if (outcome == 2) { dprintf(DEBUG_DBR, "Won tie-breaking on %ls", dr->dr_name); @@ -1831,7 +1805,7 @@ struct dbr_rec *dr; struct record *r; - RW_RLOCK(dbr, dbr_lock); + RW_WLOCK(dbr, dbr_lock); pac = dbr_pac_new(dbr, PAC_PROBE); records_foreach(r, &dbr->dbr_recs) { dr = record_getparent(r); @@ -1861,6 +1835,7 @@ TAILQ_INIT(&pac->pac_head); MDNS_INIT_SET(pac, pac_magic); MTX_INIT(pac, pac_mtx, NULL); + TAILQ_INSERT_TAIL(&dbr->dbr_paclist, pac, pac_next); dprintf(DEBUG_DBR, "Created probe/announce context pac=%x", pac); return (pac); @@ -1892,6 +1867,7 @@ dr->dr_flags &= ~(DR_PROBING | DR_ANNOUNCE); dr->dr_pac = NULL; } + TAILQ_REMOVE(&dbr->dbr_paclist, pac, pac_next); dprintf(DEBUG_DBR, "Destroyed probe/announce context pac=%x", pac); MTX_UNLOCK(pac, pac_mtx); MTX_DESTROY(pac, pac_mtx); @@ -2158,13 +2134,13 @@ mif = dbr->dbr_ctx; MDNS_INIT_ASSERT(mif, mif_magic); - RW_RLOCK(dbr, dbr_lock); /* * If this is the last step we create an announce context * and add all valid records to it. */ if (pac->pac_step == 3) { + RW_WLOCK(dbr, dbr_lock); pac_an = dbr_pac_new(dbr, PAC_ANNOUNCE); TAILQ_FOREACH_SAFE(dr, &pac->pac_head, dr_pac_next, dr2) { dbr_probe_del(dr); @@ -2189,6 +2165,8 @@ mdns_pkg_sethdr(&pc6, 0, MDNS_HEAD_QUERY | MDNS_HEAD_AA); #endif + RW_RLOCK(dbr, dbr_lock); + /* * Add all valid records to the packet chain */ ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.h#6 (text+ko) ==== @@ -38,6 +38,7 @@ * Database record set */ struct dbr_ident; +struct dbr_pac; struct dbr { MAGIC(dbr_magic); DEF_MTX(dbr_mtx); @@ -47,6 +48,7 @@ struct vars dbr_vars; /* Variable subsystem */ struct hashtbl dbr_ident; /* Identifier lookup */ TAILQ_HEAD(, dbr_ident) dbr_ilist; /* Identifier list */ + TAILQ_HEAD(, dbr_pac) dbr_paclist; /* Active probe/annonuce contexs */ }; /* @@ -122,7 +124,6 @@ /* * Database record resource name */ -struct dbr_pac; struct dbr_res; struct dbr_rec { struct record dr_rec; @@ -185,6 +186,7 @@ #define PAC_PROBE 0x02 /* This is a probe context */ #define PAC_ANNOUNCE 0x04 /* This is an announce context */ TAILQ_HEAD(, dbr_rec) pac_head; + TAILQ_ENTRY(dbr_pac) pac_next; }; /* Initialize record database */ From owner-p4-projects@FreeBSD.ORG Sun Oct 7 18:21:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86B0216A4A5; Sun, 7 Oct 2007 18:21:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29BB016A496 for ; Sun, 7 Oct 2007 18:21:27 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1B6413C458 for ; Sun, 7 Oct 2007 18:21:26 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97ILQXC090127 for ; Sun, 7 Oct 2007 18:21:26 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97ILQe9090124 for perforce@freebsd.org; Sun, 7 Oct 2007 18:21:26 GMT (envelope-from fli@FreeBSD.org) Date: Sun, 7 Oct 2007 18:21:26 GMT Message-Id: <200710071821.l97ILQe9090124@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 127287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 18:21:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=127287 Change 127287 by fli@fli_genesis on 2007/10/07 18:21:20 Add a test case that (currently only) exercices the probe tie-breaking code path. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/regression/Makefile.dbrec#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/regression/test-dbrec.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 7 21:54:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F87016A41A; Sun, 7 Oct 2007 21:54:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1031F16A421 for ; Sun, 7 Oct 2007 21:54:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EEAE113C465 for ; Sun, 7 Oct 2007 21:54:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97Lsohe017008 for ; Sun, 7 Oct 2007 21:54:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97LsoxZ017005 for perforce@freebsd.org; Sun, 7 Oct 2007 21:54:50 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 Oct 2007 21:54:50 GMT Message-Id: <200710072154.l97LsoxZ017005@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 127291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 21:54:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=127291 Change 127291 by kmacy@kmacy_home:ethng on 2007/10/07 21:54:41 mark deleted rtentry as expired so that any inpcbs referencing it will free their reference and look it up again Affected files ... .. //depot/projects/ethng/src/sys/net/route.c#7 edit .. //depot/projects/ethng/src/sys/netinet/tcp_output.c#4 edit .. //depot/projects/ethng/src/sys/netinet/udp_usrreq.c#5 edit Differences ... ==== //depot/projects/ethng/src/sys/net/route.c#7 (text+ko) ==== @@ -861,7 +861,12 @@ * when RTFREE(rt) is eventually called. */ rttrash++; - + /* + * If inpcbs hold a reference to this route + * they need to be notified that it is no longer valid + */ + rt->rt_rmx.rmx_expire = time_uptime; + /* * If the caller wants it, then it can have it, * but it's up to it to free the rtentry as we won't be ==== //depot/projects/ethng/src/sys/netinet/tcp_output.c#4 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -141,6 +142,7 @@ struct sackhole *p; int tso = 0; struct tcpopt to; + struct rtentry *rt; #if 0 int maxburst = TCP_MAXBURST; #endif @@ -1123,9 +1125,10 @@ if (path_mtu_discovery) ip->ip_off |= IP_DF; /* - * XXX need to validate - */ - if (inp->inp_route.ro_rt == NULL) { + * XXX timer wrap? + */ + rt = inp->inp_route.ro_rt; + if (rt == NULL || (rt && rt->rt_rmx.rmx_expire && (rt->rt_rmx.rmx_expire <= time_uptime))) { struct sockaddr_in *dst = (struct sockaddr_in *)&inp->inp_route.ro_dst; struct ip *ip = mtod(m, struct ip *); @@ -1133,7 +1136,10 @@ dst->sin_family = AF_INET; dst->sin_len = sizeof(*dst); dst->sin_addr = ip->ip_dst; - + if (rt) { + RTFREE(rt); + inp->inp_route.ro_rt = NULL; + } rtalloc_ign(&inp->inp_route, 0); } ==== //depot/projects/ethng/src/sys/netinet/udp_usrreq.c#5 (text+ko) ==== @@ -767,7 +767,8 @@ int ipflags; u_short fport, lport; int unlock_udbinfo; - + struct rtentry *rt; + /* * udp_output() may need to temporarily bind or connect the current * inpcb. As such, we don't know up front whether we will need the @@ -969,9 +970,10 @@ INP_INFO_WUNLOCK(&udbinfo); /* - * XXX need to validate + * XXX timer wrap? */ - if (inp->inp_route.ro_rt == NULL) { + rt = inp->inp_route.ro_rt; + if (rt == NULL || (rt && rt->rt_rmx.rmx_expire && (rt->rt_rmx.rmx_expire <= time_uptime))) { struct sockaddr_in *dst = (struct sockaddr_in *)&inp->inp_route.ro_dst; struct ip *ip = mtod(m, struct ip *); @@ -979,9 +981,15 @@ dst->sin_family = AF_INET; dst->sin_len = sizeof(*dst); dst->sin_addr = ip->ip_dst; - + if (rt) { + RTFREE(rt); + inp->inp_route.ro_rt = NULL; + } rtalloc_ign(&inp->inp_route, 0); - } + } + + + m->m_pkthdr.rss_hash = inp->inp_rss_hash; error = ip_output(m, inp->inp_options, &inp->inp_route, ipflags, inp->inp_moptions, inp); From owner-p4-projects@FreeBSD.ORG Sun Oct 7 22:08:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAA2416A419; Sun, 7 Oct 2007 22:08:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58F2516A417 for ; Sun, 7 Oct 2007 22:08:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 419D513C43E for ; Sun, 7 Oct 2007 22:08:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97M86Q5018870 for ; Sun, 7 Oct 2007 22:08:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97M85o2018867 for perforce@freebsd.org; Sun, 7 Oct 2007 22:08:05 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 7 Oct 2007 22:08:05 GMT Message-Id: <200710072208.l97M85o2018867@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 127292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 22:08:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=127292 Change 127292 by kmacy@kmacy_home:ethng on 2007/10/07 22:07:18 IFC 127290 Affected files ... .. //depot/projects/ethng/src/bin/sh/eval.c#2 integrate .. //depot/projects/ethng/src/bin/sh/sh.1#2 integrate .. //depot/projects/ethng/src/contrib/gcc/opts.c#3 integrate .. //depot/projects/ethng/src/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/ethng/src/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/ethng/src/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/ethng/src/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/ethng/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/ethng/src/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/ethng/src/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/ethng/src/etc/mtree/README#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/ethng/src/lib/libkse/Makefile#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/ethng/src/lib/libkse/pthread.map#1 branch .. //depot/projects/ethng/src/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/ethng/src/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/sys/lock.c#1 branch .. //depot/projects/ethng/src/lib/libkse/sys/lock.h#1 branch .. //depot/projects/ethng/src/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/Makefile#1 branch .. //depot/projects/ethng/src/lib/libkse/test/README#1 branch .. //depot/projects/ethng/src/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/ethng/src/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/ethng/src/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/ethng/src/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/ethng/src/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/ethng/src/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/ethng/src/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/ethng/src/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/ethng/src/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/ethng/src/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/ethng/src/lib/libkse/test/verify#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/ethng/src/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/ethng/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/ethng/src/share/man/man4/ata.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/uscanner.4#2 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#3 integrate .. //depot/projects/ethng/src/sys/boot/common/module.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/ethng/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/ethng/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/ethng/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/igmp.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/in.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_id.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_options.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/ethng/src/sys/sys/mbuf.h#9 edit .. //depot/projects/ethng/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/ethng/src/tools/regression/bin/sh/builtins/case1.0#1 branch .. //depot/projects/ethng/src/usr.sbin/pciconf/pciconf.8#3 integrate .. //depot/projects/ethng/src/usr.sbin/pciconf/pciconf.c#3 integrate Differences ... ==== //depot/projects/ethng/src/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.53 2006/06/15 07:57:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $"); #include #include @@ -367,6 +367,7 @@ setstackmark(&smark); arglist.lastp = &arglist.list; oexitstatus = exitstatus; + exitstatus = 0; expandarg(n->ncase.expr, &arglist, EXP_TILDE); for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) { for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) { ==== //depot/projects/ethng/src/bin/sh/sh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -861,6 +861,10 @@ separated by .Dq Li \&| characters. +The exit code of the +.Ic case +command is the exit code of the last command executed in the list or +zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Bd -literal -offset indent ==== //depot/projects/ethng/src/contrib/gcc/opts.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/opts.c,v 1.4 2007/10/02 20:06:14 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5 2007/10/03 01:26:24 obrien Exp $ */ #include "config.h" #include "system.h" ==== //depot/projects/ethng/src/contrib/groff/tmac/doc-common#2 (text+ko) ==== @@ -485,6 +485,7 @@ .ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-7.0 7.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 ==== //depot/projects/ethng/src/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -204,13 +204,13 @@ .as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] .ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V .as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1 +.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1 .as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2 +.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2 .as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3 +.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3 .as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4 +.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4 .as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] . .de At ==== //depot/projects/ethng/src/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ==== @@ -813,9 +813,9 @@ Local, OS-specific additions might be found in the file .Pa mdoc.local ; look for strings named -.Ql volume-ds-XXX +.Ql volume\-ds\-XXX (for the former type) and -.Ql volume-as-XXX +.Ql volume\-as\-XXX (for the latter type); .Ql XXX then denotes the keyword to be used with the @@ -848,7 +848,7 @@ local additions might be defined in .Pa mdoc.local ; look for strings named -.Ql operating-system-XXX-YYY , +.Ql operating\-system\-XXX\-YYY , where .Ql XXX is the acronym for the operating system and @@ -869,7 +869,7 @@ 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, -5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1 +5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0 .It DragonFly 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 .It Darwin @@ -1202,7 +1202,7 @@ If this is not desirable, . .Bd -literal -offset indent -\&.An -nosplit +\&.An \-nosplit .Ed .Pp . @@ -1210,7 +1210,7 @@ To turn splitting back on, write . .Bd -literal -offset indent -\&.An -split +\&.An \-split .Ed . .Ss "Arguments" @@ -1580,10 +1580,10 @@ .Sx RETURN VALUES section. .Pp -.Dl Usage: .Rv Oo -std Oc Op Ao function Ac ... +.Dl Usage: .Rv Oo \-std Oc Op Ao function Ac ... .Pp For example, -.Ql ".Rv -std atexit" +.Ql ".Rv \-std atexit" produces: . .Bd -ragged -offset -indent @@ -1610,10 +1610,10 @@ .Sx DIAGNOSTICS section. .Pp -.Dl Usage: .Ex Oo -std Oc Op Ao utility Ac ... +.Dl Usage: .Ex Oo \-std Oc Op Ao utility Ac ... .Pp For example, -.Ql ".Ex -std cat" +.Ql ".Ex \-std cat" produces: . .Bd -ragged -offset -indent @@ -1737,7 +1737,7 @@ Local, OS-specific additions might be found in the file .Pa mdoc.local ; look for strings named -.Ql str-Lb-XXX . +.Ql str\-Lb\-XXX . .Ql XXX then denotes the keyword to be used with the .Ql .Lb @@ -1755,16 +1755,16 @@ The .Ql .Li literal macro may be used for special characters, variable constants, etc.\& --- anything which should be displayed as it would be typed. +\- anything which should be displayed as it would be typed. .Pp .Dl Usage: .Li Ao argument Ac ... .Pp -.Bl -tag -width ".Li .Li\ cntrl-D\ )\ ," -compact -offset 15n +.Bl -tag -width ".Li .Li\ cntrl\-D\ )\ ," -compact -offset 15n .It Li ".Li \een" .Li \en .It Li ".Li M1 M2 M3 ;" .Li M1 M2 M3 ; -.It Li ".Li cntrl-D ) ," +.It Li ".Li cntrl\-D ) ," .Li cntrl-D ) , .It Li ".Li 1024 ..." .Li 1024 ... @@ -1812,7 +1812,7 @@ .Bl -tag -width ".Li .Nm\ groff_mdoc" -compact -offset 15n .It Li ".Nm groff_mdoc" .Nm groff_mdoc -.It Li ".Nm \e-mdoc" +.It Li ".Nm \e\-mdoc" .Nm \-mdoc .It Li ".Nm foo ) ) ," .Nm foo ) ) , @@ -1930,16 +1930,16 @@ .Pp .Tn ANSI/ISO C .Pp -.Bl -tag -width ".Li -iso9945-1-90" -compact -offset indent -.It Li -ansiC +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-ansiC .St -ansiC -.It Li -ansiC-89 +.It Li \-ansiC\-89 .St -ansiC-89 -.It Li -isoC +.It Li \-isoC .St -isoC -.It Li -isoC-90 +.It Li \-isoC\-90 .St -isoC-90 -.It Li -isoC-99 +.It Li \-isoC\-99 .St -isoC-99 .El .Pp @@ -1947,30 +1947,30 @@ .Tn POSIX Part 1: System API .Pp -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent -.It Li -iso9945-1-90 +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-iso9945\-1\-90 .St -iso9945-1-90 -.It Li -iso9945-1-96 +.It Li \-iso9945\-1\-96 .St -iso9945-1-96 -.It Li -p1003.1 +.It Li \-p1003.1 .St -p1003.1 -.It Li -p1003.1-88 +.It Li \-p1003.1\-88 .St -p1003.1-88 -.It Li -p1003.1-90 +.It Li \-p1003.1\-90 .St -p1003.1-90 -.It Li -p1003.1-96 +.It Li \-p1003.1\-96 .St -p1003.1-96 -.It Li -p1003.1b-93 +.It Li \-p1003.1b\-93 .St -p1003.1b-93 -.It Li -p1003.1c-95 +.It Li \-p1003.1c\-95 .St -p1003.1c-95 -.It Li -p1003.1g-2000 +.It Li \-p1003.1g\-2000 .St -p1003.1g-2000 -.It Li -p1003.1i-95 +.It Li \-p1003.1i\-95 .St -p1003.1i-95 -.It Li -p1003.1-2001 +.It Li \-p1003.1\-2001 .St -p1003.1-2001 -.It Li -p1003.1-2004 +.It Li \-p1003.1\-2004 .St -p1003.1-2004 .El .Pp @@ -1978,52 +1978,52 @@ .Tn POSIX Part 2: Shell and Utilities .Pp -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent -.It Li -iso9945-2-93 +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-iso9945\-2\-93 .St -iso9945-2-93 -.It Li -p1003.2 +.It Li \-p1003.2 .St -p1003.2 -.It Li -p1003.2-92 +.It Li \-p1003.2\-92 .St -p1003.2-92 -.It Li -p1003.2a-92 +.It Li \-p1003.2a\-92 .St -p1003.2a-92 .El .Pp . X/Open -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .Pp -.It Li -susv2 +.It Li \-susv2 .St -susv2 -.It Li -svid4 +.It Li \-svid4 .St -svid4 -.It Li -xbd5 +.It Li \-xbd5 .St -xbd5 -.It Li -xcu5 +.It Li \-xcu5 .St -xcu5 -.It Li -xcurses4.2 +.It Li \-xcurses4.2 .St -xcurses4.2 -.It Li -xns5 +.It Li \-xns5 .St -xns5 -.It Li -xns5.2 +.It Li \-xns5.2 .St -xns5.2 -.It Li -xpg3 +.It Li \-xpg3 .St -xpg3 -.It Li -xpg4 +.It Li \-xpg4 .St -xpg4 -.It Li -xpg4.2 +.It Li \-xpg4.2 .St -xpg4.2 -.It Li -xsh5 +.It Li \-xsh5 .St -xsh5 .El .Pp . Miscellaneous .Pp -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent -.It Li -ieee754 +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-ieee754 .St -ieee754 -.It Li -iso8802-3 +.It Li \-iso8802\-3 .St -iso8802-3 .El . @@ -2113,7 +2113,7 @@ .Ss "BSD Macro" . .Pp -.Dl "Usage: .Bx" Bro -alpha | -beta | -devel Brc ... +.Dl "Usage: .Bx" Bro \-alpha | \-beta | \-devel Brc ... .Dl " .Bx" Oo Ao version Ac Oo Ao release Ac Oc Oc ... .Pp .Bl -tag -width ".Li .Bx\ -devel" -compact -offset 15n @@ -2384,7 +2384,7 @@ .Dq .It Li ".Dq string abc ." .Dq string abc . -.It Li ".Dq \'^[A-Z]\'" +.It Li ".Dq \'^[A\-Z]\'" .Dq \'^[A-Z]\' .It Li ".Ql man mdoc" .Ql man mdoc @@ -2577,7 +2577,7 @@ \&.%A "Matthew Bar" \&.%A "John Foo" \&.%T "Implementation Notes on foobar(1)" -\&.%R "Technical Report ABC-DE-12-345" +\&.%R "Technical Report ABC\-DE\-12\-345" \&.%Q "Drofnats College, Nowhere" \&.%D "April 1991" \&.Re @@ -2750,7 +2750,7 @@ .Pp .Ql .Nd first prints -.Ql - , +.Ql \- , then all its arguments. . .It Li ".Sh LIBRARY" @@ -3157,10 +3157,10 @@ .Ql .Dl is parsed but not callable. .Pp -.Dl % ls -ldg /usr/local/bin +.Dl % ls \-ldg /usr/local/bin .Pp The above was produced by: -.Li ".Dl % ls -ldg /usr/local/bin" . +.Li ".Dl % ls \e\-ldg /usr/local/bin" . . .It Li .Bd Begin display. @@ -3232,7 +3232,7 @@ macros, so one is guaranteed the two types of displays will line up. The indentation value is normally set to\~6n or about two thirds of an inch (six constant width characters). -.It Ar indent-two +.It Ar indent\-two Indent two times the default indent value. .It Ar right This @@ -3327,7 +3327,7 @@ A bullet list. . .Bd -literal -offset indent -\&.Bl -bullet -offset indent -compact +\&.Bl \-bullet \-offset indent \-compact \&.It Bullet one goes here. \&.It @@ -3351,7 +3351,7 @@ A dash list. . .Bd -literal -offset indent -\&.Bl -dash -offset indent -compact +\&.Bl \-dash \-offset indent \-compact \&.It Dash one goes here. \&.It @@ -3375,7 +3375,7 @@ An enumerated list. . .Bd -literal -offset indent -\&.Bl -enum -offset indent -compact +\&.Bl \-enum \-offset indent \-compact \&.It Item one goes here. \&.It @@ -3400,10 +3400,10 @@ flag (starting with the second-level list): . .Bd -literal -offset indent -\&.Bl -enum -offset indent -compact +\&.Bl \-enum \-offset indent \-compact \&.It Item one goes here -\&.Bl -enum -nested -compact +\&.Bl \-enum \-nested \-compact \&.It Item two goes here. \&.It @@ -3438,7 +3438,7 @@ without list markers. . .Bd -literal -offset indent -\&.Bl -item -offset indent +\&.Bl \-item \-offset indent \&.It Item one goes here. Item one goes here. @@ -3492,7 +3492,7 @@ The raw text: . .Bd -literal -offset indent -\&.Bl -tag -width "PPID" -compact -offset indent +\&.Bl \-tag \-width "PPID" \-compact \-offset indent \&.It SL sleep time of the process (seconds blocked) \&.It PAGEIN @@ -3501,10 +3501,10 @@ resulting from references by the process to pages not loaded in core. \&.It UID -numerical user-id of process owner +numerical user\-id of process owner \&.It PPID numerical id of parent of process priority -(non-positive when in non-interruptible wait) +(non\-positive when in non\-interruptible wait) \&.El .Ed .Pp @@ -3519,7 +3519,7 @@ Example: . .Bd -literal -offset indent -\&.Bl -diag +\&.Bl \-diag \&.It You can't use Sy here. The message says all. \&.El @@ -3549,7 +3549,7 @@ And the unformatted text which created it: . .Bd -literal -offset indent -\&.Bl -hang -offset indent +\&.Bl \-hang \-offset indent \&.It Em Hanged labels appear similar to tagged lists when the label is smaller than the label width. @@ -3583,7 +3583,7 @@ The raw text: . .Bd -literal -offset indent -\&.Bl -ohang -offset indent +\&.Bl \-ohang \-offset indent \&.It Sy SL sleep time of the process (seconds blocked) \&.It Sy PAGEIN @@ -3592,10 +3592,10 @@ resulting from references by the process to pages not loaded in core. \&.It Sy UID -numerical user-id of process owner +numerical user\-id of process owner \&.It Sy PPID numerical id of parent of process priority -(non-positive when in non-interruptible wait) +(non\-positive when in non\-interruptible wait) \&.El .Ed .Pp @@ -3628,7 +3628,7 @@ Here is the source text which produced the above example: . .Bd -literal -offset indent -\&.Bl -inset -offset indent +\&.Bl \-inset \-offset indent \&.It Em Tag The tagged list (also called a tagged paragraph) is the most common type of list used in the @@ -3693,12 +3693,18 @@ was produced by: . .Bd -literal -\&.Bl -column -offset indent ".Sy String" ".Sy Nroff" ".Sy Troff" +\&.Bl \-column \-offset indent ".Sy String" ".Sy Nroff" ".Sy Troff" \&.It Sy String Ta Sy Nroff Ta Sy Troff \&.It Li <= Ta <= Ta \e*(<= \&.It Li >= Ta >= Ta \e*(>= \&.El .Ed +.Pp +. +Don't abuse this list type! +For more complicated cases it might be far better and easier to use +.Xr tbl 1 , +the table preprocessor. .El .Pp . @@ -3720,7 +3726,7 @@ Example: . .Bd -literal -offset indent -\&.Bl -tag -width ".Fl test Ao Ar string Ac" +\&.Bl \-tag \-width ".Fl test Ao Ar string Ac" \&.It Fl test Ao Ar string Ac This is a longer sentence to show how the \&.Fl width @@ -4029,19 +4035,19 @@ .Xr groff 1 , resulting in multiple pages instead of a single, very long page: .Pp -.Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt +.Dl groff \-Tlatin1 \-rcR=0 \-mdoc foo.man > foo.txt .Pp For double-sided printing, set register .Ql D to\~1: .Pp -.Dl groff -Tps -rD1 -mdoc foo.man > foo.ps +.Dl groff \-Tps \-rD1 \-mdoc foo.man > foo.ps .Pp To change the document font size to 11pt or 12pt, set register .Ql S accordingly: .Pp -.Dl groff -Tdvi -rS11 -mdoc foo.man > foo.dvi +.Dl groff \-Tdvi \-rS11 \-mdoc foo.man > foo.dvi .Pp Register .Ql S @@ -4055,7 +4061,7 @@ .Ql LT , respectively: .Pp -.Dl groff -Tutf8 -rLL=100n -rLT=100n -mdoc foo.man | less +.Dl groff \-Tutf8 \-rLL=100n \-rLT=100n \-mdoc foo.man | less .Pp If not set, both registers default to 78n for TTY devices and 6.5i otherwise. ==== //depot/projects/ethng/src/crypto/openssl/ssl/ssl_lib.c#2 (text+ko) ==== @@ -1201,7 +1201,6 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) { char *p; - const char *cp; STACK_OF(SSL_CIPHER) *sk; SSL_CIPHER *c; int i; @@ -1214,20 +1213,21 @@ sk=s->session->ciphers; for (i=0; iname; *cp; ) + n=strlen(c->name); + if (n+1 > len) { - if (len-- <= 0) - { - *p='\0'; - return(buf); - } - else - *(p++)= *(cp++); + if (p != buf) + --p; + *p='\0'; + return buf; } + strcpy(p,c->name); + p+=n; *(p++)=':'; + len-=n+1; } p[-1]='\0'; return(buf); ==== //depot/projects/ethng/src/etc/mtree/BSD.include.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.120 2007/10/03 05:51:20 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -24,52 +24,52 @@ ext pb_ds detail - pairing_heap_ + basic_tree_policy + .. + bin_search_tree_ + .. + binary_heap_ .. - splay_tree_ + binomial_heap_ .. - list_update_map_ + binomial_heap_base_ .. - basic_tree_policy + cc_hash_table_map_ .. - trie_policy + eq_fn .. gp_hash_table_map_ .. - tree_policy + hash_fn .. - binomial_heap_base_ + left_child_next_sibling_heap_ .. - resize_policy + list_update_map_ .. - bin_search_tree_ + list_update_policy .. - binomial_heap_ + ov_tree_map_ .. - thin_heap_ + pairing_heap_ .. pat_trie_ .. - cc_hash_table_map_ + rb_tree_map_ .. rc_binomial_heap_ .. - left_child_next_sibling_heap_ + resize_policy .. - unordered_iterator + splay_tree_ .. - binary_heap_ + thin_heap_ .. - ov_tree_map_ + tree_policy .. - hash_fn + trie_policy .. - eq_fn - .. - rb_tree_map_ + unordered_iterator .. - list_update_policy - .. .. .. .. @@ -106,10 +106,10 @@ .. pbio .. + powermac_nvram + .. ppbus .. - powermac_nvram - .. smbus .. speaker ==== //depot/projects/ethng/src/etc/mtree/BSD.local.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.125 2006/11/12 12:02:34 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.126 2007/10/03 05:51:20 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -471,11 +471,11 @@ LC_MESSAGES .. .. - sr@Latn + sq LC_MESSAGES .. .. - sq >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 7 23:15:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A48416A421; Sun, 7 Oct 2007 23:15:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8F9A16A419 for ; Sun, 7 Oct 2007 23:15:22 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C22EB13C45B for ; Sun, 7 Oct 2007 23:15:22 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97NFMxu024057 for ; Sun, 7 Oct 2007 23:15:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97NFMAX024054 for perforce@freebsd.org; Sun, 7 Oct 2007 23:15:22 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 7 Oct 2007 23:15:22 GMT Message-Id: <200710072315.l97NFMAX024054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 127294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 23:15:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127294 Change 127294 by pgj@disznohal on 2007/10/07 23:14:52 Add the initial Hungarian translation of Chapter 6: Desktop Applications. Affected files ... .. //depot/projects/docproj_hu/books/handbook/desktop/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/desktop/chapter.sgml#2 (text+ko) ==== @@ -2,172 +2,218 @@ The FreeBSD Documentation Project $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.73 2007/07/11 09:15:31 blackend Exp $ --> + - + - Christophe - Juniet - Contributed by + Christophe + Juniet + Írta: - Desktop Applications + Asztali alkalmazások - Synopsis + Áttekintés - FreeBSD can run a wide variety of desktop applications, such - as browsers and word processors. Most of these are available as - packages or can be automatically built from the ports - collection. Many new users expect to find these kinds of - applications on their desktop. This chapter will show you how - to install some popular desktop applications effortlessly, - either from their packages or from the Ports Collection. + &os;-n asztali alkalmazások széles + spektrumát lehet futtatni, például + böngészõket, szövegszerkesztõket. + Legtöbbjük csomagként áll + rendelkezésre, ill. automatizált módon + lefordíthatóak a portgyûjteménybõl. + Az új felhasználók közül sokan + szeretnének ilyen fajta alkalmazásokat + használni, ezért ez a fejezet bemutatja, + miként lehet a népszerûbb asztali + alkalmazásokat minden különösebb + erõfeszítés nélkül + telepíteni, legyen szó az elõre csomagolt vagy + a Portgyûjteményben megtalálható + formájukról. - Note that when installing programs from the ports, they are - compiled from source. This can take a very long time, depending - on what you are compiling and the processing power of your - machine(s). If building from source takes a prohibitively long - amount of time for you, you can install most of the programs of - the Ports Collection from pre-built packages. + Vegyük észre, hogy amikor portként + telepítünk egy programot, a + forráskódját fordítjuk le. Ez + bizonyos esetekben nagyon sokáig is eltarthat attól + függõen, hogy pontosan mit is fordítunk le ill. + mekkora az erre a célra felhasznált + számítógépünk, + számítógépeink + teljesítménye. Amennyiben a + fordításra nem tudunk vagy nem + kívánunk elegendõ idõt szánni, a + Portgyûjteményben található programok + többségét már elõre + lefordított csomagból is + telepíthetjük. - As FreeBSD features Linux binary compatibility, many - applications originally developed for Linux are available for - your desktop. It is strongly recommended that you read - before installing any of the Linux - applications. Many of the ports using the Linux binary - compatibility start with linux-. Remember this - when you search for a particular port, for instance with - &man.whereis.1;. In the following text, it is assumed that you - have enabled Linux binary compatibility before installing any of - the Linux applications. + Mivel a &os; kínál fel + &linux;-kompatibilitást, számos, eredetileg &linux;-ra + fejlesztett alkalmazás is elérhetõvé + válik az asztali környezetünkre. Azonban + határozottan javasoljuk, hogy a &linux;-os + alkalmazások használatához elõször + figyelmesen olvassa át a et. A + &linux;-os bináris kompabilitást + használó portok neve általában a + linux- elõtaggal kezdõdik. Ezt ne + felejtsük el figyelembe venni, amikor pl. a &man.whereis.1; + segítségével keresünk egy portot. A + fejezet további részében + feltételezzük, hogy aktiváltuk a bináris + &linux;-kompatibilitást a &linux;-os alkalmazások + telepítése elõtt. - Here are the categories covered by this chapter: + Íme a fejezetben tárgyalt + kategóriák: - Browsers (such as Mozilla, - Opera, - Firefox, + Böngészõk (mint a + Mozilla, + Opera, + Firefox, Konqueror) - Productivity (such as - KOffice, - AbiWord, - The GIMP, - OpenOffice.org) + Termelõeszközök (mint a + KOffice, + AbiWord, The + GIMP, + OpenOffice.org) - Document Viewers (such as &acrobat.reader;, - gv, - Xpdf, - GQview) + Dokumentumnézegetõk (mint az + &acrobat.reader;, + gv, + Xpdf, + GQview) - Finance (such as - GnuCash, - Gnumeric, - Abacus) + Pénzügyi szoftverek (mint a + GnuCash, + Gnumeric, + Abacus) - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Know how to install additional third-party software - (). + A külsõs alkalmazások + telepítésének ismerete (). - Know how to install additional Linux software - (). + &linux;-os alkalmazások + telepítésének ismerete (). - For information on how to get a multimedia environment, read - . If you want to set up and use - electronic mail, please refer to . + A multimédiás környezet + kialakítására vonatkozó + információkért a t + érdemes elolvasni. Az elektronikus levelezés + beállítását és + használatát a bõl + tudhatjuk meg. - Browsers + Böngészõk - browsers - web + böngészõk + világháló - FreeBSD does not come with a particular browser - pre-installed. Instead, the - www - directory of the Ports Collection contains a lot of browsers - ready to be installed. If you do not have time to compile - everything (this can take a very long time in some cases) many - of them are available as packages. + A &os;-vel együtt nem települ semmilyen + böngészõ. Helyette keressük meg a + Portgyûjteményben a www + könyvtárat, ahol viszont már rengeteg + böngészõ áll telepítésre + készen. Csomagolt formában is + elérhetõek, ha nem lenne idõnk mindent + lefordítani (egyes esetekben termérdek idõnkbe + is kerülhet). - KDE and - GNOME already provide HTML browsers. - Please refer to for more information on - how to set up these complete desktops. + A KDE-hez és a + GNOME-hoz eleve tartoznak + HTML-böngészõk. Ezen komplett + asztalkörnyezetek beállításához a + t olvassuk el. - If you are looking for light-weight browsers, you should - investigate the Ports Collection for - www/dillo, - www/links, or - www/w3m. + Ha viszont csak pehelysúlyú + böngészõkre vágyunk, érdemes + megnéznünk a Portgyûjteményben + található www/dillo, www/links vagy www/w3m portokat. - This section covers these applications: + Ez a rész az alábbi alkalmazásokat + említi: - - - Application Name - Resources Needed - Installation from Ports - Major Dependencies - - + + + Alkalmazás + Erõforrásigény + Telepítés forrásból + Fõbb függõségek + + + + + + Mozilla + sok + nehéz + Gtk+ + - - - Mozilla - heavy - heavy - Gtk+ - + + Opera + kevés + könnyû + Vannak &os;-s és &linux;-os változatai + is. A &linux;-os verzió használatához + azonban szükség van a bináris + &linux;-kompatibilitásra és a + linux-openmotif-ra. + - - Opera - light - light - FreeBSD and Linux versions available. The Linux - version depends on the Linux Binary Compatibility and - linux-openmotif. - + + Firefox + közepes + nehéz + Gtk+ + - - Firefox - medium - heavy - Gtk+ - - Konqueror - medium - heavy - KDE Libraries - - + közepes + nehéz + a KDE + függvénykönyvtárai + + @@ -177,161 +223,215 @@ Mozilla - Mozilla is a modern, - stable browser that is fully ported to FreeBSD: it features a very - standards-compliant HTML display engine; it provides a mail - and news reader. It even has a HTML composer if you plan to - write some web pages yourself. Users of - &netscape; will recognize the - similarities with the Communicator - suite, as both browsers share some development history. + A Mozilla egy modern, + megbízható böngészõ, melyet + sikeresen portoltak &os;-re. Egy nagyon jó, a + szabványoknak megfelelõ HTML-megjelenítõ + motorral rendelkezik, valamint hírolvasót + és levelezõklienst is tartalmaz. Ezenfelül + találhatunk benne egy HTML-szerkesztõt is, ami + jól használható honlapok + készítéséhez. A + &netscape;-hez szokott + felhasználók felfedezhetnek némi + hasonlóságot a + Communicator programcsomaggal, mivel + ez a két böngészõ egykoron ugyanaz + volt. - On slow machines, with a CPU speed less than 233MHz or - with less than 64MB of RAM, Mozilla - can be too resource-demanding to be fully usable. You may - want to look at the Opera browser - instead, described a little later in this chapter. + 233 MHz-nél lassabb processzorral vagy 64 + MB-nál kevesebb memóriával rendelkezõ + gépeken a Mozilla + erõforrásigényesnek hathat a megfelelõ + használathoz. Ebben az esetben inkább + érdemes a fejezet egy késõbbi + részében bemutatandó + Opera böngészõ + használata. - If you cannot or do not want to compile - Mozilla, for whatever reason, the FreeBSD - GNOME team has already done this for you. Just install the - package from the network by: + Ha bármilyen okból nem akarjuk vagy nem tudjuk + lefordítani a Mozilla-t, + nyugodtan támaszkodhatunk a &os; GNOME csapatának + munkájára. Hálózaton keresztül + a következõ paranccsal tudjuk telepíteni + csomagból: &prompt.root; pkg_add -r mozilla - If the package is not available, and you have enough time - and disk space, you can get the source for - Mozilla, compile it and install it - on your system. This is accomplished by: + Ha ez a csomag nem érhetõ el, és van + elegendõ idõnk és tárhelyünk, + letölthetjük a Mozilla + forrását is, amit aztán lefordítunk + és telepítünk. Ennek módja: &prompt.root; cd /usr/ports/www/mozilla &prompt.root; make install clean - The Mozilla port ensures a - correct initialization by running the chrome registry setup - with root privileges. However, if you - want to fetch some add-ons like mouse gestures, you must run - Mozilla as - root to get them properly - installed. + A Mozilla portja a + root felhasználó jogaival + végzett regisztrációs + beállítások + érvényesítésével gondoskodik + a megfelelõ inicializálásról. Azonban + ha további kiegészítéseket + szeretnénk még telepíteni, mondjuk az + egérmozdulatok támogatását, + magunknak kell root-ként futtatni a + Mozilla-t, hogy szabályosan + feltelepítõdhessenek. - Once you have completed the installation of - Mozilla, you do not need to be - root any longer. You can start - Mozilla as a browser by typing: + Amint sikeresen befejezõdõtt a + Mozilla telepítése, + nincs szükség rá, hogy továbbra is + root felhasználók + legyünk. A Mozilla + böngészõt így tudjuk elindítani a + parancssorból: &prompt.user; mozilla - You can start it directly as a mail and news reader as - shown below: + Hírolvasóként és + levelezõkliensként pedig az alábbi módon + lehet elindítani: &prompt.user; mozilla -mail - + Firefox Firefox - Firefox is the next-generation - browser based on the Mozilla - codebase. Mozilla is a complete - suite of applications, such as a browser, a mail client, a chat - client and much more. Firefox is - just a browser, which makes it smaller and faster. + A Firefox a + Mozilla alapjaira + építkezõ, következõ + generációs böngészõ. A + Mozilla egy teljes programcsomag, + tehát böngészõ, levelezõkliens, + csevegõkliens stb. A Firefox + azonban csak egy egyszerû böngészõ, aminek + köszönhetõen kisebb és gyorsabb is. - Install the package by typing: + Csomagból így telepíthetõ: &prompt.root; pkg_add -r firefox - You can also use the Ports Collection if you - prefer to compile from source code: + Ha forrásból szeretnénk felrakni, + használhatjuk a Portgyûjteményben + található portját is: &prompt.root; cd /usr/ports/www/firefox &prompt.root; make install clean - Firefox, Mozilla and &java; plugin + Firefox, Mozilla és a &java; plugin - In this section and in the next one, we assume you have - already installed Firefox or - Mozilla. + Ennél és a következõ + résznél feltételezzük, hogy már + korábban telepítettük a + Firefox vagy a + Mozilla alkalmazások + valamelyikét. - The &os; Foundation has a license with Sun Microsystems to - distribute &os; binaries for the Java Runtime Environment - (&jre;) and Java Development Kit (&jdk;). Binary packages for - &os; are available on the A &os; alapítvány megegyezett a Sun + Microsystems-szel, hogy terjesztheti a &java; + futtatókörnyezet (&jre;) és a &java; + fejlesztõkörnyezet (&jdk;) &os;-s bináris + változatait. Ezek a csomagok elérhetõek a + &os; - Foundation web site. + alapítvány + honlapjáról. - To add &java; support to - Firefox or - Mozilla, you first have to install - the java/javavmwrapper port. Then, - download the Diablo &jre; package - from , - and install it with &man.pkg.add.1;. + Ha tehát &java;-támogatást + szeretnénk hozzáadni a + Firefox vagy a + Mozilla valamelyikéhez, + elsõként fel kell telepítenünk a + java/javavmwrapper portot. + Ezután le kell töltenünk a Diablo + &jre; csomagot a + címrõl, majd telepítenünk azt a + &man.pkg.add.1; segítségével. - Start your browser, enter - about:plugins in the location bar and press - Enter. A page listing the installed plugins - will be displayed; the &java; - plugin should be listed there now. If it is not, as - root, run the following command: + Indítsuk el a böngészõnket, + és írjuk be a címsorba, hogy + about:plugins és nyomjuk le az + Entert. Az eredményül kapott + oldalon láthatjuk az eddig telepített pluginok + listáját, ahol mostanra már a + &java; pluginnak is meg kell + jelennie. Amennyiben ez nem következne be, + rootként adjuk ki az alábbi + parancsot: &prompt.root; ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \ /usr/local/lib/browser_plugins/ - then relaunch your browser. + és indítsuk újra a + böngészõnket. - Firefox, Mozilla and ¯omedia; &flash; plugin + Firefox, Mozilla és a ¯omedia; &flash; + plugin - ¯omedia; &flash; plugin is not available for &os;. However, - a software layer (wrapper) for running the Linux version of the plugin - exists. This wrapper also supports &adobe; &acrobat; plugin, - &realplayer; plugin and more. + A ¯omedia; &flash; plugin nem érhetõ el + közvetlenül &os;-re. Azonban létezik egy, a + plugin &linux;-os verziójára épített + szoftveres réteg (wrapper). Ez a wrapper még + használhatóvá teszi többek közt + az &adobe; &acrobat; és a &realplayer; pluginjait + is. - Install the www/linuxpluginwrapper - port. This port requires - emulators/linux_base which is a - large port. Follow the instructions displayed by the port to set up - your /etc/libmap.conf correctly! Example - configurations are installed into + Telepítsük fel a www/linuxpluginwrapper portot. A port + telepítése viszont maga után vonja a + emulators/linux_base + telepítését is, ami viszont egy nagyobb + port. Igyekezzünk minél pontosabban követni a + port telepítése során megjelenõ + utasításokat és minél jobban + beállítani a /etc/libmap.conf + állományt! Ehhez segítséget a /usr/local/share/examples/linuxpluginwrapper/ - directory. + könyvtárban találhatunk. - The next step is to install the www/linux-flashplugin7 port. Once - the plugin is installed, start your browser, enter - about:plugins in the location bar and press - Enter. - A list should appear with all the currently - available plugins. + A következõ lépésben + telepítsük a www/linux-flashplugin7 portot. + Miután felkerült a plugin, indítsuk el a + böngészõt és írjuk be az + about:plugins sort a címsorba, majd + üssünk Entert. Az eddig + telepített pluginok felsorolása fog + megjelenni. - If the &flash; plugin is not listed, this is, most of time, - caused by a missing symlink. As root, - run the following commands: + Ha nem szerepel közte a &flash; plugin, akkor annak az + oka (legalább is az esetek többségében) + egy hiányzó szimbolikus link. A + pótlásához + rootként adjuk ki a + következõ parancsokat: &prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \ /usr/local/lib/browser_plugins/ &prompt.root; ln -s /usr/local/lib/npapi/linux-flashplugin/flashplayer.xpt \ /usr/local/lib/browser_plugins/ - If you restart your browser the plugin should now appears - in the previously mentioned list. + Ha most újraindítjuk a + böngészõt, a pluginnak meg kell jelennie az + elõbb említett listában. - The linuxpluginwrapper only works on - the &i386; system architecture. + A linuxpluginwrapper csak az + &i386; architektúrán mûködik. @@ -342,151 +442,178 @@ Opera - Opera is a - full-featured and standards-compliant browser. It also - comes with a built-in mail and news reader, an IRC client, - an RSS/Atom feeds reader and much more. Despite this, - Opera is relatively lightweight - and very fast. It comes in two flavors: a native - FreeBSD version and a version that runs under Linux - emulation. + Az Opera egy sokoldalú + és szabványokkal kompatibilis + böngészõ. Tartalmaz beépített + levelezõklienst és hírolvasót, + IRC-klienst, RSS/Atom-olvasót és még sok + mindent mást. Ennek ellenére az + Opera viszonylag + pehelysúlyúnak és gyorsanak + számít. Két fajta kiszerelésben is + használható: létezik + natív &os;-s változata, valamint a + &linux;-emulációval futó + változata. - To browse the Web with the FreeBSD version of Opera, - install the package: + Az Opera &os;-s + változatát a megfelelõ csomag + telepítésével érhetjük + el: &prompt.root; pkg_add -r opera - Some FTP sites do not have all the packages, but - Opera can still be obtained - through the Ports Collection by typing: + Habár egyes FTP oldalakon nem található + meg az összes csomag, viszont a + Portgyûjteménybõl még ekkor is be tudjuk + szerezni az Opera-t: &prompt.root; cd /usr/ports/www/opera &prompt.root; make install clean - To install the Linux version of - Opera, substitute - linux-opera in place of - opera in the examples above. The Linux - version is useful in situations requiring the use of plug-ins - that are only available for Linux, such as Adobe - &acrobat.reader;. In all other respects, the - FreeBSD and Linux versions should be functionally - identical. + A &linux;-os Opera + telepítéséhez opera + helyett linux-opera-t kell megadnunk a fenti + parancsokban. Ennek a verziónak a használata + akkor lehet elõnyös, ha olyan plugineket akarunk + elérni, amelyek csak &linux;-ra léteznek. Ilyen + példáu az Adobe + &acrobat.reader;. Ettõl eltekintve azonban a + &os;-s és &linux;-os változatok szinte teljesen + megegyeznek. Konqueror - Konqueror + Konqueror - Konqueror is part of - KDE but it can also be used outside - of KDE by installing - x11/kdebase3. - Konqueror is much more than a browser, - it is also a file manager and a multimedia viewer. + A Konqueror a + KDE része, de + anélkül is használható, ha csak a + x11/kdebase3 portot + telepítjük fel. A + Konqueror több, mint egy + egszerû böngészõ: + állománykezelõ és + multimédiás nézegetõ is. - There is also a set of plugins available for - Konqueror, - available in misc/konq-plugins. + Számtalan plugin áll rendelkezésre a + Konquerorhoz, melyeket a misc/konq-plugins portban + találunk meg. - Konqueror also supports &flash;; a How To guide - for getting &flash; support on - Konqueror - is available at . + A Konqueror ismeri a + &flash;-t is. A + &flash; és a + Konqueror kapcsolatával egy + külön Hogyan is foglalkozik, amelyet a + + címen olvashatunk el. - Productivity + Termelõeszközök - When it comes to productivity, new users often look for a - good office suite or a friendly word processor. While some - desktop environments like - KDE already provide an office suite, - there is no default productivity package. FreeBSD can provide all that is - needed, regardless of your desktop environment. + Ha termelésrõl van szó, az új + felhasználók gyakorta keresnek egy jó irodai + programcsomagot vagy egy baratságos + szövegszerkesztõt. Miközben a + különféle asztalkörnyzetek, mint mondjuk a + KDE - This section covers these applications: + Ebben a részben a következõ + alkalmazásokról esik szó: - - - Application Name - Resources Needed - Installation from Ports - Major Dependencies - - + + + Alkalmazás + Erõforrásigény + Telepítés forrásból + Fõbb függõségek + + - - - KOffice - light - heavy - KDE - + + + KOffice + kevés + nehéz + KDE + - - AbiWord - light - light - Gtk+ or GNOME - + + AbiWord + kevés + könnyû + Gtk+ vagy + GNOME + - - The Gimp - light - heavy - Gtk+ - + + The Gimp + kevés + nehéz + Gtk+ + - - OpenOffice.org - heavy - huge - &jdk; 1.4, Mozilla - - + + OpenOffice.org + sok + nagyon nehéz + &jdk; 1.4, + Mozilla + + - + KOffice KOffice - office suite + irodai programcsomag KOffice - The KDE community has provided its desktop environment - with an office suite which can be used outside - KDE. It includes the four standard - components that can be found in other office suites. - KWord is the word processor, - KSpread is the spreadsheet program, - KPresenter manages slide - presentations, and Kontour lets you - draw graphical documents. + A KDE közösség által kiadott + asztalkörnyezethez társul egy irodai programcsomag is, + amely a KDE-tõl + függetlenül is használható. Tartalmazza + a többi irodai programcsomagban is + megtalálható négy szabványos + komponenst: a KWord + szövegszerkesztõt, a + KSpread táblazatkezelõt, + a KPresenter + prezentációkészítõt és + végezetül a Kontourt, + mellyel grafikus dokumentumokat tudunk rajzolni. - Before installing the latest - KOffice, make sure you have an - up-to-date version of KDE. + A legfrissebb KOffice + telepítése elõtt bizonyosodjuk meg + róla, hogy a KDE legfrissebb + verziójával is rendelkezünk. - To install KOffice as a - package, issue the following command: + A KOffice csomagként + történõ telepítéséhez adjuk + ki az alábbi parancsot: &prompt.root; pkg_add -r koffice - If the package is not available, you can use the ports - collection. For instance, to install - KOffice for - KDE3, do: + Ha ez a csomag nem érhetõ el, + telepíthetjük a Portgyûjteménybõl is. + Például a KDE3-hoz + tartozó KOffice-t így + rakhatjuk fel: &prompt.root; cd /usr/ports/editors/koffice-kde3 &prompt.root; make install clean @@ -498,24 +625,32 @@ AbiWord - AbiWord is a free word - processing program similar in look and feel to µsoft; Word. - It is suitable for typing papers, letters, reports, memos, and - so forth. It is very fast, contains many features, and is - very user-friendly. + Az AbiWord egy szabad + szövegszerkesztõ program, a µsoft; + Wordéhez hasonló kinézettel. + Remekül használható levelek, + beszámolók, feljegyzések, cikkek stb. + írásához. Nagyon gyors, rengeteg + funkciót ajánl fel, és kifejezetten + felhasználóbarát. - AbiWord can import or export - many file formats, including some proprietary ones like - µsoft;'s .doc. + Az AbiWord képes + többféle állományformátumba + exportálni és onnan importálni, + beleértve az olyan zárt formátumokat is, + mint mondjuk a µsoft; .doc. - AbiWord is available as a - package. You can install it by: + Az AbiWord csomagból + telepíthetõ, a következõ + módon: &prompt.root; pkg_add -r abiword - If the package is not available, it can be compiled from - the Ports Collection. The Ports Collection should be more - up to date. It can be done as follows: + Amennyiben ez a csomag nem érhetõ el, + lefordítható a Portgyûjteménybõl + is, ill. a Portgyûjtemény sokszor frissebb + verziót tartalmaz. Ezt így tudjuk + megtenni: &prompt.root; cd /usr/ports/editors/abiword &prompt.root; make install clean @@ -527,26 +662,36 @@ The GIMP - For image authoring or picture retouching, - The GIMP is a very sophisticated - image manipulation program. It can be used as a simple paint - program or as a quality photo retouching suite. It supports a - large number of plug-ins and features a scripting interface. - The GIMP can read and write a wide - range of file formats. It supports interfaces with scanners - and tablets. + Képek készítésére vagy + retusálásra a The GIMP a + legfejlettebb képszerkesztõ program. Egyszerû + rajzolóprogram gyanánt is + használható, de akár minõségi + fényképretusálásra is. + Óriási mennyiségû plugin + található hozzá és magában + foglal egy szkriptes interfészt is. A The + GIMP formátumok széles + skáláját ismeri. Számos scanner + és digitális rajztábla + csatlakoztatható hozzá. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 7 23:34:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F9E116A420; Sun, 7 Oct 2007 23:34:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21EC216A41A for ; Sun, 7 Oct 2007 23:34:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A0E113C45A for ; Sun, 7 Oct 2007 23:34:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l97NYkZS025058 for ; Sun, 7 Oct 2007 23:34:46 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l97NYjY2025055 for perforce@freebsd.org; Sun, 7 Oct 2007 23:34:45 GMT (envelope-from imp@freebsd.org) Date: Sun, 7 Oct 2007 23:34:45 GMT Message-Id: <200710072334.l97NYjY2025055@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 127297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2007 23:34:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=127297 Change 127297 by imp@imp_paco-paco on 2007/10/07 23:34:19 IFC @127292 Affected files ... .. //depot/projects/arm/src/bin/sh/eval.c#2 integrate .. //depot/projects/arm/src/bin/sh/sh.1#6 integrate .. //depot/projects/arm/src/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/arm/src/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/arm/src/contrib/groff/tmac/groff_mdoc.man#3 integrate .. //depot/projects/arm/src/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#12 integrate .. //depot/projects/arm/src/etc/mtree/BSD.local.dist#5 integrate .. //depot/projects/arm/src/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/arm/src/etc/mtree/README#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/arm/src/lib/libkse/Makefile#1 branch .. //depot/projects/arm/src/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/arm/src/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/arm/src/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/arm/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/arm/src/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/arm/src/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/arm/src/lib/libkse/pthread.map#1 branch .. //depot/projects/arm/src/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/arm/src/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/sys/lock.c#1 branch .. //depot/projects/arm/src/lib/libkse/sys/lock.h#1 branch .. //depot/projects/arm/src/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/Makefile#1 branch .. //depot/projects/arm/src/lib/libkse/test/README#1 branch .. //depot/projects/arm/src/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/arm/src/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/arm/src/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/arm/src/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/arm/src/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/arm/src/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/arm/src/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/arm/src/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/arm/src/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/arm/src/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/arm/src/lib/libkse/test/verify#1 branch .. //depot/projects/arm/src/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/arm/src/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/arm/src/share/man/man4/ata.4#9 integrate .. //depot/projects/arm/src/share/man/man4/uscanner.4#5 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#14 integrate .. //depot/projects/arm/src/sys/boot/common/module.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#18 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#39 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#16 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#20 integrate .. //depot/projects/arm/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/arm/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#18 integrate .. //depot/projects/arm/src/sys/netinet/igmp.c#6 integrate .. //depot/projects/arm/src/sys/netinet/in.c#11 integrate .. //depot/projects/arm/src/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/arm/src/sys/netinet/in_gif.c#8 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#23 integrate .. //depot/projects/arm/src/sys/netinet/in_proto.c#9 integrate .. //depot/projects/arm/src/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#15 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#13 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/arm/src/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#38 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_pfil.c#8 integrate .. //depot/projects/arm/src/sys/netinet/ip_gre.c#6 integrate .. //depot/projects/arm/src/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_id.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#22 integrate .. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#16 integrate .. //depot/projects/arm/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#25 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#22 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#24 integrate .. //depot/projects/arm/src/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#37 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#21 integrate .. //depot/projects/arm/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#27 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#20 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#23 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#25 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#16 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#25 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#33 integrate .. //depot/projects/arm/src/tools/regression/bin/sh/builtins/case1.0#1 branch .. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.8#5 integrate .. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.c#4 integrate Differences ... ==== //depot/projects/arm/src/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.53 2006/06/15 07:57:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $"); #include #include @@ -367,6 +367,7 @@ setstackmark(&smark); arglist.lastp = &arglist.list; oexitstatus = exitstatus; + exitstatus = 0; expandarg(n->ncase.expr, &arglist, EXP_TILDE); for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) { for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) { ==== //depot/projects/arm/src/bin/sh/sh.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -861,6 +861,10 @@ separated by .Dq Li \&| characters. +The exit code of the +.Ic case +command is the exit code of the last command executed in the list or +zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Bd -literal -offset indent ==== //depot/projects/arm/src/contrib/groff/tmac/doc-common#3 (text+ko) ==== @@ -485,6 +485,7 @@ .ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-7.0 7.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 ==== //depot/projects/arm/src/contrib/groff/tmac/doc-syms#3 (text+ko) ==== @@ -204,13 +204,13 @@ .as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] .ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V .as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1 +.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1 .as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2 +.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2 .as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3 +.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3 .as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4 +.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4 .as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] . .de At ==== //depot/projects/arm/src/contrib/groff/tmac/groff_mdoc.man#3 (text+ko) ==== @@ -813,9 +813,9 @@ Local, OS-specific additions might be found in the file .Pa mdoc.local ; look for strings named -.Ql volume-ds-XXX +.Ql volume\-ds\-XXX (for the former type) and -.Ql volume-as-XXX +.Ql volume\-as\-XXX (for the latter type); .Ql XXX then denotes the keyword to be used with the @@ -848,7 +848,7 @@ local additions might be defined in .Pa mdoc.local ; look for strings named -.Ql operating-system-XXX-YYY , +.Ql operating\-system\-XXX\-YYY , where .Ql XXX is the acronym for the operating system and @@ -869,7 +869,7 @@ 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, -5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1 +5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0 .It DragonFly 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 .It Darwin @@ -1202,7 +1202,7 @@ If this is not desirable, . .Bd -literal -offset indent -\&.An -nosplit +\&.An \-nosplit .Ed .Pp . @@ -1210,7 +1210,7 @@ To turn splitting back on, write . .Bd -literal -offset indent -\&.An -split +\&.An \-split .Ed . .Ss "Arguments" @@ -1580,10 +1580,10 @@ .Sx RETURN VALUES section. .Pp -.Dl Usage: .Rv Oo -std Oc Op Ao function Ac ... +.Dl Usage: .Rv Oo \-std Oc Op Ao function Ac ... .Pp For example, -.Ql ".Rv -std atexit" +.Ql ".Rv \-std atexit" produces: . .Bd -ragged -offset -indent @@ -1610,10 +1610,10 @@ .Sx DIAGNOSTICS section. .Pp -.Dl Usage: .Ex Oo -std Oc Op Ao utility Ac ... +.Dl Usage: .Ex Oo \-std Oc Op Ao utility Ac ... .Pp For example, -.Ql ".Ex -std cat" +.Ql ".Ex \-std cat" produces: . .Bd -ragged -offset -indent @@ -1737,7 +1737,7 @@ Local, OS-specific additions might be found in the file .Pa mdoc.local ; look for strings named -.Ql str-Lb-XXX . +.Ql str\-Lb\-XXX . .Ql XXX then denotes the keyword to be used with the .Ql .Lb @@ -1755,16 +1755,16 @@ The .Ql .Li literal macro may be used for special characters, variable constants, etc.\& --- anything which should be displayed as it would be typed. +\- anything which should be displayed as it would be typed. .Pp .Dl Usage: .Li Ao argument Ac ... .Pp -.Bl -tag -width ".Li .Li\ cntrl-D\ )\ ," -compact -offset 15n +.Bl -tag -width ".Li .Li\ cntrl\-D\ )\ ," -compact -offset 15n .It Li ".Li \een" .Li \en .It Li ".Li M1 M2 M3 ;" .Li M1 M2 M3 ; -.It Li ".Li cntrl-D ) ," +.It Li ".Li cntrl\-D ) ," .Li cntrl-D ) , .It Li ".Li 1024 ..." .Li 1024 ... @@ -1812,7 +1812,7 @@ .Bl -tag -width ".Li .Nm\ groff_mdoc" -compact -offset 15n .It Li ".Nm groff_mdoc" .Nm groff_mdoc -.It Li ".Nm \e-mdoc" +.It Li ".Nm \e\-mdoc" .Nm \-mdoc .It Li ".Nm foo ) ) ," .Nm foo ) ) , @@ -1930,16 +1930,16 @@ .Pp .Tn ANSI/ISO C .Pp -.Bl -tag -width ".Li -iso9945-1-90" -compact -offset indent -.It Li -ansiC +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-ansiC .St -ansiC -.It Li -ansiC-89 +.It Li \-ansiC\-89 .St -ansiC-89 -.It Li -isoC +.It Li \-isoC .St -isoC -.It Li -isoC-90 +.It Li \-isoC\-90 .St -isoC-90 -.It Li -isoC-99 +.It Li \-isoC\-99 .St -isoC-99 .El .Pp @@ -1947,30 +1947,30 @@ .Tn POSIX Part 1: System API .Pp -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent -.It Li -iso9945-1-90 +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-iso9945\-1\-90 .St -iso9945-1-90 -.It Li -iso9945-1-96 +.It Li \-iso9945\-1\-96 .St -iso9945-1-96 -.It Li -p1003.1 +.It Li \-p1003.1 .St -p1003.1 -.It Li -p1003.1-88 +.It Li \-p1003.1\-88 .St -p1003.1-88 -.It Li -p1003.1-90 +.It Li \-p1003.1\-90 .St -p1003.1-90 -.It Li -p1003.1-96 +.It Li \-p1003.1\-96 .St -p1003.1-96 -.It Li -p1003.1b-93 +.It Li \-p1003.1b\-93 .St -p1003.1b-93 -.It Li -p1003.1c-95 +.It Li \-p1003.1c\-95 .St -p1003.1c-95 -.It Li -p1003.1g-2000 +.It Li \-p1003.1g\-2000 .St -p1003.1g-2000 -.It Li -p1003.1i-95 +.It Li \-p1003.1i\-95 .St -p1003.1i-95 -.It Li -p1003.1-2001 +.It Li \-p1003.1\-2001 .St -p1003.1-2001 -.It Li -p1003.1-2004 +.It Li \-p1003.1\-2004 .St -p1003.1-2004 .El .Pp @@ -1978,52 +1978,52 @@ .Tn POSIX Part 2: Shell and Utilities .Pp -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent -.It Li -iso9945-2-93 +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-iso9945\-2\-93 .St -iso9945-2-93 -.It Li -p1003.2 +.It Li \-p1003.2 .St -p1003.2 -.It Li -p1003.2-92 +.It Li \-p1003.2\-92 .St -p1003.2-92 -.It Li -p1003.2a-92 +.It Li \-p1003.2a\-92 .St -p1003.2a-92 .El .Pp . X/Open -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .Pp -.It Li -susv2 +.It Li \-susv2 .St -susv2 -.It Li -svid4 +.It Li \-svid4 .St -svid4 -.It Li -xbd5 +.It Li \-xbd5 .St -xbd5 -.It Li -xcu5 +.It Li \-xcu5 .St -xcu5 -.It Li -xcurses4.2 +.It Li \-xcurses4.2 .St -xcurses4.2 -.It Li -xns5 +.It Li \-xns5 .St -xns5 -.It Li -xns5.2 +.It Li \-xns5.2 .St -xns5.2 -.It Li -xpg3 +.It Li \-xpg3 .St -xpg3 -.It Li -xpg4 +.It Li \-xpg4 .St -xpg4 -.It Li -xpg4.2 +.It Li \-xpg4.2 .St -xpg4.2 -.It Li -xsh5 +.It Li \-xsh5 .St -xsh5 .El .Pp . Miscellaneous .Pp -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent -.It Li -ieee754 +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-ieee754 .St -ieee754 -.It Li -iso8802-3 +.It Li \-iso8802\-3 .St -iso8802-3 .El . @@ -2113,7 +2113,7 @@ .Ss "BSD Macro" . .Pp -.Dl "Usage: .Bx" Bro -alpha | -beta | -devel Brc ... +.Dl "Usage: .Bx" Bro \-alpha | \-beta | \-devel Brc ... .Dl " .Bx" Oo Ao version Ac Oo Ao release Ac Oc Oc ... .Pp .Bl -tag -width ".Li .Bx\ -devel" -compact -offset 15n @@ -2384,7 +2384,7 @@ .Dq .It Li ".Dq string abc ." .Dq string abc . -.It Li ".Dq \'^[A-Z]\'" +.It Li ".Dq \'^[A\-Z]\'" .Dq \'^[A-Z]\' .It Li ".Ql man mdoc" .Ql man mdoc @@ -2577,7 +2577,7 @@ \&.%A "Matthew Bar" \&.%A "John Foo" \&.%T "Implementation Notes on foobar(1)" -\&.%R "Technical Report ABC-DE-12-345" +\&.%R "Technical Report ABC\-DE\-12\-345" \&.%Q "Drofnats College, Nowhere" \&.%D "April 1991" \&.Re @@ -2750,7 +2750,7 @@ .Pp .Ql .Nd first prints -.Ql - , +.Ql \- , then all its arguments. . .It Li ".Sh LIBRARY" @@ -3157,10 +3157,10 @@ .Ql .Dl is parsed but not callable. .Pp -.Dl % ls -ldg /usr/local/bin +.Dl % ls \-ldg /usr/local/bin .Pp The above was produced by: -.Li ".Dl % ls -ldg /usr/local/bin" . +.Li ".Dl % ls \e\-ldg /usr/local/bin" . . .It Li .Bd Begin display. @@ -3232,7 +3232,7 @@ macros, so one is guaranteed the two types of displays will line up. The indentation value is normally set to\~6n or about two thirds of an inch (six constant width characters). -.It Ar indent-two +.It Ar indent\-two Indent two times the default indent value. .It Ar right This @@ -3327,7 +3327,7 @@ A bullet list. . .Bd -literal -offset indent -\&.Bl -bullet -offset indent -compact +\&.Bl \-bullet \-offset indent \-compact \&.It Bullet one goes here. \&.It @@ -3351,7 +3351,7 @@ A dash list. . .Bd -literal -offset indent -\&.Bl -dash -offset indent -compact +\&.Bl \-dash \-offset indent \-compact \&.It Dash one goes here. \&.It @@ -3375,7 +3375,7 @@ An enumerated list. . .Bd -literal -offset indent -\&.Bl -enum -offset indent -compact +\&.Bl \-enum \-offset indent \-compact \&.It Item one goes here. \&.It @@ -3400,10 +3400,10 @@ flag (starting with the second-level list): . .Bd -literal -offset indent -\&.Bl -enum -offset indent -compact +\&.Bl \-enum \-offset indent \-compact \&.It Item one goes here -\&.Bl -enum -nested -compact +\&.Bl \-enum \-nested \-compact \&.It Item two goes here. \&.It @@ -3438,7 +3438,7 @@ without list markers. . .Bd -literal -offset indent -\&.Bl -item -offset indent +\&.Bl \-item \-offset indent \&.It Item one goes here. Item one goes here. @@ -3492,7 +3492,7 @@ The raw text: . .Bd -literal -offset indent -\&.Bl -tag -width "PPID" -compact -offset indent +\&.Bl \-tag \-width "PPID" \-compact \-offset indent \&.It SL sleep time of the process (seconds blocked) \&.It PAGEIN @@ -3501,10 +3501,10 @@ resulting from references by the process to pages not loaded in core. \&.It UID -numerical user-id of process owner +numerical user\-id of process owner \&.It PPID numerical id of parent of process priority -(non-positive when in non-interruptible wait) +(non\-positive when in non\-interruptible wait) \&.El .Ed .Pp @@ -3519,7 +3519,7 @@ Example: . .Bd -literal -offset indent -\&.Bl -diag +\&.Bl \-diag \&.It You can't use Sy here. The message says all. \&.El @@ -3549,7 +3549,7 @@ And the unformatted text which created it: . .Bd -literal -offset indent -\&.Bl -hang -offset indent +\&.Bl \-hang \-offset indent \&.It Em Hanged labels appear similar to tagged lists when the label is smaller than the label width. @@ -3583,7 +3583,7 @@ The raw text: . .Bd -literal -offset indent -\&.Bl -ohang -offset indent +\&.Bl \-ohang \-offset indent \&.It Sy SL sleep time of the process (seconds blocked) \&.It Sy PAGEIN @@ -3592,10 +3592,10 @@ resulting from references by the process to pages not loaded in core. \&.It Sy UID -numerical user-id of process owner +numerical user\-id of process owner \&.It Sy PPID numerical id of parent of process priority -(non-positive when in non-interruptible wait) +(non\-positive when in non\-interruptible wait) \&.El .Ed .Pp @@ -3628,7 +3628,7 @@ Here is the source text which produced the above example: . .Bd -literal -offset indent -\&.Bl -inset -offset indent +\&.Bl \-inset \-offset indent \&.It Em Tag The tagged list (also called a tagged paragraph) is the most common type of list used in the @@ -3693,12 +3693,18 @@ was produced by: . .Bd -literal -\&.Bl -column -offset indent ".Sy String" ".Sy Nroff" ".Sy Troff" +\&.Bl \-column \-offset indent ".Sy String" ".Sy Nroff" ".Sy Troff" \&.It Sy String Ta Sy Nroff Ta Sy Troff \&.It Li <= Ta <= Ta \e*(<= \&.It Li >= Ta >= Ta \e*(>= \&.El .Ed +.Pp +. +Don't abuse this list type! +For more complicated cases it might be far better and easier to use +.Xr tbl 1 , +the table preprocessor. .El .Pp . @@ -3720,7 +3726,7 @@ Example: . .Bd -literal -offset indent -\&.Bl -tag -width ".Fl test Ao Ar string Ac" +\&.Bl \-tag \-width ".Fl test Ao Ar string Ac" \&.It Fl test Ao Ar string Ac This is a longer sentence to show how the \&.Fl width @@ -4029,19 +4035,19 @@ .Xr groff 1 , resulting in multiple pages instead of a single, very long page: .Pp -.Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt +.Dl groff \-Tlatin1 \-rcR=0 \-mdoc foo.man > foo.txt .Pp For double-sided printing, set register .Ql D to\~1: .Pp -.Dl groff -Tps -rD1 -mdoc foo.man > foo.ps +.Dl groff \-Tps \-rD1 \-mdoc foo.man > foo.ps .Pp To change the document font size to 11pt or 12pt, set register .Ql S accordingly: .Pp -.Dl groff -Tdvi -rS11 -mdoc foo.man > foo.dvi +.Dl groff \-Tdvi \-rS11 \-mdoc foo.man > foo.dvi .Pp Register .Ql S @@ -4055,7 +4061,7 @@ .Ql LT , respectively: .Pp -.Dl groff -Tutf8 -rLL=100n -rLT=100n -mdoc foo.man | less +.Dl groff \-Tutf8 \-rLL=100n \-rLT=100n \-mdoc foo.man | less .Pp If not set, both registers default to 78n for TTY devices and 6.5i otherwise. ==== //depot/projects/arm/src/crypto/openssl/ssl/ssl_lib.c#5 (text+ko) ==== @@ -1201,7 +1201,6 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) { char *p; - const char *cp; STACK_OF(SSL_CIPHER) *sk; SSL_CIPHER *c; int i; @@ -1214,20 +1213,21 @@ sk=s->session->ciphers; for (i=0; iname; *cp; ) + n=strlen(c->name); + if (n+1 > len) { - if (len-- <= 0) - { - *p='\0'; - return(buf); - } - else - *(p++)= *(cp++); + if (p != buf) + --p; + *p='\0'; + return buf; } + strcpy(p,c->name); + p+=n; *(p++)=':'; + len-=n+1; } p[-1]='\0'; return(buf); ==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.120 2007/10/03 05:51:20 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -24,52 +24,52 @@ ext pb_ds detail - pairing_heap_ + basic_tree_policy + .. + bin_search_tree_ + .. + binary_heap_ .. - splay_tree_ + binomial_heap_ .. - list_update_map_ + binomial_heap_base_ .. - basic_tree_policy + cc_hash_table_map_ .. - trie_policy + eq_fn .. gp_hash_table_map_ .. - tree_policy + hash_fn .. - binomial_heap_base_ + left_child_next_sibling_heap_ .. - resize_policy + list_update_map_ .. - bin_search_tree_ + list_update_policy .. - binomial_heap_ + ov_tree_map_ .. - thin_heap_ + pairing_heap_ .. pat_trie_ .. - cc_hash_table_map_ + rb_tree_map_ .. rc_binomial_heap_ .. - left_child_next_sibling_heap_ + resize_policy .. - unordered_iterator + splay_tree_ .. - binary_heap_ + thin_heap_ .. - ov_tree_map_ + tree_policy .. - hash_fn + trie_policy .. - eq_fn - .. - rb_tree_map_ + unordered_iterator .. - list_update_policy - .. .. .. .. @@ -106,10 +106,10 @@ .. pbio .. + powermac_nvram + .. ppbus .. - powermac_nvram - .. smbus .. speaker ==== //depot/projects/arm/src/etc/mtree/BSD.local.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.125 2006/11/12 12:02:34 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.126 2007/10/03 05:51:20 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -471,11 +471,11 @@ LC_MESSAGES .. .. - sr@Latn + sq LC_MESSAGES .. .. - sq + sr@Latn LC_MESSAGES .. .. ==== //depot/projects/arm/src/etc/mtree/BSD.x11-4.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.31 2006/03/14 18:23:35 marcus Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.32 2007/10/03 05:51:20 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 8 06:57:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E38CE16A476; Mon, 8 Oct 2007 06:57:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D3E016A418 for ; Mon, 8 Oct 2007 06:57:14 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D2A213C4B7 for ; Mon, 8 Oct 2007 06:57:13 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l986vDNX074741 for ; Mon, 8 Oct 2007 06:57:13 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l986vDpO074738 for perforce@freebsd.org; Mon, 8 Oct 2007 06:57:13 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 8 Oct 2007 06:57:13 GMT Message-Id: <200710080657.l986vDpO074738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 127298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 06:57:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=127298 Change 127298 by kevlo@kevlo_rtsl on 2007/10/08 06:56:52 Change bwi_stop() returns void rather than int for consistency. Affected files ... .. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#3 (text+ko) ==== @@ -114,7 +114,7 @@ static void bwi_rx_radiotap(struct bwi_softc *, struct mbuf *, struct bwi_rxbuf_hdr *, const void *, int); -static int bwi_stop(struct bwi_softc *); +static void bwi_stop(struct bwi_softc *); static int bwi_newbuf(struct bwi_softc *, int, int); static int bwi_encap(struct bwi_softc *, int, struct mbuf *, struct ieee80211_node *); @@ -1064,12 +1064,7 @@ DPRINTF(sc, "%s\n", __func__); - error = bwi_stop(sc); - if (error) { - if_printf(ifp, "can't stop\n"); - BWI_UNLOCK(sc); - return; - } + bwi_stop(sc); bwi_bbp_power_on(sc, BWI_CLOCK_MODE_FAST); @@ -1319,7 +1314,7 @@ BWI_UNLOCK(sc); } -static int +static void bwi_stop(struct bwi_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; @@ -1367,8 +1362,6 @@ ifp->if_timer = 0; ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); BWI_UNLOCK(sc); - - return 0; } void From owner-p4-projects@FreeBSD.ORG Mon Oct 8 08:06:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 895E416A421; Mon, 8 Oct 2007 08:06:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF97316A41B for ; Mon, 8 Oct 2007 08:06:32 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8EC9B13C465 for ; Mon, 8 Oct 2007 08:06:32 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9886WRQ081055 for ; Mon, 8 Oct 2007 08:06:32 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9886WhV081052 for perforce@freebsd.org; Mon, 8 Oct 2007 08:06:32 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 8 Oct 2007 08:06:32 GMT Message-Id: <200710080806.l9886WhV081052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 127300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 08:06:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=127300 Change 127300 by kevlo@kevlo_rtsl on 2007/10/08 08:05:43 Passed in the MTX_RECURSE argument of mtx_init(). This fixes a potential kernel panic problem after configuring a bwi interface. Affected files ... .. //depot/projects/wifi/sys/dev/bwi/bwirf.c#3 edit .. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#4 edit .. //depot/projects/wifi/sys/dev/bwi/if_bwi_pci.c#3 edit .. //depot/projects/wifi/sys/dev/bwi/if_bwivar.h#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/bwi/bwirf.c#3 (text+ko) ==== @@ -358,6 +358,7 @@ 0x0810, 0x002b, 0x0015 }; + struct bwi_softc *sc = mac->mac_sc; struct bwi_phy *phy = &mac->mac_phy; struct bwi_rf *rf = &mac->mac_rf; uint16_t save_phy[SAVE_PHY_MAX]; @@ -425,7 +426,7 @@ PHY_SETBITS(mac, 0x811, 0x100); PHY_CLRBITS(mac, 0x812, 0x3000); - if ((mac->mac_sc->sc_card_flags & BWI_CARD_F_EXT_LNA) && + if ((sc->sc_card_flags & BWI_CARD_F_EXT_LNA) && phy->phy_rev >= 7) { PHY_SETBITS(mac, 0x811, 0x800); PHY_SETBITS(mac, 0x812, 0x8000); ==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#4 (text+ko) ==== @@ -285,6 +285,8 @@ struct bwi_phy *phy; int i, error, bands; + BWI_LOCK_INIT(sc); + bwi_power_on(sc, 1); error = bwi_bbp_attach(sc); @@ -459,10 +461,10 @@ if (bootverbose) ieee80211_announce(ic); - return 0; + return (0); fail: - bwi_detach(sc); - return error; + BWI_LOCK_DESTROY(sc); + return (error); } int ==== //depot/projects/wifi/sys/dev/bwi/if_bwi_pci.c#3 (text+ko) ==== @@ -194,13 +194,10 @@ sc->sc_pci_subvid = pci_get_subvendor(dev); sc->sc_pci_subdid = pci_get_subdevice(dev); - BWI_LOCK_INIT(sc); - error = bwi_attach(sc); if (error == 0) /* success */ return 0; - BWI_LOCK_DESTROY(sc); bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_irq_handle); bad2: bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res); @@ -227,8 +224,6 @@ bus_release_resource(dev, SYS_RES_MEMORY, BS_BAR, sc->sc_mem_res); - BWI_LOCK_DESTROY(sc); - return (0); } ==== //depot/projects/wifi/sys/dev/bwi/if_bwivar.h#3 (text+ko) ==== @@ -590,10 +590,9 @@ #define BWI_F_BUS_INITED 0x1 #define BWI_F_PROMISC 0x2 -#define BWI_LOCK_INIT(sc) do { \ +#define BWI_LOCK_INIT(sc) \ mtx_init(&(sc)->sc_mtx, device_get_nameunit((sc)->sc_dev), \ - MTX_NETWORK_LOCK, MTX_DEF); \ -} while (0) + MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); #define BWI_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_mtx) #define BWI_LOCK(sc) mtx_lock(&sc->sc_mtx) #define BWI_UNLOCK(sc) mtx_unlock(&sc->sc_mtx) From owner-p4-projects@FreeBSD.ORG Mon Oct 8 08:12:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2256316A41B; Mon, 8 Oct 2007 08:12:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC1D316A418 for ; Mon, 8 Oct 2007 08:12:39 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B8AF13C457 for ; Mon, 8 Oct 2007 08:12:39 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l988Cd2G081505 for ; Mon, 8 Oct 2007 08:12:39 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l988CdYx081502 for perforce@freebsd.org; Mon, 8 Oct 2007 08:12:39 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 8 Oct 2007 08:12:39 GMT Message-Id: <200710080812.l988CdYx081502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 127301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 08:12:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=127301 Change 127301 by kevlo@kevlo_rtsl on 2007/10/08 08:11:39 Forgot to destroy mutex in bwi_detach(). Affected files ... .. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#5 edit Differences ... ==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#5 (text+ko) ==== @@ -482,7 +482,9 @@ bwi_dma_free(sc); if_free(ifp); - return 0; + BWI_LOCK_DESTROY(sc); + + return (0); } void From owner-p4-projects@FreeBSD.ORG Mon Oct 8 10:12:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE19116A41B; Mon, 8 Oct 2007 10:12:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED06616A417 for ; Mon, 8 Oct 2007 10:12:52 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D567E13C48E for ; Mon, 8 Oct 2007 10:12:52 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l98ACqsA000816 for ; Mon, 8 Oct 2007 10:12:52 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98ACppR000813 for perforce@freebsd.org; Mon, 8 Oct 2007 10:12:51 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 8 Oct 2007 10:12:51 GMT Message-Id: <200710081012.l98ACppR000813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 127305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 10:12:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=127305 Change 127305 by kevlo@kevlo_rtsl on 2007/10/08 10:12:50 Fix a panic with my Asus WL-100G(BCM4306 chipset) device. Affected files ... .. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#6 edit Differences ... ==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#6 (text+ko) ==== @@ -1201,6 +1201,11 @@ struct bwi_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; struct bwi_txbuf_data *tbd = &sc->sc_tx_bdata[BWI_TX_DATA_RING]; + struct ieee80211_frame *wh; + struct ieee80211_node *ni; + struct ether_header *eh; + struct ieee80211_key *k; + struct mbuf *m; int trans, idx; BWI_LOCK(sc); @@ -1214,17 +1219,11 @@ idx = tbd->tbd_idx; while (tbd->tbd_buf[idx].tb_mbuf == NULL) { - struct ieee80211_frame *wh; - struct ieee80211_node *ni; - struct mbuf *m; - IF_DEQUEUE(&ic->ic_mgtq, m); if (m != NULL) { ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; m->m_pkthdr.rcvif = NULL; } else { - struct ether_header *eh; - if (ic->ic_state != IEEE80211_S_RUN) break; @@ -1265,7 +1264,8 @@ wh = mtod(m, struct ieee80211_frame *); if (wh->i_fc[1] & IEEE80211_FC1_WEP) { - if (ieee80211_crypto_encap(ic, ni, m) == NULL) { + k = ieee80211_crypto_encap(ic, ni, m); + if (k == NULL) { ieee80211_free_node(ni); m_freem(m); ifp->if_oerrors++; @@ -1515,6 +1515,8 @@ { struct ifnet *ifp = ic->ic_ifp; struct bwi_softc *sc = ifp->if_softc; + struct bwi_mac *mac; + struct ieee80211_node *ni; int error; BWI_LOCK(sc); @@ -1528,7 +1530,7 @@ if (ic->ic_opmode == IEEE80211_M_MONITOR) { /* Nothing to do */ } else if (nstate == IEEE80211_S_RUN) { - struct bwi_mac *mac; + ni = ic->ic_bss; bwi_set_bssid(sc, ic->ic_bss->ni_bssid); @@ -1539,10 +1541,17 @@ /* Initial TX power calibration */ bwi_mac_calibrate_txpower(mac); - /* start automatic rate control timer */ - if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) - callout_reset(&sc->sc_amrr_ch, hz / 2, - bwi_amrr_timeout, sc); + if (ic->ic_opmode == IEEE80211_M_STA) { + /* fake a join to init the tx rate */ + bwi_newassoc(ni, 1); + } + + if (ic->ic_opmode != IEEE80211_M_MONITOR) { + /* start automatic rate control timer */ + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) + callout_reset(&sc->sc_amrr_ch, hz / 2, + bwi_amrr_timeout, sc); + } } else { bwi_set_bssid(sc, bwi_zero_addr); } @@ -1581,7 +1590,7 @@ for (i = ni->ni_rates.rs_nrates - 1; i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; i--); - ni->ni_txrate = i; + ni->ni_txrate = i; } static void @@ -3089,8 +3098,8 @@ if (tx_status0 & (BWI_TXSTATUS0_AMPDU | BWI_TXSTATUS0_PENDING)) continue; - _bwi_txeof(sc, tx_id, tx_status0 & BWI_TXSTATUS0_ACKED, - data_txcnt); + _bwi_txeof(sc, le16toh(tx_id), tx_status0 & BWI_TXSTATUS0_ACKED, + data_txcnt); } if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) From owner-p4-projects@FreeBSD.ORG Mon Oct 8 16:24:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C537116A46E; Mon, 8 Oct 2007 16:24:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74FF516A417 for ; Mon, 8 Oct 2007 16:24:51 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D59013C467 for ; Mon, 8 Oct 2007 16:24:51 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l98GOpp8036399 for ; Mon, 8 Oct 2007 16:24:51 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98GOphW036396 for perforce@freebsd.org; Mon, 8 Oct 2007 16:24:51 GMT (envelope-from mharvan@FreeBSD.org) Date: Mon, 8 Oct 2007 16:24:51 GMT Message-Id: <200710081624.l98GOphW036396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 127309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 16:24:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=127309 Change 127309 by mharvan@mharvan_peleus on 2007/10/08 16:24:42 added the EuroBSDCon 2007 poster about mtund Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.doc/eurobsdcon.pdf#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 8 18:14:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC44B16A41B; Mon, 8 Oct 2007 18:14:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BF3A16A477 for ; Mon, 8 Oct 2007 18:14:13 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outU.internet-mail-service.net (outU.internet-mail-service.net [216.240.47.244]) by mx1.freebsd.org (Postfix) with ESMTP id 2A27F13C465 for ; Mon, 8 Oct 2007 18:14:13 +0000 (UTC) (envelope-from julian@elischer.org) Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160) by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP; Mon, 08 Oct 2007 11:14:12 -0700 X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (nat.ironport.com [63.251.108.100]) by idiom.com (Postfix) with ESMTP id B33AF126612; Mon, 8 Oct 2007 11:14:11 -0700 (PDT) Message-ID: <470A737C.3070805@elischer.org> Date: Mon, 08 Oct 2007 11:14:20 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728) MIME-Version: 1.0 To: Marko Zec References: <200710062222.l96MMM7U044733@repoman.freebsd.org> In-Reply-To: <200710062222.l96MMM7U044733@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 127267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 18:14:14 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=127267 > > Change 127267 by zec@zec_tpx32 on 2007/10/06 22:21:31 > > Change the M_REMOTE_VNET mbuf flag so that it won't > collide with the newly introduced M_NOFREE flag in -HEAD > on next IFC. > > Apparently we are running out of bits in mbuf flags... > > Affected files ... > > .. //depot/projects/vimage/src/sys/sys/mbuf.h#8 edit > > Differences ... > > ==== //depot/projects/vimage/src/sys/sys/mbuf.h#8 (text+ko) ==== > > @@ -192,7 +192,7 @@ > #define M_LASTFRAG 0x2000 /* packet is last fragment */ > #define M_VLANTAG 0x10000 /* ether_vtag is valid */ > #define M_PROMISC 0x20000 /* packet was not for us */ > -#define M_REMOTE_VNET 0x40000 /* mbuf crossed boundary between two vnets */ > +#define M_REMOTE_VNET 0x80000 /* mbuf crossed boundary between two vnets */ > > /* > * External buffer types: identify ext_buf type. nope I believe we still have 0xfff00000 From owner-p4-projects@FreeBSD.ORG Mon Oct 8 18:23:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0774D16A420; Mon, 8 Oct 2007 18:23:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A60DF16A46D for ; Mon, 8 Oct 2007 18:23:28 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id 6DF2F13C46E for ; Mon, 8 Oct 2007 18:23:28 +0000 (UTC) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 347269B788; Mon, 8 Oct 2007 20:23:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.103] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 6C34D9B769; Mon, 8 Oct 2007 20:23:20 +0200 (CEST) From: Marko Zec To: Julian Elischer Date: Mon, 8 Oct 2007 20:23:16 +0200 User-Agent: KMail/1.9.7 References: <200710062222.l96MMM7U044733@repoman.freebsd.org> <470A737C.3070805@elischer.org> In-Reply-To: <470A737C.3070805@elischer.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200710082023.16517.zec@icir.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 127267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 18:23:29 -0000 On Monday 08 October 2007 20:14:20 Julian Elischer wrote: > Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=127267 > > > > Change 127267 by zec@zec_tpx32 on 2007/10/06 22:21:31 > > > > Change the M_REMOTE_VNET mbuf flag so that it won't > > collide with the newly introduced M_NOFREE flag in -HEAD > > on next IFC. > > > > Apparently we are running out of bits in mbuf flags... > > > > Affected files ... > > > > .. //depot/projects/vimage/src/sys/sys/mbuf.h#8 edit > > > > Differences ... > > > > ==== //depot/projects/vimage/src/sys/sys/mbuf.h#8 (text+ko) ==== > > > > @@ -192,7 +192,7 @@ > > #define M_LASTFRAG 0x2000 /* packet is last fragment */ > > #define M_VLANTAG 0x10000 /* ether_vtag is valid */ > > #define M_PROMISC 0x20000 /* packet was not for us */ > > -#define M_REMOTE_VNET 0x40000 /* mbuf crossed boundary between two > > vnets */ +#define M_REMOTE_VNET 0x80000 /* mbuf crossed boundary > > between two vnets */ > > > > /* > > * External buffer types: identify ext_buf type. > > nope > > I believe we still have > 0xfff00000 Umm you're right... Marko From owner-p4-projects@FreeBSD.ORG Mon Oct 8 20:23:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9272516A419; Mon, 8 Oct 2007 20:23:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4558F16A46B for ; Mon, 8 Oct 2007 20:23:25 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2DCD113C4BC for ; Mon, 8 Oct 2007 20:23:25 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l98KNPNM063680 for ; Mon, 8 Oct 2007 20:23:25 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98KNNG0063677 for perforce@freebsd.org; Mon, 8 Oct 2007 20:23:23 GMT (envelope-from delphij@freebsd.org) Date: Mon, 8 Oct 2007 20:23:23 GMT Message-Id: <200710082023.l98KNNG0063677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 127318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 20:23:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=127318 Change 127318 by delphij@tarsier on 2007/10/08 20:22:47 IFC Affected files ... .. //depot/projects/delphij_fork/sys/boot/common/module.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/delphij_fork/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/delphij_fork/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/accf_data.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/accf_http.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/if_ether.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/igmp.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in_gif.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in_proto.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_id.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_input.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_options.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_output.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/delphij_fork/sys/netinet/sctputil.c#11 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/delphij_fork/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/delphij_fork/sys/sys/mbuf.h#3 integrate .. //depot/projects/delphij_fork/sys/vm/vm_fault.c#6 integrate .. //depot/projects/delphij_fork/sys/vm/vm_page.c#6 integrate Differences ... ==== //depot/projects/delphij_fork/sys/boot/common/module.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.26 2006/01/12 13:18:49 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.27 2007/10/04 18:29:52 obrien Exp $"); /* * file/module function dispatcher, support, etc. @@ -75,6 +75,7 @@ static char *kld_ext_list[] = { ".ko", "", + ".debug", NULL }; ==== //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 (text+ko) ==== @@ -209,6 +209,8 @@ winner = dmu_buf_set_user(db, zap, &zap->zap_m.zap_phys, zap_evict); if (winner != NULL) { + rw_exit(&zap->zap_rwlock); + rw_destroy(&zap->zap_rwlock); if (!zap->zap_ismicro) mutex_destroy(&zap->zap_f.zap_num_entries_mtx); kmem_free(zap, sizeof (zap_t)); ==== //depot/projects/delphij_fork/sys/dev/ata/ata-all.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.279 2007/02/23 16:25:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.280 2007/10/04 19:17:15 sos Exp $"); #include "opt_ata.h" #include @@ -738,7 +738,7 @@ atadev->flags &= ~ATA_D_48BIT_ACTIVE; - if ((request->u.ata.lba >= ATA_MAX_28BIT_LBA || + if (((request->u.ata.lba + request->u.ata.count) >= ATA_MAX_28BIT_LBA || request->u.ata.count > 256) && atadev->param.support.command2 & ATA_SUPPORT_ADDRESS48) { ==== //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.199 2007/09/10 19:16:39 simon Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.201 2007/10/04 19:17:15 sos Exp $"); #include "opt_ata.h" #include @@ -1216,6 +1216,7 @@ { ATA_AMD766, 0x00, AMDNVIDIA, AMDCABLE|AMDBUG, ATA_UDMA5, "766" }, { ATA_AMD768, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA5, "768" }, { ATA_AMD8111, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA6, "8111" }, + { ATA_AMD5536, 0x00, AMDNVIDIA, 0x00, ATA_UDMA5, "CS5536" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -5095,6 +5096,7 @@ { ATA_VIA8235, 0x00, VIA133, 0x00, ATA_UDMA6, "8235" }, { ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" }, { ATA_VIA8237A, 0x00, VIA133, 0x00, ATA_UDMA6, "8237A" }, + { ATA_VIA8237S, 0x00, VIA133, 0x00, ATA_UDMA6, "8237S" }, { ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "8251" }, { 0, 0, 0, 0, 0, 0 }}; static struct ata_chip_id new_ids[] = @@ -5102,6 +5104,7 @@ { ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "6420" }, { ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" }, { ATA_VIA8237A, 0x00, 7, 0x00, ATA_SA150, "8237A" }, + { ATA_VIA8237S, 0x00, 7, 0x00, ATA_SA150, "8237S" }, { ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA300, "8251" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; ==== //depot/projects/delphij_fork/sys/dev/ata/ata-pci.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.78 2007/09/10 19:16:39 simon Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.80 2007/10/04 19:17:16 sos Exp $ */ /* structure holding chipset config info */ @@ -86,6 +86,7 @@ #define ATA_AMD766 0x74111022 #define ATA_AMD768 0x74411022 #define ATA_AMD8111 0x74691022 +#define ATA_AMD5536 0x209a1022 #define ATA_ACER_LABS_ID 0x10b9 #define ATA_ALI_1533 0x153310b9 @@ -357,6 +358,7 @@ #define ATA_VIA8235 0x31771106 #define ATA_VIA8237 0x32271106 #define ATA_VIA8237A 0x05911106 +#define ATA_VIA8237S 0x53371106 #define ATA_VIA8251 0x33491106 #define ATA_VIA8361 0x31121106 #define ATA_VIA8363 0x03051106 ==== //depot/projects/delphij_fork/sys/dev/usb/usbdevs#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.327 2007/08/29 21:00:57 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.328 2007/10/05 07:26:39 luigi Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -1198,6 +1198,8 @@ product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner product EPSON 4200 0x0820 CX4200 MP scanner +product EPSON 5000 0x082b DX-50x0 MFP scanner +product EPSON 6000 0x082e DX-60x0 MFP scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial ==== //depot/projects/delphij_fork/sys/dev/usb/uscanner.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.88 2007/06/22 05:49:12 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.89 2007/10/05 07:26:39 luigi Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -210,6 +210,8 @@ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3590 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4990 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000 }, 0 }, /* UMAX */ {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, @@ -314,12 +316,28 @@ uscanner_match(device_t self) { struct usb_attach_arg *uaa = device_get_ivars(self); + usb_interface_descriptor_t *id; + + if (uaa->iface == NULL) + return UMATCH_NONE; /* do not grab the entire device */ + + if (uscanner_lookup(uaa->vendor, uaa->product) == NULL) + return UMATCH_NONE; /* not in the list of known devices */ + id = usbd_get_interface_descriptor(uaa->iface); + if (id == NULL) + return UMATCH_NONE; - if (uaa->iface != NULL) + /* + * There isn't a specific UICLASS for scanners, many vendors use + * UICLASS_VENDOR, so detecting the right interface is not so easy. + * But certainly we can exclude PRINTER and MASS - which some + * multifunction devices implement. + */ + if (id->bInterfaceClass == UICLASS_PRINTER || + id->bInterfaceClass == UICLASS_MASS) return UMATCH_NONE; - return (uscanner_lookup(uaa->vendor, uaa->product) != NULL ? - UMATCH_VENDOR_PRODUCT : UMATCH_NONE); + return UMATCH_VENDOR_PRODUCT; /* ok we found it */ } static int @@ -331,20 +349,32 @@ usb_endpoint_descriptor_t *ed, *ed_bulkin = NULL, *ed_bulkout = NULL; int i; usbd_status err; + int ifnum; sc->sc_dev = self; sc->sc_dev_flags = uscanner_lookup(uaa->vendor, uaa->product)->flags; sc->sc_udev = uaa->device; + id = usbd_get_interface_descriptor(uaa->iface); + ifnum = id->bInterfaceNumber; +#if 0 + /* + * This was in the original driver, but we cannot change the + * configuration of the whole device while attaching only to + * one of its interfaces. This can kill other already-attached + * driver, and/or possibly prevent this driver from attaching + * if an error occurs in set_config_no. + * If a device need setting the configuration, this must be done + * before attaching drivers to the various interfaces. + */ err = usbd_set_config_no(uaa->device, 1, 1); /* XXX */ if (err) { printf("%s: setting config no failed\n", device_get_nameunit(sc->sc_dev)); return ENXIO; } - - /* XXX We only check the first interface */ - err = usbd_device2interface_handle(sc->sc_udev, 0, &sc->sc_iface); +#endif + err = usbd_device2interface_handle(sc->sc_udev, ifnum, &sc->sc_iface); if (!err && sc->sc_iface) id = usbd_get_interface_descriptor(sc->sc_iface); if (err || id == 0) { ==== //depot/projects/delphij_fork/sys/fs/pseudofs/pseudofs_vnops.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.64 2007/06/07 15:04:30 bmah Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.65 2007/10/05 17:37:25 jhb Exp $"); #include "opt_pseudofs.h" @@ -417,7 +417,7 @@ got_pnode: pfs_assert_not_owned(pd); pfs_assert_not_owned(pn); - visible = pfs_visible(curthread, pn, pvd->pvd_pid, NULL); + visible = pfs_visible(curthread, pn, pid, NULL); if (!visible) { error = ENOENT; goto failed; ==== //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#7 (text+ko) ==== @@ -48,7 +48,7 @@ * allocate and release resources. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.9 2007/08/10 05:24:49 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.11 2007/10/04 17:11:48 delphij Exp $"); #include #include @@ -85,7 +85,7 @@ /* --------------------------------------------------------------------- */ static const char *tmpfs_opts[] = { - "from", "size", "inodes", "uid", "gid", "mode", + "from", "size", "inodes", "uid", "gid", "mode", "export", NULL }; @@ -215,6 +215,9 @@ return EOPNOTSUPP; } + printf("WARNING: TMPFS is considered to be a highly experimental " + "feature in FreeBSD.\n"); + vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY, td); error = VOP_GETATTR(mp->mnt_vnodecovered, &va, mp->mnt_cred, td); VOP_UNLOCK(mp->mnt_vnodecovered, 0, td); ==== //depot/projects/delphij_fork/sys/kern/kern_mbuf.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.30 2007/06/04 18:25:07 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.32 2007/10/06 21:42:39 kmacy Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -339,11 +339,15 @@ mb_dtor_mbuf(void *mem, int size, void *arg) { struct mbuf *m; + unsigned long flags; m = (struct mbuf *)mem; - if ((m->m_flags & M_PKTHDR) != 0) + flags = (unsigned long)arg; + + if ((flags & MB_NOTAGS) == 0 && (m->m_flags & M_PKTHDR) != 0) m_tag_delete_chain(m, NULL); KASSERT((m->m_flags & M_EXT) == 0, ("%s: M_EXT set", __func__)); + KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__)); #ifdef INVARIANTS trash_dtor(mem, size, arg); #endif @@ -527,7 +531,7 @@ m->m_len = 0; m->m_flags = (flags | M_EXT); m->m_type = type; - + if (flags & M_PKTHDR) { m->m_pkthdr.rcvif = NULL; m->m_pkthdr.len = 0; ==== //depot/projects/delphij_fork/sys/kern/uipc_mbuf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.173 2007/05/16 20:41:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.174 2007/10/06 21:42:39 kmacy Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -211,9 +211,17 @@ void mb_free_ext(struct mbuf *m) { + int skipmbuf; + KASSERT((m->m_flags & M_EXT) == M_EXT, ("%s: M_EXT not set", __func__)); KASSERT(m->m_ext.ref_cnt != NULL, ("%s: ref_cnt not set", __func__)); + + /* + * check if the header is embedded in the cluster + */ + skipmbuf = (m->m_flags & M_NOFREE); + /* Free attached storage if this mbuf is the only reference to it. */ if (*(m->m_ext.ref_cnt) == 1 || atomic_fetchadd_int(m->m_ext.ref_cnt, -1) == 1) { @@ -254,6 +262,9 @@ ("%s: unknown ext_type", __func__)); } } + if (skipmbuf) + return; + /* * Free this mbuf back to the mbuf zone with all m_ext * information purged. ==== //depot/projects/delphij_fork/sys/netinet/accf_data.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/accf_data.c,v 1.10 2004/05/30 20:23:30 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/accf_data.c,v 1.11 2007/10/07 20:44:22 silby Exp $"); + #define ACCEPT_FILTER_MOD #include ==== //depot/projects/delphij_fork/sys/netinet/accf_http.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/accf_http.c,v 1.16 2005/01/07 01:45:44 imp Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/accf_http.c,v 1.17 2007/10/07 20:44:22 silby Exp $"); + #define ACCEPT_FILTER_MOD #include ==== //depot/projects/delphij_fork/sys/netinet/if_ether.c#2 (text+ko) ==== @@ -27,7 +27,6 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.161 2007/05/10 15:58:46 rwatson Exp $ */ /* @@ -36,6 +35,9 @@ * add "inuse/lock" bit (or ref. count) along with valid bit */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.162 2007/10/07 20:44:22 silby Exp $"); + #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" ==== //depot/projects/delphij_fork/sys/netinet/igmp.c#2 (text+ko) ==== @@ -31,7 +31,6 @@ * SUCH DAMAGE. * * @(#)igmp.c 8.1 (Berkeley) 7/19/93 - * $FreeBSD: src/sys/netinet/igmp.c,v 1.53 2006/12/04 00:41:48 rwatson Exp $ */ /* @@ -45,6 +44,9 @@ * MULTICAST Revision: 3.5.1.4 */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.54 2007/10/07 20:44:22 silby Exp $"); + #include "opt_mac.h" #include ==== //depot/projects/delphij_fork/sys/netinet/in.c#2 (text+ko) ==== @@ -28,9 +28,11 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/in.c,v 1.101 2007/06/17 00:31:24 mjacob Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.102 2007/10/07 20:44:22 silby Exp $"); + #include "opt_carp.h" #include ==== //depot/projects/delphij_fork/sys/netinet/in_cksum.c#2 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/in_cksum.c,v 1.9 2007/05/10 15:58:46 rwatson Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/in_cksum.c,v 1.10 2007/10/07 20:44:22 silby Exp $"); + #include #include ==== //depot/projects/delphij_fork/sys/netinet/in_gif.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.37 2007/09/23 17:50:17 csjp Exp $ */ /* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */ /*- @@ -30,6 +29,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/in_gif.c,v 1.38 2007/10/07 20:44:22 silby Exp $"); + #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/delphij_fork/sys/netinet/in_pcb.c#2 (text+ko) ==== @@ -29,9 +29,11 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.195 2007/07/03 12:13:43 gnn Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.196 2007/10/07 20:44:22 silby Exp $"); + #include "opt_ddb.h" #include "opt_ipsec.h" #include "opt_inet6.h" ==== //depot/projects/delphij_fork/sys/netinet/in_proto.c#2 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)in_proto.c 8.2 (Berkeley) 2/9/95 - * $FreeBSD: src/sys/netinet/in_proto.c,v 1.86 2007/07/03 12:13:43 gnn Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/in_proto.c,v 1.87 2007/10/07 20:44:22 silby Exp $"); + #include "opt_ipx.h" #include "opt_mrouting.h" #include "opt_ipsec.h" ==== //depot/projects/delphij_fork/sys/netinet/in_rmx.c#2 (text+ko) ==== @@ -25,8 +25,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/in_rmx.c,v 1.56 2007/05/10 15:58:47 rwatson Exp $ */ /* @@ -42,6 +40,9 @@ * indefinitely. See in_rtqtimo() below for the exact mechanism. */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.57 2007/10/07 20:44:22 silby Exp $"); + #include #include #include ==== //depot/projects/delphij_fork/sys/netinet/ip_carp.c#3 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.51 2007/07/28 07:31:30 rwatson Exp $ */ - /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. * Copyright (c) 2003 Ryan McBride. All rights reserved. @@ -26,6 +24,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_carp.c,v 1.52 2007/10/07 20:44:22 silby Exp $"); + #include "opt_carp.h" #include "opt_bpf.h" #include "opt_inet.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_divert.c#3 (text+ko) ==== @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.129 2007/08/06 22:06:36 csjp Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.130 2007/10/07 20:44:22 silby Exp $"); + #if !defined(KLD_MODULE) #include "opt_inet.h" #include "opt_ipfw.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#4 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.109 2007/08/06 14:26:01 rwatson Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.110 2007/10/07 20:44:22 silby Exp $"); + #define DUMMYNET_DEBUG #include "opt_inet6.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_ecn.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/netinet/ip_ecn.c,v 1.8 2007/05/10 15:58:47 rwatson Exp $ */ /* $KAME: ip_ecn.c,v 1.12 2002/01/07 11:34:47 kjc Exp $ */ /*- @@ -35,6 +34,9 @@ * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_ecn.c,v 1.9 2007/10/07 20:44:22 silby Exp $"); + #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_encap.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.23 2007/05/10 15:58:47 rwatson Exp $ */ /* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */ /*- @@ -57,6 +56,9 @@ */ /* XXX is M_NETADDR correct? */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_encap.c,v 1.24 2007/10/07 20:44:23 silby Exp $"); + #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_fastfwd.c#2 (text+ko) ==== @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.40 2007/03/18 23:05:20 bms Exp $ */ /* @@ -75,6 +73,9 @@ * is being followed here. */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.41 2007/10/07 20:44:23 silby Exp $"); + #include "opt_ipfw.h" #include "opt_ipstealth.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#7 (text+ko) ==== @@ -21,10 +21,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.174 2007/09/29 15:01:41 maxim Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.175 2007/10/07 20:44:23 silby Exp $"); + #define DEB(x) #define DDB(x) x ==== //depot/projects/delphij_fork/sys/netinet/ip_fw_pfil.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.24 2006/12/29 21:59:17 piso Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.25 2007/10/07 20:44:23 silby Exp $"); + #if !defined(KLD_MODULE) #include "opt_ipfw.h" #include "opt_ipdn.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_gre.c#2 (text+ko) ==== @@ -1,5 +1,4 @@ /* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */ -/* $FreeBSD$ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -45,6 +44,9 @@ * This currently handles IPPROTO_GRE, IPPROTO_MOBILE */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_inet.h" #include "opt_atalk.h" #include "opt_inet6.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.117 2007/07/19 22:34:25 rwatson Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_icmp.c,v 1.118 2007/10/07 20:44:23 silby Exp $"); + #include "opt_ipsec.h" #include "opt_mac.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_id.c#2 (text+ko) ==== @@ -33,8 +33,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_id.c,v 1.8 2007/05/11 11:05:30 rwatson Exp $ */ /*- @@ -57,6 +55,9 @@ * caused by reseeding. */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.9 2007/10/07 20:44:23 silby Exp $"); + #include "opt_pf.h" #include #include ==== //depot/projects/delphij_fork/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.331 2007/08/05 16:16:15 bz Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.332 2007/10/07 20:44:23 silby Exp $"); + #include "opt_bootp.h" #include "opt_ipfw.h" #include "opt_ipstealth.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_ipsec.c#3 (text+ko) ==== @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.7 2007/08/05 16:16:15 bz Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.8 2007/10/07 20:44:23 silby Exp $"); + #include "opt_ipsec.h" #include ==== //depot/projects/delphij_fork/sys/netinet/ip_mroute.c#4 (text+ko) ==== @@ -51,10 +51,11 @@ * MROUTING Revision: 3.5 * and PIM-SMv2 and PIM-DM support, advanced API support, * bandwidth metering and signaling - * - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.137 2007/08/06 14:26:01 rwatson Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_mroute.c,v 1.138 2007/10/07 20:44:23 silby Exp $"); + #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_options.c#2 (text+ko) ==== @@ -27,10 +27,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/ip_options.c,v 1.5 2007/05/11 10:48:30 rwatson Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_options.c,v 1.6 2007/10/07 20:44:23 silby Exp $"); + #include "opt_ipstealth.h" #include "opt_mac.h" ==== //depot/projects/delphij_fork/sys/netinet/ip_output.c#2 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.275 2007/07/03 12:13:43 gnn Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.276 2007/10/07 20:44:23 silby Exp $"); + #include "opt_ipfw.h" #include "opt_ipsec.h" #include "opt_mac.h" ==== //depot/projects/delphij_fork/sys/netinet/raw_ip.c#2 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.179 2007/07/03 12:13:43 gnn Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.180 2007/10/07 20:44:23 silby Exp $"); + #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_mac.h" ==== //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.61 2007/10/01 03:22:28 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.62 2007/10/06 13:23:42 rrs Exp $"); #include #include @@ -4235,6 +4235,7 @@ SS_ISCONNECTED); } SOCK_UNLOCK(so); + socantrcvmore(so); sctp_sowwakeup(inp, so); sctp_sorwakeup(inp, so); SCTP_SOWAKEUP(so); ==== //depot/projects/delphij_fork/sys/netinet/sctputil.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.64 2007/10/01 03:22:29 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.65 2007/10/04 09:29:33 rrs Exp $"); #include #include @@ -5009,7 +5009,8 @@ so->so_error = 0; } else { SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, ENOTCONN); - error = ENOTCONN; + /* indicate EOF */ + error = 0; } goto out; } ==== //depot/projects/delphij_fork/sys/netinet/tcp_debug.c#2 (text+ko) ==== @@ -28,9 +28,11 @@ * SUCH DAMAGE. * * @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/tcp_debug.c,v 1.28 2007/05/07 14:05:23 rwatson Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/tcp_debug.c,v 1.29 2007/10/07 20:44:23 silby Exp $"); + #include "opt_inet.h" #include "opt_inet6.h" #include "opt_tcpdebug.h" ==== //depot/projects/delphij_fork/sys/netinet/tcp_hostcache.c#2 (text+ko) ==== @@ -25,8 +25,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.16 2007/06/08 13:43:28 yar Exp $ */ /* @@ -64,6 +62,9 @@ * followed here. */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.17 2007/10/07 20:44:23 silby Exp $"); + #include "opt_inet6.h" #include ==== //depot/projects/delphij_fork/sys/netinet/tcp_input.c#5 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.368 2007/09/10 14:49:32 kensmith Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.370 2007/10/07 20:44:23 silby Exp $"); + #include "opt_ipfw.h" /* for ipfw_fwd */ #include "opt_inet.h" #include "opt_inet6.h" @@ -1573,9 +1575,9 @@ KASSERT(headlocked, ("%s: trimthenstep6: tcp_close.3: head " "not locked", __func__)); if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) { - log(LOG_DEBUG, "%s; %s: %s: Received data after socket " >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 8 20:54:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5977B16A420; Mon, 8 Oct 2007 20:54:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F8ED16A41A for ; Mon, 8 Oct 2007 20:54:03 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00F4413C459 for ; Mon, 8 Oct 2007 20:54:03 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l98Ks24R073880 for ; Mon, 8 Oct 2007 20:54:02 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98Ks0fx073873 for perforce@freebsd.org; Mon, 8 Oct 2007 20:54:00 GMT (envelope-from delphij@freebsd.org) Date: Mon, 8 Oct 2007 20:54:00 GMT Message-Id: <200710082054.l98Ks0fx073873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 127319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 20:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=127319 Change 127319 by delphij@tarsier on 2007/10/08 20:53:39 IFC Affected files ... .. //depot/projects/delphij_fork/Makefile.inc1#4 integrate .. //depot/projects/delphij_fork/ObsoleteFiles.inc#10 integrate .. //depot/projects/delphij_fork/UPDATING#4 integrate .. //depot/projects/delphij_fork/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/delphij_fork/bin/ps/print.c#2 integrate .. //depot/projects/delphij_fork/bin/ps/ps.c#2 integrate .. //depot/projects/delphij_fork/bin/sh/eval.c#2 integrate .. //depot/projects/delphij_fork/bin/sh/sh.1#2 integrate .. //depot/projects/delphij_fork/cddl/lib/Makefile#2 integrate .. //depot/projects/delphij_fork/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/delphij_fork/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/delphij_fork/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/delphij_fork/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/delphij_fork/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/delphij_fork/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/gcc/opts.c#2 integrate .. //depot/projects/delphij_fork/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/delphij_fork/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/delphij_fork/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/delphij_fork/contrib/less/NEWS#2 integrate .. //depot/projects/delphij_fork/contrib/less/README#2 integrate .. //depot/projects/delphij_fork/contrib/less/ch.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/charset.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/configure#2 integrate .. //depot/projects/delphij_fork/contrib/less/configure.ac#2 integrate .. //depot/projects/delphij_fork/contrib/less/filename.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/funcs.h#2 integrate .. //depot/projects/delphij_fork/contrib/less/jump.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/less.h#2 integrate .. //depot/projects/delphij_fork/contrib/less/less.man#2 integrate .. //depot/projects/delphij_fork/contrib/less/less.nro#2 integrate .. //depot/projects/delphij_fork/contrib/less/lessecho.man#2 integrate .. //depot/projects/delphij_fork/contrib/less/lessecho.nro#2 integrate .. //depot/projects/delphij_fork/contrib/less/lesskey.man#2 integrate .. //depot/projects/delphij_fork/contrib/less/lesskey.nro#2 integrate .. //depot/projects/delphij_fork/contrib/less/line.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/search.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/signal.c#2 integrate .. //depot/projects/delphij_fork/contrib/less/version.c#2 integrate .. //depot/projects/delphij_fork/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/delphij_fork/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/delphij_fork/etc/defaults/rc.conf#4 integrate .. //depot/projects/delphij_fork/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/delphij_fork/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/delphij_fork/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/delphij_fork/etc/mtree/README#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/Makefile#3 integrate .. //depot/projects/delphij_fork/etc/rc.d/cached#2 delete .. //depot/projects/delphij_fork/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/delphij_fork/etc/rc.d/nscd#3 integrate .. //depot/projects/delphij_fork/etc/services#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/binutils/ld/Makefile#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/delphij_fork/gnu/usr.bin/texinfo/info/Makefile#2 integrate .. //depot/projects/delphij_fork/include/Makefile#4 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/delphij_fork/lib/libc/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/delphij_fork/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/rpc/auth_time.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/rpc/getnetpath.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/rpc/rpc_generic.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/delphij_fork/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/delphij_fork/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/ntp_gettime.2#2 delete .. //depot/projects/delphij_fork/lib/libdisk/open_disk.c#3 integrate .. //depot/projects/delphij_fork/lib/libdisk/open_ia64_disk.c#2 integrate .. //depot/projects/delphij_fork/lib/libelf/elf_update.3#2 integrate .. //depot/projects/delphij_fork/lib/libelf/elf_update.c#2 integrate .. //depot/projects/delphij_fork/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/delphij_fork/lib/libkse/Makefile#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/delphij_fork/lib/libkse/pthread.map#1 branch .. //depot/projects/delphij_fork/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/sys/lock.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/sys/lock.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/Makefile#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/README#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/delphij_fork/lib/libkse/test/verify#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/delphij_fork/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/delphij_fork/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/delphij_fork/lib/libpthread/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libthr/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libutil/expand_number.3#3 integrate .. //depot/projects/delphij_fork/lib/libutil/flopen.3#3 integrate .. //depot/projects/delphij_fork/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/delphij_fork/lib/libutil/kld.3#2 integrate .. //depot/projects/delphij_fork/libexec/atrun/Makefile#2 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/delphij_fork/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/delphij_fork/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/delphij_fork/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/delphij_fork/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/delphij_fork/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/delphij_fork/sbin/fsck_ffs/Makefile#2 integrate .. //depot/projects/delphij_fork/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/delphij_fork/sbin/geom/class/Makefile#2 integrate .. //depot/projects/delphij_fork/sbin/geom/class/virstor/Makefile#1 branch .. //depot/projects/delphij_fork/sbin/geom/class/virstor/geom_virstor.c#1 branch .. //depot/projects/delphij_fork/sbin/geom/class/virstor/gvirstor.8#1 branch .. //depot/projects/delphij_fork/sbin/geom/core/geom.8#2 integrate .. //depot/projects/delphij_fork/sbin/geom/core/geom.c#2 integrate .. //depot/projects/delphij_fork/sbin/ggate/Makefile#2 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/delphij_fork/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/delphij_fork/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/delphij_fork/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/delphij_fork/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/delphij_fork/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ata.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/cxgb.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/gem.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/pci.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ral.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/rum.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/sctp.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ural.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/uscanner.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/wlan.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/wlan_amrr.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/zyd.4#2 integrate .. //depot/projects/delphij_fork/share/man/man5/Makefile#3 integrate .. //depot/projects/delphij_fork/share/man/man5/ar.5#1 branch .. //depot/projects/delphij_fork/share/man/man5/elf.5#2 integrate .. //depot/projects/delphij_fork/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/delphij_fork/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate .. //depot/projects/delphij_fork/share/man/man9/Makefile#2 integrate .. //depot/projects/delphij_fork/share/man/man9/crypto.9#2 integrate .. //depot/projects/delphij_fork/share/man/man9/pci.9#2 integrate .. //depot/projects/delphij_fork/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/delphij_fork/share/misc/committers-ports.dot#2 integrate .. //depot/projects/delphij_fork/share/misc/committers-src.dot#2 integrate .. //depot/projects/delphij_fork/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/delphij_fork/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/delphij_fork/tools/build/make_check/Makefile#2 integrate .. //depot/projects/delphij_fork/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/delphij_fork/tools/make_libdeps.sh#2 integrate .. //depot/projects/delphij_fork/tools/regression/bin/sh/builtins/case1.0#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/Makefile#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/main.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/main.h#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_acct.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_adjtime.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_control.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_getaudit.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_setaudit.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_submit.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_clock_settime.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_cred.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_io.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_kenv_set.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_kenv_unset.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_msgbuf.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_netinet_raw.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_proc_setlogin.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_proc_setrlimit.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_sched_rtprio.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_sched_setpriority.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_settimeofday.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_sysctl_write.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_admin.c#2 delete .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chflags.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chmod.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chown.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chroot.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_clearsugid.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_fhopen.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_fhstat.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_fhstatfs.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_generation.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_getfh.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_read_write.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_setgid.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_stickyfile.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_utimes.c#1 branch .. //depot/projects/delphij_fork/tools/regression/priv/priv_vm_madv_protect.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vm_mlock.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/priv_vm_munlock.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/priv/test_utimes.c#2 delete .. //depot/projects/delphij_fork/tools/tools/crypto/ipsecstats.c#2 integrate .. //depot/projects/delphij_fork/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/delphij_fork/tools/tools/pciroms/pciroms.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.bin/at/at.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.holiday#3 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici#2 integrate .. //depot/projects/delphij_fork/usr.bin/login/login_fbtab.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/m4/gnum4.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/sctp.c#4 integrate .. //depot/projects/delphij_fork/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/top/machine.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/Makefile#4 integrate .. //depot/projects/delphij_fork/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cached/Makefile#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agent.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agent.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agents/Makefile.inc#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agents/group.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agents/group.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agents/passwd.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agents/passwd.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agents/services.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/agents/services.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cached.8#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cached.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cached.conf.5#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cachedcli.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cachedcli.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cachelib.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cachelib.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cacheplcs.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/cacheplcs.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/config.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/config.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/debug.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/debug.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/hashtable.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/log.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/log.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/mp_rs_query.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/mp_rs_query.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/mp_ws_query.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/mp_ws_query.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/parser.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/parser.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/protocol.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/protocol.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/query.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/query.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/singletons.c#2 delete .. //depot/projects/delphij_fork/usr.sbin/cached/singletons.h#2 delete .. //depot/projects/delphij_fork/usr.sbin/config/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/cron/cron/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/Makefile#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agent.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agent.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agents/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agents/group.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agents/group.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agents/passwd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agents/passwd.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agents/services.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/agents/services.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/cachelib.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/cachelib.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/cacheplcs.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/cacheplcs.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/config.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/config.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/debug.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/hashtable.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/log.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/log.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/mp_ws_query.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/mp_ws_query.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.8#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.conf.5#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/nscdcli.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/nscdcli.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/parser.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/parser.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/protocol.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/protocol.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/query.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/query.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/singletons.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/nscd/singletons.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/periodic/periodic.8#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/hostapd/Makefile#3 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate Differences ... ==== //depot/projects/delphij_fork/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -330,8 +330,7 @@ .endfor .for _dir in \ lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc \ - usr/share/snmp/defs usr/share/snmp/mibs + usr/libexec usr/sbin usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -415,9 +414,7 @@ @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" .for _dir in \ - lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc \ - usr/share/snmp/defs usr/share/snmp/mibs + usr/include usr/lib32 usr/share/misc mkdir -p ${LIB32TMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -1038,12 +1035,20 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ + lib/libopie lib/libpam ${_default_thread_lib} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} +.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no" +_default_thread_lib= lib/${DEFAULT_THREAD_LIB} +.elif ${MK_LIBTHR} != "no" +_default_thread_lib= lib/libthr +.elif ${MK_LIBPTHREAD} != "no" +_default_thread_lib= lib/libpthread +.endif + _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L ==== //depot/projects/delphij_fork/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.110 2007/08/31 19:41:27 yar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070930: rename of cached to nscd +OLD_FILES+=etc/rc.d/cached +OLD_FILES+=usr/sbin/cached +OLD_FILES+=usr/share/man/man5/cached.conf.5 +OLD_FILES+=usr/share/man/man8/cached.8 # 20070807: removal of PowerPC specific header file. .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/machine/interruptvar.h @@ -3301,7 +3306,6 @@ OLD_FILES+=usr/share/man/man4/uaudio.4.gz OLD_FILES+=usr/share/man/man4/utf2.4.gz OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz -OLD_FILES+=usr/share/man/man5/ar.5.gz OLD_FILES+=usr/share/man/man5/disklabel.5.gz OLD_FILES+=usr/share/man/man5/dm.conf.5.gz OLD_FILES+=usr/share/man/man5/ranlib.5.gz ==== //depot/projects/delphij_fork/UPDATING#4 (text+ko) ==== @@ -21,6 +21,20 @@ developers choose to disable these features on build machines to maximize performance. +20070930: + The PCI code has been made aware of PCI domains. This means that + the location strings as used by pciconf(8) etc are now in the + following format: pci::[:]. It + also means that consumers of potentially need to + be recompiled; this includes the hal and xorg-server ports. + +20070928: + The caching daemon (cached) was renamed to nscd. nscd.conf + configuration file should be used instead of cached.conf and + nscd_enable, nscd_pidfile and nscd_flags options should be used + instead of cached_enable, cached_pidfile and cached_flags in + rc.conf. + 20070704: The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel @@ -887,4 +901,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $ +$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $ ==== //depot/projects/delphij_fork/bin/getfacl/getfacl.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $"); #include #include @@ -41,6 +41,8 @@ #include #include +#include +#include #include #include #include @@ -55,6 +57,32 @@ fprintf(stderr, "getfacl [-dhq] [file ...]\n"); } +static char * +getuname(uid_t uid) +{ + struct passwd *pw; + static char uids[10]; + + if ((pw = getpwuid(uid)) == NULL) { + (void)snprintf(uids, sizeof(uids), "%u", uid); + return (uids); + } else + return (pw->pw_name); +} + +static char * +getgname(gid_t gid) +{ + struct group *gr; + static char gids[10]; + + if ((gr = getgrgid(gid)) == NULL) { + (void)snprintf(gids, sizeof(gids), "%u", gid); + return (gids); + } else + return (gr->gr_name); +} + /* * return an ACL corresponding to the permissions * contained in struct stat @@ -169,8 +197,8 @@ more_than_one++; if (!qflag) - printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, - sb.st_gid); + printf("# file: %s\n# owner: %s\n# group: %s\n", path, + getuname(sb.st_uid), getgname(sb.st_gid)); if (hflag) acl = acl_get_link_np(path, type); ==== //depot/projects/delphij_fork/bin/ps/print.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); #include #include @@ -197,14 +197,13 @@ void state(KINFO *k, VARENT *ve) { - int flag, sflag, tdflags; + int flag, tdflags; char *cp; VAR *v; char buf[16]; v = ve->var; flag = k->ki_p->ki_flag; - sflag = k->ki_p->ki_sflag; tdflags = k->ki_p->ki_tdflags; /* XXXKSE */ cp = buf; @@ -242,7 +241,7 @@ *cp = '?'; } cp++; - if (!(sflag & PS_INMEM)) + if (!(flag & P_INMEM)) *cp++ = 'W'; if (k->ki_p->ki_nice < NZERO) *cp++ = '<'; @@ -591,7 +590,7 @@ #define fxtofl(fixpt) ((double)(fixpt) / fscale) /* XXX - I don't like this */ - if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0) + if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0) return (0.0); if (rawcpu) return (100.0 * fxtofl(k->ki_p->ki_pctcpu)); @@ -619,7 +618,7 @@ if (failure) return (0.0); - if ((k->ki_p->ki_sflag & PS_INMEM) == 0) + if ((k->ki_p->ki_flag & P_INMEM) == 0) return (0.0); /* XXX want pmap ptpages, segtab, etc. (per architecture) */ /* XXX don't have info about shared */ ==== //depot/projects/delphij_fork/bin/ps/ps.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); #include #include @@ -994,13 +994,13 @@ return (s); } -#define UREADOK(ki) (forceuread || (ki->ki_p->ki_sflag & PS_INMEM)) +#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM)) static void saveuser(KINFO *ki) { - if (ki->ki_p->ki_sflag & PS_INMEM) { + if (ki->ki_p->ki_flag & P_INMEM) { /* * The u-area might be swapped out, and we can't get * at it because we have a crashdump and no swap. ==== //depot/projects/delphij_fork/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.53 2006/06/15 07:57:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $"); #include #include @@ -367,6 +367,7 @@ setstackmark(&smark); arglist.lastp = &arglist.list; oexitstatus = exitstatus; + exitstatus = 0; expandarg(n->ncase.expr, &arglist, EXP_TILDE); for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) { for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) { ==== //depot/projects/delphij_fork/bin/sh/sh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -861,6 +861,10 @@ separated by .Dq Li \&| characters. +The exit code of the +.Ic case +command is the exit code of the last command executed in the list or +zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Bd -literal -offset indent ==== //depot/projects/delphij_fork/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ .include @@ -11,7 +11,9 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/delphij_fork/cddl/sbin/zfs/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs @@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} -LDADD= -lgeom -lm -lnvpair -luutil -lzfs +DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} +LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil .include ==== //depot/projects/delphij_fork/cddl/sbin/zpool/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool @@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} -LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs +DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} +LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \ + -lm -lnvpair -luutil -lutil .include ==== //depot/projects/delphij_fork/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -1,11 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ .include SUBDIR= ${_ztest} .if ${MK_ZFS} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" _ztest= ztest .endif +.endif .include ==== //depot/projects/delphij_fork/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest @@ -15,7 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool +DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl .include ==== //depot/projects/delphij_fork/cddl/usr.sbin/Makefile#2 (text+ko) ==== @@ -1,11 +1,13 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ .include SUBDIR= ${_zdb} .if ${MK_ZFS} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" _zdb= zdb .endif +.endif .include ==== //depot/projects/delphij_fork/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ +# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb @@ -16,7 +16,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool +DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ + ${LIBPTHREAD} ${LIBZ} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl .include ==== //depot/projects/delphij_fork/contrib/gcc/opts.c#2 (text+ko) ==== @@ -20,7 +20,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/opts.c,v 1.3 2007/05/19 02:22:16 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5 2007/10/03 01:26:24 obrien Exp $ */ #include "config.h" #include "system.h" @@ -501,7 +501,10 @@ flag_reorder_functions = 1; flag_tree_store_ccp = 1; flag_tree_store_copy_prop = 1; - flag_tree_vrp = 1; + /* XXX: some issues with ports have been traced to -ftree-vrp. + So remove it from -O2 and above. Note that jdk1{5,6} are affected + and they build with w/-O3 - so we cannot just move it to -O3. */ + // flag_tree_vrp = 1; if (!optimize_size) { ==== //depot/projects/delphij_fork/contrib/groff/tmac/doc-common#2 (text+ko) ==== @@ -485,6 +485,7 @@ .ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-7.0 7.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 ==== //depot/projects/delphij_fork/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -204,13 +204,13 @@ .as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] .ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V .as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1 +.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1 .as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2 +.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2 .as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3 +.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3 .as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4 +.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4 .as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] . .de At ==== //depot/projects/delphij_fork/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ==== @@ -813,9 +813,9 @@ Local, OS-specific additions might be found in the file .Pa mdoc.local ; look for strings named -.Ql volume-ds-XXX +.Ql volume\-ds\-XXX (for the former type) and -.Ql volume-as-XXX +.Ql volume\-as\-XXX >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 8 23:00:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FB2016A41B; Mon, 8 Oct 2007 23:00:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5176816A419 for ; Mon, 8 Oct 2007 23:00:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4382213C49D for ; Mon, 8 Oct 2007 23:00:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l98N0NFP086694 for ; Mon, 8 Oct 2007 23:00:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98N0LPR086678 for perforce@freebsd.org; Mon, 8 Oct 2007 23:00:21 GMT (envelope-from jb@freebsd.org) Date: Mon, 8 Oct 2007 23:00:21 GMT Message-Id: <200710082300.l98N0LPR086678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 127323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 23:00:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=127323 Change 127323 by jb@jb_freebsd1 on 2007/10/08 22:59:47 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#44 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#39 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/ports/LEGAL#22 integrate .. //depot/projects/dtrace/ports/MOVED#43 integrate .. //depot/projects/dtrace/ports/Mk/bsd.java.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#12 integrate .. //depot/projects/dtrace/ports/UPDATING#35 integrate .. //depot/projects/dtrace/src/contrib/less/NEWS#6 integrate .. //depot/projects/dtrace/src/contrib/less/README#6 integrate .. //depot/projects/dtrace/src/contrib/less/ch.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/charset.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/configure#6 integrate .. //depot/projects/dtrace/src/contrib/less/configure.ac#6 integrate .. //depot/projects/dtrace/src/contrib/less/filename.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/funcs.h#6 integrate .. //depot/projects/dtrace/src/contrib/less/jump.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/less.h#6 integrate .. //depot/projects/dtrace/src/contrib/less/less.man#6 integrate .. //depot/projects/dtrace/src/contrib/less/less.nro#6 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.man#4 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.nro#4 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.man#6 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.nro#6 integrate .. //depot/projects/dtrace/src/contrib/less/line.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/search.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/signal.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/version.c#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/auto-host.h#6 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/dtrace/src/share/man/man4/ata.4#10 integrate .. //depot/projects/dtrace/src/share/man/man4/uscanner.4#8 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#16 integrate .. //depot/projects/dtrace/src/share/zoneinfo/Makefile#4 integrate .. //depot/projects/dtrace/src/share/zoneinfo/africa#7 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#7 integrate .. //depot/projects/dtrace/src/share/zoneinfo/southamerica#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/accf_data.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/accf_http.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/igmp.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/in.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/in_cksum.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/in_gif.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/in_proto.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ecn.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_encap.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_gre.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_id.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_options.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.c#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/dtrace/src/sys/sys/mbuf.h#10 integrate .. //depot/projects/dtrace/src/sys/vm/vm_fault.c#11 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#21 integrate .. //depot/projects/dtrace/www/en/news/status/README#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2006-06-2006-10.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report.xsl#5 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#18 integrate .. //depot/projects/dtrace/www/en/ports/categories#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#44 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -221,7 +221,7 @@ NOINET6 for &os; prior to 6.0-RELEASE and NO_INET6 for later releases (for example in &man.make.conf.5;) was defined during the build, it also - requiresoptions INET6. + requires options INET6. Once the kernel module is loaded or the kernel is statically ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#39 (text+ko) ==== @@ -1,7 +1,7 @@ + INSTALL_KLD is a command to install + kernel loadable modules. Some architectures don't like it when + the modules are stripped, therefor use this command instead + of INSTALL_PROGRAM. + + + INSTALL_DATA is a command to install sharable data. ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -4032,7 +4032,8 @@ нь ~/.ssh/id_dsa.pub эсвэл ~/.ssh/id_rsa.pub-д DSA болон RSA түлхүүрийн төрлүүдэд зориулагдан хадгалагддаг. Тохируулга нь ажиллахын тулд нийтийн түлхүүр нь алсын машины - ~/.ssh/authorized_keys файлд хийгдэх ёстой байдаг. + ~/.ssh/authorized_keys файлд DSA болон RSA түлхүүрүүдийн + хоёулангийнх нь хувьд хийгдэх ёстой байдаг. Үүнтэй адилаар нийтийн түлхүүрүүдийн RSA хувилбар нь ~/.ssh/authorized_keys файлд бас хийгдэх ёстой. ==== //depot/projects/dtrace/ports/LEGAL#22 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.553 2007/10/02 19:14:47 alepulver Exp $ +# $FreeBSD: ports/LEGAL,v 1.554 2007/10/05 20:23:11 acm Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -427,6 +427,8 @@ netshow_linux.gz multimedia/netshow Commercial software nerolinux-* sysutils/linux-nero Must be downloaded from WWW and a Serial Number must be bought +nero2_linux_* games/linux-nerogame Nero is freeware, but i am not + sure of its license nntpcache-* news/nntpcache Commercial or government use requires license nsc2ke.* math/nsc2ke No resale, contact author for ==== //depot/projects/dtrace/ports/MOVED#43 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1490 2007/10/04 09:00:56 linimon Exp $ +# $FreeBSD: ports/MOVED,v 1.1492 2007/10/07 23:09:09 bsam Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3269,3 +3269,5 @@ print/clibpdf||2007-10-01|Has expired: distfile and homepage disappeared print/ruby-clibpdf||2007-10-01|Has expired: required port print/clibpdf deprecated lang/snobol|lang/snobol4|2007-10-04|Use newer version +x11-servers/synaptics|x11-drivers/synaptics|2007-10-06|Change to new category +emulators/linux_base-fc7|emulators/linux_base-f7|2007-10-07|Fedora is no more Core ==== //depot/projects/dtrace/ports/Mk/bsd.java.mk#5 (text+ko) ==== @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.java.mk,v 1.80 2007/08/05 21:19:47 glewis Exp $ +# $FreeBSD: ports/Mk/bsd.java.mk,v 1.81 2007/10/07 14:42:03 glewis Exp $ # .if !defined(Java_Include) @@ -214,7 +214,7 @@ # Enforce preferred Java ports according to OS . if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \ - (${ARCH} == "i386" && ${OSVERSION} >= 500000 && ${OSVERSION} < 700000) + (${ARCH} == "i386" && ${OSVERSION} < 700000) _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 . else _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 ==== //depot/projects/dtrace/ports/Mk/bsd.python.mk#12 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.99 2007/08/04 11:37:24 gabor Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.100 2007/10/07 13:50:15 perky Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -204,8 +204,8 @@ # # USE_ZOPE - Use Zope - an object-based web application platform, this # also sets up: -# ZOPEBASEDIR - relative base directory of zope server -# SZOPEBASEDIR - absolute base directory of zope that is +# SZOPEBASEDIR - relative base directory of zope server +# ZOPEBASEDIR - absolute base directory of zope that is # ${LOCALBASE}/${SZOPEBASEDIR} by default, # ZOPEPRODUCTDIR - directory, where products for zope can be found # @@ -431,7 +431,11 @@ PYDISTUTILS_BUILD_TARGET?= bdist_egg PYDISTUTILS_INSTALL_TARGET?= easy_install -PYDISTUTILS_INSTALLARGS?= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG} +PYDISTUTILS_INSTALLARGS?= -O 1 -N -S ${PYTHON_SITELIBDIR} \ + -d ${PYEASYINSTALL_SITELIBDIR} \ + -s ${PYEASYINSTALL_BINDIR} \ + ${WRKSRC}/dist/${PYEASYINSTALL_EGG} +MAKE_ENV+= PYTHONPATH=${PYEASYINSTALL_SITELIBDIR} .if defined(PYEASYINSTALL_ARCHDEP) _OSRELEASE!= ${UNAME} -r @@ -439,13 +443,23 @@ .endif PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg PYEASYINSTALL_CMD?= ${LOCALBASE}/bin/easy_install-${PYTHON_VER} +PYEASYINSTALL_BINDIR?= ${PREFIX}/bin +PYEASYINSTALL_SITELIBDIR?= ${PYTHONPREFIX_SITELIBDIR} PYEASYINSTALL_INSTALLARGS?= -q -N -S ${PYTHON_SITELIBDIR} \ + -d ${PYEASYINSTALL_SITELIBDIR} \ + -s ${PYEASYINSTALL_BINDIR} \ ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} PYEASYINSTALL_UNINSTALLARGS?= -q -m -S ${PYTHON_SITELIBDIR} \ + -d ${PYEASYINSTALL_SITELIBDIR} \ + -s ${PYEASYINSTALL_BINDIR} \ ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} PLIST_SUB+= PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG} +pre-install: pre-install-easyinstall +pre-install-easyinstall: + @${MKDIR} ${PYEASYINSTALL_SITELIBDIR} + add-plist-post: add-plist-easyinstall add-plist-easyinstall: @# @unexec line must be located before any other line while @exec must not. @@ -453,7 +467,8 @@ @${ECHO_CMD} "@unexec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_UNINSTALLARGS}" \ > ${TMPPLIST} @${CAT} ${TMPPLIST}.pei_tmp >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}" \ + @${ECHO_CMD} "@exec ${SETENV} PYTHONPATH=${PYEASYINSTALL_SITELIBDIR} \ + ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}" \ >> ${TMPPLIST} .endif # defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" @@ -465,7 +480,7 @@ PYDISTUTILS_PKGNAME?= ${PORTNAME} PYDISTUTILS_PKGVERSION?=${PORTVERSION} PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info -PYDISTUTILS_EGGINFODIR?=${PYTHON_SITELIBDIR} +PYDISTUTILS_EGGINFODIR?=${PYTHONPREFIX_SITELIBDIR} .if !defined(PYDISTUTILS_NOEGGINFO) && \ (defined(INSTALLS_EGGINFO) || \ @@ -488,7 +503,7 @@ ZOPESKELDIR= ${ZOPEBASEDIR}/zopeskel .elif ${ZOPE_VERSION} == "2.10" SZOPEBASEDIR?= www/Zope210 -ZOPE_PORTDIR= ${PORTSDIR}/www/zope210 +ZOPE_PORTSDIR= ${PORTSDIR}/www/zope210 ZOPESKELDIR= ${ZOPEBASEDIR}/skel .elif ${ZOPE_VERSION} == "2.9" SZOPEBASEDIR?= www/Zope29 @@ -688,6 +703,19 @@ do-install: @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) .endif + +.if defined(PYEASYINSTALL_ARCHDEP) +.if !target(easyinstall-setopt) +easyinstall-setopt: + @(cd ${BUILD_WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-platlib -s lib.${PYEASYINSTALL_OSARCH:S/^-//}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-temp -s temp.${PYEASYINSTALL_OSARCH:S/^-//}-${PYTHON_VER}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//}) +.endif # !target(eayinstall-setopt) + +pre-build: easyinstall-setopt +.endif # defined(PYEASYINSTALL_ARCHDEP) .endif # defined(USE_PYDISTUTILS) .endif # defined(_POSTMKINCLUDED) && !defined(Python_Post_Include) ==== //depot/projects/dtrace/ports/UPDATING#35 (text+ko) ==== @@ -6,6 +6,50 @@ time you update your ports collection, before attempting any port upgrades. +20070614: + AFFECTS: users of www/mediawiki + AUTHOR: miwi@FreeBSD.org + + www/mediawiki version is 1.11 now. 1.10 version was preserved on + www/mediawiki110 port. + +20071008: + AFFECTS: users of graphics/OpenEXR and graphics/ilmbase + AUTHOR: nork@FreeBSD.org + + The new OpenEXR (1.6 and later) separated two libraries. The first is IlmImf + library a.k.a. ILM's "EXR" file format operation library for storing 16-bit + FP images. The others are Half, IlmThread, Imath and Iex a.k.a. ILM's basic + utility libraries. + + To portupgrade OpenEXR and related ports, please do following operations, + manually: + + # pkg_delete -f OpenEXR + # pkg_delete -f ilmbase (if you already installed before CONFLICT) + # cd /usr/ports/graphics/OpenEXR + # make install + # pkgdb -F + +20071008: + AFFECTS: users of emulators/linux_base-fc7 + AUTHOR: bsam@FreeBSD.org + + Since Fedora is not more Core the port emulators/linux_base-fc7 is renamed + emulators/linux_base-f7. Now it's Fedora 7. + +20071007: + AFFECTS: users of sysutils/nut sysutils/nut-* + AUTHOR: Martin Matuska + + The slave ports sysutils/nut-libupsclient, sysutils/nut-snmp and + sysutils/nut-usb have been removed with the upgrade of sysutils/nut to 2.2.0 + They are now fully integrated into sysutils/nut and their functionality + can be enabled/disabled in OPTIONS of sysutils/nut. + + Please uninstall all sysutils/nut-* slave ports before upgrading sysutils/nut + to version 2.2.0 or higher. + 20070930: AFFECTS: everyone AUTHOR: Mark Linimon @@ -5704,4 +5748,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.552 2007/10/04 20:06:24 linimon Exp $ +$FreeBSD: ports/UPDATING,v 1.556 2007/10/08 09:21:42 miwi Exp $ ==== //depot/projects/dtrace/src/contrib/less/NEWS#6 (text+ko) ==== @@ -13,6 +13,18 @@ ====================================================================== + Major changes between "less" versions 406 and 408 + +* Support CSI escape sequences, like SGR escape sequences. + +* Fix bug which caused screen to fail to repaint when window is resized. + +* Fix bug in using -i and -I flags with non-ASCII text. + +* Fix configure bug on systems which don't support langinfo.h. + +====================================================================== + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. ==== //depot/projects/dtrace/src/contrib/less/README#6 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 406 + Less, version 408 - This is the distribution of less, version 406, released 19 Jun 2007. + This is the distribution of less, version 408, released 01 Oct 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/dtrace/src/contrib/less/ch.c#6 (text+ko) ==== @@ -128,6 +128,9 @@ POSITION pos; POSITION len; + if (thisfile == NULL) + return (EOI); + slept = FALSE; /* @@ -416,6 +419,9 @@ BLOCKNUM new_block; POSITION len; + if (thisfile == NULL) + return (0); + len = ch_length(); if (pos < ch_zero() || (len != NULL_POSITION && pos > len)) return (1); @@ -450,6 +456,9 @@ { POSITION len; + if (thisfile == NULL) + return (0); + if (ch_flags & CH_CANSEEK) ch_fsize = filesize(ch_file); @@ -503,6 +512,8 @@ public POSITION ch_length() { + if (thisfile == NULL) + return (NULL_POSITION); if (ignore_eoi) return (NULL_POSITION); if (ch_flags & CH_HELPFILE) @@ -516,6 +527,8 @@ public POSITION ch_tell() { + if (thisfile == NULL) + return (NULL_POSITION); return (ch_block * LBUFSIZE) + ch_offset; } @@ -527,6 +540,8 @@ { register int c; + if (thisfile == NULL) + return (EOI); c = ch_get(); if (c == EOI) return (EOI); @@ -546,6 +561,8 @@ public int ch_back_get() { + if (thisfile == NULL) + return (EOI); if (ch_offset > 0) ch_offset --; else @@ -586,6 +603,9 @@ { register struct buf *bp; + if (thisfile == NULL) + return; + if (!(ch_flags & CH_CANSEEK)) { /* @@ -769,6 +789,9 @@ { int keepstate = FALSE; + if (thisfile == NULL) + return; + if (ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE)) { /* @@ -807,6 +830,8 @@ public int ch_getflags() { + if (thisfile == NULL) + return (0); return (ch_flags); } ==== //depot/projects/dtrace/src/contrib/less/charset.c#6 (text+ko) ==== @@ -567,24 +567,29 @@ { case 1: default: + /* 0xxxxxxx */ return (LWCHAR) (p[0] & 0xFF); case 2: + /* 110xxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x1F) << 6) | (p[1] & 0x3F)); case 3: + /* 1110xxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x0F) << 12) | ((p[1] & 0x3F) << 6) | (p[2] & 0x3F)); case 4: + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x07) << 18) | ((p[1] & 0x3F) << 12) | ((p[2] & 0x3F) << 6) | (p[3] & 0x3F)); case 5: + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x03) << 24) | ((p[1] & 0x3F) << 18) | @@ -592,6 +597,7 @@ ((p[3] & 0x3F) << 6) | (p[4] & 0x3F)); case 6: + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x01) << 30) | ((p[1] & 0x3F) << 24) | @@ -603,6 +609,56 @@ } /* + * Store a character into a UTF-8 string. + */ + public void +put_wchar(pp, ch) + char **pp; + LWCHAR ch; +{ + if (!utf_mode || ch < 0x80) + { + /* 0xxxxxxx */ + *(*pp)++ = (char) ch; + } else if (ch < 0x800) + { + /* 110xxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xC0 | ((ch >> 6) & 0x1F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x10000) + { + /* 1110xxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xE0 | ((ch >> 12) & 0x0F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x200000) + { + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 18) & 0x07)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x4000000) + { + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 24) & 0x03)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else + { + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 30) & 0x01)); + *(*pp)++ = (char) (0x80 | ((ch >> 24) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } +} + +/* * Step forward or backward one character in a string. */ public LWCHAR ==== //depot/projects/dtrace/src/contrib/less/configure#6 (text+ko) ==== @@ -6473,6 +6473,7 @@ /* end confdefs.h. */ #include #include +#include int main () { ==== //depot/projects/dtrace/src/contrib/less/configure.ac#6 (text+ko) ==== @@ -304,7 +304,8 @@ AC_MSG_CHECKING(for locale) AC_TRY_LINK([#include -#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], +#include +#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for ctype functions) AC_TRY_LINK([ ==== //depot/projects/dtrace/src/contrib/less/filename.c#6 (text+ko) ==== @@ -482,7 +482,7 @@ for (i = 0; i < n; i++) { char c = data[i]; - if (ctldisp == OPT_ONPLUS && c == ESC) + if (ctldisp == OPT_ONPLUS && IS_CSI_START(c)) { while (++i < n && is_ansi_middle(data[i])) continue; ==== //depot/projects/dtrace/src/contrib/less/funcs.h#6 (text+ko) ==== @@ -56,6 +56,7 @@ public int utf_len (); public int is_utf8_well_formed (); public LWCHAR get_wchar (); + public void put_wchar (); public LWCHAR step_char (); public int is_composing_char (); public int is_ubin_char (); ==== //depot/projects/dtrace/src/contrib/less/jump.c#6 (text+ko) ==== @@ -31,6 +31,7 @@ jump_forw() { POSITION pos; + POSITION end_pos; if (ch_end_seek()) { @@ -42,11 +43,17 @@ * Go back one line from the end of the file * to get to the beginning of the last line. */ - pos = back_line(ch_tell()); + pos_clear(); + end_pos = ch_tell(); + pos = back_line(end_pos); if (pos == NULL_POSITION) jump_loc((POSITION)0, sc_height-1); else + { jump_loc(pos, sc_height-1); + if (position(sc_height-1) != end_pos) + repaint(); + } } /* ==== //depot/projects/dtrace/src/contrib/less/less.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/less.h,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/less.h,v 1.8 2007/10/08 16:17:42 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -150,6 +150,8 @@ #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') #endif +#define IS_CSI_START(c) ((c) == ESC || ((unsigned char)(c)) == CSI) + #ifndef NULL #define NULL 0 #endif @@ -425,6 +427,7 @@ #endif /* IS_EBCDIC_HOST */ #define ESC CONTROL('[') +#define CSI ((unsigned char)'\233') #if _OSK_MWC32 #define LSIGNAL(sig,func) os9_signal(sig,func) ==== //depot/projects/dtrace/src/contrib/less/less.man#6 (text+ko) ==== @@ -1544,4 +1544,4 @@ - Version 406: 19 Jun 2007 LESS(1) + Version 408: 01 Oct 2007 LESS(1) ==== //depot/projects/dtrace/src/contrib/less/less.nro#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 406: 19 Jun 2007" +.TH LESS 1 "Version 408: 01 Oct 2007" .SH NAME less \- opposite of more .SH SYNOPSIS ==== //depot/projects/dtrace/src/contrib/less/lessecho.man#4 (text+ko) ==== @@ -46,4 +46,4 @@ - Version 406: 19 Jun 2007 LESSECHO(1) + Version 408: 01 Oct 2007 LESSECHO(1) ==== //depot/projects/dtrace/src/contrib/less/lessecho.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 406: 19 Jun 2007" +.TH LESSECHO 1 "Version 408: 01 Oct 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS ==== //depot/projects/dtrace/src/contrib/less/lesskey.man#6 (text+ko) ==== @@ -357,4 +357,4 @@ - Version 406: 19 Jun 2007 LESSKEY(1) + Version 408: 01 Oct 2007 LESSKEY(1) ==== //depot/projects/dtrace/src/contrib/less/lesskey.nro#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 406: 19 Jun 2007" +.TH LESSKEY 1 "Version 408: 01 Oct 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS ==== //depot/projects/dtrace/src/contrib/less/line.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/line.c,v 1.4 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/line.c,v 1.5 2007/10/08 16:17:42 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -269,7 +269,7 @@ while (shifted <= shift && from < curr) { c = linebuf[from]; - if (c == ESC && ctldisp == OPT_ONPLUS) + if (ctldisp == OPT_ONPLUS && IS_CSI_START(c)) { /* Keep cumulative effect. */ linebuf[to] = c; @@ -524,7 +524,7 @@ for (p = &linebuf[curr]; p > linebuf; ) { LWCHAR ch = step_char(&p, -1, linebuf); - if (ch == ESC) + if (IS_CSI_START(ch)) return (1); if (!is_ansi_middle(ch)) return (0); @@ -603,13 +603,13 @@ /* Remove whole unrecognized sequence. */ do { --curr; - } while (linebuf[curr] != ESC); + } while (!IS_CSI_START(linebuf[curr])); return 0; } a = AT_ANSI; /* Will force re-AT_'ing around it. */ w = 0; } - else if (ctldisp == OPT_ONPLUS && ch == ESC) + else if (ctldisp == OPT_ONPLUS && IS_CSI_START(ch)) { a = AT_ANSI; /* Will force re-AT_'ing around it. */ w = 0; @@ -943,7 +943,7 @@ } else if ((!utf_mode || is_ascii_char(ch)) && control_char((char)ch)) { do_control_char: - if (ctldisp == OPT_ON || (ctldisp == OPT_ONPLUS && ch == ESC)) + if (ctldisp == OPT_ON || (ctldisp == OPT_ONPLUS && IS_CSI_START(ch))) { /* * Output as a normal character. ==== //depot/projects/dtrace/src/contrib/less/search.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/search.c,v 1.8 2007/06/17 23:20:43 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/search.c,v 1.9 2007/10/08 16:17:42 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -16,6 +16,7 @@ #include "less.h" #include "position.h" +#include "charset.h" #define MINPOS(a,b) (((a) < (b)) ? (a) : (b)) #define MAXPOS(a,b) (((a) > (b)) ? (a) : (b)) @@ -120,24 +121,31 @@ int *lenp; int ops; { - register char *dst; - register char *src; + char *dst; + char *src; register char *src_end; + LWCHAR ch; if (lenp != NULL) src_end = osrc + *lenp; else src_end = osrc + strlen(osrc); - for (src = osrc, dst = odst; src < src_end; src++) + for (src = osrc, dst = odst; src < src_end; ) { - if ((ops & CVT_TO_LC) && IS_UPPER(*src)) + ch = step_char(&src, +1, src_end); + if ((ops & CVT_TO_LC) && IS_UPPER(ch)) + { /* Convert uppercase to lowercase. */ - *dst++ = TO_LOWER(*src); - else if ((ops & CVT_BS) && *src == '\b' && dst > odst) + put_wchar(&dst, TO_LOWER(ch)); + } else if ((ops & CVT_BS) && ch == '\b' && dst > odst) + { /* Delete BS and preceding char. */ - dst--; - else if ((ops & CVT_ANSI) && *src == ESC) + do { + dst--; + } while (dst > odst && + !IS_ASCII_OCTET(*dst) && !IS_UTF8_LEAD(*dst)); + } else if ((ops & CVT_ANSI) && IS_CSI_START(ch)) { /* Skip to end of ANSI escape sequence. */ while (src + 1 != src_end) @@ -145,7 +153,7 @@ break; } else /* Just copy. */ - *dst++ = *src; + put_wchar(&dst, ch); } if ((ops & CVT_CRLF) && dst > odst && dst[-1] == '\r') dst--; @@ -182,14 +190,18 @@ * Are there any uppercase letters in this string? */ static int -is_ucase(s) - char *s; +is_ucase(str) + char *str; { - register char *p; + char *str_end = str + strlen(str); + LWCHAR ch; - for (p = s; *p != '\0'; p++) - if (IS_UPPER(*p)) + while (str < str_end) + { + ch = step_char(&str, +1, str_end); + if (IS_UPPER(ch)) return (1); + } return (0); } @@ -679,7 +691,7 @@ char *line_end = *line + line_len; if (cvt_ops & CVT_ANSI) - while (**line == ESC) + while (IS_CSI_START(**line)) { /* * Found an ESC. The file position moves ==== //depot/projects/dtrace/src/contrib/less/signal.c#6 (text+ko) ==== @@ -8,7 +8,7 @@ * contact the author, see the README file. */ -/* $FreeBSD: src/contrib/less/signal.c,v 1.5 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/signal.c,v 1.6 2007/10/08 16:17:42 delphij Exp $ */ /* * Routines dealing with signals. @@ -93,6 +93,8 @@ { LSIGNAL(SIGWINCH, winch); sigs |= S_WINCH; + if (reading) + intread(); } #else #ifdef SIGWIND ==== //depot/projects/dtrace/src/contrib/less/version.c#6 (text+ko) ==== @@ -693,6 +693,8 @@ v404 6/5/07 Fix display bug with F command and long lines. v405 6/17/07 Fix display bug when using -w option. v406 6/17/07 Fix secure build. +v407 8/16/07 Fix bugs; support CSI chars. +v408 10/1/07 Fix bug in -i with non-ASCII chars. */ -char version[] = "406"; +char version[] = "408"; ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/auto-host.h#6 (text+ko) ==== @@ -1,6 +1,6 @@ /* auto-host.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.20 2007/05/19 04:25:58 kan Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.21 2007/10/08 18:59:34 marius Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 8 23:02:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0427216A41A; Mon, 8 Oct 2007 23:02:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 867E716A418 for ; Mon, 8 Oct 2007 23:02:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78DB313C48E for ; Mon, 8 Oct 2007 23:02:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l98N2QAJ086918 for ; Mon, 8 Oct 2007 23:02:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98N2PwJ086915 for perforce@freebsd.org; Mon, 8 Oct 2007 23:02:25 GMT (envelope-from jb@freebsd.org) Date: Mon, 8 Oct 2007 23:02:25 GMT Message-Id: <200710082302.l98N2PwJ086915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 127324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Oct 2007 23:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=127324 Change 127324 by jb@jb_freebsd1 on 2007/10/08 23:01:38 IF6 Affected files ... .. //depot/projects/dtrace6/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/dtrace6/src/sys/conf/files#2 integrate .. //depot/projects/dtrace6/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/dtrace6/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/dtrace6/src/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/dtrace6/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/em/if_em_hw.c#2 delete .. //depot/projects/dtrace6/src/sys/dev/em/if_em_hw.h#2 delete .. //depot/projects/dtrace6/src/sys/dev/em/if_em_osdep.h#2 delete .. //depot/projects/dtrace6/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/dtrace6/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/dtrace6/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/lib/libc/gen/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121.2.1 2005/12/05 19:59:20 jhb Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121.2.2 2007/10/06 03:15:15 scf Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -81,7 +81,8 @@ fpclassify.3 isnormal.3 MLINKS+=frexp.3 frexpf.3 frexp.3 frexpl.3 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \ - fts.3 fts_read.3 fts.3 fts_set.3 + fts.3 fts_read.3 fts.3 fts_set.3 fts.3 fts_set_clientptr.3 \ + fts.3 fts_get_clientptr.3 fts.3 fts_get_stream.3 MLINKS+=ftw.3 nftw.3 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \ getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \ ==== //depot/projects/dtrace6/src/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.3 2007/05/02 18:42:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.4 2007/10/05 15:22:35 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(APIC_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static MULTIPLE_APIC_TABLE *madt; @@ -391,7 +388,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -447,7 +444,7 @@ proc->ProcessorEnabled ? "enabled" : "disabled"); if (!proc->ProcessorEnabled) break; - if (proc->LocalApicId >= NLAPICS) + if (proc->LocalApicId > MAX_APIC_ID) panic("%s: CPU ID %d too high", __func__, proc->LocalApicId); la = &lapics[proc->LocalApicId]; @@ -476,7 +473,7 @@ printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", apic->IoApicId, apic->Interrupt, (void *)(uintptr_t)apic->Address); - if (apic->IoApicId >= NIOAPICS) + if (apic->IoApicId > MAX_APIC_ID) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); if (ioapics[apic->IoApicId].io_apic != NULL) @@ -544,7 +541,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -565,7 +562,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/dtrace6/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.13 2007/04/28 09:04:09 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.14 2007/10/05 15:22:35 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -65,13 +65,6 @@ #include #endif -/* - * We can handle up to 60 APICs via our logical cluster IDs, but currently - * the physical IDs on Intel processors up to the Pentium 4 are limited to - * 16. - */ -#define MAX_APICID 16 - /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -114,7 +107,7 @@ u_long la_hard_ticks; u_long la_stat_ticks; u_long la_prof_ticks; -} static lapics[MAX_APICID]; +} static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -237,7 +230,7 @@ { int i; - if (apic_id >= MAX_APICID) { + if (apic_id > MAX_APIC_ID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); ==== //depot/projects/dtrace6/src/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.12 2007/08/29 23:26:33 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.14 2007/10/08 21:51:01 jhb Exp $"); #include "opt_cpu.h" #include "opt_kdb.h" @@ -133,7 +133,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; -} static cpu_info[MAXCPU]; +} static cpu_info[MAX_APIC_ID + 1]; static int cpu_apic_ids[MAXCPU]; /* Holds pending bitmap based IPIs per CPU */ @@ -141,6 +141,7 @@ static u_int boot_address; +static void assign_cpu_ids(void); static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); @@ -178,7 +179,7 @@ return; group = &mp_groups[0]; groups = 1; - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { + for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; /* @@ -225,9 +226,8 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id >= MAXCPU) { - printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU - 1); + if (apic_id > MAX_APIC_ID) { + panic("SMP: APIC ID %d too high", apic_id); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", @@ -240,13 +240,13 @@ boot_cpu_id = apic_id; cpu_info[apic_id].cpu_bsp = 1; } - mp_ncpus++; - if (apic_id > mp_maxid) - mp_maxid = apic_id; + if (mp_ncpus < MAXCPU) { + mp_ncpus++; + mp_maxid = mp_ncpus -1; + } if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); - } void @@ -265,8 +265,7 @@ else KASSERT(mp_maxid >= mp_ncpus - 1, ("%s: counters out of sync: max %d, count %d", __func__, - mp_maxid, mp_ncpus)); - + mp_maxid, mp_ncpus)); } int @@ -344,6 +343,8 @@ ("BSP's APIC ID doesn't match boot_cpu_id")); cpu_apic_ids[0] = boot_cpu_id; + assign_cpu_ids(); + /* Start each Application Processor */ start_all_aps(); @@ -408,7 +409,7 @@ /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x < MAXCPU; x++) { + for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) continue; if (cpu_info[x].cpu_disabled) @@ -624,6 +625,48 @@ } /* + * Assign logical CPU IDs to local APICs. + */ +static void +assign_cpu_ids(void) +{ + u_int i; + + /* Check for explicitly disabled CPUs. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp) + continue; + + /* Don't use this CPU if it has been disabled by a tunable. */ + if (resource_disabled("lapic", i)) { + cpu_info[i].cpu_disabled = 1; + continue; + } + } + + /* + * Assign CPU IDs to local APIC IDs and disable any CPUs + * beyond MAXCPU. CPU 0 has already been assigned to the BSP, + * so we only have to assign IDs for APs. + */ + mp_ncpus = 1; + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || + cpu_info[i].cpu_disabled) + continue; + + if (mp_ncpus < MAXCPU) { + cpu_apic_ids[mp_ncpus] = i; + mp_ncpus++; + } else + cpu_info[i].cpu_disabled = 1; + } + KASSERT(mp_maxid >= mp_ncpus - 1, + ("%s: counters out of sync: max %d, count %d", __func__, mp_maxid, + mp_ncpus)); +} + +/* * start each AP in our list */ static int @@ -674,25 +717,9 @@ outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ /* start each AP */ - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { - - /* Ignore non-existent CPUs and the BSP. */ - if (!cpu_info[apic_id].cpu_present || - cpu_info[apic_id].cpu_bsp) - continue; + for (cpu = 1; cpu < mp_ncpus; cpu++) { + apic_id = cpu_apic_ids[cpu]; - /* Don't use this CPU if it has been disabled by a tunable. */ - if (resource_disabled("lapic", apic_id)) { - cpu_info[apic_id].cpu_disabled = 1; - mp_ncpus--; - continue; - } - - cpu++; - - /* save APIC ID for this logical ID */ - cpu_apic_ids[cpu] = apic_id; - /* allocate and set up an idle stack data page */ bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); @@ -937,10 +964,10 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); #ifdef IPI_PREEMPTION - if (ipi_bitmap & IPI_PREEMPT) { + if (ipi_bitmap & (1 << IPI_PREEMPT)) { mtx_lock_spin(&sched_lock); /* Don't preempt the idle thread */ - if (curthread->td_priority < PRI_MIN_IDLE) { + if (curthread != PCPU_GET(idlethread)) { struct thread *running_thread = curthread; if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; ==== //depot/projects/dtrace6/src/sys/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236.2.1 2007/10/05 15:22:35 jhb Exp $"); #include #include @@ -50,7 +50,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of APIC's */ +#define MAX_LAPIC_ID 63 /* Max local APIC ID for HTT fixup */ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -136,7 +136,7 @@ static mpfps_t mpfps; static mpcth_t mpct; -static void *ioapics[NAPICID]; +static void *ioapics[MAX_APIC_ID + 1]; static bus_datum *busses; static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; @@ -152,7 +152,7 @@ static void mptable_count_items(void); static void mptable_count_items_handler(u_char *entry, void *arg); #ifdef MPTABLE_FORCE_HTT -static void mptable_hyperthread_fixup(u_int id_mask); +static void mptable_hyperthread_fixup(u_long id_mask); #endif static void mptable_parse_apics_and_busses(void); static void mptable_parse_apics_and_busses_handler(u_char *entry, @@ -294,7 +294,7 @@ static int mptable_probe_cpus(void) { - u_int cpu_mask; + u_long cpu_mask; /* Is this a pre-defined config? */ if (mpfps->config_type != 0) { @@ -354,7 +354,7 @@ mptable_parse_ints(); /* Fourth, we register all the I/O APIC's. */ - for (i = 0; i < NAPICID; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i] != NULL) ioapic_register(ioapics[i]); @@ -412,7 +412,7 @@ mptable_probe_cpus_handler(u_char *entry, void *arg) { proc_entry_ptr proc; - u_int *cpu_mask; + u_long *cpu_mask; switch (*entry) { case MPCT_ENTRY_PROCESSOR: @@ -420,8 +420,10 @@ if (proc->cpu_flags & PROCENTRY_FLAG_EN) { lapic_create(proc->apic_id, proc->cpu_flags & PROCENTRY_FLAG_BP); - cpu_mask = (u_int *)arg; - *cpu_mask |= (1 << proc->apic_id); + if (proc->apic_id < MAX_LAPIC_ID) { + cpu_mask = (u_long *)arg; + *cpu_mask |= (1ul << proc->apic_id); + } } break; } @@ -508,7 +510,7 @@ apic = (io_apic_entry_ptr)entry; if (!(apic->apic_flags & IOAPICENTRY_FLAG_EN)) break; - if (apic->apic_id >= NAPICID) + if (apic->apic_id > MAX_APIC_ID) panic("%s: I/O APIC ID %d too high", __func__, apic->apic_id); if (ioapics[apic->apic_id] != NULL) @@ -653,7 +655,7 @@ return; } } - if (apic_id >= NAPICID) { + if (apic_id > MAX_APIC_ID) { printf("MPTable: Ignoring interrupt entry for ioapic%d\n", intr->dst_apic_id); return; @@ -866,7 +868,7 @@ * with the number of logical CPU's in the processor. */ static void -mptable_hyperthread_fixup(u_int id_mask) +mptable_hyperthread_fixup(u_long id_mask) { u_int i, id, logical_cpus; @@ -883,7 +885,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id < NAPICID; id++) { + for (id = 0; id <= MAX_LAPIC_ID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ @@ -898,7 +900,7 @@ * Ok, the ID's checked out, so perform the fixup by * adding the logical CPUs. */ - while ((id = ffs(id_mask)) != 0) { + while ((id = ffsl(id_mask)) != 0) { id--; for (i = id + 1; i < id + logical_cpus; i++) { if (bootverbose) ==== //depot/projects/dtrace6/src/sys/amd64/include/apicvar.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.13.2.5 2007/05/02 15:40:14 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.13.2.6 2007/10/05 15:22:36 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -79,6 +79,7 @@ * I/O device! */ +#define MAX_APIC_ID 0xfe #define APIC_ID_ALL 0xff /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ ==== //depot/projects/dtrace6/src/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1031.2.68 2007/09/04 22:40:38 alfred Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1031.2.69 2007/10/05 22:49:06 jfv Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -568,8 +568,34 @@ dev/ed/if_ed_rtl80x9.c optional ed dev/eisa/eisa_if.m standard dev/eisa/eisaconf.c optional eisa -dev/em/if_em.c optional em -dev/em/if_em_hw.c optional em +dev/em/if_em.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_80003es2lan.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_82540.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_82541.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_82542.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_82543.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_82571.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_82575.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_api.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_ich8lan.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_mac.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_manage.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_nvm.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" +dev/em/e1000_phy.c optional em \ + compile-with "${NORMAL_C} -I$S/dev/em" dev/en/if_en_pci.c optional en pci dev/en/midway.c optional en dev/ep/if_ep.c optional ep ==== //depot/projects/dtrace6/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.65.2.4 2007/02/25 05:01:05 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.65.2.5 2007/10/05 22:49:06 jfv Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -67,6 +67,12 @@ # .. and the same for twa INCLUDES+= -I$S/dev/twa +# .. and the same for em +INCLUDES+= -I$S/dev/em + +# .. and the same for em +INCLUDES+= -I$S/dev/em + CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h .if ${CC} != "icc" ==== //depot/projects/dtrace6/src/sys/dev/em/LICENSE#2 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/sys/dev/em/LICENSE,v 1.3.2.1 2006/08/08 09:20:26 glebius Exp $ +$FreeBSD: src/sys/dev/em/LICENSE,v 1.3.2.2 2007/10/05 22:49:06 jfv Exp $ /*- -Copyright (c) 2001-2005, Intel Corporation +Copyright (c) 2001-2007, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without ==== //depot/projects/dtrace6/src/sys/dev/em/if_em.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /************************************************************************** -Copyright (c) 2001-2006, Intel Corporation +Copyright (c) 2001-2007, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.65.2.23 2007/06/05 17:44:01 jfv Exp $*/ +/* $FreeBSD: src/sys/dev/em/if_em.c,v 1.65.2.26 2007/10/07 03:11:31 jfv Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -69,15 +69,17 @@ #include #include #include +#include #include #include #include - #include #include -#include -#include + +#include "e1000_api.h" +#include "e1000_82575.h" +#include "if_em.h" /********************************************************************* * Set this to one to display debug statistics @@ -85,16 +87,16 @@ int em_display_debug_stats = 0; /********************************************************************* - * Driver version + * Base Driver version: *********************************************************************/ -char em_driver_version[] = "Version - 6.2.9"; +char em_driver_version[] = "Version - 6.6.6"; /********************************************************************* * PCI Device ID Table * * Used by probe to select devices to load on - * Last field stores an index into em_strings + * Last field stores an index into e1000_strings * Last entry must be all 0s * * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, String Index } @@ -153,9 +155,12 @@ { 0x8086, E1000_DEV_ID_82571EB_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE, + { 0x8086, E1000_DEV_ID_82571EB_QUAD_COPPER_LP, + PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82571EB_QUAD_FIBER, + PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82571PT_QUAD_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, E1000_DEV_ID_82572EI_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82572EI_FIBER, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82572EI_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, @@ -180,6 +185,17 @@ { 0x8086, E1000_DEV_ID_ICH8_IFE_G, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_ICH8_IGP_M, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH9_IGP_AMT, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH9_IGP_C, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH9_IFE, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH9_IFE_GT, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_ICH9_IFE_G, PCI_ANY_ID, PCI_ANY_ID, 0}, + + { 0x8086, E1000_DEV_ID_82575EB_COPPER, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82575EB_FIBER_SERDES, + PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82575GB_QUAD_COPPER, + PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} }; @@ -228,35 +244,39 @@ static void em_free_receive_structures(struct adapter *); static void em_update_stats_counters(struct adapter *); static void em_txeof(struct adapter *); +static void em_tx_purge(struct adapter *); static int em_allocate_receive_structures(struct adapter *); static int em_allocate_transmit_structures(struct adapter *); static int em_rxeof(struct adapter *, int); #ifndef __NO_STRICT_ALIGNMENT static int em_fixup_rx(struct adapter *); #endif -static void em_receive_checksum(struct adapter *, struct em_rx_desc *, +static void em_receive_checksum(struct adapter *, struct e1000_rx_desc *, struct mbuf *); static void em_transmit_checksum_setup(struct adapter *, struct mbuf *, uint32_t *, uint32_t *); +static boolean_t em_tx_adv_ctx_setup(struct adapter *, struct mbuf *); #ifdef EM_TSO -static boolean_t em_tso_setup(struct adapter *, struct mbuf *, u_int32_t *, +static boolean_t em_tso_setup(struct adapter *, struct mbuf *, uint32_t *, uint32_t *); -#endif +static boolean_t em_tso_adv_setup(struct adapter *, struct mbuf *, uint32_t *); +#endif /* EM_TSO */ static void em_set_promisc(struct adapter *); static void em_disable_promisc(struct adapter *); static void em_set_multi(struct adapter *); static void em_print_hw_stats(struct adapter *); static void em_update_link_status(struct adapter *); -static int em_get_buf(int i, struct adapter *, struct mbuf *); +static int em_get_buf(struct adapter *, int); static void em_enable_vlans(struct adapter *); static int em_encap(struct adapter *, struct mbuf **); +static int em_adv_encap(struct adapter *, struct mbuf **); static void em_smartspeed(struct adapter *); static int em_82547_fifo_workaround(struct adapter *, int); static void em_82547_update_fifo_head(struct adapter *, int); static int em_82547_tx_fifo_reset(struct adapter *); static void em_82547_move_tail(void *); static int em_dma_malloc(struct adapter *, bus_size_t, - struct em_dma_alloc *, int); + struct em_dma_alloc *, int); static void em_dma_free(struct adapter *, struct em_dma_alloc *); static void em_print_debug_info(struct adapter *); static int em_is_valid_ether_addr(uint8_t *); @@ -266,19 +286,24 @@ PDESC_ARRAY desc_array); static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); static void em_add_int_delay_sysctl(struct adapter *, const char *, - const char *, struct em_int_delay_info *, int, int); + const char *, struct em_int_delay_info *, int, int); +/* Management and WOL Support */ +static void em_init_manageability(struct adapter *); +static void em_release_manageability(struct adapter *); +static void em_get_hw_control(struct adapter *); +static void em_release_hw_control(struct adapter *); +static void em_enable_wakeup(device_t); + +#ifdef DEVICE_POLLING +static poll_handler_t em_poll; +static void em_intr(void *); +#else +static void em_intr_fast(void *); static void em_add_rx_process_limit(struct adapter *, const char *, - const char *, int *, int); -#ifdef EM_FAST_INTR -static void em_intr_fast(void *); + const char *, int *, int); static void em_handle_rxtx(void *context, int pending); static void em_handle_link(void *context, int pending); -#else /* Legacy Interrupt Handling */ -static void em_intr(void *); -#ifdef DEVICE_POLLING -static poll_handler_t em_poll; -#endif /* DEVICE_POLLING */ -#endif /* EM_FAST_INTR */ +#endif /********************************************************************* * FreeBSD Device Interface Entry Points @@ -308,14 +333,19 @@ * Tunable default values. *********************************************************************/ -#define E1000_TICKS_TO_USECS(ticks) ((1024 * (ticks) + 500) / 1000) -#define E1000_USECS_TO_TICKS(usecs) ((1000 * (usecs) + 512) / 1024) -#define M_TSO_LEN 66 /* mbuf with just hdr and TSO pkthdr */ +#define EM_TICKS_TO_USECS(ticks) ((1024 * (ticks) + 500) / 1000) +#define EM_USECS_TO_TICKS(usecs) ((1000 * (usecs) + 512) / 1024) +#define M_TSO_LEN 66 + +/* Allow common code without TSO */ +#ifndef CSUM_TSO +#define CSUM_TSO 0 +#endif -static int em_tx_int_delay_dflt = E1000_TICKS_TO_USECS(EM_TIDV); -static int em_rx_int_delay_dflt = E1000_TICKS_TO_USECS(EM_RDTR); -static int em_tx_abs_int_delay_dflt = E1000_TICKS_TO_USECS(EM_TADV); -static int em_rx_abs_int_delay_dflt = E1000_TICKS_TO_USECS(EM_RADV); +static int em_tx_int_delay_dflt = EM_TICKS_TO_USECS(EM_TIDV); +static int em_rx_int_delay_dflt = EM_TICKS_TO_USECS(EM_RDTR); +static int em_tx_abs_int_delay_dflt = EM_TICKS_TO_USECS(EM_TADV); +static int em_rx_abs_int_delay_dflt = EM_TICKS_TO_USECS(EM_RADV); static int em_rxd = EM_DEFAULT_RXD; static int em_txd = EM_DEFAULT_TXD; static int em_smart_pwr_down = FALSE; @@ -327,10 +357,13 @@ TUNABLE_INT("hw.em.rxd", &em_rxd); TUNABLE_INT("hw.em.txd", &em_txd); TUNABLE_INT("hw.em.smart_pwr_down", &em_smart_pwr_down); - +#ifndef DEVICE_POLLING /* How many packets rxeof tries to clean at a time */ static int em_rx_process_limit = 100; TUNABLE_INT("hw.em.rx_process_limit", &em_rx_process_limit); +#endif +/* Global used in WOL setup with multiport cards */ +static int global_quad_port_a = 0; /********************************************************************* * Device identification routine @@ -399,6 +432,7 @@ struct adapter *adapter; int tsize, rsize; int error = 0; + u16 eeprom_data, device_id; INIT_DEBUGOUT("em_attach: begin"); @@ -420,51 +454,88 @@ callout_init_mtx(&adapter->timer, &adapter->mtx, 0); callout_init_mtx(&adapter->tx_fifo_timer, &adapter->mtx, 0); - /* Determine hardware revision */ + /* Determine hardware and mac info */ em_identify_hardware(adapter); + /* Setup PCI resources */ + if (em_allocate_pci_resources(adapter)) { + device_printf(dev, "Allocation of PCI resources failed\n"); + error = ENXIO; + goto err_pci; + } + + /* + ** For ICH8 and family we need to + ** map the flash memory, and this + ** must happen after the MAC is + ** identified + */ + if ((adapter->hw.mac.type == e1000_ich8lan) || + (adapter->hw.mac.type == e1000_ich9lan)) { + int rid = EM_BAR_TYPE_FLASH; + adapter->flash_mem = bus_alloc_resource_any(dev, + SYS_RES_MEMORY, &rid, RF_ACTIVE); + /* This is used in the shared code */ + adapter->hw.flash_address = (u8 *)adapter->flash_mem; + adapter->osdep.flash_bus_space_tag = + rman_get_bustag(adapter->flash_mem); + adapter->osdep.flash_bus_space_handle = + rman_get_bushandle(adapter->flash_mem); + } + + /* Do Shared Code initialization */ + if (e1000_setup_init_funcs(&adapter->hw, TRUE)) { + device_printf(dev, "Setup of Shared code failed\n"); + error = ENXIO; + goto err_pci; + } + + e1000_get_bus_info(&adapter->hw); + /* Set up some sysctls for the tunable interrupt delays */ em_add_int_delay_sysctl(adapter, "rx_int_delay", "receive interrupt delay in usecs", &adapter->rx_int_delay, - E1000_REG_OFFSET(&adapter->hw, RDTR), em_rx_int_delay_dflt); + E1000_REGISTER(&adapter->hw, E1000_RDTR), em_rx_int_delay_dflt); em_add_int_delay_sysctl(adapter, "tx_int_delay", "transmit interrupt delay in usecs", &adapter->tx_int_delay, - E1000_REG_OFFSET(&adapter->hw, TIDV), em_tx_int_delay_dflt); - if (adapter->hw.mac_type >= em_82540) { + E1000_REGISTER(&adapter->hw, E1000_TIDV), em_tx_int_delay_dflt); + if (adapter->hw.mac.type >= e1000_82540) { em_add_int_delay_sysctl(adapter, "rx_abs_int_delay", "receive interrupt delay limit in usecs", &adapter->rx_abs_int_delay, - E1000_REG_OFFSET(&adapter->hw, RADV), + E1000_REGISTER(&adapter->hw, E1000_RADV), em_rx_abs_int_delay_dflt); em_add_int_delay_sysctl(adapter, "tx_abs_int_delay", "transmit interrupt delay limit in usecs", &adapter->tx_abs_int_delay, - E1000_REG_OFFSET(&adapter->hw, TADV), + E1000_REGISTER(&adapter->hw, E1000_TADV), em_tx_abs_int_delay_dflt); } +#ifndef DEVICE_POLLING /* Sysctls for limiting the amount of work done in the taskqueue */ em_add_rx_process_limit(adapter, "rx_processing_limit", "max number of rx packets to process", &adapter->rx_process_limit, em_rx_process_limit); +#endif /* * Validate number of transmit and receive descriptors. It * must not exceed hardware maximum, and must be multiple - * of EM_DBA_ALIGN. + * of E1000_DBA_ALIGN. */ - if (((em_txd * sizeof(struct em_tx_desc)) % EM_DBA_ALIGN) != 0 || - (adapter->hw.mac_type >= em_82544 && em_txd > EM_MAX_TXD) || - (adapter->hw.mac_type < em_82544 && em_txd > EM_MAX_TXD_82543) || + if (((em_txd * sizeof(struct e1000_tx_desc)) % EM_DBA_ALIGN) != 0 || + (adapter->hw.mac.type >= e1000_82544 && em_txd > EM_MAX_TXD) || + (adapter->hw.mac.type < e1000_82544 && em_txd > EM_MAX_TXD_82543) || (em_txd < EM_MIN_TXD)) { device_printf(dev, "Using %d TX descriptors instead of %d!\n", EM_DEFAULT_TXD, em_txd); adapter->num_tx_desc = EM_DEFAULT_TXD; } else adapter->num_tx_desc = em_txd; - if (((em_rxd * sizeof(struct em_rx_desc)) % EM_DBA_ALIGN) != 0 || - (adapter->hw.mac_type >= em_82544 && em_rxd > EM_MAX_RXD) || - (adapter->hw.mac_type < em_82544 && em_rxd > EM_MAX_RXD_82543) || + if (((em_rxd * sizeof(struct e1000_rx_desc)) % EM_DBA_ALIGN) != 0 || + (adapter->hw.mac.type >= e1000_82544 && em_rxd > EM_MAX_RXD) || + (adapter->hw.mac.type < e1000_82544 && em_rxd > EM_MAX_RXD_82543) || (em_rxd < EM_MIN_RXD)) { device_printf(dev, "Using %d RX descriptors instead of %d!\n", EM_DEFAULT_RXD, em_rxd); @@ -472,45 +543,35 @@ } else adapter->num_rx_desc = em_rxd; - adapter->hw.autoneg = DO_AUTO_NEG; - adapter->hw.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; - adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; - adapter->hw.tbi_compatibility_en = TRUE; - adapter->rx_buffer_len = EM_RXBUFFER_2048; + adapter->hw.mac.autoneg = DO_AUTO_NEG; + adapter->hw.phy.autoneg_wait_to_complete = FALSE; + adapter->hw.phy.autoneg_advertised = AUTONEG_ADV_DEFAULT; + adapter->rx_buffer_len = 2048; + + e1000_init_script_state_82541(&adapter->hw, TRUE); + e1000_set_tbi_compatibility_82543(&adapter->hw, TRUE); - adapter->hw.phy_init_script = 1; - adapter->hw.phy_reset_disable = FALSE; + /* Copper options */ + if (adapter->hw.phy.media_type == e1000_media_type_copper) { + adapter->hw.phy.mdix = AUTO_ALL_MODES; + adapter->hw.phy.disable_polarity_correction = FALSE; + adapter->hw.phy.ms_type = EM_MASTER_SLAVE; + } -#ifndef EM_MASTER_SLAVE - adapter->hw.master_slave = em_ms_hw_default; -#else - adapter->hw.master_slave = EM_MASTER_SLAVE; -#endif /* - * Set the max frame size assuming standard ethernet - * sized frames. + * Set the frame limits assuming + * standard ethernet sized frames. */ - adapter->hw.max_frame_size = - ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; + adapter->max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHERNET_FCS_SIZE; + adapter->min_frame_size = ETH_ZLEN + ETHERNET_FCS_SIZE; - adapter->hw.min_frame_size = - MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; - /* * This controls when hardware reports transmit completion * status. */ - adapter->hw.report_tx_early = 1; - if (em_allocate_pci_resources(adapter)) { - device_printf(dev, "Allocation of PCI resources failed\n"); - error = ENXIO; - goto err_pci; - } - - /* Initialize eeprom parameters */ - em_init_eeprom_params(&adapter->hw); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 9 12:51:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48AD216A41B; Tue, 9 Oct 2007 12:51:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD08816A418 for ; Tue, 9 Oct 2007 12:51:28 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B069B13C48A for ; Tue, 9 Oct 2007 12:51:28 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l99CpSI1091116 for ; Tue, 9 Oct 2007 12:51:28 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l99CpSu4091113 for perforce@freebsd.org; Tue, 9 Oct 2007 12:51:28 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 9 Oct 2007 12:51:28 GMT Message-Id: <200710091251.l99CpSu4091113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2007 12:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=127337 Change 127337 by zec@zec_tpx32 on 2007/10/09 12:50:27 When reassign an ifnet to another vnet, clean up a reference to it in the old vnet's ifindex_table[]. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#39 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#39 (text+ko) ==== @@ -351,6 +351,15 @@ /* if_detach(ifp); */ } ifp->if_bpf = NULL; + /* do/while construct needed to confine scope of INIT_VNET_NET() */ + do { + INIT_VNET_NET(curvnet); + + ifnet_byindex(ifp->if_index) = NULL; + /* XXX: should be locked with if_findindex() */ + while (V_if_index > 0 && ifnet_byindex(V_if_index) == NULL) + V_if_index--; + } while (0); CURVNET_SET_QUIET(new_vnet); INIT_VNET_NET(new_vnet); From owner-p4-projects@FreeBSD.ORG Tue Oct 9 19:56:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19F9816A46B; Tue, 9 Oct 2007 19:56:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5BCF16A421 for ; Tue, 9 Oct 2007 19:56:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B49A913C44B for ; Tue, 9 Oct 2007 19:56:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l99Ju2Er049370 for ; Tue, 9 Oct 2007 19:56:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l99Ju2fW049367 for perforce@freebsd.org; Tue, 9 Oct 2007 19:56:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 9 Oct 2007 19:56:02 GMT Message-Id: <200710091956.l99Ju2fW049367@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 127347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2007 19:56:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=127347 Change 127347 by hselasky@hselasky_laptop001 on 2007/10/09 19:55:18 This commit is the first of two commits where the "USBD_CHECK_STATUS()" macro will be replaced by a switch statement. The change was suggested by Alfred Perlstein. This commit also includes a fix to the "usbd_std_packet_size[]" table, which had one BULK entry too little for Variable USB speed. The entry in question is currently not used. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#17 edit .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#18 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#47 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#34 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#17 (text+ko) ==== @@ -188,9 +188,6 @@ #define USB_MAX_IPACKET 8 /* maximum size of the initial packet */ -#define USB_2_MAX_CTRL_PACKET 64 -#define USB_2_MAX_BULK_PACKET 512 - typedef struct { uByte bLength; uByte bDescriptorType; ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#18 (text+ko) ==== @@ -234,14 +234,6 @@ #define PRINTFN(n,x) #endif -#define USBD_CHECK_STATUS(xfer) do { \ - if (!(xfer)->flags_int.transferring) goto tr_setup; \ - (xfer)->flags_int.transferring = 0; \ - if ((xfer)->error) goto tr_error; \ - goto tr_transferred; \ -} while (0) -/**/ - #define _MAKE_ENUM(enum,value,arg...) \ enum value, \ /**/ ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#47 (text+ko) ==== @@ -70,6 +70,14 @@ MAKE_ENUM(USBD_STATUS, N_USBD_STATUS); +#define USBD_GET_STATE(xfer) ((xfer)->usb_state) + +enum { + USBD_ST_SETUP, + USBD_ST_TRANSFERRED, + USBD_ST_ERROR, +}; + struct usbd_xfer; struct usbd_pipe; struct usbd_bus; @@ -418,6 +426,7 @@ uint8_t usb_smask; uint8_t usb_cmask; uint8_t usb_uframe; + uint8_t usb_state; usbd_status error; ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#34 (text+ko) ==== @@ -249,7 +249,7 @@ [USB_SPEED_LOW] = { }, /* invalid (all zero) */ [USB_SPEED_FULL] = { .fixed = { 8, 16, 32, 64 } }, [USB_SPEED_HIGH] = { .fixed = { 512, 512, 512, 512 } }, - [USB_SPEED_VARIABLE] = { .fixed = { 512, 1024, 1536 } }, + [USB_SPEED_VARIABLE] = { .fixed = { 512, 512, 1024, 1536 } }, }, [UE_ISOCHRONOUS] = { @@ -1504,6 +1504,17 @@ xfer->flags_int.recursed_1 = 1; xfer->flags_int.recursed_2 = 1; + /* set correct USB state for callback */ + if (!xfer->flags_int.transferring) { + xfer->usb_state = USBD_ST_SETUP; + } else { + xfer->flags_int.transferring = 0; + if (xfer->error) + xfer->usb_state = USBD_ST_ERROR; + else + xfer->usb_state = USBD_ST_TRANSFERRED; + } + /* call processing routine */ (xfer->callback)(xfer); From owner-p4-projects@FreeBSD.ORG Tue Oct 9 21:16:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A979C16A468; Tue, 9 Oct 2007 21:16:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3183716A417 for ; Tue, 9 Oct 2007 21:16:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F4B213C45A for ; Tue, 9 Oct 2007 21:16:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l99LGapP065668 for ; Tue, 9 Oct 2007 21:16:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l99LGZo6065665 for perforce@freebsd.org; Tue, 9 Oct 2007 21:16:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 9 Oct 2007 21:16:35 GMT Message-Id: <200710092116.l99LGZo6065665@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 127350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2007 21:16:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=127350 Change 127350 by hselasky@hselasky_laptop001 on 2007/10/09 21:16:21 This commit completes change 127347 . The change has been done using the below attached script. Except for two places, manual intervention was needed. One case was in "ugen.c" where I added a check for "xfer->error == USBD_CANCELLED". The other case was in the function "usbd_clear_stall_callback()" where I need to change the argument to "USBD_GET_STATE()" into "xfer1" instead of "xfer". FYI; Patch size in bytes is 151766. Script size in bytes is 9884 bytes. The gain factor and time saving of using a script for this job was more than 10 : 1 . /* * Copyright (c) 2007 Hans Petter Selasky. All Rights Reserved. * BSD License */ #include #include #include #include #include #include #include #include #include static void * load_file(const char *fname, char **ppEnd) { int f; int err; char *ptr; off_t size; off_t temp; f = open(fname, O_RDONLY); if (f < 0) return NULL; size = lseek(f, 0, SEEK_END); size += 2; ptr = malloc(size); if (ptr == NULL) { error: close(f); return NULL; } size -= 2; temp = lseek(f, 0, SEEK_SET); err = read(f, ptr, size); if (err != size) { goto error; } close(f); if (ppEnd) { *ppEnd = ptr + size; } /* zero terminate */ ptr[size] = 0; ptr[size+1] = 0; /* convert \0 into space */ while (size--) { if (ptr[size] == 0) { ptr[size] = ' '; } } return ptr; } static void print_to(char **pp0, char *end, char echar) { char tchar; tchar = *end; *end = 0; printf("%s", *pp0); if (echar) { printf("%c", echar); } *pp0 = end; *end = tchar; return; } static uint8_t rewind_to(char **ppChar, char *pStart, char cStop) { char *ptr; ptr = *ppChar; while (1) { if (pStart == ptr) { break; } if (*ptr == cStop) { *ppChar = ptr; return 0; /* success */ } ptr --; } return 1; /* failed */ } static uint8_t skipto(char **ppChar, char *pEnd, char cStop) { char *ptr; ptr = *ppChar; while (1) { if (ptr == pEnd) { break; } if (*ptr == 0) { break; } if (*ptr == cStop) { *ppChar = ptr; return 0; /* success */ } ptr ++; } return 1; /* failed */ } static uint8_t have_return_sub(char *from, char *to, const char *what) { char etemp; char *ptr = NULL; char *ret = NULL; char cprev = 0; etemp = *to; *to = 0; while (1) { ptr = strstr(from, what); if (ptr) { ret = ptr; from = ptr + 1; } else { break; } } if (ret) { while (*ret) { if ((cprev != '\n') && (*ret == '}')) { /* restore end character */ *to = etemp; return 0; } cprev = *ret; ret++; } /* restore end character */ *to = etemp; return 1; } /* restore end character */ *to = etemp; return 0; } static uint8_t have_return(char *from, char *to) { return (have_return_sub(from,to," ""return") || have_return_sub(from,to,"\t""return") || have_return_sub(from,to,"\t""goto") || have_return_sub(from,to," ""goto")); } enum { ST_FIRST, ST_SETUP, ST_ERROR, ST_TRANSFERRED, ST_END, }; static const char *fstart = "\n{"; static const char *fend = "\n}"; static const char *ustatus = "USBD_CHECK_STATUS"; #define NEND ((void *)(0-1)) static struct states { char *from; char *to; char *new_label[2]; char have_return; char order; char next_state; char need_label; } st_temp[ST_END]; static void do_st_temp(uint8_t x) { printf("%s", st_temp[x].need_label ? st_temp[x].new_label[0] : st_temp[x].new_label[1]); print_to(&st_temp[x].from, st_temp[x].to, 0); return; } int main(int argc, char **argv) { char *ptr; char *end; char *p0; char *p1; char *p3; char *p4; char *p5; char *new_label[2]; char echar[6]; char *tr_error; char *tr_transferred; char *tr_setup; uint8_t need_tr_error; uint8_t need_tr_transferred; uint8_t need_tr_setup; uint8_t need_label; uint8_t state; uint8_t state_last; uint8_t x; uint8_t y; char order; if (argc < 2) { return EINVAL; } ptr = load_file(argv[1], &end); if (ptr == NULL) { return EINVAL; } while (1) { p0 = strstr(ptr, fstart); if (p0 == NULL) { /* end of file */ break; } p1 = strstr(p0, fend); if (p1 == NULL) { /* end of file */ break; } echar[1] = p1[1]; p1[1] = 0; while (1) { p3 = strstr(p0 + 1, fstart); if (p3 == NULL) { /* no more fstart */ break; } p0 = p3; } p3 = strstr(p0, ustatus); /* find the last USBD_CHECK_STATUS() */ while (p3) { p5 = strstr(p3+1, ustatus); if (p5) { p3 = p5; } else { break; } } tr_error = strstr(p0, "tr_error:"); tr_setup = strstr(p0, "tr_setup:"); tr_transferred = strstr(p0, "tr_transferred:"); if ((p3 != NULL) && (tr_error > p3) && (tr_setup > p3) && (tr_transferred > p3)) { need_tr_error = (strstr(p0, "goto tr_error;") != NULL); need_tr_setup = (strstr(p0, "goto tr_setup;") != NULL); need_tr_transferred = (strstr(p0, "goto tr_transferred;") != NULL); if (rewind_to(&p3, p0, '\n') || rewind_to(&tr_error, p0, '\n') || rewind_to(&tr_setup, p0, '\n') || rewind_to(&tr_transferred, p0, '\n')) { /* do nothing */ } else { p3++; tr_error ++; tr_setup ++; tr_transferred ++; goto level2; } } complete: print_to(&ptr, p1 + 1, echar[1]); ptr = p1 + 2; continue; level2: order = 0; new_label[0] = ""; new_label[1] = ""; need_label = 0; state_last = ST_FIRST; print_to(&ptr, p3, 0); printf(" switch (USBD_GET_STATE(xfer)) {"); if (skipto(&p3, NULL, '\n')) { goto complete; } p3++; ptr = p3; while (1) { /* sort pointers */ if (tr_setup < tr_error) { p4 = tr_setup; state = ST_SETUP; } else { p4 = tr_error; state = ST_ERROR; } if (tr_transferred < p4) { p4 = tr_transferred; state = ST_TRANSFERRED; } if (p4 == NEND) { break; } switch (state) { case ST_SETUP: st_temp[state_last].from = ptr; st_temp[state_last].to = tr_setup; st_temp[state_last].new_label[0] = new_label[0]; st_temp[state_last].new_label[1] = new_label[1]; st_temp[state_last].order = order; st_temp[state_last].next_state = state; st_temp[state_last].need_label = need_label; new_label[0] = " case USBD_ST_SETUP: tr_setup:"; new_label[1] = " case USBD_ST_SETUP: "; need_label = need_tr_setup; if (skipto(&tr_setup, NULL, '\n')) { goto complete; } ptr = tr_setup; tr_setup = NEND; state_last = state; break; case ST_ERROR: st_temp[state_last].from = ptr; st_temp[state_last].to = tr_error; st_temp[state_last].new_label[0] = new_label[0]; st_temp[state_last].new_label[1] = new_label[1]; st_temp[state_last].order = order; st_temp[state_last].next_state = state; st_temp[state_last].need_label = need_label; new_label[0] = " default: tr_error:"; new_label[1] = " default: /* Error */"; need_label = need_tr_error; if (skipto(&tr_error, NULL, '\n')) { goto complete; } ptr = tr_error; tr_error = NEND; state_last = state; break; case ST_TRANSFERRED: st_temp[state_last].from = ptr; st_temp[state_last].to = tr_transferred; st_temp[state_last].new_label[0] = new_label[0]; st_temp[state_last].new_label[1] = new_label[1]; st_temp[state_last].order = order; st_temp[state_last].next_state = state; st_temp[state_last].need_label = need_label; new_label[0] = " case USBD_ST_TRANSFERRED: tr_transferred:"; new_label[1] = " case USBD_ST_TRANSFERRED: "; need_label = need_tr_transferred; if (skipto(&tr_transferred, NULL, '\n')) { goto complete; } ptr = tr_transferred; tr_transferred = NEND; state_last = state; break; } order ++; } p3 = p1 + 1; st_temp[state_last].from = ptr; st_temp[state_last].to = p3; st_temp[state_last].new_label[0] = new_label[0]; st_temp[state_last].new_label[1] = new_label[1]; st_temp[state_last].order = order; st_temp[state_last].next_state = ST_END; st_temp[state_last].need_label = need_label; for (x = 0; x < ST_END; x++) { st_temp[x].have_return = have_return(st_temp[x].from, st_temp[x].to); } /* override */ st_temp[ST_FIRST].have_return = 1; state_last = 0; /* figure out if "default:" is last */ if (st_temp[ST_ERROR].order == (ST_END-1)) { /* change least possible if the order is correct */ for (x = 0; x < ST_END; x++) { for (y = 0; y < ST_END; y++) { if (st_temp[y].order == x) { do_st_temp(y); } } } } else { /* We need to change the order of the code. * Make sure that we don't mess something up ! */ if (!st_temp[ST_ERROR].have_return) { st_temp[st_temp[ST_ERROR].next_state & 0xFF].need_label = 1; } for (x = 0; x < ST_END; x++) { for (y = 0; y < ST_END; y++) { if (st_temp[y].order == x) { if (y == ST_ERROR) { if (!st_temp[state_last].have_return) { printf(" goto tr_error;\n"); st_temp[ST_ERROR].need_label = 1; } } else { do_st_temp(y); } state_last = y; } } } if (!st_temp[state_last].have_return) { printf(" return;\n"); } printf("\n"); do_st_temp(ST_ERROR); state_last = st_temp[ST_ERROR].next_state; if (!st_temp[ST_ERROR].have_return) { printf(" goto %s;\n", (state_last == ST_SETUP) ? "tr_setup" : (state_last == ST_TRANSFERRED) ? "tr_transferred" : "super_invalid_label"); } } printf(" }\n"); ptr = p3; goto complete; } print_to(&ptr, end, 0); return 0; } Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#20 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/README#19 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#26 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#16 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#20 (text) ==== @@ -483,17 +483,12 @@ struct atausb_softc *sc = xfer->priv_sc; usb_device_request_t req; - USBD_CHECK_STATUS(xfer); - - tr_error: - atausb_tr_error(xfer); - return; - - tr_transferred: + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: atausb_transfer_start(sc, ATAUSB_T_BBB_RESET2); return; - tr_setup: + case USBD_ST_SETUP: req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = 0xff; /* bulk-only reset */ USETW(req.wValue, 0); @@ -508,6 +503,12 @@ usbd_start_hardware(xfer); return; + + default: /* Error */ + atausb_tr_error(xfer); + return; + + } } static void @@ -533,21 +534,22 @@ { struct atausb_softc *sc = xfer->priv_sc; - USBD_CHECK_STATUS(xfer); - - tr_error: - atausb_tr_error(xfer); - return; - - tr_transferred: + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: tr_transferred: atausb_transfer_start(sc, next_xfer); return; - tr_setup: + case USBD_ST_SETUP: if (usbd_clear_stall_callback(xfer, sc->xfer[stall_xfer])) { goto tr_transferred; } return; + + default: /* Error */ + atausb_tr_error(xfer); + return; + + } } static void @@ -558,20 +560,15 @@ struct ata_channel *ch; uint32_t tag; - USBD_CHECK_STATUS(xfer); - - tr_error: - atausb_tr_error(xfer); - return; - - tr_transferred: + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: atausb_transfer_start (sc, ((request->flags & ATA_R_READ) ? ATAUSB_T_BBB_DATA_READ : (request->flags & ATA_R_WRITE) ? ATAUSB_T_BBB_DATA_WRITE : ATAUSB_T_BBB_STATUS)); return; - tr_setup: + case USBD_ST_SETUP: sc->status_try = 0; @@ -597,6 +594,12 @@ usbd_start_hardware(xfer); } return; + + default: /* Error */ + atausb_tr_error(xfer); + return; + + } } static void @@ -605,17 +608,8 @@ struct atausb_softc *sc = xfer->priv_sc; uint32_t max_bulk = xfer->max_data_length; - USBD_CHECK_STATUS(xfer); - - tr_error: - if (xfer->error == USBD_CANCELLED) { - atausb_tr_error(xfer); - } else { - atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); - } - return; - - tr_transferred: + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: usbd_copy_out(&(xfer->buf_data), 0, sc->ata_data, xfer->actlen); @@ -629,7 +623,7 @@ sc->ata_bytecount = 0; } - tr_setup: + case USBD_ST_SETUP: if (atausbdebug > 1) { device_printf(sc->dev, "%s: max_bulk=%d, ata_bytecount=%d\n", @@ -650,6 +644,16 @@ usbd_start_hardware(xfer); return; + + default: /* Error */ + if (xfer->error == USBD_CANCELLED) { + atausb_tr_error(xfer); + } else { + atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); + } + return; + + } } static void @@ -666,23 +670,14 @@ struct atausb_softc *sc = xfer->priv_sc; uint32_t max_bulk = xfer->max_data_length; - USBD_CHECK_STATUS(xfer); + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: - tr_error: - if (xfer->error == USBD_CANCELLED) { - atausb_tr_error(xfer); - } else { - atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_WR_CS); - } - return; - - tr_transferred: - sc->ata_bytecount -= xfer->actlen; sc->ata_data += xfer->actlen; sc->ata_donecount += xfer->actlen; - tr_setup: + case USBD_ST_SETUP: if (atausbdebug > 1) { device_printf(sc->dev, "%s: max_bulk=%d, ata_bytecount=%d\n", @@ -706,6 +701,16 @@ usbd_start_hardware(xfer); return; + + default: /* Error */ + if (xfer->error == USBD_CANCELLED) { + atausb_tr_error(xfer); + } else { + atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_WR_CS); + } + return; + + } } static void @@ -723,20 +728,9 @@ struct ata_request *request = sc->ata_request; uint32_t residue; - USBD_CHECK_STATUS(xfer); - - tr_error: - if ((xfer->error == USBD_CANCELLED) || - (sc->status_try)) { - atausb_tr_error(xfer); - } else { - sc->status_try = 1; - atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); - } - return; + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: - tr_transferred: - if (xfer->actlen < sizeof(sc->csw)) { bzero(&(sc->csw), sizeof(sc->csw)); } @@ -815,10 +809,22 @@ mtx_lock(xfer->priv_mtx); return; - tr_setup: + case USBD_ST_SETUP: xfer->frlengths[0] = xfer->max_data_length; usbd_start_hardware(xfer); return; + + default: tr_error: + if ((xfer->error == USBD_CANCELLED) || + (sc->status_try)) { + atausb_tr_error(xfer); + } else { + sc->status_try = 1; + atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); + } + return; + + } } static void ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#19 (text+ko) ==== @@ -1226,14 +1226,8 @@ uint32_t total = (ch->bytes_per_frame * xfer->nframes); uint32_t offset; - USBD_CHECK_STATUS(xfer); - - tr_error: - if (xfer->error == USBD_CANCELLED) { - return; - } - - tr_transferred: + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: tr_transferred: if (xfer->actlen < xfer->sumlen) { DPRINTF(0, "short transfer, " "%d of %d bytes\n", xfer->actlen, total); @@ -1241,7 +1235,7 @@ chn_intr(ch->pcm_ch); - tr_setup: + case USBD_ST_SETUP: if (ch->bytes_per_frame > xfer->max_frame_size) { DPRINTF(0, "bytes per transfer, %d, " "exceeds maximum, %d!\n", @@ -1283,6 +1277,14 @@ usbd_start_hardware(xfer); return; + + default: /* Error */ + if (xfer->error == USBD_CANCELLED) { + return; + } + + goto tr_transferred; + } } static void @@ -1296,14 +1298,8 @@ uint32_t offset0; uint32_t offset1; - USBD_CHECK_STATUS(xfer); - - tr_error: - if (xfer->error == USBD_CANCELLED) { - return; - } - - tr_transferred: + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: tr_transferred: if (xfer->actlen < total) { DPRINTF(0, "short transfer, " "%d of %d bytes\n", xfer->actlen, total); @@ -1341,7 +1337,7 @@ chn_intr(ch->pcm_ch); - tr_setup: + case USBD_ST_SETUP: if (ch->bytes_per_frame > xfer->max_frame_size) { DPRINTF(0, "bytes per transfer, %d, " "exceeds maximum, %d!\n", @@ -1361,6 +1357,14 @@ usbd_start_hardware(xfer); return; + + default: /* Error */ + if (xfer->error == USBD_CANCELLED) { + return; + } + + goto tr_transferred; + } } void * @@ -3054,14 +3058,10 @@ uint8_t chan; uint8_t buf[2]; - USBD_CHECK_STATUS(xfer); + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: tr_transferred: + case USBD_ST_SETUP: tr_setup: - tr_error: - DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); - - tr_transferred: - tr_setup: - if (mc == NULL) { mc = sc->sc_mixer_root; sc->sc_mixer_curr = mc; @@ -3117,6 +3117,12 @@ goto tr_setup; } return; + + default: /* Error */ + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + goto tr_transferred; + } } static usbd_status @@ -3327,21 +3333,9 @@ uint8_t cn; uint16_t pos; - USBD_CHECK_STATUS(xfer); + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: - tr_error: - - DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); - - if (xfer->error != USBD_CANCELLED) { - /* try to clear stall first */ - chan->flags |= UMIDI_FLAG_READ_STALL; - usbd_transfer_start(chan->xfer[3]); - } - return; - - tr_transferred: - DPRINTF(0, "actlen=%d bytes\n", xfer->actlen); if (xfer->actlen == 0) { @@ -3370,7 +3364,7 @@ pos += 4; } - tr_setup: + case USBD_ST_SETUP: DPRINTF(0, "start\n"); if (chan->flags & UMIDI_FLAG_READ_STALL) { @@ -3380,6 +3374,19 @@ xfer->frlengths[0] = xfer->max_data_length; usbd_start_hardware(xfer); return; + + default: tr_error: + + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + chan->flags |= UMIDI_FLAG_READ_STALL; + usbd_transfer_start(chan->xfer[3]); + } + return; + + } } static void @@ -3540,23 +3547,11 @@ uint8_t start_cable; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 9 22:21:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 920D516A419; Tue, 9 Oct 2007 22:21:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BB5B16A417 for ; Tue, 9 Oct 2007 22:21:53 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe09.tele2.se [212.247.155.1]) by mx1.freebsd.org (Postfix) with ESMTP id B903613C43E for ; Tue, 9 Oct 2007 22:21:52 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] Received: from [85.19.218.45] (account mc467741@c2i.net [85.19.218.45] verified) by mailfe09.swip.net (CommuniGate Pro SMTP 5.1.10) with ESMTPA id 475326045 for perforce@freebsd.org; Tue, 09 Oct 2007 23:21:49 +0200 From: Hans Petter Selasky To: Perforce Change Reviews Date: Tue, 9 Oct 2007 23:22:13 +0200 User-Agent: KMail/1.9.7 References: <200710092116.l99LGZo6065665@repoman.freebsd.org> In-Reply-To: <200710092116.l99LGZo6065665@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200710092322.13500.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 127350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Oct 2007 22:21:53 -0000 On Tuesday 09 October 2007, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=127350 > > Change 127350 by hselasky@hselasky_laptop001 on 2007/10/09 21:16:21 > > > This commit completes change 127347 . The change has been done > using the below attached script. Except for two places, manual ^^^^ Correcting myself: Only two places manual intervention was needed. --HPS From owner-p4-projects@FreeBSD.ORG Thu Oct 11 01:13:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36DFF16A46C; Thu, 11 Oct 2007 01:13:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEA6F16A419 for ; Thu, 11 Oct 2007 01:13:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C6E413C45A for ; Thu, 11 Oct 2007 01:13:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9B1DJiU028767 for ; Thu, 11 Oct 2007 01:13:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9B1DJGZ028764 for perforce@freebsd.org; Thu, 11 Oct 2007 01:13:19 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 11 Oct 2007 01:13:19 GMT Message-Id: <200710110113.l9B1DJGZ028764@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 127377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2007 01:13:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=127377 Change 127377 by kmacy@kmacy_home:ethng on 2007/10/11 01:12:48 fix yet another instance of destroying a lock while held Affected files ... .. //depot/projects/ethng/src/sys/kern/vfs_export.c#3 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/vfs_export.c#3 (text+ko) ==== @@ -222,6 +222,7 @@ if ((rnh = nep->ne_rtable[i])) { RADIX_NODE_HEAD_LOCK(rnh); (*rnh->rnh_walktree) (rnh, vfs_free_netcred, rnh); + RADIX_NODE_HEAD_UNLOCK(rnh); RADIX_NODE_HEAD_DESTROY(rnh); free(rnh, M_RTABLE); nep->ne_rtable[i] = NULL; /* not SMP safe XXX */ From owner-p4-projects@FreeBSD.ORG Thu Oct 11 09:49:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A82EE16A468; Thu, 11 Oct 2007 09:49:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 506FF16A420 for ; Thu, 11 Oct 2007 09:49:03 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6332713C4A3 for ; Thu, 11 Oct 2007 09:49:03 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9B9n3uR008956 for ; Thu, 11 Oct 2007 09:49:03 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9B9n3qU008953 for perforce@freebsd.org; Thu, 11 Oct 2007 09:49:03 GMT (envelope-from kevlo@freebsd.org) Date: Thu, 11 Oct 2007 09:49:03 GMT Message-Id: <200710110949.l9B9n3qU008953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 127382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2007 09:49:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=127382 Change 127382 by kevlo@kevlo_rtsl on 2007/10/11 09:48:47 Do a boardflags workaround for Dell boards. Affected files ... .. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#7 edit .. //depot/projects/wifi/sys/dev/bwi/if_bwireg.h#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#7 (text+ko) ==== @@ -873,16 +873,23 @@ bwi_get_card_flags(struct bwi_softc *sc) { #define PCI_VENDOR_APPLE 0x106b +#define PCI_VENDOR_DELL 0x1028 sc->sc_card_flags = bwi_read_sprom(sc, BWI_SPROM_CARD_FLAGS); if (sc->sc_card_flags == 0xffff) sc->sc_card_flags = 0; + if (sc->sc_pci_subvid == PCI_VENDOR_DELL && + sc->sc_bbp_id == BWI_BBPID_BCM4301 && + sc->sc_pci_revid == 0x74) + sc->sc_card_flags |= BWI_CARD_F_BT_COEXIST; + if (sc->sc_pci_subvid == PCI_VENDOR_APPLE && sc->sc_pci_subdid == 0x4e && /* XXX */ sc->sc_pci_revid > 0x40) sc->sc_card_flags |= BWI_CARD_F_PA_GPIO9; DPRINTF(sc, "card flags 0x%04x\n", sc->sc_card_flags); +#undef PCI_VENDOR_DELL #undef PCI_VENDOR_APPLE } ==== //depot/projects/wifi/sys/dev/bwi/if_bwireg.h#2 (text+ko) ==== @@ -391,6 +391,7 @@ /* * SPROM card flags */ +#define BWI_CARD_F_BT_COEXIST __BIT(0) /* Bluetooth coexist */ #define BWI_CARD_F_PA_GPIO9 __BIT(1) /* GPIO 9 controls PA */ #define BWI_CARD_F_SW_NRSSI __BIT(3) #define BWI_CARD_F_NO_SLOWCLK __BIT(5) /* no slow clock */ From owner-p4-projects@FreeBSD.ORG Thu Oct 11 18:22:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 218C416A4DF; Thu, 11 Oct 2007 18:22:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEB4E16A4C4 for ; Thu, 11 Oct 2007 18:22:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2DF113C469 for ; Thu, 11 Oct 2007 18:22:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9BIMbAK085174 for ; Thu, 11 Oct 2007 18:22:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9BIMb08085171 for perforce@freebsd.org; Thu, 11 Oct 2007 18:22:37 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 11 Oct 2007 18:22:37 GMT Message-Id: <200710111822.l9BIMb08085171@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 127388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2007 18:22:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=127388 Change 127388 by kmacy@kmacy_home:ethng on 2007/10/11 18:22:25 put busdma failure under cxgb_debug to prevent spamming the console add more diagnostic printfs to determine why we're seeing a failure Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#29 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#11 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#29 (text+ko) ==== @@ -1315,7 +1315,8 @@ return (err); nsegs = count; } else if ((err = busdma_map_sg_collapse(&m0, segs, &nsegs))) { - printf("failed ... err=%d\n", err); + if (cxgb_debug) + printf("failed ... err=%d\n", err); return (err); } if (m0->m_type == MT_DATA) { ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#11 (text+ko) ==== @@ -217,8 +217,15 @@ n = *m; goto retry; } - if (seg_count == 0 || seg_count >= TX_MAX_SEGS) + if (seg_count == 0) { + if (cxgb_debug) + printf("empty segment chain\n"); + return (EFBIG); + } else if (seg_count >= TX_MAX_SEGS) { + if (cxgb_debug) + printf("mbuf chain too long: %d max allowed %d\n", seg_count, TX_MAX_SEGS); return (EFBIG); + } if (seg_count > MAX_MIOVEC_IOV) { DPRINTF("seg count=%d ", seg_count); From owner-p4-projects@FreeBSD.ORG Thu Oct 11 22:56:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CA8116A420; Thu, 11 Oct 2007 22:56:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C24D116A41A for ; Thu, 11 Oct 2007 22:56:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D64313C465 for ; Thu, 11 Oct 2007 22:56:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9BMupWd029010 for ; Thu, 11 Oct 2007 22:56:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9BMupaQ029007 for perforce@freebsd.org; Thu, 11 Oct 2007 22:56:51 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 11 Oct 2007 22:56:51 GMT Message-Id: <200710112256.l9BMupaQ029007@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 127398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2007 22:56:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=127398 Change 127398 by kmacy@kmacy_home:ethng on 2007/10/11 22:56:01 tighten up panic checks on free always call collapse routine for marshalling info into the tx sw desc try to defrag excessively long mbuf chain move up freeing of mbuf tags to guarantee that they are always freed Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#30 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#9 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#12 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#30 (text+ko) ==== @@ -68,10 +68,7 @@ #include #endif -uint32_t collapse_free = 0; -uint32_t mb_free_vec_free = 0; int txq_fills = 0; -int collapse_mbufs = 0; static int bogus_imm = 0; #ifndef DISABLE_MBUF_IOVEC static int recycle_enable = 1; @@ -1322,14 +1319,15 @@ if (m0->m_type == MT_DATA) { DPRINTF("mbuf type=%d tags:%d head=%p", m0->m_type, !SLIST_EMPTY(&m0->m_pkthdr.tags), SLIST_FIRST(&m0->m_pkthdr.tags)); - mi_collapse_mbuf(&txsd->mi, m0); } else { mv = mtomv(m0); txsd->mi.mi_flags = m0->m_flags; + txsd->mi.mi_data = NULL; txsd->mi.mi_base = (caddr_t)m0; txsd->mi.mi_type = m0->m_type; txsd->mi.mi_len = m0->m_pkthdr.len; } + mi_collapse_mbuf(&txsd->mi, m0); mi = &txsd->mi; if (count > 1) { ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#9 (text+ko) ==== @@ -158,7 +158,7 @@ return _m_collapse(m, maxbufs, mnew); } -void mb_free_ext_fast(struct mbuf_iovec *mi, int type); +void mb_free_ext_fast(struct mbuf_iovec *mi, int type, int idx); static __inline void m_free_iovec(struct mbuf *m, int type) @@ -171,7 +171,7 @@ mi = mv->mv_vec; for (i = 0; i < mv->mv_count; i++, mi++) { DPRINTF("freeing buf=%d of %d\n", i, mv->mv_count); - mb_free_ext_fast(mi, mi->mi_type); + mb_free_ext_fast(mi, mi->mi_type, i); } switch (type) { case EXT_IOVEC: @@ -194,11 +194,17 @@ case EXT_IOVEC: case EXT_CLIOVEC: m = (struct mbuf *)mi->mi_base; - DPRINTF("freeing iovec, type=%d\n", mi->mi_type); m_free_iovec(m, mi->mi_type); break; + case EXT_MBUF: + case EXT_CLUSTER: + case EXT_JUMBOP: + case EXT_JUMBO9: + case EXT_JUMBO16: + mb_free_ext_fast(mi, mi->mi_type, -1); + break; default: - mb_free_ext_fast(mi, mi->mi_type); + panic("unknown miov type: %d\n", mi->mi_type); break; } } ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#12 (text+ko) ==== @@ -122,8 +122,6 @@ struct mbuf *n = m->m_next; prefetch(n); - if (m->m_flags & M_PKTHDR && !SLIST_EMPTY(&m->m_pkthdr.tags)) - m_tag_delete_chain(m, NULL); mi->mi_flags = m->m_flags; mi->mi_len = m->m_len; @@ -132,10 +130,19 @@ mi->mi_tso_segsz = m->m_pkthdr.tso_segsz; mi->mi_rss_hash = m->m_pkthdr.rss_hash; } - if (m->m_flags & M_EXT) { + if (m->m_type != MT_DATA) { + mi->mi_data = NULL; + mi->mi_base = (caddr_t)m; + mi->mi_size = (m->m_type == EXT_CLIOVEC) ? MCLBYTES : MIOVBYTES; + mi->mi_type = m->m_type; + mi->mi_len = m->m_pkthdr.len; + } else if (m->m_flags & M_EXT) { memcpy(&mi->mi_ext, &m->m_ext, sizeof(struct m_ext_)); mi->mi_data = m->m_data; + mi->mi_base = m->m_ext.ext_buf; mi->mi_type = m->m_ext.ext_type; + mi->mi_size = m->m_ext.ext_size; + mi->mi_refcnt = m->m_ext.ref_cnt; } else { mi->mi_base = (caddr_t)m; mi->mi_data = m->m_data; @@ -158,10 +165,14 @@ struct mbuf *m0, *n = *m; struct mbuf_iovec *mi; struct mbuf *marray[TX_MAX_SEGS]; - int i, type, seg_count = 0; + int i, type, seg_count, defragged = 0; struct mbuf_vec *mv; -retry: + if (n->m_flags & M_PKTHDR && !SLIST_EMPTY(&n->m_pkthdr.tags)) + m_tag_delete_chain(n, NULL); + +retry: + seg_count = 0; if (n->m_next == NULL) { busdma_map_mbuf_fast(n, segs); *nsegs = 1; @@ -174,9 +185,6 @@ if ((m0 = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) return (ENOMEM); - - if (!SLIST_EMPTY(&n->m_pkthdr.tags)) - m_tag_delete_chain(n, NULL); data = m0->m_data; SLIST_INIT(&n->m_pkthdr.tags); @@ -185,6 +193,7 @@ m0->m_len = n->m_pkthdr.len; m0->m_flags &= ~M_EXT; m0->m_next = NULL; + m0->m_type = n->m_type; n->m_flags &= ~M_PKTHDR; while (n) { memcpy(data, n->m_data, n->m_len); @@ -215,6 +224,7 @@ } if (__predict_false(seg_count == 1)) { n = *m; + /* XXX */ goto retry; } if (seg_count == 0) { @@ -224,6 +234,17 @@ } else if (seg_count >= TX_MAX_SEGS) { if (cxgb_debug) printf("mbuf chain too long: %d max allowed %d\n", seg_count, TX_MAX_SEGS); + if (!defragged) { + n = m_defrag(*m, M_DONTWAIT); + if (n == NULL) { + m_freem(*m); + *m = NULL; + return (ENOBUFS); + } + *m = n; + defragged = 1; + goto retry; + } return (EFBIG); } @@ -285,6 +306,8 @@ mv->mv_count = count; mv->mv_first = 0; for (mp = m, i = 0, mi = mv->mv_vec; i < count; mp++, segs++, mi++, i++) { + if ((*mp)->m_flags & M_PKTHDR && !SLIST_EMPTY(&(*mp)->m_pkthdr.tags)) + m_tag_delete_chain(*mp, NULL); busdma_map_mbuf_fast(*mp, segs); _mcl_collapse_mbuf(mi, *mp); } @@ -302,7 +325,7 @@ } void -mb_free_ext_fast(struct mbuf_iovec *mi, int type) +mb_free_ext_fast(struct mbuf_iovec *mi, int type, int idx) { u_int cnt; int dofree; @@ -360,7 +383,7 @@ break; default: dump_mi(mi); - panic("unknown mv type in m_free_vec type=%d", type); + panic("unknown mv type in m_free_vec type=%d idx=d", type, idx); break; } } From owner-p4-projects@FreeBSD.ORG Thu Oct 11 22:58:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C8B716A469; Thu, 11 Oct 2007 22:58:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29EF616A417 for ; Thu, 11 Oct 2007 22:58:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E12E713C46E for ; Thu, 11 Oct 2007 22:58:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9BMwrhJ029084 for ; Thu, 11 Oct 2007 22:58:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9BMwrkS029081 for perforce@freebsd.org; Thu, 11 Oct 2007 22:58:53 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 11 Oct 2007 22:58:53 GMT Message-Id: <200710112258.l9BMwrkS029081@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 127399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Oct 2007 22:58:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=127399 Change 127399 by kmacy@kmacy_home:ethng on 2007/10/11 22:58:18 add % in front of d in panic format string :-/ Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#13 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#13 (text+ko) ==== @@ -383,7 +383,7 @@ break; default: dump_mi(mi); - panic("unknown mv type in m_free_vec type=%d idx=d", type, idx); + panic("unknown mv type in m_free_vec type=%d idx=%d", type, idx); break; } } From owner-p4-projects@FreeBSD.ORG Fri Oct 12 00:20:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E580E16A420; Fri, 12 Oct 2007 00:20:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D99416A417 for ; Fri, 12 Oct 2007 00:20:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 560E013C46E for ; Fri, 12 Oct 2007 00:20:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9C0KO7N035753 for ; Fri, 12 Oct 2007 00:20:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9C0KOXl035750 for perforce@freebsd.org; Fri, 12 Oct 2007 00:20:24 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 00:20:24 GMT Message-Id: <200710120020.l9C0KOXl035750@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 127400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 00:20:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=127400 Change 127400 by kmacy@kmacy_home:ethng on 2007/10/12 00:19:56 - word align mbuf iovec - move error handling to end of sg collapse routine - allocate a page if there are too many segments to be tracked by a cluster (fixes insta-panics) - when freeing a cluster handle non-standard types Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#10 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#14 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#10 (text+ko) ==== @@ -61,6 +61,7 @@ uint16_t mi_rss_hash; /* this can be shrunk down if something comes * along that needs 1 byte */ + uint16_t mi_pad; #define mi_size mi_ext.ext_size #define mi_base mi_ext.ext_buf #define mi_args mi_ext.ext_args @@ -166,7 +167,7 @@ int i; struct mbuf_vec *mv; struct mbuf_iovec *mi; - + mv = mtomv(m); mi = mv->mv_vec; for (i = 0; i < mv->mv_count; i++, mi++) { @@ -180,6 +181,9 @@ case EXT_CLIOVEC: cxgb_cache_put(zone_clust, m); break; + case EXT_JMPIOVEC: + cxgb_cache_put(zone_jumbop, m); + break; default: panic("unexpected type %d\n", type); } @@ -193,6 +197,7 @@ switch (mi->mi_type) { case EXT_IOVEC: case EXT_CLIOVEC: + case EXT_JMPIOVEC: m = (struct mbuf *)mi->mi_base; m_free_iovec(m, mi->mi_type); break; @@ -201,6 +206,11 @@ case EXT_JUMBOP: case EXT_JUMBO9: case EXT_JUMBO16: + case EXT_SFBUF: + case EXT_NET_DRV: + case EXT_MOD_TYPE: + case EXT_DISPOSABLE: + case EXT_EXTREF: mb_free_ext_fast(mi, mi->mi_type, -1); break; default: ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#14 (text+ko) ==== @@ -125,6 +125,8 @@ mi->mi_flags = m->m_flags; mi->mi_len = m->m_len; + + if (m->m_flags & M_PKTHDR) { mi->mi_ether_vtag = m->m_pkthdr.ether_vtag; mi->mi_tso_segsz = m->m_pkthdr.tso_segsz; @@ -133,9 +135,13 @@ if (m->m_type != MT_DATA) { mi->mi_data = NULL; mi->mi_base = (caddr_t)m; + /* + * XXX JMPIOVEC + */ mi->mi_size = (m->m_type == EXT_CLIOVEC) ? MCLBYTES : MIOVBYTES; mi->mi_type = m->m_type; mi->mi_len = m->m_pkthdr.len; + mi->mi_refcnt = NULL; } else if (m->m_flags & M_EXT) { memcpy(&mi->mi_ext, &m->m_ext, sizeof(struct m_ext_)); mi->mi_data = m->m_data; @@ -150,6 +156,9 @@ mi->mi_type = EXT_MBUF; mi->mi_refcnt = NULL; } + KASSERT(mi->mi_len != 0, ("miov has len 0")); + KASSERT(mi->mi_type > 0, ("mi_type is invalid")); + return (n); } @@ -165,7 +174,7 @@ struct mbuf *m0, *n = *m; struct mbuf_iovec *mi; struct mbuf *marray[TX_MAX_SEGS]; - int i, type, seg_count, defragged = 0; + int i, type, seg_count, defragged = 0, err = 0; struct mbuf_vec *mv; if (n->m_flags & M_PKTHDR && !SLIST_EMPTY(&n->m_pkthdr.tags)) @@ -187,7 +196,6 @@ return (ENOMEM); data = m0->m_data; - SLIST_INIT(&n->m_pkthdr.tags); memcpy(m0, n, sizeof(struct m_hdr) + sizeof(struct pkthdr)); m0->m_data = data; m0->m_len = n->m_pkthdr.len; @@ -230,32 +238,42 @@ if (seg_count == 0) { if (cxgb_debug) printf("empty segment chain\n"); - return (EFBIG); + err = EFBIG; + goto err_out; } else if (seg_count >= TX_MAX_SEGS) { if (cxgb_debug) printf("mbuf chain too long: %d max allowed %d\n", seg_count, TX_MAX_SEGS); if (!defragged) { n = m_defrag(*m, M_DONTWAIT); if (n == NULL) { - m_freem(*m); - *m = NULL; - return (ENOBUFS); + err = ENOBUFS; + goto err_out; } *m = n; defragged = 1; goto retry; } - return (EFBIG); + err = EFBIG; + goto err_out; } - - if (seg_count > MAX_MIOVEC_IOV) { + if (seg_count > MAX_CL_IOV) { + if ((m0 = uma_zalloc_arg(zone_jumbop, NULL, M_NOWAIT)) == NULL) { + err = ENOMEM; + goto err_out; + } + type = EXT_JMPIOVEC; + } else if (seg_count > MAX_MIOVEC_IOV) { DPRINTF("seg count=%d ", seg_count); - if ((m0 = uma_zalloc_arg(zone_clust, NULL, M_NOWAIT)) == NULL) - return (ENOMEM); + if ((m0 = uma_zalloc_arg(zone_clust, NULL, M_NOWAIT)) == NULL) { + err = ENOMEM; + goto err_out; + } type = EXT_CLIOVEC; } else { - if ((m0 = uma_zalloc_arg(zone_miovec, NULL, M_NOWAIT)) == NULL) - return (ENOMEM); + if ((m0 = uma_zalloc_arg(zone_miovec, NULL, M_NOWAIT)) == NULL) { + err = ENOMEM; + goto err_out; + } type = EXT_IOVEC; } @@ -281,6 +299,10 @@ *m = m0; DPRINTF("pktlen=%d m0=%p *m=%p m=%p\n", m0->m_pkthdr.len, m0, *m, m); return (0); +err_out: + m_freem(*m); + *m = NULL; + return (err); } int From owner-p4-projects@FreeBSD.ORG Fri Oct 12 00:33:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 267F816A46C; Fri, 12 Oct 2007 00:33:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF3DB16A41B for ; Fri, 12 Oct 2007 00:33:41 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A397013C461 for ; Fri, 12 Oct 2007 00:33:41 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9C0XfXZ036676 for ; Fri, 12 Oct 2007 00:33:41 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9C0XfIt036673 for perforce@freebsd.org; Fri, 12 Oct 2007 00:33:41 GMT (envelope-from ivoras@FreeBSD.org) Date: Fri, 12 Oct 2007 00:33:41 GMT Message-Id: <200710120033.l9C0XfIt036673@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 127401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 00:33:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=127401 Change 127401 by ivoras@ivoras_finstall on 2007/10/12 00:32:46 Add the copyright notice that is referenced a few lines below. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/LICENSE.txt#3 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/LICENSE.txt#3 (text+ko) ==== @@ -1,3 +1,5 @@ +Copyright (c) 2007. Ivan Voras + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -17,4 +19,3 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - From owner-p4-projects@FreeBSD.ORG Fri Oct 12 03:07:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6473C16A46B; Fri, 12 Oct 2007 03:07:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBFB516A417 for ; Fri, 12 Oct 2007 03:07:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5EF613C461 for ; Fri, 12 Oct 2007 03:07:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9C37drV056984 for ; Fri, 12 Oct 2007 03:07:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9C37dOv056981 for perforce@freebsd.org; Fri, 12 Oct 2007 03:07:39 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 03:07:39 GMT Message-Id: <200710120307.l9C37dOv056981@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 127403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 03:07:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=127403 Change 127403 by kmacy@kmacy_home:ethng on 2007/10/12 03:06:45 fix handling of case where packet header mbuf contained zero bytes of data - don't modify initial mbuf chain while iterating through it - when collapsing mbufs do it from the array and not the chain - when freeing mbufs do it from the chain and not the array skip special handling of mbuf chain with only buffer but multiple mbufs probably not common enough to special case and the way it was being handled could leak memory Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#15 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#15 (text+ko) ==== @@ -125,7 +125,6 @@ mi->mi_flags = m->m_flags; mi->mi_len = m->m_len; - if (m->m_flags & M_PKTHDR) { mi->mi_ether_vtag = m->m_pkthdr.ether_vtag; @@ -141,6 +140,7 @@ mi->mi_size = (m->m_type == EXT_CLIOVEC) ? MCLBYTES : MIOVBYTES; mi->mi_type = m->m_type; mi->mi_len = m->m_pkthdr.len; + KASSERT(mi->mi_len, ("empty packet")); mi->mi_refcnt = NULL; } else if (m->m_flags & M_EXT) { memcpy(&mi->mi_ext, &m->m_ext, sizeof(struct m_ext_)); @@ -171,11 +171,12 @@ int busdma_map_sg_collapse(struct mbuf **m, bus_dma_segment_t *segs, int *nsegs) { - struct mbuf *m0, *n = *m; + struct mbuf *m0, *n = *m, *mhead; struct mbuf_iovec *mi; struct mbuf *marray[TX_MAX_SEGS]; int i, type, seg_count, defragged = 0, err = 0; struct mbuf_vec *mv; + uma_zone_t zone; if (n->m_flags & M_PKTHDR && !SLIST_EMPTY(&n->m_pkthdr.tags)) m_tag_delete_chain(n, NULL); @@ -221,20 +222,23 @@ /* * firmware doesn't like empty segments */ - if (__predict_false(n->m_len == 0)) { - n = m_free(n); - if (seg_count) - marray[seg_count - 1]->m_next = n; - continue; - } - seg_count++; + if (__predict_true(n->m_len != 0)) + seg_count++; + n = n->m_next; } +#if 0 + /* + * XXX needs more careful consideration + */ if (__predict_false(seg_count == 1)) { - n = *m; + n = marray[0]; + if (n != *m) + /* XXX */ goto retry; } +#endif if (seg_count == 0) { if (cxgb_debug) printf("empty segment chain\n"); @@ -257,43 +261,41 @@ goto err_out; } if (seg_count > MAX_CL_IOV) { - if ((m0 = uma_zalloc_arg(zone_jumbop, NULL, M_NOWAIT)) == NULL) { - err = ENOMEM; - goto err_out; - } + zone = zone_jumbop; type = EXT_JMPIOVEC; } else if (seg_count > MAX_MIOVEC_IOV) { - DPRINTF("seg count=%d ", seg_count); - if ((m0 = uma_zalloc_arg(zone_clust, NULL, M_NOWAIT)) == NULL) { - err = ENOMEM; - goto err_out; - } + zone = zone_clust; type = EXT_CLIOVEC; } else { - if ((m0 = uma_zalloc_arg(zone_miovec, NULL, M_NOWAIT)) == NULL) { - err = ENOMEM; - goto err_out; - } type = EXT_IOVEC; + zone = zone_miovec; } + if ((m0 = uma_zalloc_arg(zone, NULL, M_NOWAIT)) == NULL) { + err = ENOMEM; + goto err_out; + } - n = marray[0]; - memcpy(m0, n, sizeof(struct m_hdr) + sizeof(struct pkthdr)); + memcpy(m0, *m, sizeof(struct m_hdr) + sizeof(struct pkthdr)); m0->m_type = type; mv = mtomv(m0); mv->mv_count = seg_count; mv->mv_first = 0; - - for (mi = mv->mv_vec; n; mi++, segs++) { + for (i = 0, mi = mv->mv_vec; i < seg_count; mi++, segs++, i++) { + n = marray[i]; busdma_map_mbuf_fast(n, segs); - n = _mcl_collapse_mbuf(mi, n); + _mcl_collapse_mbuf(mi, n); } - for (i = 0; i < seg_count; i++) { - marray[i]->m_next = marray[i]->m_nextpkt = NULL; - if ((marray[i]->m_flags & (M_EXT|M_NOFREE)) == M_EXT) { - marray[i]->m_flags &= ~M_EXT; - m_free(marray[i]); + n = *m; + while (n) { + if (((n->m_flags & (M_EXT|M_NOFREE)) == M_EXT) && (n->m_len > 0)) + n->m_flags &= ~M_EXT; + else if (n->m_len > 0) { + n = n->m_next; + continue; } + mhead = n->m_next; + m_free(n); + n = mhead; } *nsegs = seg_count; *m = m0; From owner-p4-projects@FreeBSD.ORG Fri Oct 12 04:01:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF7C716A420; Fri, 12 Oct 2007 04:01:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 617F016A41A for ; Fri, 12 Oct 2007 04:01:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 366A713C469 for ; Fri, 12 Oct 2007 04:01:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9C41jl4060275 for ; Fri, 12 Oct 2007 04:01:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9C41jjo060272 for perforce@freebsd.org; Fri, 12 Oct 2007 04:01:45 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 04:01:45 GMT Message-Id: <200710120401.l9C41jjo060272@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 127408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 04:01:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=127408 Change 127408 by kmacy@kmacy_home:ethng on 2007/10/12 04:00:59 initialize pkthdr len in packet batching case as well with value of first packet Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#16 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#16 (text+ko) ==== @@ -171,13 +171,15 @@ int busdma_map_sg_collapse(struct mbuf **m, bus_dma_segment_t *segs, int *nsegs) { - struct mbuf *m0, *n = *m, *mhead; + struct mbuf *m0, *mhead, *n = *m; struct mbuf_iovec *mi; struct mbuf *marray[TX_MAX_SEGS]; int i, type, seg_count, defragged = 0, err = 0; struct mbuf_vec *mv; uma_zone_t zone; + KASSERT(n->m_pkthdr.len, ("packet has zero header len")); + if (n->m_flags & M_PKTHDR && !SLIST_EMPTY(&n->m_pkthdr.tags)) m_tag_delete_chain(n, NULL); @@ -277,6 +279,7 @@ memcpy(m0, *m, sizeof(struct m_hdr) + sizeof(struct pkthdr)); m0->m_type = type; + KASSERT(m0->m_pkthdr.len, ("empty packet being marshalled")); mv = mtomv(m0); mv->mv_count = seg_count; mv->mv_first = 0; @@ -326,6 +329,7 @@ } m0->m_flags = 0; + m0->m_pkthdr.len = m0->m_len = (*m)->m_len; /* not the real length but needs to be non-zero */ mv = mtomv(m0); mv->mv_count = count; mv->mv_first = 0; @@ -334,6 +338,7 @@ m_tag_delete_chain(*mp, NULL); busdma_map_mbuf_fast(*mp, segs); _mcl_collapse_mbuf(mi, *mp); + KASSERT(mi->mi_len, ("empty packet")); } for (mp = m, i = 0; i < count; i++, mp++) { From owner-p4-projects@FreeBSD.ORG Fri Oct 12 08:20:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD1EB16A469; Fri, 12 Oct 2007 08:20:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AB8B16A417 for ; Fri, 12 Oct 2007 08:20:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 371B313C459 for ; Fri, 12 Oct 2007 08:20:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9C8KYgL097909 for ; Fri, 12 Oct 2007 08:20:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9C8KY7q097906 for perforce@freebsd.org; Fri, 12 Oct 2007 08:20:34 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 08:20:34 GMT Message-Id: <200710120820.l9C8KY7q097906@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 127416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 08:20:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=127416 Change 127416 by kmacy@kmacy_home:ethng on 2007/10/12 08:20:28 only check for empty tags list on packet header define page size iovec Affected files ... .. //depot/projects/ethng/src/sys/sys/mbuf.h#10 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/mbuf.h#10 (text+ko) ==== @@ -252,6 +252,7 @@ #define EXT_MBUF 7 /* external mbuf reference (M_IOVEC) */ #define EXT_IOVEC 8 #define EXT_CLIOVEC 9 +#define EXT_JMPIOVEC 10 #define EXT_NET_DRV 100 /* custom ext_buf provided by net driver(s) */ #define EXT_MOD_TYPE 200 /* custom module's ext_buf type */ #define EXT_DISPOSABLE 300 /* can throw this buffer away w/page flipping */ @@ -541,8 +542,10 @@ static __inline void m_free_fast(struct mbuf *m) { - KASSERT(SLIST_EMPTY(&m->m_pkthdr.tags), ("doing fast free of mbuf with tags")); - +#ifdef INVARIANTS + if (m->m_flags & M_PKTHDR) + KASSERT(SLIST_EMPTY(&m->m_pkthdr.tags), ("doing fast free of mbuf with tags")); +#endif uma_zfree_arg(zone_mbuf, m, (void *)MB_NOTAGS); } From owner-p4-projects@FreeBSD.ORG Fri Oct 12 11:55:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE25B16A46E; Fri, 12 Oct 2007 11:55:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BDD716A46C for ; Fri, 12 Oct 2007 11:55:34 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D1B813C447 for ; Fri, 12 Oct 2007 11:55:34 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CBtYwh023692 for ; Fri, 12 Oct 2007 11:55:34 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CBtY79023689 for perforce@freebsd.org; Fri, 12 Oct 2007 11:55:34 GMT (envelope-from zec@FreeBSD.org) Date: Fri, 12 Oct 2007 11:55:34 GMT Message-Id: <200710121155.l9CBtY79023689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 11:55:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=127424 Change 127424 by zec@zec_tpx32 on 2007/10/12 11:55:17 Allow for a process in parent vprocg waiting for a child proc executing in a child vprocg context to be woken up when the child proc exits. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_exit.c#8 edit .. //depot/projects/vimage/src/sys/kern/kern_prot.c#5 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#40 edit .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#13 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#41 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#8 (text+ko) ==== @@ -176,13 +176,8 @@ ("exit1: proc %p exiting with %d threads", p, p->p_numthreads)); #ifdef VIMAGE - /* - * Switch back to vprocg of our parent so we can deliver - * signals, otherwise we won't die - why?!? XXX - * - * XXX is PROC_UNLOCK()/PROC_LOCK() sequence safe here? - */ - if (p->p_pptr && p->p_ucred->cr_vimage->v_procg != + /* XXX is PROC_UNLOCK()/PROC_LOCK() sequence safe here? */ + if (p->p_ucred->cr_vimage->v_procg != p->p_pptr->p_ucred->cr_vimage->v_procg) { struct ucred *oldcred; @@ -190,12 +185,12 @@ crhold(p->p_pptr->p_ucred); oldcred = p->p_ucred; p->p_ucred = p->p_pptr->p_ucred; + PROC_UNLOCK(p); + sx_xlock(&allproc_lock); #ifdef SCHED_4BSD sched_load_reassign(oldcred->cr_vimage->v_procg, p->p_ucred->cr_vimage->v_procg); #endif - PROC_UNLOCK(p); - sx_xlock(&allproc_lock); oldcred->cr_vimage->v_procg->nprocs--; p->p_ucred->cr_vimage->v_procg->nprocs++; sx_xunlock(&allproc_lock); ==== //depot/projects/vimage/src/sys/kern/kern_prot.c#5 (text+ko) ==== @@ -46,6 +46,7 @@ #include "opt_compat.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include @@ -67,6 +68,7 @@ #include #include #include +#include #include #include @@ -1720,6 +1722,9 @@ KASSERT(td == curthread, ("%s: td not curthread", __func__)); PROC_LOCK_ASSERT(p, MA_OWNED); +#ifdef VIMAGE + if (!vi_child_of(td->td_ucred->cr_vimage, p->p_ucred->cr_vimage)) +#endif if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); #ifdef MAC ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#40 (text+ko) ==== @@ -67,7 +67,6 @@ static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); static int vnet_mod_destructor(struct vnet_modlink *); -static int vi_child_of(struct vimage *, struct vimage *); #ifdef VI_PREALLOC_SIZE /* @@ -517,7 +516,7 @@ /* * XXX priv_check()? * XXX refcounting ucred -> vimage ? - * XXX change ucred for proc or thread, or both? + * XXX allow only a single td per proc here? */ newcred = crget(); PROC_LOCK(p); ==== //depot/projects/vimage/src/sys/kern/sched_4bsd.c#13 (text+ko) ==== @@ -239,7 +239,7 @@ INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); V_sched_tdcnt++; - CTR1(KTR_SCHED, "global load: %d", sched_tdcnt); + CTR1(KTR_SCHED, "global load: %d", V_sched_tdcnt); } static __inline void @@ -248,7 +248,7 @@ INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); V_sched_tdcnt--; - CTR1(KTR_SCHED, "global load: %d", sched_tdcnt); + CTR1(KTR_SCHED, "global load: %d", V_sched_tdcnt); } #ifdef VIMAGE @@ -1361,19 +1361,15 @@ thread_unlock(td); } +int #ifdef VIMAGE -int sched_load(struct vprocg *vprocg) -{ - return (V_sched_tdcnt); -} #else -int sched_load(void) +#endif { - return (sched_tdcnt); + return (V_sched_tdcnt); } -#endif int sched_sizeof_proc(void) ==== //depot/projects/vimage/src/sys/sys/vimage.h#41 (text+ko) ==== @@ -318,6 +318,7 @@ int vi_symlookup(struct kld_sym_lookup *, char *); struct vimage *vnet2vimage(struct vnet *); char *vnet_name(struct vnet *); +int vi_child_of(struct vimage *, struct vimage *); LIST_HEAD(vimage_list_head, vimage); extern struct vimage_list_head vimage_head; From owner-p4-projects@FreeBSD.ORG Fri Oct 12 13:30:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66DC416A421; Fri, 12 Oct 2007 13:30:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0F1916A418 for ; Fri, 12 Oct 2007 13:30:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D294D13C458 for ; Fri, 12 Oct 2007 13:30:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CDUH0R040660 for ; Fri, 12 Oct 2007 13:30:17 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CDUHvB040657 for perforce@freebsd.org; Fri, 12 Oct 2007 13:30:17 GMT (envelope-from csjp@freebsd.org) Date: Fri, 12 Oct 2007 13:30:17 GMT Message-Id: <200710121330.l9CDUHvB040657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 127427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 13:30:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=127427 Change 127427 by csjp@push on 2007/10/12 13:29:57 - Change the wakeup logic associated with having multiple sleepers on multiple different audit pipes. The old method used cv_signal() which would result in only one thread being woken up after we appended a record to it's queue. This resulted in un-timely wakeups when processing audit records. - Assign PSOCK priority to threads that have been sleeping on a read(2). This is the same priority threads are woken up with when they select(2) or poll(2). This ensures fairness between various forms of sleep on the audit pipes. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#33 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#33 (text+ko) ==== @@ -466,7 +466,7 @@ } audit_pipe_records++; mtx_unlock(&audit_pipe_mtx); - cv_signal(&audit_pipe_cv); + cv_broadcastpri(&audit_pipe_cv, PSOCK); } /* @@ -493,7 +493,7 @@ audit_pipe_append(ap, record, record_len); audit_pipe_records++; mtx_unlock(&audit_pipe_mtx); - cv_signal(&audit_pipe_cv); + cv_broadcastpri(&audit_pipe_cv, PSOCK); } From owner-p4-projects@FreeBSD.ORG Fri Oct 12 13:38:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C5B216A41A; Fri, 12 Oct 2007 13:38:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFD9616A420 for ; Fri, 12 Oct 2007 13:38:45 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 919E213C467 for ; Fri, 12 Oct 2007 13:38:45 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CDcjdf041167 for ; Fri, 12 Oct 2007 13:38:45 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CDcj4s041164 for perforce@freebsd.org; Fri, 12 Oct 2007 13:38:45 GMT (envelope-from csjp@freebsd.org) Date: Fri, 12 Oct 2007 13:38:45 GMT Message-Id: <200710121338.l9CDcj4s041164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 127430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 13:38:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=127430 Change 127430 by csjp@push on 2007/10/12 13:38:17 getauevnonam() returns a pointer to statically defined stack allocated storage. Calling free() on this pointer result in a memory fault crashing auditreduce. This change fixes -m when the user specifies an event name. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#20 $ */ /* @@ -722,7 +722,6 @@ if (n == NULL) usage("Incorrect event name"); p_evtype = *n; - free(n); } SETOPT(opttochk, OPT_m); break; From owner-p4-projects@FreeBSD.ORG Fri Oct 12 13:40:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7290C16A473; Fri, 12 Oct 2007 13:40:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B41F16A419 for ; Fri, 12 Oct 2007 13:40:48 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D39213C481 for ; Fri, 12 Oct 2007 13:40:48 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CDemBv041304 for ; Fri, 12 Oct 2007 13:40:48 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CDelNr041301 for perforce@freebsd.org; Fri, 12 Oct 2007 13:40:47 GMT (envelope-from csjp@freebsd.org) Date: Fri, 12 Oct 2007 13:40:47 GMT Message-Id: <200710121340.l9CDelNr041301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 127431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 13:40:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=127431 Change 127431 by csjp@push on 2007/10/12 13:40:46 Update HISTORY for the latest auditreduce(8) bug fix. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#56 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#56 (text+ko) ==== @@ -1,3 +1,6 @@ +- Fix bug in auditreduce(8) which resulted in a memory fault/crash when + the user specified an event name with -m. + OpenBSM 1.0 alpha 15 - Fix bug when processing in_addr_ex tokens. @@ -295,4 +298,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#55 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#56 $ From owner-p4-projects@FreeBSD.ORG Fri Oct 12 14:22:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C66616A41A; Fri, 12 Oct 2007 14:22:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B78AF16A419 for ; Fri, 12 Oct 2007 14:22:08 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B4BB13C461 for ; Fri, 12 Oct 2007 14:22:08 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CEM8aD044792 for ; Fri, 12 Oct 2007 14:22:08 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CELglk044743 for perforce@freebsd.org; Fri, 12 Oct 2007 14:21:42 GMT (envelope-from csjp@freebsd.org) Date: Fri, 12 Oct 2007 14:21:42 GMT Message-Id: <200710121421.l9CELglk044743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 127433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 14:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=127433 Change 127433 by csjp@push on 2007/10/12 14:21:41 Integrate the BPF zerocopy branch Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/smp.h#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npe.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/zcopybpf/src/sys/boot/common/module.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#10 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#11 integrate .. //depot/projects/zcopybpf/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#9 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/awi/awi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/zcopybpf/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/my/if_my.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zyd.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zydfw.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zydreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_event.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/zcopybpf/src/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/zcopybpf/src/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/zcopybpf/src/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/zcopybpf/src/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/zcopybpf/src/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/geode.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/support.s#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/asm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/smp.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/vmparam.h#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/isa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/uma_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_main.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kse.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_switch.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/modules/Makefile#9 integrate .. //depot/projects/zcopybpf/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/Makefile#5 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/ixgbe/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/zyd/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/net/bpf.c#23 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net/if_media.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_stf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/rtsock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/_ieee80211.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/igmp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_proto.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_id.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp.h#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_asconf.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_header.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_os.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_var.h#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.h#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timer.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_var.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/zcopybpf/src/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_i810.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp_via.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_vr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_wb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_xl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/uma_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/intr_machdep.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/vmparam.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sbus/sbus.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sbus/sbusreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/upa.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/vmparam.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/callout.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/lock_profile.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/mbuf.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/mount.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/pciio.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/socket.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/user.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/vmmeter.h#4 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/device_pager.c#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/phys_pager.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/uma_core.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_contig.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_fault.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_map.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.h#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_phys.c#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_phys.h#3 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/sctp.c#3 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.160 2007/08/22 05:06:14 jkoshy Exp $ */ #include @@ -81,6 +81,7 @@ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ jmp swact +END(cpu_throw) /* * cpu_switch(old, new, mtx) @@ -256,7 +257,8 @@ movq %rax,%dr7 1: ret - +END(cpu_switch) + /* * savectx(pcb) * Update pcb, saving current processor state. @@ -314,3 +316,4 @@ popfq ret +END(savectx) ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -74,7 +74,6 @@ ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); -ASSYM(P_SFLAG, offsetof(struct proc, p_sflag)); ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); @@ -181,6 +180,7 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/legacy.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -207,6 +207,9 @@ struct legacy_device *atdev = DEVTOAT(child); switch (which) { + case LEGACY_IVAR_PCIDOMAIN: + *result = 0; + break; case LEGACY_IVAR_PCIBUS: *result = atdev->lg_pcibus; break; @@ -223,6 +226,8 @@ struct legacy_device *atdev = DEVTOAT(child); switch (which) { + case LEGACY_IVAR_PCIDOMAIN: + return EINVAL; case LEGACY_IVAR_PCIBUS: atdev->lg_pcibus = value; break; ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $"); #include "opt_hwpmc_hooks.h" @@ -1061,7 +1061,7 @@ printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $"); /* * Manages physical address maps. @@ -1722,7 +1722,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field, page_req; + int bit, field; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1755,8 +1755,7 @@ } } /* No free items, allocate another chunk */ - page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; - m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -1775,7 +1774,7 @@ PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); m = vm_page_alloc(NULL, colour, - VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { PV_STAT(pmap_collect_active++); pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); ==== //depot/projects/zcopybpf/src/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.127 2007/05/23 08:33:04 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.128 2007/08/22 05:06:14 jkoshy Exp $ */ #include "opt_ddb.h" @@ -69,7 +69,8 @@ rep stosb ret - +END(bzero) + /* Address: %rdi */ ENTRY(pagezero) movq $-PAGE_SIZE,%rdx @@ -84,6 +85,7 @@ jne 1b sfence ret +END(pagezero) ENTRY(bcmp) movq %rdx,%rcx @@ -101,6 +103,7 @@ setne %al movsbl %al,%eax ret +END(bcmp) /* * bcopy(src, dst, cnt) @@ -144,7 +147,8 @@ movsq cld ret - +END(bcopy) + /* * Note: memcpy does not support overlapping copies */ @@ -159,6 +163,7 @@ rep movsb ret +END(memcpy) /* * pagecopy(%rdi=from, %rsi=to) @@ -185,6 +190,7 @@ jne 2b sfence ret +END(pagecopy) /* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ @@ -196,6 +202,7 @@ rep stosw ret +END(fillw) /*****************************************************************************/ /* copyout and fubyte family */ @@ -267,6 +274,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyout) /* * copyin(from_user, to_kernel, len) - MP SAFE @@ -312,6 +320,7 @@ movq $0,PCB_ONFAULT(%rdx) movq $EFAULT,%rax ret +END(copyin) /* * casuword32. Compare and set user integer. Returns -1 or the current value. @@ -340,6 +349,7 @@ movq PCPU(CURPCB),%rcx movq $0,PCB_ONFAULT(%rcx) ret +END(casuword32) /* * casuword. Compare and set user word. Returns -1 or the current value. @@ -369,6 +379,7 @@ movq $fusufault,PCB_ONFAULT(%rcx) movq $0,PCB_ONFAULT(%rcx) ret +END(casuword) /* * Fetch (load) a 64-bit word, a 32-bit word, a 16-bit word, or an 8-bit @@ -388,6 +399,8 @@ movq (%rdi),%rax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword64) +END(fuword) ENTRY(fuword32) movq PCPU(CURPCB),%rcx @@ -400,6 +413,7 @@ movl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword32) /* * fuswintr() and suswintr() are specialized variants of fuword16() and @@ -412,6 +426,8 @@ ENTRY(fuswintr) movq $-1,%rax ret +END(suswintr) +END(fuswintr) ENTRY(fuword16) movq PCPU(CURPCB),%rcx @@ -424,6 +440,7 @@ movzwl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fuword16) ENTRY(fubyte) movq PCPU(CURPCB),%rcx @@ -436,6 +453,7 @@ movzbl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ret +END(fubyte) ALIGN_TEXT fusufault: @@ -464,6 +482,8 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword64) +END(suword) ENTRY(suword32) movq PCPU(CURPCB),%rcx @@ -478,6 +498,7 @@ movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret +END(suword32) ENTRY(suword16) movq PCPU(CURPCB),%rcx @@ -492,6 +513,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(suword16) ENTRY(subyte) movq PCPU(CURPCB),%rcx @@ -507,6 +529,7 @@ movq PCPU(CURPCB),%rcx /* restore trashed register */ movq %rax,PCB_ONFAULT(%rcx) ret +END(subyte) /* * copyinstr(from, to, maxlen, int *lencopied) - MP SAFE @@ -575,7 +598,7 @@ movq %r8,(%r9) 1: ret - +END(copyinstr) /* * copystr(from, to, maxlen, int *lencopied) - MP SAFE @@ -612,6 +635,7 @@ movq %r8,(%rcx) 7: ret +END(copystr) /* * Handling of special amd64 registers and descriptor tables etc @@ -639,6 +663,7 @@ pushq %rax MEXITCOUNT lretq +END(lgdt) /*****************************************************************************/ /* setjump, longjump */ @@ -656,6 +681,7 @@ movq %rdx,56(%rdi) /* save rip */ xorl %eax,%eax /* return(0); */ ret +END(setjmp) ENTRY(longjmp) movq 0(%rdi),%rbx /* restore rbx */ @@ -670,6 +696,7 @@ xorl %eax,%eax /* return(1); */ incl %eax ret +END(longjmp) /* * Support for BB-profiling (gcc -a). The kernbb program will extract ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/uma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.3 2007/02/18 06:33:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.4 2007/09/15 18:47:01 alc Exp $"); #include #include @@ -50,9 +50,9 @@ *flags = UMA_SLAB_PRIV; if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else - pflags = VM_ALLOC_SYSTEM; + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; for (;;) { @@ -82,5 +82,7 @@ pa = DMAP_TO_PHYS((vm_offset_t)mem); dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); + m->wire_count--; vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, 1); } ==== //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.483 2007/07/01 21:47:45 njl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484 2007/09/26 20:05:06 brueffer Exp $ cpu HAMMER ident GENERIC @@ -44,7 +44,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols -options SCTP # Stream Transmission Control Protocol +options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists ==== //depot/projects/zcopybpf/src/sys/amd64/include/asm.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.17 2005/04/10 20:49:21 alc Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.18 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -77,6 +77,8 @@ #define ENTRY(x) _ENTRY(x) #endif +#define END(x) .size x, . - x + #define RCSID(x) .text; .asciz x #undef __FBSDID ==== //depot/projects/zcopybpf/src/sys/amd64/include/asmacros.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/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.33 2007/08/22 04:26:07 jkoshy Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -57,6 +57,8 @@ #define NON_GPROF_ENTRY(name) GEN_ENTRY(name) #define NON_GPROF_RET .byte 0xc3 /* opcode for `ret' */ +#define END(name) .size name, . - name + #ifdef GPROF /* * __mcount is like [.]mcount except that doesn't require its caller to set ==== //depot/projects/zcopybpf/src/sys/amd64/include/legacyvar.h#2 (text+ko) ==== @@ -23,19 +23,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $ + * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $ */ #ifndef _MACHINE_LEGACYVAR_H_ #define _MACHINE_LEGACYVAR_H_ enum legacy_device_ivars { + LEGACY_IVAR_PCIDOMAIN, LEGACY_IVAR_PCIBUS }; #define LEGACY_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type) +LEGACY_ACCESSOR(pcidomain, PCIDOMAIN, uint32_t) LEGACY_ACCESSOR(pcibus, PCIBUS, uint32_t) #undef LEGACY_ACCESSOR ==== //depot/projects/zcopybpf/src/sys/amd64/include/smp.h#4 (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.90 2007/05/19 05:01:43 kan Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.91 2007/09/20 20:38:43 attilio Exp $ * */ @@ -34,7 +34,6 @@ extern int mp_naps; extern int boot_cpu_id; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 12 17:05:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABF2F16A421; Fri, 12 Oct 2007 17:05:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DC6616A41B for ; Fri, 12 Oct 2007 17:05:11 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4392D13C45B for ; Fri, 12 Oct 2007 17:05:11 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CH5BUo075534 for ; Fri, 12 Oct 2007 17:05:11 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CH5BMm075531 for perforce@freebsd.org; Fri, 12 Oct 2007 17:05:11 GMT (envelope-from cnst@FreeBSD.org) Date: Fri, 12 Oct 2007 17:05:11 GMT Message-Id: <200710121705.l9CH5BMm075531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 127439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 17:05:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=127439 Change 127439 by cnst@dale on 2007/10/12 17:05:02 integrate Affected files ... .. //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#4 integrate .. //depot/projects/soc2007/cnst-sensors/share.man.man9/Makefile#5 integrate .. //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#4 integrate Differences ... ==== //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.319 2007/10/12 16:35:36 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -207,6 +207,12 @@ ppp_profile="papchap" # Which profile to use from /etc/ppp/ppp.conf. ppp_user="root" # Which user to run ppp as +# Start multiple instances of ppp at boot time +#ppp_profile="profile1 profile2 profile3" # Which profiles to use +#ppp_profile1_mode="ddial" # Override ppp mode for profile1 +#ppp_profile2_nat="NO" # Override nat mode for profile2 +# profile3 uses default ppp_mode and ppp_nat + ### Network daemon (miscellaneous) ### hostapd_enable="NO" # Run hostap daemon. syslogd_enable="YES" # Run syslog daemon (or NO). ==== //depot/projects/soc2007/cnst-sensors/share.man.man9/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.309 2007/09/05 19:46:23 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.310 2007/10/05 22:50:44 marius Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -856,6 +856,7 @@ pci.9 pci_enable_busmaster.9 \ pci.9 pci_enable_io.9 \ pci.9 pci_find_bsf.9 \ + pci.9 pci_find_dbsf.9 \ pci.9 pci_find_device.9 \ pci.9 pci_get_powerstate.9 \ pci.9 pci_read_config.9 \ ==== //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.373 2007/10/01 18:22:32 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.375 2007/10/09 23:31:11 obrien Exp $ .include @@ -269,7 +269,7 @@ _authpf= authpf .endif -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _pppctl= pppctl .endif @@ -278,7 +278,7 @@ .endif .if ${MK_NS_CACHING} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _nscd= nscd .endif .endif From owner-p4-projects@FreeBSD.ORG Fri Oct 12 17:11:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A027A16A421; Fri, 12 Oct 2007 17:11:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E70FC16A419 for ; Fri, 12 Oct 2007 17:11:17 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE9CC13C447 for ; Fri, 12 Oct 2007 17:11:17 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CHBHHA075966 for ; Fri, 12 Oct 2007 17:11:17 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CHBH2J075963 for perforce@freebsd.org; Fri, 12 Oct 2007 17:11:17 GMT (envelope-from cnst@FreeBSD.org) Date: Fri, 12 Oct 2007 17:11:17 GMT Message-Id: <200710121711.l9CHBH2J075963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 127441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 17:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=127441 Change 127441 by cnst@dale on 2007/10/12 17:10:19 sync OpenBSD id (some local changes were committed upstream) Affected files ... .. //depot/projects/soc2007/cnst-sensors/usr.bin.systat/sensors.c#4 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/usr.bin.systat/sensors.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/usr.bin.systat/sensors.c#3 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/usr.bin.systat/sensors.c#4 $ */ /* $FreeBSD$ */ -/* $OpenBSD: sensors.c,v 1.11 2007/03/23 14:48:22 ckuethe Exp $ */ +/* $OpenBSD: sensors.c,v 1.12 2007/07/29 04:51:59 cnst Exp $ */ /*- * Copyright (c) 2007 Deanna Phillips From owner-p4-projects@FreeBSD.ORG Fri Oct 12 17:19:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9822E16A418; Fri, 12 Oct 2007 17:19:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA7DA16A419 for ; Fri, 12 Oct 2007 17:19:30 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D079213C461 for ; Fri, 12 Oct 2007 17:19:30 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CHJUif076267 for ; Fri, 12 Oct 2007 17:19:30 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CHJRg2076263 for perforce@freebsd.org; Fri, 12 Oct 2007 17:19:27 GMT (envelope-from thioretic@FreeBSD.org) Date: Fri, 12 Oct 2007 17:19:27 GMT Message-Id: <200710121719.l9CHJRg2076263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 127443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 17:19:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127443 Change 127443 by thioretic@thioretic_freebox on 2007/10/12 17:18:56 IFC Affected files ... .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/pmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/alpha/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl/alpha/isa/isa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/pcibus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/acpica/madt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/genassym.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mptable.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/nexus.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/arm/nexus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/common/module.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_file.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_stats.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/conf/NOTES#3 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files#3 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.amd64#2 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.i386#2 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.pc98#2 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.sparc64#2 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/options#3 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/options.sparc64#2 integrate .. //depot/projects/soc2007/thioretic_gidl/contrib/pf/net/pf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/crypto/sha2/sha2.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/coretemp/coretemp.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/em/LICENSE#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82540.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82541.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82541.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82542.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82543.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82543.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82571.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82571.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82575.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_82575.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_api.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_api.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_defines.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_hw.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_mac.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_mac.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_manage.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_manage.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_nvm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_nvm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_osdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_phy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_phy.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/e1000_regs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em_hw.c#2 delete .. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em_hw.h#2 delete .. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em_osdep.h#2 delete .. //depot/projects/soc2007/thioretic_gidl/dev/fdc/fdc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/gem/if_gem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hme/if_hme.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ic/nec765.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/am7990.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/am79900.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/if_le_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/lance.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/le/lancevar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfivar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/ukphy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/re/if_re.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/uart/uart_kbd_sun.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/acpica/madt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/genassym.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/io_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/mptable.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/nexus.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_proto.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/syscalls.master#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ia64/ia64/nexus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/init_main.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_condvar.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_cpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_rwlock.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/kern/kern_sx.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_synch.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_thread.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/acpi/Makefile#3 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/coretemp/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/modules/em/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/linux/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/bridgestp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/bridgestp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_bridge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_lagg.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_lagg.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_base.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_ppp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_ppp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet6/in6_src.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/opencrypto/cryptodev.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pc98/cbus/fdc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_dc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_dcreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_xl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_xlreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/powermac/macio.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/psim/iobus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/pci/apb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/pci/psycho.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/_rwlock.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/sys/_sx.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/sys/ata.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/lock_profile.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/sys/param.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/proc.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/rwlock.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/sys/sleepqueue.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/sx.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/turnstile.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/swap_pager.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_map.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_map.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2007/thioretic_gidl/alpha/alpha/pmap.c#2 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.6 2007/04/17 03:56:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.7 2007/09/15 09:40:38 wilko Exp $"); #include #include @@ -159,11 +159,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include ==== //depot/projects/soc2007/thioretic_gidl/alpha/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156.2.1 2007/09/20 06:33:26 netchild Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -68,10 +68,3 @@ # Enable OSF/1 ABI emulation options COMPAT_OSF1 - -# Enable Linux ABI emulation (requires COMPAT_OSF1) -options COMPAT_LINUX - -# Enable the linux-like proc filesystem support (requires COMPAT_LINUX -# and PSEUDOFS) -options LINPROCFS ==== //depot/projects/soc2007/thioretic_gidl/alpha/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.1 2006/03/10 19:37:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.2 2007/10/03 20:41:32 jhb Exp $"); #define __RMAN_RESOURCE_VISIBLE #include @@ -232,6 +232,7 @@ res = rman_reserve_resource(&isa_drq_rman, start, start, 1, 0, child); + rman_set_rid(res, *rid); if (res && !passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); ==== //depot/projects/soc2007/thioretic_gidl/alpha/pci/apecs_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15.10.1 2007/10/03 20:41:33 jhb Exp $"); #include #include @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/soc2007/thioretic_gidl/alpha/pci/lca_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17.10.1 2007/10/03 20:41:33 jhb Exp $"); #include #include @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/soc2007/thioretic_gidl/alpha/pci/pcibus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36 2005/01/05 20:05:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.1 2007/10/03 20:41:33 jhb Exp $"); #include "opt_isa.h" @@ -97,7 +97,12 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + struct resource *rv; + + rv = isa_alloc_intr(0, 0, irqs[chan]); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } int @@ -230,9 +235,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +259,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rv->r_start); switch (type) { ==== //depot/projects/soc2007/thioretic_gidl/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.3 2007/05/02 18:42:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.4 2007/10/05 15:22:35 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(APIC_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static MULTIPLE_APIC_TABLE *madt; @@ -391,7 +388,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -447,7 +444,7 @@ proc->ProcessorEnabled ? "enabled" : "disabled"); if (!proc->ProcessorEnabled) break; - if (proc->LocalApicId >= NLAPICS) + if (proc->LocalApicId > MAX_APIC_ID) panic("%s: CPU ID %d too high", __func__, proc->LocalApicId); la = &lapics[proc->LocalApicId]; @@ -476,7 +473,7 @@ printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", apic->IoApicId, apic->Interrupt, (void *)(uintptr_t)apic->Address); - if (apic->IoApicId >= NIOAPICS) + if (apic->IoApicId > MAX_APIC_ID) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); if (ioapics[apic->IoApicId].io_apic != NULL) @@ -544,7 +541,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -565,7 +562,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.155.2.2 2005/11/15 00:25:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.155.2.3 2007/09/10 23:01:35 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -177,6 +177,7 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.136.2.4 2006/12/06 20:12:13 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.136.2.5 2007/09/28 08:26:16 des Exp $"); #include "opt_cpu.h" @@ -220,19 +220,19 @@ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ - "\007" + "\007SMX" /* Safer Mode Extensions */ "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ - "\012" - "\013CNTX-ID" /* L1 context ID available */ + "\012SSSE3" /* SSSE3 */ + "\013CNXT-ID" /* L1 context ID available */ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017XTPR" /* Send Task Priority Messages*/ - "\020" + "\017xTPR" /* Send Task Priority Messages*/ + "\020PDCM" /* Perf/Debug Capability MSR */ "\021" "\022" - "\023" + "\023DCA" /* Direct Cache Access */ "\024" "\025" "\026" @@ -307,7 +307,7 @@ "\006" "\007" "\010" - "\011" + "\011Prefetch" /* 3DNow! Prefetch/PrefetchW */ "\012" "\013" "\014" @@ -335,13 +335,8 @@ } if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) { + "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; - if (bootverbose) - printf("\nHTT bit cleared - FreeBSD" - " does not have licensing issues" - " requiring it.\n"); - } /* * If this CPU supports HTT or CMP then mention the ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15.2.8 2007/03/12 19:50:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15.2.9 2007/08/28 15:47:41 jhb Exp $"); #include "opt_isa.h" @@ -468,7 +468,7 @@ intbase = next_ioapic_base; printf("ioapic%u: Assuming intbase of %d\n", io->io_id, intbase); - } else if (intbase != next_ioapic_base) + } else if (intbase != next_ioapic_base && bootverbose) printf("ioapic%u: WARNING: intbase %d != expected base %d\n", io->io_id, intbase, next_ioapic_base); io->io_intbase = intbase; ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.13 2007/04/28 09:04:09 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.14 2007/10/05 15:22:35 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -65,13 +65,6 @@ #include #endif -/* - * We can handle up to 60 APICs via our logical cluster IDs, but currently - * the physical IDs on Intel processors up to the Pentium 4 are limited to - * 16. - */ -#define MAX_APICID 16 - /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -114,7 +107,7 @@ u_long la_hard_ticks; u_long la_stat_ticks; u_long la_prof_ticks; -} static lapics[MAX_APICID]; +} static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -237,7 +230,7 @@ { int i; - if (apic_id >= MAX_APICID) { + if (apic_id > MAX_APIC_ID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.11 2007/05/05 21:13:16 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.14 2007/10/08 21:51:01 jhb Exp $"); #include "opt_cpu.h" #include "opt_kdb.h" @@ -95,6 +95,9 @@ /* Free these after use */ void *bootstacks[MAXCPU]; +/* Temporary holder for double fault stack */ +char *doublefault_stack; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -130,7 +133,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; -} static cpu_info[MAXCPU]; +} static cpu_info[MAX_APIC_ID + 1]; static int cpu_apic_ids[MAXCPU]; /* Holds pending bitmap based IPIs per CPU */ @@ -138,6 +141,7 @@ static u_int boot_address; +static void assign_cpu_ids(void); static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); @@ -175,7 +179,7 @@ return; group = &mp_groups[0]; groups = 1; - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { + for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; /* @@ -222,9 +226,8 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id >= MAXCPU) { - printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU - 1); + if (apic_id > MAX_APIC_ID) { + panic("SMP: APIC ID %d too high", apic_id); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", @@ -237,13 +240,13 @@ boot_cpu_id = apic_id; cpu_info[apic_id].cpu_bsp = 1; } - mp_ncpus++; - if (apic_id > mp_maxid) - mp_maxid = apic_id; + if (mp_ncpus < MAXCPU) { + mp_ncpus++; + mp_maxid = mp_ncpus -1; + } if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); - } void @@ -262,8 +265,7 @@ else KASSERT(mp_maxid >= mp_ncpus - 1, ("%s: counters out of sync: max %d, count %d", __func__, - mp_maxid, mp_ncpus)); - + mp_maxid, mp_ncpus)); } int @@ -341,6 +343,8 @@ ("BSP's APIC ID doesn't match boot_cpu_id")); cpu_apic_ids[0] = boot_cpu_id; + assign_cpu_ids(); + /* Start each Application Processor */ start_all_aps(); @@ -405,7 +409,7 @@ /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x < MAXCPU; x++) { + for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) continue; if (cpu_info[x].cpu_disabled) @@ -435,6 +439,7 @@ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); + common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], @@ -620,6 +625,48 @@ } /* + * Assign logical CPU IDs to local APICs. + */ +static void +assign_cpu_ids(void) +{ + u_int i; + + /* Check for explicitly disabled CPUs. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp) + continue; + + /* Don't use this CPU if it has been disabled by a tunable. */ + if (resource_disabled("lapic", i)) { + cpu_info[i].cpu_disabled = 1; + continue; + } + } + + /* + * Assign CPU IDs to local APIC IDs and disable any CPUs + * beyond MAXCPU. CPU 0 has already been assigned to the BSP, + * so we only have to assign IDs for APs. + */ + mp_ncpus = 1; + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || + cpu_info[i].cpu_disabled) + continue; + + if (mp_ncpus < MAXCPU) { + cpu_apic_ids[mp_ncpus] = i; + mp_ncpus++; + } else + cpu_info[i].cpu_disabled = 1; + } + KASSERT(mp_maxid >= mp_ncpus - 1, + ("%s: counters out of sync: max %d, count %d", __func__, mp_maxid, + mp_ncpus)); +} + +/* * start each AP in our list */ static int @@ -670,27 +717,12 @@ outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ /* start each AP */ - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { - - /* Ignore non-existent CPUs and the BSP. */ - if (!cpu_info[apic_id].cpu_present || - cpu_info[apic_id].cpu_bsp) - continue; - - /* Don't use this CPU if it has been disabled by a tunable. */ - if (resource_disabled("lapic", apic_id)) { - cpu_info[apic_id].cpu_disabled = 1; - mp_ncpus--; - continue; - } + for (cpu = 1; cpu < mp_ncpus; cpu++) { + apic_id = cpu_apic_ids[cpu]; - cpu++; - - /* save APIC ID for this logical ID */ - cpu_apic_ids[cpu] = apic_id; - /* allocate and set up an idle stack data page */ - bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; @@ -932,10 +964,10 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); #ifdef IPI_PREEMPTION - if (ipi_bitmap & IPI_PREEMPT) { + if (ipi_bitmap & (1 << IPI_PREEMPT)) { mtx_lock_spin(&sched_lock); /* Don't preempt the idle thread */ - if (curthread->td_priority < PRI_MIN_IDLE) { + if (curthread != PCPU_GET(idlethread)) { struct thread *running_thread = curthread; if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236.2.1 2007/10/05 15:22:35 jhb Exp $"); #include #include @@ -50,7 +50,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of APIC's */ +#define MAX_LAPIC_ID 63 /* Max local APIC ID for HTT fixup */ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -136,7 +136,7 @@ static mpfps_t mpfps; static mpcth_t mpct; -static void *ioapics[NAPICID]; +static void *ioapics[MAX_APIC_ID + 1]; static bus_datum *busses; static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; @@ -152,7 +152,7 @@ static void mptable_count_items(void); static void mptable_count_items_handler(u_char *entry, void *arg); #ifdef MPTABLE_FORCE_HTT -static void mptable_hyperthread_fixup(u_int id_mask); +static void mptable_hyperthread_fixup(u_long id_mask); #endif static void mptable_parse_apics_and_busses(void); static void mptable_parse_apics_and_busses_handler(u_char *entry, @@ -294,7 +294,7 @@ static int mptable_probe_cpus(void) { - u_int cpu_mask; + u_long cpu_mask; /* Is this a pre-defined config? */ if (mpfps->config_type != 0) { @@ -354,7 +354,7 @@ mptable_parse_ints(); /* Fourth, we register all the I/O APIC's. */ - for (i = 0; i < NAPICID; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i] != NULL) ioapic_register(ioapics[i]); @@ -412,7 +412,7 @@ mptable_probe_cpus_handler(u_char *entry, void *arg) { proc_entry_ptr proc; - u_int *cpu_mask; + u_long *cpu_mask; switch (*entry) { case MPCT_ENTRY_PROCESSOR: @@ -420,8 +420,10 @@ if (proc->cpu_flags & PROCENTRY_FLAG_EN) { lapic_create(proc->apic_id, proc->cpu_flags & PROCENTRY_FLAG_BP); - cpu_mask = (u_int *)arg; - *cpu_mask |= (1 << proc->apic_id); + if (proc->apic_id < MAX_LAPIC_ID) { + cpu_mask = (u_long *)arg; + *cpu_mask |= (1ul << proc->apic_id); + } } break; } @@ -508,7 +510,7 @@ apic = (io_apic_entry_ptr)entry; if (!(apic->apic_flags & IOAPICENTRY_FLAG_EN)) break; - if (apic->apic_id >= NAPICID) + if (apic->apic_id > MAX_APIC_ID) panic("%s: I/O APIC ID %d too high", __func__, apic->apic_id); if (ioapics[apic->apic_id] != NULL) @@ -653,7 +655,7 @@ return; } } - if (apic_id >= NAPICID) { + if (apic_id > MAX_APIC_ID) { printf("MPTable: Ignoring interrupt entry for ioapic%d\n", intr->dst_apic_id); return; @@ -866,7 +868,7 @@ * with the number of logical CPU's in the processor. */ static void -mptable_hyperthread_fixup(u_int id_mask) +mptable_hyperthread_fixup(u_long id_mask) { u_int i, id, logical_cpus; @@ -883,7 +885,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id < NAPICID; id++) { + for (id = 0; id <= MAX_LAPIC_ID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ @@ -898,7 +900,7 @@ * Ok, the ID's checked out, so perform the fixup by * adding the logical CPUs. */ - while ((id = ffs(id_mask)) != 0) { + while ((id = ffsl(id_mask)) != 0) { id--; for (i = id + 1; i < id + logical_cpus; i++) { if (bootverbose) ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.66.2.4 2007/08/15 21:12:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.66.2.5 2007/10/03 20:41:33 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -347,7 +347,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 12 17:49:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E94B16A469; Fri, 12 Oct 2007 17:49:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 173A016A41B for ; Fri, 12 Oct 2007 17:49:05 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CA0D13C455 for ; Fri, 12 Oct 2007 17:49:05 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CHn4jK077919 for ; Fri, 12 Oct 2007 17:49:04 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CHn1s6077914 for perforce@freebsd.org; Fri, 12 Oct 2007 17:49:01 GMT (envelope-from thioretic@FreeBSD.org) Date: Fri, 12 Oct 2007 17:49:01 GMT Message-Id: <200710121749.l9CHn1s6077914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 127444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 17:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=127444 Change 127444 by thioretic@thioretic_freebox on 2007/10/12 17:48:47 IFC Affected files ... .. //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/pmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/alpha/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/alpha/isa/isa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/alpha/pci/pcibus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/acpica/madt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/genassym.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/mptable.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/nexus.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/arm/nexus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/common/module.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_file.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_stats.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/conf/NOTES#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.amd64#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.i386#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.pc98#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.sparc64#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/options#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/options.sparc64#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/contrib/pf/net/pf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/crypto/sha2/sha2.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/coretemp/coretemp.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/em/LICENSE#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82540.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82541.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82541.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82542.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82543.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82543.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82571.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82571.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82575.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_82575.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_api.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_api.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_defines.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_hw.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_mac.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_mac.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_manage.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_manage.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_nvm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_nvm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_osdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_phy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_phy.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/e1000_regs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em_hw.c#2 delete .. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em_hw.h#2 delete .. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em_osdep.h#2 delete .. //depot/projects/soc2007/thioretic_gidl2/dev/fdc/fdc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/gem/if_gem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hme/if_hme.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ic/nec765.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/am7990.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/am79900.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/if_le_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/lance.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/le/lancevar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfivar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/ukphy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/re/if_re.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/uart/uart_kbd_sun.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/acpica/madt.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/genassym.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/io_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/mptable.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/nexus.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_proto.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/syscalls.master#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ia64/ia64/nexus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/init_main.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_condvar.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_cpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_rwlock.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_sx.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_synch.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_thread.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/acpi/Makefile#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/coretemp/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/modules/em/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/linux/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/bridgestp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/bridgestp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_bridge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_lagg.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_lagg.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_base.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_ppp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_ppp.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet6/in6_src.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/opencrypto/cryptodev.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pc98/cbus/fdc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_dc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_dcreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_xl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_xlreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/powermac/macio.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/psim/iobus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/pci/apb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/pci/psycho.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/_rwlock.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/sys/_sx.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/sys/ata.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/lock_profile.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/sys/param.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/proc.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/rwlock.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/sys/sleepqueue.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/sx.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/turnstile.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/swap_pager.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_map.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_map.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/pmap.c#2 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.6 2007/04/17 03:56:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.7 2007/09/15 09:40:38 wilko Exp $"); #include #include @@ -159,11 +159,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include ==== //depot/projects/soc2007/thioretic_gidl2/alpha/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156.2.1 2007/09/20 06:33:26 netchild Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -68,10 +68,3 @@ # Enable OSF/1 ABI emulation options COMPAT_OSF1 - -# Enable Linux ABI emulation (requires COMPAT_OSF1) -options COMPAT_LINUX - -# Enable the linux-like proc filesystem support (requires COMPAT_LINUX -# and PSEUDOFS) -options LINPROCFS ==== //depot/projects/soc2007/thioretic_gidl2/alpha/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.1 2006/03/10 19:37:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.2 2007/10/03 20:41:32 jhb Exp $"); #define __RMAN_RESOURCE_VISIBLE #include @@ -232,6 +232,7 @@ res = rman_reserve_resource(&isa_drq_rman, start, start, 1, 0, child); + rman_set_rid(res, *rid); if (res && !passthrough) { rle = resource_list_find(rl, type, *rid); rle->start = rman_get_start(res); ==== //depot/projects/soc2007/thioretic_gidl2/alpha/pci/apecs_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15.10.1 2007/10/03 20:41:33 jhb Exp $"); #include #include @@ -79,12 +79,17 @@ apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if ((hwrpb->rpb_type == ST_DEC_2100_A50) && (type == SYS_RES_IRQ)) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/soc2007/thioretic_gidl2/alpha/pci/lca_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17.10.1 2007/10/03 20:41:33 jhb Exp $"); #include #include @@ -78,11 +78,16 @@ lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct resource *rv = NULL; + if (type == SYS_RES_IRQ) - return isa_alloc_intr(bus, child, start); + rv = isa_alloc_intr(bus, child, start); else - return alpha_pci_alloc_resource(bus, child, type, rid, - start, end, count, flags); + rv = alpha_pci_alloc_resource(bus, child, type, rid, + start, end, count, flags); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } static int ==== //depot/projects/soc2007/thioretic_gidl2/alpha/pci/pcibus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36 2005/01/05 20:05:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.1 2007/10/03 20:41:33 jhb Exp $"); #include "opt_isa.h" @@ -97,7 +97,12 @@ alpha_platform_alloc_ide_intr(int chan) { int irqs[2] = { 14, 15 }; - return isa_alloc_intr(0, 0, irqs[chan]); + struct resource *rv; + + rv = isa_alloc_intr(0, 0, irqs[chan]); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } int @@ -230,9 +235,11 @@ #ifdef DEV_ISA if((start >= ISA_IRQ_OFFSET) && (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) { - return isa_alloc_intrs(bus, child, - start - ISA_IRQ_OFFSET, - end - ISA_IRQ_OFFSET); + rv = isa_alloc_intrs(bus, child, + start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET); + if (rv != NULL) + rman_set_rid(rv, *rid); + return (rv); } else #endif @@ -252,6 +259,7 @@ if (rv == 0) return 0; + rman_set_rid(rv, *rid); rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type)); rman_set_bushandle(rv, rv->r_start); switch (type) { ==== //depot/projects/soc2007/thioretic_gidl2/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.3 2007/05/02 18:42:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.16.2.4 2007/10/05 15:22:35 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(APIC_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static MULTIPLE_APIC_TABLE *madt; @@ -391,7 +388,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -447,7 +444,7 @@ proc->ProcessorEnabled ? "enabled" : "disabled"); if (!proc->ProcessorEnabled) break; - if (proc->LocalApicId >= NLAPICS) + if (proc->LocalApicId > MAX_APIC_ID) panic("%s: CPU ID %d too high", __func__, proc->LocalApicId); la = &lapics[proc->LocalApicId]; @@ -476,7 +473,7 @@ printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", apic->IoApicId, apic->Interrupt, (void *)(uintptr_t)apic->Address); - if (apic->IoApicId >= NIOAPICS) + if (apic->IoApicId > MAX_APIC_ID) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); if (ioapics[apic->IoApicId].io_apic != NULL) @@ -544,7 +541,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -565,7 +562,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.155.2.2 2005/11/15 00:25:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.155.2.3 2007/09/10 23:01:35 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -177,6 +177,7 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.136.2.4 2006/12/06 20:12:13 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.136.2.5 2007/09/28 08:26:16 des Exp $"); #include "opt_cpu.h" @@ -220,19 +220,19 @@ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ - "\007" + "\007SMX" /* Safer Mode Extensions */ "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ - "\012" - "\013CNTX-ID" /* L1 context ID available */ + "\012SSSE3" /* SSSE3 */ + "\013CNXT-ID" /* L1 context ID available */ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ - "\017XTPR" /* Send Task Priority Messages*/ - "\020" + "\017xTPR" /* Send Task Priority Messages*/ + "\020PDCM" /* Perf/Debug Capability MSR */ "\021" "\022" - "\023" + "\023DCA" /* Direct Cache Access */ "\024" "\025" "\026" @@ -307,7 +307,7 @@ "\006" "\007" "\010" - "\011" + "\011Prefetch" /* 3DNow! Prefetch/PrefetchW */ "\012" "\013" "\014" @@ -335,13 +335,8 @@ } if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) { + "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; - if (bootverbose) - printf("\nHTT bit cleared - FreeBSD" - " does not have licensing issues" - " requiring it.\n"); - } /* * If this CPU supports HTT or CMP then mention the ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15.2.8 2007/03/12 19:50:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15.2.9 2007/08/28 15:47:41 jhb Exp $"); #include "opt_isa.h" @@ -468,7 +468,7 @@ intbase = next_ioapic_base; printf("ioapic%u: Assuming intbase of %d\n", io->io_id, intbase); - } else if (intbase != next_ioapic_base) + } else if (intbase != next_ioapic_base && bootverbose) printf("ioapic%u: WARNING: intbase %d != expected base %d\n", io->io_id, intbase, next_ioapic_base); io->io_intbase = intbase; ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.13 2007/04/28 09:04:09 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.14 2007/10/05 15:22:35 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -65,13 +65,6 @@ #include #endif -/* - * We can handle up to 60 APICs via our logical cluster IDs, but currently - * the physical IDs on Intel processors up to the Pentium 4 are limited to - * 16. - */ -#define MAX_APICID 16 - /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -114,7 +107,7 @@ u_long la_hard_ticks; u_long la_stat_ticks; u_long la_prof_ticks; -} static lapics[MAX_APICID]; +} static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -237,7 +230,7 @@ { int i; - if (apic_id >= MAX_APICID) { + if (apic_id > MAX_APIC_ID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.11 2007/05/05 21:13:16 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260.2.14 2007/10/08 21:51:01 jhb Exp $"); #include "opt_cpu.h" #include "opt_kdb.h" @@ -95,6 +95,9 @@ /* Free these after use */ void *bootstacks[MAXCPU]; +/* Temporary holder for double fault stack */ +char *doublefault_stack; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -130,7 +133,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; -} static cpu_info[MAXCPU]; +} static cpu_info[MAX_APIC_ID + 1]; static int cpu_apic_ids[MAXCPU]; /* Holds pending bitmap based IPIs per CPU */ @@ -138,6 +141,7 @@ static u_int boot_address; +static void assign_cpu_ids(void); static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); @@ -175,7 +179,7 @@ return; group = &mp_groups[0]; groups = 1; - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { + for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; /* @@ -222,9 +226,8 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id >= MAXCPU) { - printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU - 1); + if (apic_id > MAX_APIC_ID) { + panic("SMP: APIC ID %d too high", apic_id); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", @@ -237,13 +240,13 @@ boot_cpu_id = apic_id; cpu_info[apic_id].cpu_bsp = 1; } - mp_ncpus++; - if (apic_id > mp_maxid) - mp_maxid = apic_id; + if (mp_ncpus < MAXCPU) { + mp_ncpus++; + mp_maxid = mp_ncpus -1; + } if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); - } void @@ -262,8 +265,7 @@ else KASSERT(mp_maxid >= mp_ncpus - 1, ("%s: counters out of sync: max %d, count %d", __func__, - mp_maxid, mp_ncpus)); - + mp_maxid, mp_ncpus)); } int @@ -341,6 +343,8 @@ ("BSP's APIC ID doesn't match boot_cpu_id")); cpu_apic_ids[0] = boot_cpu_id; + assign_cpu_ids(); + /* Start each Application Processor */ start_all_aps(); @@ -405,7 +409,7 @@ /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x < MAXCPU; x++) { + for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) continue; if (cpu_info[x].cpu_disabled) @@ -435,6 +439,7 @@ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); + common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], @@ -620,6 +625,48 @@ } /* + * Assign logical CPU IDs to local APICs. + */ +static void +assign_cpu_ids(void) +{ + u_int i; + + /* Check for explicitly disabled CPUs. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp) + continue; + + /* Don't use this CPU if it has been disabled by a tunable. */ + if (resource_disabled("lapic", i)) { + cpu_info[i].cpu_disabled = 1; + continue; + } + } + + /* + * Assign CPU IDs to local APIC IDs and disable any CPUs + * beyond MAXCPU. CPU 0 has already been assigned to the BSP, + * so we only have to assign IDs for APs. + */ + mp_ncpus = 1; + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || + cpu_info[i].cpu_disabled) + continue; + + if (mp_ncpus < MAXCPU) { + cpu_apic_ids[mp_ncpus] = i; + mp_ncpus++; + } else + cpu_info[i].cpu_disabled = 1; + } + KASSERT(mp_maxid >= mp_ncpus - 1, + ("%s: counters out of sync: max %d, count %d", __func__, mp_maxid, + mp_ncpus)); +} + +/* * start each AP in our list */ static int @@ -670,27 +717,12 @@ outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ /* start each AP */ - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { - - /* Ignore non-existent CPUs and the BSP. */ - if (!cpu_info[apic_id].cpu_present || - cpu_info[apic_id].cpu_bsp) - continue; - - /* Don't use this CPU if it has been disabled by a tunable. */ - if (resource_disabled("lapic", apic_id)) { - cpu_info[apic_id].cpu_disabled = 1; - mp_ncpus--; - continue; - } + for (cpu = 1; cpu < mp_ncpus; cpu++) { + apic_id = cpu_apic_ids[cpu]; - cpu++; - - /* save APIC ID for this logical ID */ - cpu_apic_ids[cpu] = apic_id; - /* allocate and set up an idle stack data page */ - bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; @@ -932,10 +964,10 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); #ifdef IPI_PREEMPTION - if (ipi_bitmap & IPI_PREEMPT) { + if (ipi_bitmap & (1 << IPI_PREEMPT)) { mtx_lock_spin(&sched_lock); /* Don't preempt the idle thread */ - if (curthread->td_priority < PRI_MIN_IDLE) { + if (curthread != PCPU_GET(idlethread)) { struct thread *running_thread = curthread; if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/mptable.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236 2005/04/15 18:44:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.236.2.1 2007/10/05 15:22:35 jhb Exp $"); #include #include @@ -50,7 +50,7 @@ /* string defined by the Intel MP Spec as identifying the MP table */ #define MP_SIG 0x5f504d5f /* _MP_ */ -#define NAPICID 32 /* Max number of APIC's */ +#define MAX_LAPIC_ID 63 /* Max local APIC ID for HTT fixup */ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -136,7 +136,7 @@ static mpfps_t mpfps; static mpcth_t mpct; -static void *ioapics[NAPICID]; +static void *ioapics[MAX_APIC_ID + 1]; static bus_datum *busses; static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; @@ -152,7 +152,7 @@ static void mptable_count_items(void); static void mptable_count_items_handler(u_char *entry, void *arg); #ifdef MPTABLE_FORCE_HTT -static void mptable_hyperthread_fixup(u_int id_mask); +static void mptable_hyperthread_fixup(u_long id_mask); #endif static void mptable_parse_apics_and_busses(void); static void mptable_parse_apics_and_busses_handler(u_char *entry, @@ -294,7 +294,7 @@ static int mptable_probe_cpus(void) { - u_int cpu_mask; + u_long cpu_mask; /* Is this a pre-defined config? */ if (mpfps->config_type != 0) { @@ -354,7 +354,7 @@ mptable_parse_ints(); /* Fourth, we register all the I/O APIC's. */ - for (i = 0; i < NAPICID; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i] != NULL) ioapic_register(ioapics[i]); @@ -412,7 +412,7 @@ mptable_probe_cpus_handler(u_char *entry, void *arg) { proc_entry_ptr proc; - u_int *cpu_mask; + u_long *cpu_mask; switch (*entry) { case MPCT_ENTRY_PROCESSOR: @@ -420,8 +420,10 @@ if (proc->cpu_flags & PROCENTRY_FLAG_EN) { lapic_create(proc->apic_id, proc->cpu_flags & PROCENTRY_FLAG_BP); - cpu_mask = (u_int *)arg; - *cpu_mask |= (1 << proc->apic_id); + if (proc->apic_id < MAX_LAPIC_ID) { + cpu_mask = (u_long *)arg; + *cpu_mask |= (1ul << proc->apic_id); + } } break; } @@ -508,7 +510,7 @@ apic = (io_apic_entry_ptr)entry; if (!(apic->apic_flags & IOAPICENTRY_FLAG_EN)) break; - if (apic->apic_id >= NAPICID) + if (apic->apic_id > MAX_APIC_ID) panic("%s: I/O APIC ID %d too high", __func__, apic->apic_id); if (ioapics[apic->apic_id] != NULL) @@ -653,7 +655,7 @@ return; } } - if (apic_id >= NAPICID) { + if (apic_id > MAX_APIC_ID) { printf("MPTable: Ignoring interrupt entry for ioapic%d\n", intr->dst_apic_id); return; @@ -866,7 +868,7 @@ * with the number of logical CPU's in the processor. */ static void -mptable_hyperthread_fixup(u_int id_mask) +mptable_hyperthread_fixup(u_long id_mask) { u_int i, id, logical_cpus; @@ -883,7 +885,7 @@ * physical processor. If any of those ID's are * already in the table, then kill the fixup. */ - for (id = 0; id < NAPICID; id++) { + for (id = 0; id <= MAX_LAPIC_ID; id++) { if ((id_mask & 1 << id) == 0) continue; /* First, make sure we are on a logical_cpus boundary. */ @@ -898,7 +900,7 @@ * Ok, the ID's checked out, so perform the fixup by * adding the logical CPUs. */ - while ((id = ffs(id_mask)) != 0) { + while ((id = ffsl(id_mask)) != 0) { id--; for (i = id + 1; i < id + logical_cpus; i++) { if (bootverbose) ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.66.2.4 2007/08/15 21:12:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.66.2.5 2007/10/03 20:41:33 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -347,7 +347,7 @@ rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == 0) return 0; - + rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 12 18:51:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4A0A16A420; Fri, 12 Oct 2007 18:51:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6250916A41A for ; Fri, 12 Oct 2007 18:51:25 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5993F13C468 for ; Fri, 12 Oct 2007 18:51:25 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CIpPcF083654 for ; Fri, 12 Oct 2007 18:51:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CIpPvK083651 for perforce@freebsd.org; Fri, 12 Oct 2007 18:51:25 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 18:51:25 GMT Message-Id: <200710121851.l9CIpPvK083651@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 127448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 18:51:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=127448 Change 127448 by kmacy@kmacy_home:ethng on 2007/10/12 18:50:38 disable larger than page size allocations in m_getm2 until an apparent memory leak is tracked down Affected files ... .. //depot/projects/ethng/src/sys/kern/uipc_mbuf.c#5 edit Differences ... ==== //depot/projects/ethng/src/sys/kern/uipc_mbuf.c#5 (text+ko) ==== @@ -110,14 +110,19 @@ /* Loop and append maximum sized mbufs to the chain tail. */ while (len > 0) { int clsize = MJUMPAGESIZE; - +#ifdef notyet + /* + * XXX seeing what appears to be a memory leak on blast + * overload conditions - turning this off won't fix + * but it will delay it + */ if (jumbo_phys_contig) { if (len >= MJUM9BYTES) clsize = MJUM16BYTES; else if (len >= MJUMPAGESIZE) clsize = MJUM9BYTES; } - +#endif if (len > MCLBYTES) mb = m_getjcl(how, type, (flags & M_PKTHDR), clsize); From owner-p4-projects@FreeBSD.ORG Fri Oct 12 23:16:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 726DC16A418; Fri, 12 Oct 2007 23:16:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C805516A421 for ; Fri, 12 Oct 2007 23:16:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B05F913C46E for ; Fri, 12 Oct 2007 23:16:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CNGNZc018053 for ; Fri, 12 Oct 2007 23:16:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNGNSO018050 for perforce@freebsd.org; Fri, 12 Oct 2007 23:16:23 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 23:16:23 GMT Message-Id: <200710122316.l9CNGNSO018050@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 127455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 23:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=127455 Change 127455 by kmacy@kmacy_home:ethng on 2007/10/12 23:15:29 make the lfsr for the rss_hash actually use feedback Affected files ... .. //depot/projects/ethng/src/sys/netinet/in_pcb.c#7 edit Differences ... ==== //depot/projects/ethng/src/sys/netinet/in_pcb.c#7 (text+ko) ==== @@ -194,7 +194,7 @@ bzero(inp, inp_zero_size); inp->inp_pcbinfo = pcbinfo; inp->inp_socket = so; - inp->inp_rss_hash = calc_lfsr(rss_hash++); + inp->inp_rss_hash = rss_hash = calc_lfsr(rss_hash); #ifdef MAC error = mac_init_inpcb(inp, M_NOWAIT); if (error != 0) From owner-p4-projects@FreeBSD.ORG Fri Oct 12 23:17:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B04616A47A; Fri, 12 Oct 2007 23:17:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0598F16A417 for ; Fri, 12 Oct 2007 23:17:25 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00C3513C468 for ; Fri, 12 Oct 2007 23:17:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CNHO8r018111 for ; Fri, 12 Oct 2007 23:17:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNHOPC018108 for perforce@freebsd.org; Fri, 12 Oct 2007 23:17:24 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 23:17:24 GMT Message-Id: <200710122317.l9CNHOPC018108@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 127456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 23:17:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=127456 Change 127456 by kmacy@kmacy_home:ethng on 2007/10/12 23:16:45 fix compile error in non-multiqueue case Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#24 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#24 (text+ko) ==== @@ -1880,7 +1880,7 @@ cxgb_tx_common(struct ifnet *ifp, struct sge_qset *qs, uint32_t txmax) { struct sge_txq *txq; - int err, in_use_init, count, i; + int err, in_use_init, count; struct mbuf **m_vec; txq = &qs->txq[TXQ_ETH]; @@ -1922,6 +1922,7 @@ setbit(&qs->txq_stopped, TXQ_ETH); } if (err == ENOMEM) { + int i; /* * Sub-optimal :-/ */ From owner-p4-projects@FreeBSD.ORG Fri Oct 12 23:20:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B295B16A41A; Fri, 12 Oct 2007 23:20:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 331A516A418 for ; Fri, 12 Oct 2007 23:20:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2BCA713C474 for ; Fri, 12 Oct 2007 23:20:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CNKSNo018227 for ; Fri, 12 Oct 2007 23:20:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNKSeN018224 for perforce@freebsd.org; Fri, 12 Oct 2007 23:20:28 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 23:20:28 GMT Message-Id: <200710122320.l9CNKSeN018224@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 127457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 23:20:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=127457 Change 127457 by kmacy@kmacy_home:ethng on 2007/10/12 23:19:35 remove extraneous initialization of software tx descriptor Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#31 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#31 (text+ko) ==== @@ -1315,18 +1315,13 @@ if (cxgb_debug) printf("failed ... err=%d\n", err); return (err); - } - if (m0->m_type == MT_DATA) { + } + KASSERT(m0->m_pkthdr.len, ("empty packet nsegs=%d count=%d", nsegs, count)); + + if (m0->m_type == MT_DATA) DPRINTF("mbuf type=%d tags:%d head=%p", m0->m_type, !SLIST_EMPTY(&m0->m_pkthdr.tags), SLIST_FIRST(&m0->m_pkthdr.tags)); - } else { - mv = mtomv(m0); - txsd->mi.mi_flags = m0->m_flags; - txsd->mi.mi_data = NULL; - txsd->mi.mi_base = (caddr_t)m0; - txsd->mi.mi_type = m0->m_type; - txsd->mi.mi_len = m0->m_pkthdr.len; - } + mi_collapse_mbuf(&txsd->mi, m0); mi = &txsd->mi; From owner-p4-projects@FreeBSD.ORG Fri Oct 12 23:21:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E90A16A478; Fri, 12 Oct 2007 23:21:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFA5B16A475 for ; Fri, 12 Oct 2007 23:21:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B371813C49D for ; Fri, 12 Oct 2007 23:21:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CNLWMN018371 for ; Fri, 12 Oct 2007 23:21:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNLWMQ018368 for perforce@freebsd.org; Fri, 12 Oct 2007 23:21:32 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 23:21:32 GMT Message-Id: <200710122321.l9CNLWMQ018368@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 127458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 23:21:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=127458 Change 127458 by kmacy@kmacy_home:ethng on 2007/10/12 23:20:33 scale sleep ticks in service thread with hz so we don't end up using too much cpu polling Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#24 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#24 (text+ko) ==== @@ -412,9 +412,9 @@ else { txq = &qs->txq[TXQ_ETH]; - if (!mbuf_ring_empty(&txq->txq_mr)) { + if (!mbuf_ring_empty(&txq->txq_mr)) initerr = cxgb_pcpu_enqueue_packet_(qs, immpkt); - } else + else txq->immpkt = immpkt; immpkt = NULL; @@ -564,13 +564,13 @@ { struct sge_qset *qs = arg; struct thread *td; - struct adapter *sc = qs->port->adapter; struct sge_txq *txq = &qs->txq[TXQ_ETH]; - int idleticks, err = 0; - + struct adapter *sc = qs->port->adapter; + td = curthread; + sleep_ticks = hz/100; qs->qs_flags |= QS_RUNNING; thread_lock(td); sched_bind(td, qs->qs_cpuid); @@ -600,7 +600,6 @@ } else err = EINPROGRESS; - if (mtx_trylock(&qs->rspq.lock)) { process_responses(sc, qs, -1); From owner-p4-projects@FreeBSD.ORG Fri Oct 12 23:25:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19DD716A41A; Fri, 12 Oct 2007 23:25:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0AD616A418 for ; Fri, 12 Oct 2007 23:25:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C228813C465 for ; Fri, 12 Oct 2007 23:25:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CNPcnR018616 for ; Fri, 12 Oct 2007 23:25:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNPcin018613 for perforce@freebsd.org; Fri, 12 Oct 2007 23:25:38 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 23:25:38 GMT Message-Id: <200710122325.l9CNPcin018613@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 127459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 23:25:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=127459 Change 127459 by kmacy@kmacy_home:ethng on 2007/10/12 23:25:00 remove MINCLSIZE - no longer needed now that we have m_fast_free Affected files ... .. //depot/projects/ethng/src/sys/amd64/conf/MULTIQ#5 edit Differences ... ==== //depot/projects/ethng/src/sys/amd64/conf/MULTIQ#5 (text+ko) ==== @@ -27,8 +27,8 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -options SCHED_ULE -options IPI_PREEMPTION +options SCHED_ULE # +options IPI_PREEMPTION # options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols @@ -212,5 +212,5 @@ options ALT_BREAK_TO_DEBUGGER #options LOCK_PROFILING options HWPMC_HOOKS -options MINCLSIZE=104 + From owner-p4-projects@FreeBSD.ORG Fri Oct 12 23:26:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F0BA16A41B; Fri, 12 Oct 2007 23:26:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0F5816A417 for ; Fri, 12 Oct 2007 23:26:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F0A9B13C448 for ; Fri, 12 Oct 2007 23:26:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CNQdlv018767 for ; Fri, 12 Oct 2007 23:26:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNQdjs018764 for perforce@freebsd.org; Fri, 12 Oct 2007 23:26:39 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 23:26:39 GMT Message-Id: <200710122326.l9CNQdjs018764@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 127460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 23:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=127460 Change 127460 by kmacy@kmacy_home:ethng on 2007/10/12 23:25:49 add build options needed on i386 Affected files ... .. //depot/projects/ethng/src/sys/i386/conf/GENERIC#3 edit Differences ... ==== //depot/projects/ethng/src/sys/i386/conf/GENERIC#3 (text+ko) ==== @@ -18,8 +18,6 @@ # # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474 2007/09/26 20:05:07 brueffer Exp $ -cpu I486_CPU -cpu I586_CPU cpu I686_CPU ident GENERIC @@ -311,3 +309,7 @@ device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver device dcons_crom # Configuration ROM for dcons + +options IFNET_MULTIQUEUE # add support for using multiple tx queues to ifnet +options ALT_BREAK_TO_DEBUGGER +options HWPMC_HOOKS From owner-p4-projects@FreeBSD.ORG Fri Oct 12 23:36:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FF5A16A420; Fri, 12 Oct 2007 23:36:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 355B016A419 for ; Fri, 12 Oct 2007 23:36:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32BBB13C455 for ; Fri, 12 Oct 2007 23:36:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CNatXc019340 for ; Fri, 12 Oct 2007 23:36:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9CNaoNT019322 for perforce@freebsd.org; Fri, 12 Oct 2007 23:36:50 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 12 Oct 2007 23:36:50 GMT Message-Id: <200710122336.l9CNaoNT019322@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 127461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Oct 2007 23:36:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=127461 Change 127461 by kmacy@kmacy_home:ethng on 2007/10/12 23:36:18 IFC 127454 ethngD Affected files ... .. //depot/projects/ethng/src/Makefile.inc1#3 integrate .. //depot/projects/ethng/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/ethng/src/UPDATING#4 integrate .. //depot/projects/ethng/src/cddl/lib/Makefile#3 integrate .. //depot/projects/ethng/src/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/ethng/src/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/ethng/src/contrib/less/NEWS#2 integrate .. //depot/projects/ethng/src/contrib/less/README#2 integrate .. //depot/projects/ethng/src/contrib/less/ch.c#2 integrate .. //depot/projects/ethng/src/contrib/less/charset.c#2 integrate .. //depot/projects/ethng/src/contrib/less/configure#2 integrate .. //depot/projects/ethng/src/contrib/less/configure.ac#2 integrate .. //depot/projects/ethng/src/contrib/less/filename.c#2 integrate .. //depot/projects/ethng/src/contrib/less/funcs.h#2 integrate .. //depot/projects/ethng/src/contrib/less/jump.c#2 integrate .. //depot/projects/ethng/src/contrib/less/less.h#2 integrate .. //depot/projects/ethng/src/contrib/less/less.man#2 integrate .. //depot/projects/ethng/src/contrib/less/less.nro#2 integrate .. //depot/projects/ethng/src/contrib/less/lessecho.man#2 integrate .. //depot/projects/ethng/src/contrib/less/lessecho.nro#2 integrate .. //depot/projects/ethng/src/contrib/less/lesskey.man#2 integrate .. //depot/projects/ethng/src/contrib/less/lesskey.nro#2 integrate .. //depot/projects/ethng/src/contrib/less/line.c#2 integrate .. //depot/projects/ethng/src/contrib/less/search.c#2 integrate .. //depot/projects/ethng/src/contrib/less/signal.c#2 integrate .. //depot/projects/ethng/src/contrib/less/version.c#2 integrate .. //depot/projects/ethng/src/etc/defaults/devfs.rules#2 integrate .. //depot/projects/ethng/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/ethng/src/etc/rc.d/early.sh#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ppp#2 integrate .. //depot/projects/ethng/src/etc/rc.subr#2 integrate .. //depot/projects/ethng/src/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/ethng/src/gnu/lib/libobjc/Makefile#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/ethng/src/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/ethng/src/lib/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/amd64/enter_uts.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/arm/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/arm/arm/context.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/i386/thr_getcontext.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/ia64/enter_uts.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/assym.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/assym.s#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/context.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/sparc64/assym.s#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#2 integrate .. //depot/projects/ethng/src/lib/libkse/kse.map#1 branch .. //depot/projects/ethng/src/lib/libkse/pthread.map#2 delete .. //depot/projects/ethng/src/lib/libkse/support/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/support/thr_support.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/sys/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/sys/lock.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/README#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/guard_b.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/guard_b.exp#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/guard_s.pl#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/hello_b.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/hello_d.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/hello_d.exp#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/hello_s.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/join_leak_d.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/join_leak_d.exp#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/mutex_d.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/mutex_d.exp#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/propagate_s.pl#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/sem_d.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/sem_d.exp#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/sigsuspend_d.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/sigsuspend_d.exp#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/sigwait_d.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/sigwait_d.exp#2 integrate .. //depot/projects/ethng/src/lib/libkse/test/verify#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_autoinit.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_printf.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/ethng/src/lib/libpthread/Makefile#3 delete .. //depot/projects/ethng/src/lib/libpthread/arch/amd64/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/amd64/amd64/context.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/amd64/include/atomic_ops.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/amd64/include/pthread_md.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/arm/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/arm/arm/context.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/arm/arm/pthread_md.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/arm/include/atomic_ops.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/arm/include/pthread_md.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/i386/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/i386/i386/pthread_md.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/i386/include/atomic_ops.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/i386/include/pthread_md.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/ia64/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/ia64/ia64/context.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/ia64/include/pthread_md.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/include/pthread_md.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/sparc64/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/sparc64/include/pthread_md.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete .. //depot/projects/ethng/src/lib/libpthread/pthread.map#2 delete .. //depot/projects/ethng/src/lib/libpthread/support/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/support/thr_support.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/sys/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/sys/lock.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/sys/lock.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/sys/thr_error.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/Makefile#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/README#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/guard_b.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/mutex_d.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/propagate_s.pl#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/sigsuspend_d.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/ethng/src/lib/libpthread/test/verify#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/Makefile.inc#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_accept.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_aio_suspend.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_atfork.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_destroy.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_get_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getdetachstate.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getguardsize.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getinheritsched.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getschedparam.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getscope.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getstack.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getstackaddr.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_getstacksize.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_init.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setdetachstate.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setguardsize.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setinheritsched.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setschedparam.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setscope.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setstack.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setstackaddr.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_attr_setstacksize.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_autoinit.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_barrier.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_barrierattr.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_cancel.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_clean.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_close.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_concurrency.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_cond.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_condattr_destroy.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_condattr_init.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_condattr_pshared.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_connect.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_creat.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_create.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_detach.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_equal.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_execve.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_exit.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_fcntl.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_find_thread.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_fork.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_fsync.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_getprio.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_getschedparam.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_info.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_init.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_join.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_kern.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_kill.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_main_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_mattr_init.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_mattr_kind_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_mattr_pshared.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_msync.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_multi_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_mutex.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_mutex_prioceiling.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_mutex_protocol.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_mutexattr_destroy.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_nanosleep.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_once.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_open.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_pause.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_poll.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_printf.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_priority_queue.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_private.h#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_pselect.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_pspinlock.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_raise.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_read.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_readv.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_resume_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_rtld.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_rwlock.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_rwlockattr.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_select.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_self.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sem.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_seterrno.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_setprio.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_setschedparam.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sig.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sigaction.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sigaltstack.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sigmask.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sigpending.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sigprocmask.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sigsuspend.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sigwait.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_single_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_sleep.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_spec.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_spinlock.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_stack.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_suspend_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_switch_np.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_symbols.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_system.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_tcdrain.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_vfork.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_wait.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_wait4.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_waitpid.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_write.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_writev.c#2 delete .. //depot/projects/ethng/src/lib/libpthread/thread/thr_yield.c#2 delete .. //depot/projects/ethng/src/lib/libthr/Makefile#3 integrate .. //depot/projects/ethng/src/lib/libutil/pidfile.3#2 integrate .. //depot/projects/ethng/src/lib/libutil/pidfile.c#2 integrate .. //depot/projects/ethng/src/release/Makefile#3 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/ethng/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/ethng/src/sbin/ggate/Makefile#3 integrate .. //depot/projects/ethng/src/share/examples/cvsup/stable-supfile#3 integrate .. //depot/projects/ethng/src/share/man/man3/Makefile#2 integrate .. //depot/projects/ethng/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/ethng/src/share/man/man7/Makefile#2 integrate .. //depot/projects/ethng/src/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/ethng/src/share/mk/bsd.own.mk#2 integrate .. //depot/projects/ethng/src/share/zoneinfo/Makefile#2 integrate .. //depot/projects/ethng/src/share/zoneinfo/africa#3 integrate .. //depot/projects/ethng/src/share/zoneinfo/asia#2 integrate .. //depot/projects/ethng/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/ethng/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/ethng/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/ethng/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/ethng/src/sys/conf/NOTES#3 integrate .. //depot/projects/ethng/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/ethng/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/ethng/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/ethng/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/ethng/src/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/ethng/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/ethng/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/ethng/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/ethng/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/ethng/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/ethng/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/ethng/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/ethng/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/ethng/src/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/ethng/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/ethng/src/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/ethng/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/ethng/src/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/ethng/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/ethng/src/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/ethng/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/ethng/src/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_switch.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/ethng/src/sys/kern/p1003_1b.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/ethng/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/ethng/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/ethng/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/ethng/src/sys/net/bpf.c#3 integrate .. //depot/projects/ethng/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/ethng/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/ethng/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/ethng/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/ethng/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/ethng/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/ethng/src/sys/pci/if_vr.c#2 integrate .. //depot/projects/ethng/src/sys/pci/if_wb.c#2 integrate .. //depot/projects/ethng/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/ethng/src/sys/sys/ata.h#3 integrate .. //depot/projects/ethng/src/sys/sys/param.h#4 integrate .. //depot/projects/ethng/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/ethng/src/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_LIBKSE#1 branch .. //depot/projects/ethng/src/tools/build/options/WITHOUT_LIBPTHREAD#2 integrate .. //depot/projects/ethng/src/usr.bin/Makefile#3 integrate .. //depot/projects/ethng/src/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/ethng/src/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/Makefile#4 integrate .. //depot/projects/ethng/src/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/ngctl/Makefile#3 integrate .. //depot/projects/ethng/src/usr.sbin/nscd/mp_rs_query.#3 delete .. //depot/projects/ethng/src/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/sade/sade.8#2 integrate Differences ... ==== //depot/projects/ethng/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.588 2007/10/09 23:31:09 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1030,12 +1030,12 @@ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" _default_thread_lib= lib/${DEFAULT_THREAD_LIB} .elif ${MK_LIBTHR} != "no" _default_thread_lib= lib/libthr -.elif ${MK_LIBPTHREAD} != "no" -_default_thread_lib= lib/libpthread +.elif ${MK_LIBKSE} != "no" +_default_thread_lib= lib/libkse .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/ethng/src/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -17,8 +17,8 @@ # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached -OLD_FILES+=usr/share/man/man5/cached.conf.5 -OLD_FILES+=usr/share/man/man8/cached.8 +OLD_FILES+=usr/share/man/man5/cached.conf.5.gz +OLD_FILES+=usr/share/man/man8/cached.8.gz # 20070807: removal of PowerPC specific header file. .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/machine/interruptvar.h ==== //depot/projects/ethng/src/UPDATING#4 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: - FreeBSD 7.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: + FreeBSD 8.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20071010: + RELENG_7 branched. + +20071009: + Setting WITHOUT_LIBPTHREAD now means WITHOUT_LIBKSE and + WITHOUT_LIBTHR are set. + 20070930: The PCI code has been made aware of PCI domains. This means that the location strings as used by pciconf(8) etc are now in the @@ -35,6 +42,11 @@ instead of cached_enable, cached_pidfile and cached_flags in rc.conf. +20070921: + The getfacl(1) utility now prints owning user and group name + instead of owning uid and gid in the three line comment header. + This is the same behavior as getfacl(1) on Solaris and Linux. + 20070704: The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel @@ -145,9 +157,9 @@ 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. + The default threading library (providing "libpthread") has been + changed to libthr. If you wish to have libkse as your default, + use option DEFAULT_THREAD_LIB=libkse for the buildworld. 20070423: The ABI breakage in sendmail(8)'s libmilter has been repaired @@ -901,4 +913,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $ +$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ ==== //depot/projects/ethng/src/cddl/lib/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include @@ -11,7 +11,7 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _libzpool= libzpool .endif .endif ==== //depot/projects/ethng/src/cddl/usr.bin/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include SUBDIR= ${_ztest} .if ${MK_ZFS} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _ztest= ztest .endif .endif ==== //depot/projects/ethng/src/cddl/usr.sbin/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include SUBDIR= ${_zdb} .if ${MK_ZFS} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _zdb= zdb .endif .endif ==== //depot/projects/ethng/src/contrib/less/NEWS#2 (text+ko) ==== @@ -13,6 +13,20 @@ ====================================================================== + Major changes between "less" versions 406 and 409 + +* Support CSI escape sequences, like SGR escape sequences. + +* Fix bug which caused screen to fail to repaint when window is resized. + +* Fix bug in using -i and -I flags with non-ASCII text. + +* Fix configure bug on systems which don't support langinfo.h. + +* Fix crash when searching text containing certain invalid UTF-8 sequences. + +====================================================================== + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. @@ -683,3 +697,4 @@ + ==== //depot/projects/ethng/src/contrib/less/README#2 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 406 + Less, version 409 - This is the distribution of less, version 406, released 19 Jun 2007. + This is the distribution of less, version 409, released 12 Oct 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/ethng/src/contrib/less/ch.c#2 (text+ko) ==== @@ -128,6 +128,9 @@ POSITION pos; POSITION len; + if (thisfile == NULL) + return (EOI); + slept = FALSE; /* @@ -416,6 +419,9 @@ BLOCKNUM new_block; POSITION len; + if (thisfile == NULL) + return (0); + len = ch_length(); if (pos < ch_zero() || (len != NULL_POSITION && pos > len)) return (1); @@ -450,6 +456,9 @@ { POSITION len; + if (thisfile == NULL) + return (0); + if (ch_flags & CH_CANSEEK) ch_fsize = filesize(ch_file); @@ -503,6 +512,8 @@ public POSITION ch_length() { + if (thisfile == NULL) + return (NULL_POSITION); if (ignore_eoi) return (NULL_POSITION); if (ch_flags & CH_HELPFILE) @@ -516,6 +527,8 @@ public POSITION ch_tell() { + if (thisfile == NULL) + return (NULL_POSITION); return (ch_block * LBUFSIZE) + ch_offset; } @@ -527,6 +540,8 @@ { register int c; + if (thisfile == NULL) + return (EOI); c = ch_get(); if (c == EOI) return (EOI); @@ -546,6 +561,8 @@ public int ch_back_get() { + if (thisfile == NULL) + return (EOI); if (ch_offset > 0) ch_offset --; else @@ -586,6 +603,9 @@ { register struct buf *bp; + if (thisfile == NULL) + return; + if (!(ch_flags & CH_CANSEEK)) { /* @@ -769,6 +789,9 @@ { int keepstate = FALSE; + if (thisfile == NULL) + return; + if (ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE)) { /* @@ -807,6 +830,8 @@ public int ch_getflags() { + if (thisfile == NULL) + return (0); return (ch_flags); } ==== //depot/projects/ethng/src/contrib/less/charset.c#2 (text+ko) ==== @@ -567,24 +567,29 @@ { case 1: default: + /* 0xxxxxxx */ return (LWCHAR) (p[0] & 0xFF); case 2: + /* 110xxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x1F) << 6) | (p[1] & 0x3F)); case 3: + /* 1110xxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x0F) << 12) | ((p[1] & 0x3F) << 6) | (p[2] & 0x3F)); case 4: + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x07) << 18) | ((p[1] & 0x3F) << 12) | ((p[2] & 0x3F) << 6) | (p[3] & 0x3F)); case 5: + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x03) << 24) | ((p[1] & 0x3F) << 18) | @@ -592,6 +597,7 @@ ((p[3] & 0x3F) << 6) | (p[4] & 0x3F)); case 6: + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x01) << 30) | ((p[1] & 0x3F) << 24) | @@ -603,6 +609,56 @@ } /* + * Store a character into a UTF-8 string. + */ + public void +put_wchar(pp, ch) + char **pp; + LWCHAR ch; +{ + if (!utf_mode || ch < 0x80) + { + /* 0xxxxxxx */ + *(*pp)++ = (char) ch; + } else if (ch < 0x800) + { + /* 110xxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xC0 | ((ch >> 6) & 0x1F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x10000) + { + /* 1110xxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xE0 | ((ch >> 12) & 0x0F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x200000) + { + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 18) & 0x07)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x4000000) + { + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 24) & 0x03)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else + { + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 30) & 0x01)); + *(*pp)++ = (char) (0x80 | ((ch >> 24) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } +} + +/* * Step forward or backward one character in a string. */ public LWCHAR @@ -612,6 +668,7 @@ char *limit; { LWCHAR ch; + int len; char *p = *pp; if (!utf_mode) @@ -623,14 +680,15 @@ ch = (LWCHAR) ((p > limit) ? *--p : 0); } else if (dir > 0) { - if (p + utf_len(*p) > limit) + len = utf_len(*p); + if (p + len > limit) + { ch = 0; - else + p = limit; + } else { ch = get_wchar(p); - p++; - while (IS_UTF8_TRAIL(*p)) - p++; + p += len; } } else { ==== //depot/projects/ethng/src/contrib/less/configure#2 (text+ko) ==== @@ -6473,6 +6473,7 @@ /* end confdefs.h. */ #include #include +#include int main () { ==== //depot/projects/ethng/src/contrib/less/configure.ac#2 (text+ko) ==== @@ -304,7 +304,8 @@ AC_MSG_CHECKING(for locale) AC_TRY_LINK([#include -#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], +#include +#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for ctype functions) AC_TRY_LINK([ ==== //depot/projects/ethng/src/contrib/less/filename.c#2 (text+ko) ==== @@ -482,7 +482,7 @@ for (i = 0; i < n; i++) { char c = data[i]; - if (ctldisp == OPT_ONPLUS && c == ESC) + if (ctldisp == OPT_ONPLUS && IS_CSI_START(c)) { while (++i < n && is_ansi_middle(data[i])) continue; ==== //depot/projects/ethng/src/contrib/less/funcs.h#2 (text+ko) ==== @@ -56,6 +56,7 @@ public int utf_len (); public int is_utf8_well_formed (); public LWCHAR get_wchar (); + public void put_wchar (); public LWCHAR step_char (); public int is_composing_char (); public int is_ubin_char (); ==== //depot/projects/ethng/src/contrib/less/jump.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ jump_forw() { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 13 06:27:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27C0216A41B; Sat, 13 Oct 2007 06:27:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8264116A419 for ; Sat, 13 Oct 2007 06:27:47 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A9C413C43E for ; Sat, 13 Oct 2007 06:27:47 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9D6Rl7U065908 for ; Sat, 13 Oct 2007 06:27:47 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9D6Rlfs065905 for perforce@freebsd.org; Sat, 13 Oct 2007 06:27:47 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Sat, 13 Oct 2007 06:27:47 GMT Message-Id: <200710130627.l9D6Rlfs065905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 127467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2007 06:27:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=127467 Change 127467 by zhouzhouyi@zhouzhouyi_mactest on 2007/10/13 06:27:20 Mandatory Access Control - Regression test for mount stat check Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/mount/00.t#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 13 12:44:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDDC816A421; Sat, 13 Oct 2007 12:44:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91BD416A419 for ; Sat, 13 Oct 2007 12:44:49 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F38613C45A for ; Sat, 13 Oct 2007 12:44:49 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9DCin1K003104 for ; Sat, 13 Oct 2007 12:44:49 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9DCinft003101 for perforce@freebsd.org; Sat, 13 Oct 2007 12:44:49 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 13 Oct 2007 12:44:49 GMT Message-Id: <200710131244.l9DCinft003101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2007 12:44:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=127474 Change 127474 by zec@zec_tpx32 on 2007/10/13 12:44:05 Attempt to fix per vprocg load accounting, which was not properly dealing with deaths of orphaned processes, if those would be running in a non-default vprocg. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_clock.c#8 edit .. //depot/projects/vimage/src/sys/kern/kern_exit.c#9 edit .. //depot/projects/vimage/src/sys/kern/kern_fork.c#11 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#41 edit .. //depot/projects/vimage/src/sys/sys/sched.h#6 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_clock.c#8 (text+ko) ==== @@ -416,7 +416,7 @@ td = curthread; p = td->td_proc; #ifdef VIMAGE - INIT_VPROCG(p->p_ucred->cr_rvimage->v_procg); + INIT_VPROCG(p->p_ucred->cr_vimage->v_procg); struct vprocg *vprocg_iter; #endif ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#9 (text+ko) ==== @@ -175,30 +175,6 @@ KASSERT(p->p_numthreads == 1, ("exit1: proc %p exiting with %d threads", p, p->p_numthreads)); -#ifdef VIMAGE - /* XXX is PROC_UNLOCK()/PROC_LOCK() sequence safe here? */ - if (p->p_ucred->cr_vimage->v_procg != - p->p_pptr->p_ucred->cr_vimage->v_procg) { - struct ucred *oldcred; - - setsugid(p); - crhold(p->p_pptr->p_ucred); - oldcred = p->p_ucred; - p->p_ucred = p->p_pptr->p_ucred; - PROC_UNLOCK(p); - sx_xlock(&allproc_lock); -#ifdef SCHED_4BSD - sched_load_reassign(oldcred->cr_vimage->v_procg, - p->p_ucred->cr_vimage->v_procg); -#endif - oldcred->cr_vimage->v_procg->nprocs--; - p->p_ucred->cr_vimage->v_procg->nprocs++; - sx_xunlock(&allproc_lock); - PROC_LOCK(p); - crfree(oldcred); - } -#endif - /* * Wakeup anyone in procfs' PIOCWAIT. They should have a hold * on our vmspace, so we should block below until they have @@ -438,6 +414,15 @@ LIST_REMOVE(p, p_list); LIST_INSERT_HEAD(&zombproc, p, p_list); LIST_REMOVE(p, p_hash); +#if defined(VIMAGE) && defined(SCHED_4BSD) + if (p->p_ucred->cr_vimage->v_procg != + p->p_pptr->p_ucred->cr_vimage->v_procg) { + mtx_lock_spin(&sched_lock); + sched_load_reassign(p->p_ucred->cr_vimage->v_procg, + p->p_pptr->p_ucred->cr_vimage->v_procg); + mtx_unlock_spin(&sched_lock); + } +#endif sx_xunlock(&allproc_lock); /* @@ -741,7 +726,7 @@ PROC_SLOCK(p); if (p->p_state == PRS_ZOMBIE) { #ifdef VIMAGE - struct vimage *rvp = p->p_ucred->cr_rvimage; + struct vimage *vp = p->p_ucred->cr_vimage; #endif if (rusage) { *rusage = p->p_ru; @@ -831,7 +816,7 @@ sx_xlock(&allproc_lock); nprocs--; #ifdef VIMAGE - rvp->v_procg->nprocs--; + vp->v_procg->nprocs--; #endif sx_xunlock(&allproc_lock); return (0); ==== //depot/projects/vimage/src/sys/kern/kern_fork.c#11 (text+ko) ==== @@ -326,7 +326,7 @@ */ nprocs++; #ifdef VIMAGE - p1->p_ucred->cr_rvimage->v_procg->nprocs++; + p1->p_ucred->cr_vimage->v_procg->nprocs++; #endif /* ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#41 (text+ko) ==== @@ -530,8 +530,14 @@ sx_xlock(&allproc_lock); oldcred->cr_vimage->v_procg->nprocs--; p->p_ucred->cr_vimage->v_procg->nprocs++; +#if defined(VIMAGE) && defined(SCHED_4BSD) + mtx_lock_spin(&sched_lock); +#endif sched_load_reassign(oldcred->cr_vimage->v_procg, newcred->cr_vimage->v_procg); +#if defined(VIMAGE) && defined(SCHED_4BSD) + mtx_unlock_spin(&sched_lock); +#endif sx_xunlock(&allproc_lock); crfree(oldcred); break; ==== //depot/projects/vimage/src/sys/sys/sched.h#6 (text+ko) ==== @@ -179,6 +179,8 @@ #define SCHED_STAT_INC(var) #endif +extern struct mtx sched_lock; + /* temporarily here */ void schedinit(void); void sched_newproc(struct proc *p, struct thread *td); From owner-p4-projects@FreeBSD.ORG Sat Oct 13 12:58:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50A2F16A46B; Sat, 13 Oct 2007 12:58:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB73616A41A for ; Sat, 13 Oct 2007 12:58:07 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE26813C46E for ; Sat, 13 Oct 2007 12:58:07 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9DCw7tE012497 for ; Sat, 13 Oct 2007 12:58:07 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9DCw7G6012494 for perforce@freebsd.org; Sat, 13 Oct 2007 12:58:07 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 13 Oct 2007 12:58:07 GMT Message-Id: <200710131258.l9DCw7G6012494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2007 12:58:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=127476 Change 127476 by zec@zec_tpx32 on 2007/10/13 12:57:17 Simplify previous change - there's no need for sched_lock mtx to be visible outside of kern/sched_4bsd.c. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_exit.c#10 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#42 edit .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#14 edit .. //depot/projects/vimage/src/sys/sys/sched.h#7 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#10 (text+ko) ==== @@ -414,13 +414,11 @@ LIST_REMOVE(p, p_list); LIST_INSERT_HEAD(&zombproc, p, p_list); LIST_REMOVE(p, p_hash); -#if defined(VIMAGE) && defined(SCHED_4BSD) +#if defined(VIMAGE) && defined(SCHED_4BSD) /* XXX what about ULE? */ if (p->p_ucred->cr_vimage->v_procg != p->p_pptr->p_ucred->cr_vimage->v_procg) { - mtx_lock_spin(&sched_lock); sched_load_reassign(p->p_ucred->cr_vimage->v_procg, p->p_pptr->p_ucred->cr_vimage->v_procg); - mtx_unlock_spin(&sched_lock); } #endif sx_xunlock(&allproc_lock); ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#42 (text+ko) ==== @@ -530,14 +530,8 @@ sx_xlock(&allproc_lock); oldcred->cr_vimage->v_procg->nprocs--; p->p_ucred->cr_vimage->v_procg->nprocs++; -#if defined(VIMAGE) && defined(SCHED_4BSD) - mtx_lock_spin(&sched_lock); -#endif sched_load_reassign(oldcred->cr_vimage->v_procg, newcred->cr_vimage->v_procg); -#if defined(VIMAGE) && defined(SCHED_4BSD) - mtx_unlock_spin(&sched_lock); -#endif sx_xunlock(&allproc_lock); crfree(oldcred); break; ==== //depot/projects/vimage/src/sys/kern/sched_4bsd.c#14 (text+ko) ==== @@ -104,7 +104,7 @@ ((ts)->ts_runq != 0 && (ts)->ts_runq != &runq) static struct td_sched td_sched0; -struct mtx sched_lock; +static struct mtx sched_lock; #ifndef VIMAGE static int sched_tdcnt; /* Total runnable threads in the system. */ @@ -255,9 +255,10 @@ void sched_load_reassign(struct vprocg *old, struct vprocg *new) { - /* XXX locking? */ + mtx_lock_spin(&sched_lock); old->_sched_tdcnt--; new->_sched_tdcnt++; + mtx_unlock_spin(&sched_lock); } #endif ==== //depot/projects/vimage/src/sys/sys/sched.h#7 (text+ko) ==== @@ -179,8 +179,6 @@ #define SCHED_STAT_INC(var) #endif -extern struct mtx sched_lock; - /* temporarily here */ void schedinit(void); void sched_newproc(struct proc *p, struct thread *td); From owner-p4-projects@FreeBSD.ORG Sat Oct 13 22:52:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48E3316A468; Sat, 13 Oct 2007 22:52:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E974716A417 for ; Sat, 13 Oct 2007 22:52:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D1F9113C474 for ; Sat, 13 Oct 2007 22:52:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9DMq4MA079621 for ; Sat, 13 Oct 2007 22:52:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9DMq4o2079618 for perforce@freebsd.org; Sat, 13 Oct 2007 22:52:04 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 13 Oct 2007 22:52:04 GMT Message-Id: <200710132252.l9DMq4o2079618@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 127484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2007 22:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=127484 Change 127484 by kmacy@kmacy_home:ethng on 2007/10/13 22:51:02 move NIC driver module into subdirectory to avoid merge conflicts with branches for RDMA and TOE support Affected files ... .. //depot/projects/ethng/src/sys/modules/cxgb/Makefile#9 edit .. //depot/projects/ethng/src/sys/modules/cxgb/cxgb/Makefile#1 add Differences ... ==== //depot/projects/ethng/src/sys/modules/cxgb/Makefile#9 (text+ko) ==== @@ -1,52 +1,4 @@ # $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.10 2007/09/09 01:28:02 kmacy Exp $ +SUBDIR= cxgb -CXGB = ${.CURDIR}/../../dev/cxgb -.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys - -KMOD= if_cxgb -SRCS= cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c -SRCS+= cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c -SRCS+= cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c -SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h -SRCS+= uipc_mvec.c cxgb_multiq.c cxgb_support.c - -CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP -CFLAGS+= -DIFNET_MULTIQUEUE - -#CFLAGS+= -DDISABLE_MBUF_IOVEC -#CFLAGS+= -DDEBUG -DDEBUG_PRINT -#CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS -#CFLAGS+= -DWITNESS -#CFLAGS += -DLOCK_PROFILING - -#CFLAGS+= -DWITNESS - - -.if ${MACHINE_ARCH} != "ia64" -# ld is broken on ia64 -t3fw-4.7.0.bin: ${CXGB}/t3fw-4.7.0.bin.gz.uu - uudecode -p < ${CXGB}/t3fw-4.7.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS= t3fw-4.7.0.bin:t3fw470 -CLEANFILES+= t3fw-4.7.0.bin - -t3b_protocol_sram-1.1.0.bin: ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu - uudecode -p < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS+= t3b_protocol_sram-1.1.0.bin:t3bps110 -CLEANFILES+= t3b_protocol_sram-1.1.0.bin - -t3b_tp_eeprom-1.1.0.bin: ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu - uudecode -p < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS+= t3b_tp_eeprom-1.1.0.bin:t3btpe110 -CLEANFILES+= t3b_tp_eeprom-1.1.0.bin - - -.endif - - -.include +.include From owner-p4-projects@FreeBSD.ORG Sat Oct 13 23:53:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4527D16A41B; Sat, 13 Oct 2007 23:53:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFEDE16A418 for ; Sat, 13 Oct 2007 23:53:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1D1113C45B for ; Sat, 13 Oct 2007 23:53:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9DNrGDj083891 for ; Sat, 13 Oct 2007 23:53:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9DNrDaD083888 for perforce@freebsd.org; Sat, 13 Oct 2007 23:53:13 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 13 Oct 2007 23:53:13 GMT Message-Id: <200710132353.l9DNrDaD083888@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 127487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Oct 2007 23:53:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=127487 Change 127487 by kmacy@kmacy:storage:toestack on 2007/10/13 23:52:36 IFC 127484 - IFC HEAD and integrate cxgb fixes Affected files ... .. //depot/projects/toestack/Makefile.inc1#3 integrate .. //depot/projects/toestack/ObsoleteFiles.inc#3 integrate .. //depot/projects/toestack/UPDATING#4 integrate .. //depot/projects/toestack/bin/sh/eval.c#2 integrate .. //depot/projects/toestack/bin/sh/sh.1#2 integrate .. //depot/projects/toestack/cddl/lib/Makefile#3 integrate .. //depot/projects/toestack/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/toestack/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/toestack/contrib/gcc/opts.c#3 integrate .. //depot/projects/toestack/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/toestack/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/toestack/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/toestack/contrib/less/NEWS#2 integrate .. //depot/projects/toestack/contrib/less/README#2 integrate .. //depot/projects/toestack/contrib/less/ch.c#2 integrate .. //depot/projects/toestack/contrib/less/charset.c#2 integrate .. //depot/projects/toestack/contrib/less/configure#2 integrate .. //depot/projects/toestack/contrib/less/configure.ac#2 integrate .. //depot/projects/toestack/contrib/less/filename.c#2 integrate .. //depot/projects/toestack/contrib/less/funcs.h#2 integrate .. //depot/projects/toestack/contrib/less/jump.c#2 integrate .. //depot/projects/toestack/contrib/less/less.h#2 integrate .. //depot/projects/toestack/contrib/less/less.man#2 integrate .. //depot/projects/toestack/contrib/less/less.nro#2 integrate .. //depot/projects/toestack/contrib/less/lessecho.man#2 integrate .. //depot/projects/toestack/contrib/less/lessecho.nro#2 integrate .. //depot/projects/toestack/contrib/less/lesskey.man#2 integrate .. //depot/projects/toestack/contrib/less/lesskey.nro#2 integrate .. //depot/projects/toestack/contrib/less/line.c#2 integrate .. //depot/projects/toestack/contrib/less/search.c#2 integrate .. //depot/projects/toestack/contrib/less/signal.c#2 integrate .. //depot/projects/toestack/contrib/less/version.c#2 integrate .. //depot/projects/toestack/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/toestack/etc/defaults/devfs.rules#2 integrate .. //depot/projects/toestack/etc/defaults/rc.conf#4 integrate .. //depot/projects/toestack/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/toestack/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/toestack/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/toestack/etc/mtree/README#2 integrate .. //depot/projects/toestack/etc/rc.d/early.sh#2 integrate .. //depot/projects/toestack/etc/rc.d/ppp#2 integrate .. //depot/projects/toestack/etc/rc.subr#2 integrate .. //depot/projects/toestack/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/toestack/gnu/lib/libobjc/Makefile#2 integrate .. //depot/projects/toestack/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate .. //depot/projects/toestack/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/toestack/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/toestack/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/toestack/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/toestack/lib/Makefile#2 integrate .. //depot/projects/toestack/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/toestack/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/toestack/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/toestack/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/toestack/lib/libkse/Makefile#1 branch .. //depot/projects/toestack/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/toestack/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/toestack/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/toestack/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/toestack/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/toestack/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/toestack/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/toestack/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/toestack/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/toestack/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/toestack/lib/libkse/kse.map#1 branch .. //depot/projects/toestack/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/toestack/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/sys/lock.c#1 branch .. //depot/projects/toestack/lib/libkse/sys/lock.h#1 branch .. //depot/projects/toestack/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/toestack/lib/libkse/test/Makefile#1 branch .. //depot/projects/toestack/lib/libkse/test/README#1 branch .. //depot/projects/toestack/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/toestack/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/toestack/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/toestack/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/toestack/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/toestack/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/toestack/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/toestack/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/toestack/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/toestack/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/toestack/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/toestack/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/toestack/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/toestack/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/toestack/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/toestack/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/toestack/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/toestack/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/toestack/lib/libkse/test/verify#1 branch .. //depot/projects/toestack/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/toestack/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/toestack/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/toestack/lib/libpthread/Makefile#3 delete .. //depot/projects/toestack/lib/libpthread/arch/amd64/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/arch/amd64/amd64/context.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 delete .. //depot/projects/toestack/lib/libpthread/arch/amd64/include/atomic_ops.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/amd64/include/pthread_md.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/arm/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/arch/arm/arm/context.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/arm/arm/pthread_md.c#2 delete .. //depot/projects/toestack/lib/libpthread/arch/arm/include/atomic_ops.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/arm/include/pthread_md.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/i386/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/arch/i386/i386/pthread_md.c#2 delete .. //depot/projects/toestack/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/i386/include/atomic_ops.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/i386/include/pthread_md.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/ia64/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/arch/ia64/ia64/context.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/ia64/ia64/pthread_md.c#2 delete .. //depot/projects/toestack/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/ia64/include/pthread_md.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/include/pthread_md.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete .. //depot/projects/toestack/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#2 delete .. //depot/projects/toestack/lib/libpthread/arch/sparc64/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/sparc64/include/pthread_md.h#2 delete .. //depot/projects/toestack/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete .. //depot/projects/toestack/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 delete .. //depot/projects/toestack/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete .. //depot/projects/toestack/lib/libpthread/pthread.map#2 delete .. //depot/projects/toestack/lib/libpthread/support/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/support/thr_support.c#2 delete .. //depot/projects/toestack/lib/libpthread/sys/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/sys/lock.c#2 delete .. //depot/projects/toestack/lib/libpthread/sys/lock.h#2 delete .. //depot/projects/toestack/lib/libpthread/sys/thr_error.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/Makefile#2 delete .. //depot/projects/toestack/lib/libpthread/test/README#2 delete .. //depot/projects/toestack/lib/libpthread/test/guard_b.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/toestack/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/toestack/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/toestack/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/toestack/lib/libpthread/test/mutex_d.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/toestack/lib/libpthread/test/propagate_s.pl#2 delete .. //depot/projects/toestack/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/toestack/lib/libpthread/test/sigsuspend_d.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/toestack/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/toestack/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/toestack/lib/libpthread/test/verify#2 delete .. //depot/projects/toestack/lib/libpthread/thread/Makefile.inc#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_accept.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_aio_suspend.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_atfork.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_destroy.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_get_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getdetachstate.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getguardsize.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getinheritsched.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getschedparam.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getscope.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getstack.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getstackaddr.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_getstacksize.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_init.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setdetachstate.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setguardsize.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setinheritsched.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setschedparam.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setscope.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setstack.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setstackaddr.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_attr_setstacksize.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_autoinit.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_barrier.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_barrierattr.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_cancel.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_clean.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_close.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_concurrency.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_cond.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_condattr_destroy.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_condattr_init.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_condattr_pshared.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_connect.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_creat.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_create.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_detach.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_equal.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_execve.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_exit.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_fcntl.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_find_thread.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_fork.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_fsync.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_getprio.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_getschedparam.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_info.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_init.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_join.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_kern.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_kill.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_main_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_mattr_init.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_mattr_kind_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_mattr_pshared.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_msync.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_multi_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_mutex.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_mutex_prioceiling.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_mutex_protocol.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_mutexattr_destroy.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_nanosleep.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_once.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_open.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_pause.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_poll.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_printf.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_priority_queue.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_private.h#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_pselect.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_pspinlock.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_raise.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_read.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_readv.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_resume_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_rtld.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_rwlock.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_rwlockattr.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_select.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_self.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sem.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_seterrno.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_setprio.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_setschedparam.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sig.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sigaction.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sigaltstack.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sigmask.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sigpending.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sigprocmask.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sigsuspend.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sigwait.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_single_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_sleep.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_spec.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_spinlock.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_stack.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_suspend_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_switch_np.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_symbols.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_system.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_tcdrain.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_vfork.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_wait.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_wait4.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_waitpid.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_write.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_writev.c#2 delete .. //depot/projects/toestack/lib/libpthread/thread/thr_yield.c#2 delete .. //depot/projects/toestack/lib/libthr/Makefile#3 integrate .. //depot/projects/toestack/lib/libutil/pidfile.3#2 integrate .. //depot/projects/toestack/lib/libutil/pidfile.c#2 integrate .. //depot/projects/toestack/release/Makefile#2 integrate .. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/toestack/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/toestack/sbin/ggate/Makefile#3 integrate .. //depot/projects/toestack/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/toestack/share/examples/cvsup/stable-supfile#3 integrate .. //depot/projects/toestack/share/man/man3/Makefile#2 integrate .. //depot/projects/toestack/share/man/man4/ata.4#3 integrate .. //depot/projects/toestack/share/man/man4/uscanner.4#2 integrate .. //depot/projects/toestack/share/man/man5/src.conf.5#2 integrate .. //depot/projects/toestack/share/man/man7/Makefile#2 integrate .. //depot/projects/toestack/share/man/man9/Makefile#3 integrate .. //depot/projects/toestack/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/toestack/share/mk/bsd.own.mk#2 integrate .. //depot/projects/toestack/share/zoneinfo/Makefile#2 integrate .. //depot/projects/toestack/share/zoneinfo/africa#2 integrate .. //depot/projects/toestack/share/zoneinfo/asia#2 integrate .. //depot/projects/toestack/share/zoneinfo/southamerica#2 integrate .. //depot/projects/toestack/sys/amd64/conf/MULTIQ#6 integrate .. //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/toestack/sys/boot/common/module.c#2 integrate .. //depot/projects/toestack/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/toestack/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/toestack/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/toestack/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/toestack/sys/conf/NOTES#2 integrate .. //depot/projects/toestack/sys/conf/newvers.sh#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/toestack/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/toestack/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/toestack/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/toestack/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/toestack/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/toestack/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/toestack/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/toestack/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/toestack/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/toestack/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/toestack/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/toestack/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/toestack/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/toestack/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/toestack/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/toestack/sys/dev/my/if_my.c#2 integrate .. //depot/projects/toestack/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/toestack/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/toestack/sys/dev/sio/sio.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/toestack/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/toestack/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/toestack/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/toestack/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/toestack/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/toestack/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/toestack/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/toestack/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/toestack/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/toestack/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/toestack/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/toestack/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/toestack/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/toestack/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/toestack/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/toestack/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_switch.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_synch.c#3 integrate .. //depot/projects/toestack/sys/kern/p1003_1b.c#2 integrate .. //depot/projects/toestack/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/toestack/sys/kern/sched_ule.c#4 integrate .. //depot/projects/toestack/sys/kern/sys_process.c#3 integrate .. //depot/projects/toestack/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/toestack/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/toestack/sys/kern/vfs_export.c#3 integrate .. //depot/projects/toestack/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/toestack/sys/net/bpf.c#3 integrate .. //depot/projects/toestack/sys/net/if_lagg.c#2 integrate .. //depot/projects/toestack/sys/net/if_lagg.h#2 integrate .. //depot/projects/toestack/sys/net/route.c#3 integrate .. //depot/projects/toestack/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/toestack/sys/netinet/accf_data.c#2 integrate .. //depot/projects/toestack/sys/netinet/accf_http.c#2 integrate .. //depot/projects/toestack/sys/netinet/if_ether.c#4 integrate .. //depot/projects/toestack/sys/netinet/igmp.c#2 integrate .. //depot/projects/toestack/sys/netinet/in.c#2 integrate .. //depot/projects/toestack/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/toestack/sys/netinet/in_gif.c#3 integrate .. //depot/projects/toestack/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/toestack/sys/netinet/in_proto.c#2 integrate .. //depot/projects/toestack/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_id.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_input.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_options.c#2 integrate .. //depot/projects/toestack/sys/netinet/ip_output.c#2 integrate .. //depot/projects/toestack/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/toestack/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/toestack/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/toestack/sys/netinet/sctputil.c#5 integrate .. //depot/projects/toestack/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/toestack/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/toestack/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/toestack/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/toestack/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/toestack/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/toestack/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/toestack/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/toestack/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/toestack/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/toestack/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/toestack/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/toestack/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/toestack/sys/pci/if_vr.c#2 integrate .. //depot/projects/toestack/sys/pci/if_wb.c#2 integrate .. //depot/projects/toestack/sys/pci/if_xl.c#2 integrate .. //depot/projects/toestack/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/toestack/sys/sys/ata.h#2 integrate .. //depot/projects/toestack/sys/sys/mbuf.h#4 integrate .. //depot/projects/toestack/sys/sys/param.h#4 integrate .. //depot/projects/toestack/sys/vm/uma_core.c#3 integrate .. //depot/projects/toestack/sys/vm/vm_fault.c#3 integrate .. //depot/projects/toestack/sys/vm/vm_page.c#3 integrate .. //depot/projects/toestack/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/toestack/tools/build/options/WITHOUT_LIBKSE#1 branch .. //depot/projects/toestack/tools/build/options/WITHOUT_LIBPTHREAD#2 integrate .. //depot/projects/toestack/tools/regression/bin/sh/builtins/case1.0#1 branch .. //depot/projects/toestack/usr.bin/Makefile#3 integrate .. //depot/projects/toestack/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/toestack/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/toestack/usr.sbin/Makefile#4 integrate .. //depot/projects/toestack/usr.sbin/ipfwpcap/ipfwpcap.c#2 integrate .. //depot/projects/toestack/usr.sbin/ngctl/Makefile#3 integrate .. //depot/projects/toestack/usr.sbin/nscd/mp_rs_query.#3 delete .. //depot/projects/toestack/usr.sbin/pciconf/pciconf.8#3 integrate .. //depot/projects/toestack/usr.sbin/pciconf/pciconf.c#3 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/toestack/usr.sbin/sade/sade.8#2 integrate Differences ... ==== //depot/projects/toestack/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.588 2007/10/09 23:31:09 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1030,12 +1030,12 @@ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" _default_thread_lib= lib/${DEFAULT_THREAD_LIB} .elif ${MK_LIBTHR} != "no" _default_thread_lib= lib/libthr -.elif ${MK_LIBPTHREAD} != "no" -_default_thread_lib= lib/libpthread +.elif ${MK_LIBKSE} != "no" +_default_thread_lib= lib/libkse .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/toestack/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -17,8 +17,8 @@ # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached -OLD_FILES+=usr/share/man/man5/cached.conf.5 -OLD_FILES+=usr/share/man/man8/cached.8 +OLD_FILES+=usr/share/man/man5/cached.conf.5.gz +OLD_FILES+=usr/share/man/man8/cached.8.gz # 20070807: removal of PowerPC specific header file. .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/machine/interruptvar.h ==== //depot/projects/toestack/UPDATING#4 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: - FreeBSD 7.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: + FreeBSD 8.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20071010: + RELENG_7 branched. + +20071009: + Setting WITHOUT_LIBPTHREAD now means WITHOUT_LIBKSE and + WITHOUT_LIBTHR are set. + 20070930: The PCI code has been made aware of PCI domains. This means that the location strings as used by pciconf(8) etc are now in the @@ -35,6 +42,11 @@ instead of cached_enable, cached_pidfile and cached_flags in rc.conf. +20070921: + The getfacl(1) utility now prints owning user and group name + instead of owning uid and gid in the three line comment header. + This is the same behavior as getfacl(1) on Solaris and Linux. + 20070704: The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel @@ -145,9 +157,9 @@ 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. + The default threading library (providing "libpthread") has been + changed to libthr. If you wish to have libkse as your default, + use option DEFAULT_THREAD_LIB=libkse for the buildworld. 20070423: The ABI breakage in sendmail(8)'s libmilter has been repaired @@ -901,4 +913,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $ +$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ ==== //depot/projects/toestack/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.53 2006/06/15 07:57:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $"); #include #include @@ -367,6 +367,7 @@ setstackmark(&smark); arglist.lastp = &arglist.list; oexitstatus = exitstatus; + exitstatus = 0; expandarg(n->ncase.expr, &arglist, EXP_TILDE); for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) { for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) { ==== //depot/projects/toestack/bin/sh/sh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -861,6 +861,10 @@ separated by .Dq Li \&| characters. +The exit code of the +.Ic case +command is the exit code of the last command executed in the list or +zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Bd -literal -offset indent ==== //depot/projects/toestack/cddl/lib/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include @@ -11,7 +11,7 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _libzpool= libzpool .endif .endif ==== //depot/projects/toestack/cddl/usr.bin/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include SUBDIR= ${_ztest} .if ${MK_ZFS} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _ztest= ztest .endif .endif ==== //depot/projects/toestack/cddl/usr.sbin/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include SUBDIR= ${_zdb} .if ${MK_ZFS} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _zdb= zdb .endif .endif ==== //depot/projects/toestack/contrib/gcc/opts.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/opts.c,v 1.4 2007/10/02 20:06:14 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5 2007/10/03 01:26:24 obrien Exp $ */ #include "config.h" #include "system.h" ==== //depot/projects/toestack/contrib/groff/tmac/doc-common#2 (text+ko) ==== @@ -485,6 +485,7 @@ .ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-7.0 7.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 ==== //depot/projects/toestack/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -204,13 +204,13 @@ .as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] .ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V .as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1 +.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1 .as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2 +.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2 .as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3 +.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3 .as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] -.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4 +.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4 .as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] . .de At ==== //depot/projects/toestack/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ==== @@ -813,9 +813,9 @@ Local, OS-specific additions might be found in the file .Pa mdoc.local ; look for strings named -.Ql volume-ds-XXX +.Ql volume\-ds\-XXX (for the former type) and -.Ql volume-as-XXX +.Ql volume\-as\-XXX (for the latter type); .Ql XXX then denotes the keyword to be used with the @@ -848,7 +848,7 @@ local additions might be defined in .Pa mdoc.local ; look for strings named -.Ql operating-system-XXX-YYY , +.Ql operating\-system\-XXX\-YYY , where .Ql XXX is the acronym for the operating system and @@ -869,7 +869,7 @@ 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, -5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1 +5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0 .It DragonFly 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 .It Darwin @@ -1202,7 +1202,7 @@ If this is not desirable, . .Bd -literal -offset indent -\&.An -nosplit +\&.An \-nosplit .Ed .Pp . @@ -1210,7 +1210,7 @@ To turn splitting back on, write . .Bd -literal -offset indent -\&.An -split +\&.An \-split .Ed . .Ss "Arguments" @@ -1580,10 +1580,10 @@ .Sx RETURN VALUES section. .Pp -.Dl Usage: .Rv Oo -std Oc Op Ao function Ac ... +.Dl Usage: .Rv Oo \-std Oc Op Ao function Ac ... .Pp For example, -.Ql ".Rv -std atexit" +.Ql ".Rv \-std atexit" produces: . .Bd -ragged -offset -indent @@ -1610,10 +1610,10 @@ .Sx DIAGNOSTICS section. .Pp -.Dl Usage: .Ex Oo -std Oc Op Ao utility Ac ... +.Dl Usage: .Ex Oo \-std Oc Op Ao utility Ac ... .Pp For example, -.Ql ".Ex -std cat" +.Ql ".Ex \-std cat" produces: . .Bd -ragged -offset -indent @@ -1737,7 +1737,7 @@ Local, OS-specific additions might be found in the file .Pa mdoc.local ; look for strings named -.Ql str-Lb-XXX . +.Ql str\-Lb\-XXX . .Ql XXX then denotes the keyword to be used with the .Ql .Lb @@ -1755,16 +1755,16 @@ The .Ql .Li literal macro may be used for special characters, variable constants, etc.\& --- anything which should be displayed as it would be typed. +\- anything which should be displayed as it would be typed. .Pp .Dl Usage: .Li Ao argument Ac ... .Pp -.Bl -tag -width ".Li .Li\ cntrl-D\ )\ ," -compact -offset 15n +.Bl -tag -width ".Li .Li\ cntrl\-D\ )\ ," -compact -offset 15n .It Li ".Li \een" .Li \en .It Li ".Li M1 M2 M3 ;" .Li M1 M2 M3 ; -.It Li ".Li cntrl-D ) ," +.It Li ".Li cntrl\-D ) ," .Li cntrl-D ) , .It Li ".Li 1024 ..." .Li 1024 ... @@ -1812,7 +1812,7 @@ .Bl -tag -width ".Li .Nm\ groff_mdoc" -compact -offset 15n .It Li ".Nm groff_mdoc" .Nm groff_mdoc -.It Li ".Nm \e-mdoc" +.It Li ".Nm \e\-mdoc" .Nm \-mdoc .It Li ".Nm foo ) ) ," .Nm foo ) ) , @@ -1930,16 +1930,16 @@ .Pp .Tn ANSI/ISO C .Pp -.Bl -tag -width ".Li -iso9945-1-90" -compact -offset indent -.It Li -ansiC +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-ansiC .St -ansiC -.It Li -ansiC-89 +.It Li \-ansiC\-89 .St -ansiC-89 -.It Li -isoC +.It Li \-isoC .St -isoC -.It Li -isoC-90 +.It Li \-isoC\-90 .St -isoC-90 -.It Li -isoC-99 +.It Li \-isoC\-99 .St -isoC-99 .El .Pp @@ -1947,30 +1947,30 @@ .Tn POSIX Part 1: System API .Pp -.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent -.It Li -iso9945-1-90 +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent +.It Li \-iso9945\-1\-90 .St -iso9945-1-90 -.It Li -iso9945-1-96 +.It Li \-iso9945\-1\-96 .St -iso9945-1-96 -.It Li -p1003.1 +.It Li \-p1003.1 .St -p1003.1 -.It Li -p1003.1-88 +.It Li \-p1003.1\-88 .St -p1003.1-88 >>> TRUNCATED FOR MAIL (1000 lines) <<<