From owner-p4-projects@FreeBSD.ORG Sun Apr 17 06:07:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 857D516A4D0; Sun, 17 Apr 2005 06:07:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 499C316A4CE for ; Sun, 17 Apr 2005 06:07:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57C8043D1F for ; Sun, 17 Apr 2005 06:07:05 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3H6755i037650 for ; Sun, 17 Apr 2005 06:07:05 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3H674B2037647 for perforce@freebsd.org; Sun, 17 Apr 2005 06:07:04 GMT (envelope-from julian@freebsd.org) Date: Sun, 17 Apr 2005 06:07:04 GMT Message-Id: <200504170607.j3H674B2037647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 75362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 06:07:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=75362 Change 75362 by julian@julian_jules1 on 2005/04/17 06:06:45 zap branch Affected files ... .. //depot/projects/nsched/sys/Makefile#4 delete .. //depot/projects/nsched/sys/alpha/Makefile#2 delete .. //depot/projects/nsched/sys/alpha/alpha/api_up1000.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/atomic.s#2 delete .. //depot/projects/nsched/sys/alpha/alpha/autoconf.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/busdma_machdep.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/busspace.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/clock.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/clock_if.m#2 delete .. //depot/projects/nsched/sys/alpha/alpha/cpuconf.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/db_disasm.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/db_instruction.h#2 delete .. //depot/projects/nsched/sys/alpha/alpha/db_interface.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/db_trace.c#7 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_1000a.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_2100_a50.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_2100_a500.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_3000_300.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_3000_500.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_axppci_33.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_eb164.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_eb64plus.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_kn20aa.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_kn300.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_kn8ae.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_st550.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dec_st6600.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/divrem.m4#3 delete .. //depot/projects/nsched/sys/alpha/alpha/dump_machdep.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/elf_machdep.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/exception.s#2 delete .. //depot/projects/nsched/sys/alpha/alpha/fp_emulate.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/gdb_machdep.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/genassym.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/ieee_float.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/nsched/sys/alpha/alpha/in_cksum.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/interrupt.c#7 delete .. //depot/projects/nsched/sys/alpha/alpha/locore.s#2 delete .. //depot/projects/nsched/sys/alpha/alpha/machdep.c#8 delete .. //depot/projects/nsched/sys/alpha/alpha/mem.c#6 delete .. //depot/projects/nsched/sys/alpha/alpha/mp_machdep.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/pal.s#2 delete .. //depot/projects/nsched/sys/alpha/alpha/pmap.c#14 delete .. //depot/projects/nsched/sys/alpha/alpha/prom.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/prom_disp.s#2 delete .. //depot/projects/nsched/sys/alpha/alpha/promcons.c#7 delete .. //depot/projects/nsched/sys/alpha/alpha/sgmap.c#3 delete .. //depot/projects/nsched/sys/alpha/alpha/support.s#3 delete .. //depot/projects/nsched/sys/alpha/alpha/swtch.s#2 delete .. //depot/projects/nsched/sys/alpha/alpha/sys_machdep.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/timerreg.h#3 delete .. //depot/projects/nsched/sys/alpha/alpha/trap.c#5 delete .. //depot/projects/nsched/sys/alpha/alpha/uio_machdep.c#4 delete .. //depot/projects/nsched/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/nsched/sys/alpha/alpha/vm_machdep.c#6 delete .. //depot/projects/nsched/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/nsched/sys/alpha/conf/GENERIC#11 delete .. //depot/projects/nsched/sys/alpha/conf/GENERIC.hints#3 delete .. //depot/projects/nsched/sys/alpha/conf/Makefile#2 delete .. //depot/projects/nsched/sys/alpha/conf/NOTES#5 delete .. //depot/projects/nsched/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/nsched/sys/alpha/include/_inttypes.h#2 delete .. //depot/projects/nsched/sys/alpha/include/_limits.h#3 delete .. //depot/projects/nsched/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/nsched/sys/alpha/include/_types.h#2 delete .. //depot/projects/nsched/sys/alpha/include/alpha_cpu.h#2 delete .. //depot/projects/nsched/sys/alpha/include/asm.h#2 delete .. //depot/projects/nsched/sys/alpha/include/atomic.h#3 delete .. //depot/projects/nsched/sys/alpha/include/bootinfo.h#2 delete .. //depot/projects/nsched/sys/alpha/include/bus.h#2 delete .. //depot/projects/nsched/sys/alpha/include/bus_memio.h#2 delete .. //depot/projects/nsched/sys/alpha/include/bus_pio.h#2 delete .. //depot/projects/nsched/sys/alpha/include/bwx.h#2 delete .. //depot/projects/nsched/sys/alpha/include/chipset.h#2 delete .. //depot/projects/nsched/sys/alpha/include/clock.h#2 delete .. //depot/projects/nsched/sys/alpha/include/clockvar.h#2 delete .. //depot/projects/nsched/sys/alpha/include/cpu.h#7 delete .. //depot/projects/nsched/sys/alpha/include/cpuconf.h#2 delete .. //depot/projects/nsched/sys/alpha/include/cpufunc.h#2 delete .. //depot/projects/nsched/sys/alpha/include/critical.h#3 delete .. //depot/projects/nsched/sys/alpha/include/db_machdep.h#3 delete .. //depot/projects/nsched/sys/alpha/include/elf.h#2 delete .. //depot/projects/nsched/sys/alpha/include/endian.h#3 delete .. //depot/projects/nsched/sys/alpha/include/exec.h#2 delete .. //depot/projects/nsched/sys/alpha/include/float.h#4 delete .. //depot/projects/nsched/sys/alpha/include/floatingpoint.h#2 delete .. //depot/projects/nsched/sys/alpha/include/fpu.h#3 delete .. //depot/projects/nsched/sys/alpha/include/frame.h#2 delete .. //depot/projects/nsched/sys/alpha/include/gdb_machdep.h#3 delete .. //depot/projects/nsched/sys/alpha/include/ieee.h#3 delete .. //depot/projects/nsched/sys/alpha/include/ieeefp.h#2 delete .. //depot/projects/nsched/sys/alpha/include/in_cksum.h#3 delete .. //depot/projects/nsched/sys/alpha/include/inst.h#2 delete .. //depot/projects/nsched/sys/alpha/include/intr.h#2 delete .. //depot/projects/nsched/sys/alpha/include/intrcnt.h#2 delete .. //depot/projects/nsched/sys/alpha/include/ioctl_bt848.h#2 delete .. //depot/projects/nsched/sys/alpha/include/ioctl_meteor.h#2 delete .. //depot/projects/nsched/sys/alpha/include/kdb.h#2 delete .. //depot/projects/nsched/sys/alpha/include/limits.h#3 delete .. //depot/projects/nsched/sys/alpha/include/md_var.h#2 delete .. //depot/projects/nsched/sys/alpha/include/memdev.h#2 delete .. //depot/projects/nsched/sys/alpha/include/mutex.h#2 delete .. //depot/projects/nsched/sys/alpha/include/pal.h#2 delete .. //depot/projects/nsched/sys/alpha/include/param.h#7 delete .. //depot/projects/nsched/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/nsched/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/nsched/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/nsched/sys/alpha/include/pc/vesa.h#2 delete .. //depot/projects/nsched/sys/alpha/include/pcb.h#3 delete .. //depot/projects/nsched/sys/alpha/include/pcpu.h#3 delete .. //depot/projects/nsched/sys/alpha/include/pmap.h#8 delete .. //depot/projects/nsched/sys/alpha/include/proc.h#2 delete .. //depot/projects/nsched/sys/alpha/include/profile.h#4 delete .. //depot/projects/nsched/sys/alpha/include/prom.h#2 delete .. //depot/projects/nsched/sys/alpha/include/pte.h#2 delete .. //depot/projects/nsched/sys/alpha/include/ptrace.h#4 delete .. //depot/projects/nsched/sys/alpha/include/reg.h#2 delete .. //depot/projects/nsched/sys/alpha/include/reloc.h#2 delete .. //depot/projects/nsched/sys/alpha/include/resource.h#2 delete .. //depot/projects/nsched/sys/alpha/include/rpb.h#2 delete .. //depot/projects/nsched/sys/alpha/include/runq.h#2 delete .. //depot/projects/nsched/sys/alpha/include/setjmp.h#2 delete .. //depot/projects/nsched/sys/alpha/include/sf_buf.h#3 delete .. //depot/projects/nsched/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/nsched/sys/alpha/include/sigframe.h#2 delete .. //depot/projects/nsched/sys/alpha/include/signal.h#2 delete .. //depot/projects/nsched/sys/alpha/include/smp.h#3 delete .. //depot/projects/nsched/sys/alpha/include/stdarg.h#2 delete .. //depot/projects/nsched/sys/alpha/include/swiz.h#2 delete .. //depot/projects/nsched/sys/alpha/include/sysarch.h#3 delete .. //depot/projects/nsched/sys/alpha/include/ucontext.h#2 delete .. //depot/projects/nsched/sys/alpha/include/varargs.h#2 delete .. //depot/projects/nsched/sys/alpha/include/vmparam.h#3 delete .. //depot/projects/nsched/sys/alpha/isa/isa.c#3 delete .. //depot/projects/nsched/sys/alpha/isa/isa_dma.c#4 delete .. //depot/projects/nsched/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/nsched/sys/alpha/isa/mcclock_isa.c#2 delete .. //depot/projects/nsched/sys/alpha/linux/Makefile#2 delete .. //depot/projects/nsched/sys/alpha/linux/linux.h#3 delete .. //depot/projects/nsched/sys/alpha/linux/linux_dummy.c#2 delete .. //depot/projects/nsched/sys/alpha/linux/linux_genassym.c#2 delete .. //depot/projects/nsched/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/nsched/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/nsched/sys/alpha/linux/linux_machdep.c#4 delete .. //depot/projects/nsched/sys/alpha/linux/linux_proto.h#4 delete .. //depot/projects/nsched/sys/alpha/linux/linux_syscall.h#4 delete .. //depot/projects/nsched/sys/alpha/linux/linux_sysent.c#4 delete .. //depot/projects/nsched/sys/alpha/linux/linux_sysvec.c#3 delete .. //depot/projects/nsched/sys/alpha/linux/syscalls.conf#2 delete .. //depot/projects/nsched/sys/alpha/linux/syscalls.master#4 delete .. //depot/projects/nsched/sys/alpha/mcbus/mcbus.c#2 delete .. //depot/projects/nsched/sys/alpha/mcbus/mcbusreg.h#2 delete .. //depot/projects/nsched/sys/alpha/mcbus/mcbusvar.h#2 delete .. //depot/projects/nsched/sys/alpha/mcbus/mcmem.c#2 delete .. //depot/projects/nsched/sys/alpha/mcbus/mcpcia.c#3 delete .. //depot/projects/nsched/sys/alpha/mcbus/mcpciareg.h#2 delete .. //depot/projects/nsched/sys/alpha/mcbus/mcpciavar.h#2 delete .. //depot/projects/nsched/sys/alpha/osf1/Makefile#2 delete .. //depot/projects/nsched/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/nsched/sys/alpha/osf1/exec_ecoff.h#2 delete .. //depot/projects/nsched/sys/alpha/osf1/imgact_osf1.c#2 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1.h#2 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_ioctl.c#2 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_misc.c#7 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_mount.c#2 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_proto.h#3 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_signal.c#3 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_signal.h#2 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_syscall.h#3 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_sysent.c#3 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_sysvec.c#2 delete .. //depot/projects/nsched/sys/alpha/osf1/osf1_util.h#2 delete .. //depot/projects/nsched/sys/alpha/osf1/syscalls.conf#2 delete .. //depot/projects/nsched/sys/alpha/osf1/syscalls.master#3 delete .. //depot/projects/nsched/sys/alpha/pci/alphapci_if.m#2 delete .. //depot/projects/nsched/sys/alpha/pci/apecs.c#3 delete .. //depot/projects/nsched/sys/alpha/pci/apecs_pci.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/apecsreg.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/bwx.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/cia.c#3 delete .. //depot/projects/nsched/sys/alpha/pci/cia_pci.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/ciareg.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/irongate.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/irongate_pci.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/lca.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/lca_pci.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/lcareg.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/pci_eb164_intr.s#2 delete .. //depot/projects/nsched/sys/alpha/pci/pci_eb64plus_intr.s#2 delete .. //depot/projects/nsched/sys/alpha/pci/pcibus.c#4 delete .. //depot/projects/nsched/sys/alpha/pci/pcibus.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/swiz.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/t2.c#3 delete .. //depot/projects/nsched/sys/alpha/pci/t2_pci.c#2 delete .. //depot/projects/nsched/sys/alpha/pci/t2reg.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/tsunami.c#3 delete .. //depot/projects/nsched/sys/alpha/pci/tsunami_pci.c#3 delete .. //depot/projects/nsched/sys/alpha/pci/tsunamireg.h#2 delete .. //depot/projects/nsched/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/dwlpx.c#3 delete .. //depot/projects/nsched/sys/alpha/tlsb/dwlpxreg.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/dwlpxvar.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/gbus.c#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/kftxx.c#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/kftxxreg.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/mcclock_tlsb.c#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/tlsb.c#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/tlsbcpu.c#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/tlsbmem.c#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/tlsbreg.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/tlsbvar.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#7 delete .. //depot/projects/nsched/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/nsched/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/nsched/sys/amd64/Makefile#2 delete .. //depot/projects/nsched/sys/amd64/acpica/OsdEnvironment.c#3 delete .. //depot/projects/nsched/sys/amd64/acpica/acpi_machdep.c#6 delete .. //depot/projects/nsched/sys/amd64/acpica/acpi_wakeup.c#2 delete .. //depot/projects/nsched/sys/amd64/acpica/madt.c#4 delete .. //depot/projects/nsched/sys/amd64/amd64/amd64_mem.c#3 delete .. //depot/projects/nsched/sys/amd64/amd64/apic_vector.S#5 delete .. //depot/projects/nsched/sys/amd64/amd64/atomic.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/autoconf.c#5 delete .. //depot/projects/nsched/sys/amd64/amd64/bios.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/busdma_machdep.c#7 delete .. //depot/projects/nsched/sys/amd64/amd64/cpu_switch.S#5 delete .. //depot/projects/nsched/sys/amd64/amd64/critical.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/db_disasm.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/db_interface.c#5 delete .. //depot/projects/nsched/sys/amd64/amd64/db_trace.c#6 delete .. //depot/projects/nsched/sys/amd64/amd64/dump_machdep.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/elf_machdep.c#4 delete .. //depot/projects/nsched/sys/amd64/amd64/exception.S#5 delete .. //depot/projects/nsched/sys/amd64/amd64/fpu.c#6 delete .. //depot/projects/nsched/sys/amd64/amd64/gdb_machdep.c#3 delete .. //depot/projects/nsched/sys/amd64/amd64/genassym.c#5 delete .. //depot/projects/nsched/sys/amd64/amd64/identcpu.c#4 delete .. //depot/projects/nsched/sys/amd64/amd64/in_cksum.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/initcpu.c#3 delete .. //depot/projects/nsched/sys/amd64/amd64/intr_machdep.c#8 delete .. //depot/projects/nsched/sys/amd64/amd64/io.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/io_apic.c#6 delete .. //depot/projects/nsched/sys/amd64/amd64/legacy.c#5 delete .. //depot/projects/nsched/sys/amd64/amd64/local_apic.c#4 delete .. //depot/projects/nsched/sys/amd64/amd64/locore.S#2 delete .. //depot/projects/nsched/sys/amd64/amd64/machdep.c#13 delete .. //depot/projects/nsched/sys/amd64/amd64/mem.c#6 delete .. //depot/projects/nsched/sys/amd64/amd64/mp_machdep.c#10 delete .. //depot/projects/nsched/sys/amd64/amd64/mp_watchdog.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/mpboot.S#3 delete .. //depot/projects/nsched/sys/amd64/amd64/mptable.c#6 delete .. //depot/projects/nsched/sys/amd64/amd64/mptable_pci.c#3 delete .. //depot/projects/nsched/sys/amd64/amd64/nexus.c#8 delete .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#28 delete .. //depot/projects/nsched/sys/amd64/amd64/prof_machdep.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/sigtramp.S#2 delete .. //depot/projects/nsched/sys/amd64/amd64/support.S#7 delete .. //depot/projects/nsched/sys/amd64/amd64/sys_machdep.c#3 delete .. //depot/projects/nsched/sys/amd64/amd64/trap.c#6 delete .. //depot/projects/nsched/sys/amd64/amd64/tsc.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/uio_machdep.c#4 delete .. //depot/projects/nsched/sys/amd64/amd64/uma_machdep.c#2 delete .. //depot/projects/nsched/sys/amd64/amd64/vm_machdep.c#7 delete .. //depot/projects/nsched/sys/amd64/compile/.cvsignore#2 delete .. //depot/projects/nsched/sys/amd64/conf/GENERIC#13 delete .. //depot/projects/nsched/sys/amd64/conf/GENERIC.hints#3 delete .. //depot/projects/nsched/sys/amd64/conf/Makefile#2 delete .. //depot/projects/nsched/sys/amd64/conf/NOTES#6 delete .. //depot/projects/nsched/sys/amd64/conf/gethints.awk#2 delete .. //depot/projects/nsched/sys/amd64/ia32/ia32_exception.S#3 delete .. //depot/projects/nsched/sys/amd64/ia32/ia32_signal.c#3 delete .. //depot/projects/nsched/sys/amd64/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/nsched/sys/amd64/ia32/ia32_syscall.c#3 delete .. //depot/projects/nsched/sys/amd64/include/_inttypes.h#2 delete .. //depot/projects/nsched/sys/amd64/include/_limits.h#3 delete .. //depot/projects/nsched/sys/amd64/include/_stdint.h#3 delete .. //depot/projects/nsched/sys/amd64/include/_types.h#2 delete .. //depot/projects/nsched/sys/amd64/include/acpica_machdep.h#4 delete .. //depot/projects/nsched/sys/amd64/include/apicreg.h#2 delete .. //depot/projects/nsched/sys/amd64/include/apicvar.h#4 delete .. //depot/projects/nsched/sys/amd64/include/asm.h#4 delete .. //depot/projects/nsched/sys/amd64/include/asmacros.h#3 delete .. //depot/projects/nsched/sys/amd64/include/atomic.h#2 delete .. //depot/projects/nsched/sys/amd64/include/bus.h#2 delete .. //depot/projects/nsched/sys/amd64/include/bus_amd64.h#2 delete .. //depot/projects/nsched/sys/amd64/include/bus_dma.h#2 delete .. //depot/projects/nsched/sys/amd64/include/bus_memio.h#2 delete .. //depot/projects/nsched/sys/amd64/include/bus_pio.h#2 delete .. //depot/projects/nsched/sys/amd64/include/clock.h#2 delete .. //depot/projects/nsched/sys/amd64/include/cpu.h#6 delete .. //depot/projects/nsched/sys/amd64/include/cpufunc.h#4 delete .. //depot/projects/nsched/sys/amd64/include/cputypes.h#3 delete .. //depot/projects/nsched/sys/amd64/include/critical.h#3 delete .. //depot/projects/nsched/sys/amd64/include/db_machdep.h#4 delete .. //depot/projects/nsched/sys/amd64/include/elf.h#3 delete .. //depot/projects/nsched/sys/amd64/include/endian.h#3 delete .. //depot/projects/nsched/sys/amd64/include/exec.h#3 delete .. //depot/projects/nsched/sys/amd64/include/float.h#6 delete .. //depot/projects/nsched/sys/amd64/include/floatingpoint.h#2 delete .. //depot/projects/nsched/sys/amd64/include/fpu.h#3 delete .. //depot/projects/nsched/sys/amd64/include/frame.h#4 delete .. //depot/projects/nsched/sys/amd64/include/gdb_machdep.h#3 delete .. //depot/projects/nsched/sys/amd64/include/ieeefp.h#2 delete .. //depot/projects/nsched/sys/amd64/include/in_cksum.h#3 delete .. //depot/projects/nsched/sys/amd64/include/intr_machdep.h#4 delete .. //depot/projects/nsched/sys/amd64/include/iodev.h#2 delete .. //depot/projects/nsched/sys/amd64/include/kdb.h#2 delete .. //depot/projects/nsched/sys/amd64/include/legacyvar.h#3 delete .. //depot/projects/nsched/sys/amd64/include/limits.h#3 delete .. //depot/projects/nsched/sys/amd64/include/md_var.h#4 delete .. //depot/projects/nsched/sys/amd64/include/memdev.h#2 delete .. //depot/projects/nsched/sys/amd64/include/metadata.h#2 delete .. //depot/projects/nsched/sys/amd64/include/mp_watchdog.h#2 delete .. //depot/projects/nsched/sys/amd64/include/mptable.h#2 delete .. //depot/projects/nsched/sys/amd64/include/mutex.h#2 delete .. //depot/projects/nsched/sys/amd64/include/param.h#7 delete .. //depot/projects/nsched/sys/amd64/include/pc/bios.h#2 delete .. //depot/projects/nsched/sys/amd64/include/pc/display.h#2 delete .. //depot/projects/nsched/sys/amd64/include/pcb.h#5 delete .. //depot/projects/nsched/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/nsched/sys/amd64/include/pci_cfgreg.h#2 delete .. //depot/projects/nsched/sys/amd64/include/pcpu.h#2 delete .. //depot/projects/nsched/sys/amd64/include/pmap.h#14 delete .. //depot/projects/nsched/sys/amd64/include/proc.h#3 delete .. //depot/projects/nsched/sys/amd64/include/profile.h#7 delete .. //depot/projects/nsched/sys/amd64/include/psl.h#3 delete .. //depot/projects/nsched/sys/amd64/include/ptrace.h#3 delete .. //depot/projects/nsched/sys/amd64/include/reg.h#3 delete .. //depot/projects/nsched/sys/amd64/include/reloc.h#3 delete .. //depot/projects/nsched/sys/amd64/include/resource.h#2 delete .. //depot/projects/nsched/sys/amd64/include/runq.h#2 delete .. //depot/projects/nsched/sys/amd64/include/segments.h#3 delete .. //depot/projects/nsched/sys/amd64/include/setjmp.h#2 delete .. //depot/projects/nsched/sys/amd64/include/sf_buf.h#3 delete .. //depot/projects/nsched/sys/amd64/include/sigframe.h#2 delete .. //depot/projects/nsched/sys/amd64/include/signal.h#3 delete .. //depot/projects/nsched/sys/amd64/include/smp.h#3 delete .. //depot/projects/nsched/sys/amd64/include/specialreg.h#4 delete .. //depot/projects/nsched/sys/amd64/include/stdarg.h#2 delete .. //depot/projects/nsched/sys/amd64/include/sysarch.h#3 delete .. //depot/projects/nsched/sys/amd64/include/trap.h#3 delete .. //depot/projects/nsched/sys/amd64/include/tss.h#3 delete .. //depot/projects/nsched/sys/amd64/include/ucontext.h#2 delete .. //depot/projects/nsched/sys/amd64/include/varargs.h#2 delete .. //depot/projects/nsched/sys/amd64/include/vmparam.h#3 delete .. //depot/projects/nsched/sys/amd64/isa/atpic.c#5 delete .. //depot/projects/nsched/sys/amd64/isa/atpic_vector.S#5 delete .. //depot/projects/nsched/sys/amd64/isa/clock.c#7 delete .. //depot/projects/nsched/sys/amd64/isa/elcr.c#2 delete .. //depot/projects/nsched/sys/amd64/isa/icu.h#4 delete .. //depot/projects/nsched/sys/amd64/isa/isa.c#3 delete .. //depot/projects/nsched/sys/amd64/isa/isa.h#4 delete .. //depot/projects/nsched/sys/amd64/isa/isa_dma.c#5 delete .. //depot/projects/nsched/sys/amd64/isa/nmi.c#4 delete .. //depot/projects/nsched/sys/amd64/isa/timerreg.h#3 delete .. //depot/projects/nsched/sys/amd64/linux32/Makefile#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux.h#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_dummy.c#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_genassym.c#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_ipc64.h#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_locore.s#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_machdep.c#5 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_proto.h#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_syscall.h#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_sysent.c#2 delete .. //depot/projects/nsched/sys/amd64/linux32/linux32_sysvec.c#3 delete .. //depot/projects/nsched/sys/amd64/linux32/syscalls.conf#2 delete .. //depot/projects/nsched/sys/amd64/linux32/syscalls.master#2 delete .. //depot/projects/nsched/sys/amd64/pci/pci_bus.c#6 delete .. //depot/projects/nsched/sys/amd64/pci/pci_cfgreg.c#2 delete .. //depot/projects/nsched/sys/arm/arm/autoconf.c#2 delete .. //depot/projects/nsched/sys/arm/arm/bcopy_page.S#3 delete .. //depot/projects/nsched/sys/arm/arm/bcopyinout.S#5 delete .. //depot/projects/nsched/sys/arm/arm/bcopyinout_xscale.S#3 delete .. //depot/projects/nsched/sys/arm/arm/blockio.S#3 delete .. //depot/projects/nsched/sys/arm/arm/bootconfig.c#2 delete .. //depot/projects/nsched/sys/arm/arm/bus_space_asm_generic.S#3 delete .. //depot/projects/nsched/sys/arm/arm/busdma_machdep.c#7 delete .. //depot/projects/nsched/sys/arm/arm/copystr.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc.c#5 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm10.S#2 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm3.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm67.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm7tdmi.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm8.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_arm9.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_armv4.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_ixp12x0.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_sa1.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_sa11x0.S#3 delete .. //depot/projects/nsched/sys/arm/arm/cpufunc_asm_xscale.S#3 delete .. //depot/projects/nsched/sys/arm/arm/critical.c#3 delete .. //depot/projects/nsched/sys/arm/arm/db_disasm.c#2 delete .. //depot/projects/nsched/sys/arm/arm/db_interface.c#4 delete .. //depot/projects/nsched/sys/arm/arm/db_trace.c#7 delete .. //depot/projects/nsched/sys/arm/arm/disassem.c#2 delete .. //depot/projects/nsched/sys/arm/arm/dump_machdep.c#2 delete .. //depot/projects/nsched/sys/arm/arm/elf_machdep.c#5 delete .. //depot/projects/nsched/sys/arm/arm/exception.S#5 delete .. //depot/projects/nsched/sys/arm/arm/fiq.c#2 delete .. //depot/projects/nsched/sys/arm/arm/fiq_subr.S#3 delete .. //depot/projects/nsched/sys/arm/arm/fusu.S#4 delete .. //depot/projects/nsched/sys/arm/arm/genassym.c#4 delete .. //depot/projects/nsched/sys/arm/arm/identcpu.c#4 delete .. //depot/projects/nsched/sys/arm/arm/in_cksum.c#2 delete .. //depot/projects/nsched/sys/arm/arm/in_cksum_arm.S#4 delete .. //depot/projects/nsched/sys/arm/arm/intr.c#6 delete .. //depot/projects/nsched/sys/arm/arm/irq_dispatch.S#4 delete .. //depot/projects/nsched/sys/arm/arm/locore.S#6 delete .. //depot/projects/nsched/sys/arm/arm/machdep.c#6 delete .. //depot/projects/nsched/sys/arm/arm/mem.c#2 delete .. //depot/projects/nsched/sys/arm/arm/nexus.c#4 delete .. //depot/projects/nsched/sys/arm/arm/nexus_io.c#5 delete .. //depot/projects/nsched/sys/arm/arm/nexus_io_asm.S#3 delete .. //depot/projects/nsched/sys/arm/arm/pmap.c#11 delete .. //depot/projects/nsched/sys/arm/arm/setcpsr.S#3 delete .. //depot/projects/nsched/sys/arm/arm/setstack.s#2 delete .. //depot/projects/nsched/sys/arm/arm/support.S#5 delete .. //depot/projects/nsched/sys/arm/arm/swtch.S#7 delete .. //depot/projects/nsched/sys/arm/arm/sys_machdep.c#4 delete .. //depot/projects/nsched/sys/arm/arm/trap.c#5 delete .. //depot/projects/nsched/sys/arm/arm/uio_machdep.c#4 delete .. //depot/projects/nsched/sys/arm/arm/undefined.c#3 delete .. //depot/projects/nsched/sys/arm/arm/vectors.S#2 delete .. //depot/projects/nsched/sys/arm/arm/vm_machdep.c#7 delete .. //depot/projects/nsched/sys/arm/compile/.cvsignore#2 delete .. //depot/projects/nsched/sys/arm/conf/IQ31244#5 delete .. //depot/projects/nsched/sys/arm/conf/SIMICS#6 delete .. //depot/projects/nsched/sys/arm/include/_inttypes.h#2 delete .. //depot/projects/nsched/sys/arm/include/_limits.h#3 delete .. //depot/projects/nsched/sys/arm/include/_stdint.h#3 delete .. //depot/projects/nsched/sys/arm/include/_types.h#3 delete .. //depot/projects/nsched/sys/arm/include/armreg.h#2 delete .. //depot/projects/nsched/sys/arm/include/asm.h#4 delete .. //depot/projects/nsched/sys/arm/include/asmacros.h#3 delete .. //depot/projects/nsched/sys/arm/include/atomic.h#4 delete .. //depot/projects/nsched/sys/arm/include/blockio.h#2 delete .. //depot/projects/nsched/sys/arm/include/bootconfig.h#2 delete .. //depot/projects/nsched/sys/arm/include/bus.h#5 delete .. //depot/projects/nsched/sys/arm/include/bus_memio.h#2 delete .. //depot/projects/nsched/sys/arm/include/bus_pio.h#2 delete .. //depot/projects/nsched/sys/arm/include/clock.h#2 delete .. //depot/projects/nsched/sys/arm/include/cpu.h#4 delete .. //depot/projects/nsched/sys/arm/include/cpuconf.h#3 delete .. //depot/projects/nsched/sys/arm/include/cpufunc.h#6 delete .. //depot/projects/nsched/sys/arm/include/critical.h#3 delete .. //depot/projects/nsched/sys/arm/include/db_machdep.h#4 delete .. //depot/projects/nsched/sys/arm/include/disassem.h#2 delete .. //depot/projects/nsched/sys/arm/include/elf.h#3 delete .. //depot/projects/nsched/sys/arm/include/endian.h#6 delete .. //depot/projects/nsched/sys/arm/include/exec.h#2 delete .. //depot/projects/nsched/sys/arm/include/fiq.h#2 delete .. //depot/projects/nsched/sys/arm/include/float.h#3 delete .. //depot/projects/nsched/sys/arm/include/floatingpoint.h#2 delete .. //depot/projects/nsched/sys/arm/include/fp.h#2 delete .. //depot/projects/nsched/sys/arm/include/frame.h#3 delete .. //depot/projects/nsched/sys/arm/include/ieee.h#2 delete .. //depot/projects/nsched/sys/arm/include/ieeefp.h#2 delete .. //depot/projects/nsched/sys/arm/include/in_cksum.h#2 delete .. //depot/projects/nsched/sys/arm/include/intr.h#3 delete .. //depot/projects/nsched/sys/arm/include/katelib.h#2 delete .. //depot/projects/nsched/sys/arm/include/kdb.h#3 delete .. //depot/projects/nsched/sys/arm/include/limits.h#3 delete .. //depot/projects/nsched/sys/arm/include/machdep.h#2 delete .. //depot/projects/nsched/sys/arm/include/md_var.h#3 delete .. //depot/projects/nsched/sys/arm/include/memdev.h#2 delete .. //depot/projects/nsched/sys/arm/include/metadata.h#2 delete .. //depot/projects/nsched/sys/arm/include/mutex.h#2 delete .. //depot/projects/nsched/sys/arm/include/param.h#6 delete .. //depot/projects/nsched/sys/arm/include/pcb.h#5 delete .. //depot/projects/nsched/sys/arm/include/pcpu.h#3 delete .. //depot/projects/nsched/sys/arm/include/pmap.h#7 delete .. //depot/projects/nsched/sys/arm/include/proc.h#2 delete .. //depot/projects/nsched/sys/arm/include/profile.h#6 delete .. //depot/projects/nsched/sys/arm/include/psl.h#2 delete .. //depot/projects/nsched/sys/arm/include/pte.h#3 delete .. //depot/projects/nsched/sys/arm/include/ptrace.h#2 delete .. //depot/projects/nsched/sys/arm/include/reg.h#3 delete .. //depot/projects/nsched/sys/arm/include/reloc.h#2 delete .. //depot/projects/nsched/sys/arm/include/resource.h#2 delete .. //depot/projects/nsched/sys/arm/include/runq.h#2 delete .. //depot/projects/nsched/sys/arm/include/setjmp.h#3 delete .. //depot/projects/nsched/sys/arm/include/sf_buf.h#2 delete .. //depot/projects/nsched/sys/arm/include/sigframe.h#2 delete .. //depot/projects/nsched/sys/arm/include/signal.h#5 delete .. //depot/projects/nsched/sys/arm/include/smp.h#2 delete .. //depot/projects/nsched/sys/arm/include/stdarg.h#2 delete .. //depot/projects/nsched/sys/arm/include/swi.h#2 delete .. //depot/projects/nsched/sys/arm/include/sysarch.h#2 delete .. //depot/projects/nsched/sys/arm/include/trap.h#2 delete .. //depot/projects/nsched/sys/arm/include/ucontext.h#3 delete .. //depot/projects/nsched/sys/arm/include/undefined.h#2 delete .. //depot/projects/nsched/sys/arm/include/utrap.h#2 delete .. //depot/projects/nsched/sys/arm/include/vmparam.h#4 delete .. //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#9 delete .. //depot/projects/nsched/sys/arm/sa11x0/files.sa11x0#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0.c#5 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_dmacreg.h#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_gpioreg.h#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_io.c#5 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_io_asm.S#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_irq.S#3 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_irqhandler.c#4 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_ost.c#3 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_ostreg.h#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_ppcreg.h#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_reg.h#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_var.h#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/std.sa11x0#3 delete .. //depot/projects/nsched/sys/arm/sa11x0/uart_bus_sa1110.c#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/uart_cpu_sa1110.c#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/uart_dev_sa1110.c#2 delete .. //depot/projects/nsched/sys/arm/sa11x0/uart_dev_sa1110.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/files.i80321#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/files.iq31244#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321.c#3 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321_intr.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321_mcu.c#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321_pci.c#3 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321_space.c#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321_timer.c#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321reg.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/i80321var.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/iq31244_machdep.c#4 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/iq80321.c#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/iq80321reg.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/iq80321var.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/obio.c#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/obio_space.c#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/obiovar.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/std.i80321#3 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/std.iq31244#3 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/uart_bus_i80321.c#3 delete .. //depot/projects/nsched/sys/arm/xscale/i80321/uart_cpu_i80321.c#3 delete .. //depot/projects/nsched/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/nsched/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/nsched/sys/boot/Makefile#6 delete .. //depot/projects/nsched/sys/boot/README#2 delete .. //depot/projects/nsched/sys/boot/alpha/Makefile#2 delete .. //depot/projects/nsched/sys/boot/alpha/Makefile.inc#3 delete .. //depot/projects/nsched/sys/boot/alpha/boot1/Makefile#3 delete .. //depot/projects/nsched/sys/boot/alpha/boot1/boot1.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/cdboot/Makefile#3 delete .. //depot/projects/nsched/sys/boot/alpha/cdboot/version#2 delete .. //depot/projects/nsched/sys/boot/alpha/common/Makefile.common#4 delete .. //depot/projects/nsched/sys/boot/alpha/common/conf.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/nsched/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/nsched/sys/boot/alpha/common/main.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/Makefile#3 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/OSFpal.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/alpha_copy.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/alpha_module.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/bootinfo.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/common.h#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/delay.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/devicename.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/elf_freebsd.c#3 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/getsecs.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/libalpha.h#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/prom.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/reboot.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/srmdisk.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/srmnet.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/nsched/sys/boot/alpha/libalpha/time.c#2 delete .. //depot/projects/nsched/sys/boot/alpha/loader/Makefile#2 delete .. //depot/projects/nsched/sys/boot/alpha/loader/version#2 delete .. //depot/projects/nsched/sys/boot/alpha/netboot/Makefile#3 delete .. //depot/projects/nsched/sys/boot/alpha/netboot/version#2 delete .. //depot/projects/nsched/sys/boot/arc/Makefile#2 delete .. //depot/projects/nsched/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/arc/include/arcfuncs.h#2 delete .. //depot/projects/nsched/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/nsched/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/Makefile#3 delete .. //depot/projects/nsched/sys/boot/arc/lib/abort.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/arcconsole.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/arcdisk.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/bootinfo.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/delay.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/devicename.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/elf_freebsd.c#3 delete .. //depot/projects/nsched/sys/boot/arc/lib/module.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/prom.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/setjmperr.c#2 delete .. //depot/projects/nsched/sys/boot/arc/lib/time.c#2 delete .. //depot/projects/nsched/sys/boot/arc/loader/Makefile#3 delete .. //depot/projects/nsched/sys/boot/arc/loader/conf.c#2 delete .. //depot/projects/nsched/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/nsched/sys/boot/arc/loader/main.c#2 delete .. //depot/projects/nsched/sys/boot/arc/loader/version#2 delete .. //depot/projects/nsched/sys/boot/common/Makefile.inc#4 delete .. //depot/projects/nsched/sys/boot/common/bcache.c#3 delete .. //depot/projects/nsched/sys/boot/common/boot.c#2 delete .. //depot/projects/nsched/sys/boot/common/bootstrap.h#3 delete .. //depot/projects/nsched/sys/boot/common/commands.c#4 delete .. //depot/projects/nsched/sys/boot/common/console.c#2 delete .. //depot/projects/nsched/sys/boot/common/dev_net.c#3 delete .. //depot/projects/nsched/sys/boot/common/dev_net.h#2 delete .. //depot/projects/nsched/sys/boot/common/devopen.c#2 delete .. //depot/projects/nsched/sys/boot/common/help.common#7 delete .. //depot/projects/nsched/sys/boot/common/interp.c#2 delete .. //depot/projects/nsched/sys/boot/common/interp_backslash.c#2 delete .. //depot/projects/nsched/sys/boot/common/interp_forth.c#2 delete .. //depot/projects/nsched/sys/boot/common/interp_parse.c#2 delete .. //depot/projects/nsched/sys/boot/common/isapnp.c#2 delete .. //depot/projects/nsched/sys/boot/common/isapnp.h#2 delete .. //depot/projects/nsched/sys/boot/common/load.c#3 delete .. //depot/projects/nsched/sys/boot/common/load_elf.c#3 delete .. //depot/projects/nsched/sys/boot/common/load_elf32.c#2 delete .. //depot/projects/nsched/sys/boot/common/load_elf32_obj.c#2 delete .. //depot/projects/nsched/sys/boot/common/load_elf64.c#2 delete .. //depot/projects/nsched/sys/boot/common/load_elf64_obj.c#2 delete .. //depot/projects/nsched/sys/boot/common/load_elf_obj.c#2 delete .. //depot/projects/nsched/sys/boot/common/loader.8#10 delete .. //depot/projects/nsched/sys/boot/common/ls.c#2 delete .. //depot/projects/nsched/sys/boot/common/merge_help.awk#2 delete .. //depot/projects/nsched/sys/boot/common/misc.c#3 delete .. //depot/projects/nsched/sys/boot/common/module.c#2 delete .. //depot/projects/nsched/sys/boot/common/newvers.sh#4 delete .. //depot/projects/nsched/sys/boot/common/panic.c#2 delete .. //depot/projects/nsched/sys/boot/common/pnp.c#2 delete .. //depot/projects/nsched/sys/boot/common/pnpdata#2 delete .. //depot/projects/nsched/sys/boot/common/reloc_elf.c#2 delete .. //depot/projects/nsched/sys/boot/common/reloc_elf32.c#2 delete .. //depot/projects/nsched/sys/boot/common/reloc_elf64.c#2 delete .. //depot/projects/nsched/sys/boot/common/ufsread.c#3 delete .. //depot/projects/nsched/sys/boot/efi/Makefile#3 delete .. //depot/projects/nsched/sys/boot/efi/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/efi/include/README#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efi.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efi_nii.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efiapi.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/eficon.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efidebug.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efidef.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efidevp.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efierr.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efifpswa.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efifs.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efilib.h#3 delete .. //depot/projects/nsched/sys/boot/efi/include/efinet.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efipart.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efiprot.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efipxebc.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efiser.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/efistdarg.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/i386/efibind.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/i386/pe.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/ia64/efibind.h#2 delete .. //depot/projects/nsched/sys/boot/efi/include/ia64/pe.h#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/Makefile#4 delete .. //depot/projects/nsched/sys/boot/efi/libefi/bootinfo.c#3 delete .. //depot/projects/nsched/sys/boot/efi/libefi/copy.c#3 delete .. //depot/projects/nsched/sys/boot/efi/libefi/delay.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/devicename.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/efi_console.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/efifs.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/efinet.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/elf_freebsd.c#4 delete .. //depot/projects/nsched/sys/boot/efi/libefi/libefi.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/nsched/sys/boot/efi/libefi/time.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/Makefile#4 delete .. //depot/projects/nsched/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/alpha/sysdep.h#2 delete .. //depot/projects/nsched/sys/boot/ficl/dict.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/ficl.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/ficl.h#3 delete .. //depot/projects/nsched/sys/boot/ficl/fileaccess.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/float.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/i386/sysdep.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/i386/sysdep.h#2 delete .. //depot/projects/nsched/sys/boot/ficl/ia64/sysdep.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/ia64/sysdep.h#2 delete .. //depot/projects/nsched/sys/boot/ficl/loader.c#3 delete .. //depot/projects/nsched/sys/boot/ficl/math64.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/math64.h#2 delete .. //depot/projects/nsched/sys/boot/ficl/powerpc/sysdep.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/powerpc/sysdep.h#2 delete .. //depot/projects/nsched/sys/boot/ficl/prefix.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/search.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/classes.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/ficlclass.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/ficllocal.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/fileaccess.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/forml.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/freebsd.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/ifbrack.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/jhlocal.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/marker.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/oo.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/prefix.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/softcore.awk#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/softcore.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/softwords/string.fr#2 delete .. //depot/projects/nsched/sys/boot/ficl/sparc64/sysdep.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/sparc64/sysdep.h#2 delete .. //depot/projects/nsched/sys/boot/ficl/stack.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/testmain.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/tools.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/unix.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/vm.c#2 delete .. //depot/projects/nsched/sys/boot/ficl/words.c#2 delete .. //depot/projects/nsched/sys/boot/forth/beastie.4th#4 delete .. //depot/projects/nsched/sys/boot/forth/frames.4th#2 delete .. //depot/projects/nsched/sys/boot/forth/loader.4th#2 delete .. //depot/projects/nsched/sys/boot/forth/loader.4th.8#3 delete .. //depot/projects/nsched/sys/boot/forth/loader.conf#12 delete .. //depot/projects/nsched/sys/boot/forth/loader.conf.5#5 delete .. //depot/projects/nsched/sys/boot/forth/loader.rc#3 delete .. //depot/projects/nsched/sys/boot/forth/pnp.4th#2 delete .. //depot/projects/nsched/sys/boot/forth/screen.4th#2 delete .. //depot/projects/nsched/sys/boot/forth/support.4th#2 delete .. //depot/projects/nsched/sys/boot/i386/Makefile#2 delete .. //depot/projects/nsched/sys/boot/i386/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/i386/boot0/Makefile#5 delete .. //depot/projects/nsched/sys/boot/i386/boot0/boot0.S#7 delete .. //depot/projects/nsched/sys/boot/i386/boot0/boot0ext.S#2 delete .. //depot/projects/nsched/sys/boot/i386/boot0ext/Makefile#3 delete .. //depot/projects/nsched/sys/boot/i386/boot0sio/Makefile#3 delete .. //depot/projects/nsched/sys/boot/i386/boot2/Makefile#4 delete .. //depot/projects/nsched/sys/boot/i386/boot2/boot1.S#7 delete .. //depot/projects/nsched/sys/boot/i386/boot2/boot2.c#4 delete .. //depot/projects/nsched/sys/boot/i386/boot2/lib.h#2 delete .. //depot/projects/nsched/sys/boot/i386/boot2/sio.S#4 delete .. //depot/projects/nsched/sys/boot/i386/btx/Makefile#2 delete .. //depot/projects/nsched/sys/boot/i386/btx/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/i386/btx/btx/Makefile#4 delete .. //depot/projects/nsched/sys/boot/i386/btx/btx/btx.S#5 delete .. //depot/projects/nsched/sys/boot/i386/btx/btxldr/Makefile#4 delete .. //depot/projects/nsched/sys/boot/i386/btx/btxldr/btxldr.S#4 delete .. //depot/projects/nsched/sys/boot/i386/btx/lib/Makefile#3 delete .. //depot/projects/nsched/sys/boot/i386/btx/lib/btxcsu.s#3 delete .. //depot/projects/nsched/sys/boot/i386/btx/lib/btxsys.s#2 delete .. //depot/projects/nsched/sys/boot/i386/btx/lib/btxv86.h#2 delete .. //depot/projects/nsched/sys/boot/i386/btx/lib/btxv86.s#2 delete .. //depot/projects/nsched/sys/boot/i386/cdboot/Makefile#4 delete .. //depot/projects/nsched/sys/boot/i386/cdboot/cdboot.s#3 delete .. //depot/projects/nsched/sys/boot/i386/kgzldr/Makefile#3 delete .. //depot/projects/nsched/sys/boot/i386/kgzldr/boot.c#2 delete .. //depot/projects/nsched/sys/boot/i386/kgzldr/crt.s#2 delete .. //depot/projects/nsched/sys/boot/i386/kgzldr/kgzldr.h#2 delete .. //depot/projects/nsched/sys/boot/i386/kgzldr/lib.c#2 delete .. //depot/projects/nsched/sys/boot/i386/kgzldr/sio.s#2 delete .. //depot/projects/nsched/sys/boot/i386/kgzldr/start.s#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/Makefile#3 delete .. //depot/projects/nsched/sys/boot/i386/libi386/amd64_tramp.S#4 delete .. //depot/projects/nsched/sys/boot/i386/libi386/biosacpi.c#4 delete .. //depot/projects/nsched/sys/boot/i386/libi386/bioscd.c#3 delete .. //depot/projects/nsched/sys/boot/i386/libi386/biosdisk.c#4 delete .. //depot/projects/nsched/sys/boot/i386/libi386/biosmem.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/biospci.c#3 delete .. //depot/projects/nsched/sys/boot/i386/libi386/biospnp.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/biossmap.c#3 delete .. //depot/projects/nsched/sys/boot/i386/libi386/bootinfo.c#3 delete .. //depot/projects/nsched/sys/boot/i386/libi386/bootinfo32.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/bootinfo64.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/comconsole.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/devicename.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/elf32_freebsd.c#3 delete .. //depot/projects/nsched/sys/boot/i386/libi386/elf64_freebsd.c#3 delete .. //depot/projects/nsched/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/i386_copy.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/i386_module.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/libi386.h#4 delete .. //depot/projects/nsched/sys/boot/i386/libi386/nullconsole.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/pread.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/pxe.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/pxe.h#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/pxetramp.s#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/time.c#2 delete .. //depot/projects/nsched/sys/boot/i386/libi386/vidconsole.c#2 delete .. //depot/projects/nsched/sys/boot/i386/loader/Makefile#4 delete .. //depot/projects/nsched/sys/boot/i386/loader/conf.c#3 delete .. //depot/projects/nsched/sys/boot/i386/loader/help.i386#4 delete .. //depot/projects/nsched/sys/boot/i386/loader/main.c#3 delete .. //depot/projects/nsched/sys/boot/i386/loader/version#2 delete .. //depot/projects/nsched/sys/boot/i386/mbr/Makefile#5 delete .. //depot/projects/nsched/sys/boot/i386/mbr/mbr.s#3 delete .. //depot/projects/nsched/sys/boot/i386/pxeldr/Makefile#3 delete .. //depot/projects/nsched/sys/boot/i386/pxeldr/pxeboot.8#2 delete .. //depot/projects/nsched/sys/boot/i386/pxeldr/pxeldr.S#4 delete .. //depot/projects/nsched/sys/boot/ia64/Makefile#4 delete .. //depot/projects/nsched/sys/boot/ia64/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/ia64/efi/Makefile#3 delete .. //depot/projects/nsched/sys/boot/ia64/efi/conf.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/efi/efimd.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/efi/ldscript.ia64#2 delete .. //depot/projects/nsched/sys/boot/ia64/efi/main.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/efi/start.S#2 delete .. //depot/projects/nsched/sys/boot/ia64/efi/version#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/Makefile#3 delete .. //depot/projects/nsched/sys/boot/ia64/ski/acpi_stub.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/bootinfo.c#4 delete .. //depot/projects/nsched/sys/boot/ia64/ski/conf.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/delay.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/devicename.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/efi_stub.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/exit.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/ldscript.ia64#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/libski.h#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/main.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/pal_stub.S#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/sal_stub.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/skiconsole.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/skifs.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/skiload.cmd#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/ssc.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/start.S#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/time.c#2 delete .. //depot/projects/nsched/sys/boot/ia64/ski/version#2 delete .. //depot/projects/nsched/sys/boot/ofw/Makefile#2 delete .. //depot/projects/nsched/sys/boot/ofw/common/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/ofw/common/main.c#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/Makefile#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/devicename.c#2 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/elf_freebsd.c#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/libofw.h#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_console.c#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_copy.c#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_disk.c#2 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_memory.c#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_module.c#2 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_net.c#3 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_reboot.c#2 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/ofw_time.c#2 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/openfirm.c#4 delete .. //depot/projects/nsched/sys/boot/ofw/libofw/openfirm.h#3 delete .. //depot/projects/nsched/sys/boot/pc98/Makefile#2 delete .. //depot/projects/nsched/sys/boot/pc98/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/Makefile#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/boot.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/boot0.5.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/disk.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/selector.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/start.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/support.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0.5/syscons.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot0/Makefile#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot0/boot0.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/Makefile#4 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/bios.S#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/boot.c#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/boot.h#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/dinode.h#4 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/disk.c#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/fs.h#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/inode.h#4 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/io.c#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/quota.h#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/serial_16550.S#5 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/serial_8251.S#5 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/sys.c#3 delete .. //depot/projects/nsched/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/btx/Makefile#2 delete .. //depot/projects/nsched/sys/boot/pc98/btx/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/pc98/btx/btx/Makefile#4 delete .. //depot/projects/nsched/sys/boot/pc98/btx/btx/btx.S#6 delete .. //depot/projects/nsched/sys/boot/pc98/btx/btxldr/Makefile#4 delete .. //depot/projects/nsched/sys/boot/pc98/btx/btxldr/btxldr.S#5 delete .. //depot/projects/nsched/sys/boot/pc98/btx/lib/Makefile#3 delete .. //depot/projects/nsched/sys/boot/pc98/btx/lib/btxcsu.s#3 delete .. //depot/projects/nsched/sys/boot/pc98/btx/lib/btxsys.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/btx/lib/btxv86.h#2 delete .. //depot/projects/nsched/sys/boot/pc98/btx/lib/btxv86.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/kgzldr/Makefile#3 delete .. //depot/projects/nsched/sys/boot/pc98/kgzldr/crt.s#2 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/Makefile#3 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/biosdisk.c#4 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/biosmem.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/comconsole.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/gatea20.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/i386_module.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/time.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/libpc98/vidconsole.c#2 delete .. //depot/projects/nsched/sys/boot/pc98/loader/Makefile#4 delete .. //depot/projects/nsched/sys/boot/pc98/loader/conf.c#3 delete .. //depot/projects/nsched/sys/boot/pc98/loader/help.pc98#4 delete .. //depot/projects/nsched/sys/boot/pc98/loader/main.c#3 delete .. //depot/projects/nsched/sys/boot/powerpc/Makefile#2 delete .. //depot/projects/nsched/sys/boot/powerpc/loader/Makefile#5 delete .. //depot/projects/nsched/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/nsched/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/nsched/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/nsched/sys/boot/powerpc/loader/metadata.c#3 delete .. //depot/projects/nsched/sys/boot/powerpc/loader/start.c#3 delete .. //depot/projects/nsched/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/nsched/sys/boot/sparc64/Makefile#2 delete .. //depot/projects/nsched/sys/boot/sparc64/Makefile.inc#2 delete .. //depot/projects/nsched/sys/boot/sparc64/boot1/Makefile#3 delete .. //depot/projects/nsched/sys/boot/sparc64/boot1/_start.s#2 delete .. //depot/projects/nsched/sys/boot/sparc64/boot1/boot1.c#3 delete .. //depot/projects/nsched/sys/boot/sparc64/loader/Makefile#4 delete .. //depot/projects/nsched/sys/boot/sparc64/loader/help.sparc64#2 delete .. //depot/projects/nsched/sys/boot/sparc64/loader/locore.S#2 delete .. //depot/projects/nsched/sys/boot/sparc64/loader/main.c#4 delete .. //depot/projects/nsched/sys/boot/sparc64/loader/metadata.c#4 delete .. //depot/projects/nsched/sys/boot/sparc64/loader/version#2 delete .. //depot/projects/nsched/sys/cam/cam.c#2 delete .. //depot/projects/nsched/sys/cam/cam.h#2 delete .. //depot/projects/nsched/sys/cam/cam_ccb.h#3 delete .. //depot/projects/nsched/sys/cam/cam_debug.h#2 delete .. //depot/projects/nsched/sys/cam/cam_periph.c#3 delete .. //depot/projects/nsched/sys/cam/cam_periph.h#4 delete .. //depot/projects/nsched/sys/cam/cam_queue.c#2 delete .. //depot/projects/nsched/sys/cam/cam_queue.h#2 delete .. //depot/projects/nsched/sys/cam/cam_sim.c#2 delete .. //depot/projects/nsched/sys/cam/cam_sim.h#2 delete .. //depot/projects/nsched/sys/cam/cam_xpt.c#7 delete .. //depot/projects/nsched/sys/cam/cam_xpt.h#2 delete .. //depot/projects/nsched/sys/cam/cam_xpt_periph.h#2 delete .. //depot/projects/nsched/sys/cam/cam_xpt_sim.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_all.c#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_all.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_cd.c#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_cd.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_ch.c#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_ch.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_da.c#6 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_da.h#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_dvcfg.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_iu.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_low.c#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_low.h#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_low_pisa.c#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_low_pisa.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_message.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_pass.c#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_pass.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_pt.c#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_pt.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_sa.c#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_sa.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_ses.c#3 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_ses.h#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_targ_bh.c#2 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_target.c#5 delete .. //depot/projects/nsched/sys/cam/scsi/scsi_targetio.h#2 delete .. //depot/projects/nsched/sys/coda/00READ#2 delete .. //depot/projects/nsched/sys/coda/README#2 delete .. //depot/projects/nsched/sys/coda/TODO#2 delete .. //depot/projects/nsched/sys/coda/cnode.h#4 delete .. //depot/projects/nsched/sys/coda/coda.h#4 delete .. //depot/projects/nsched/sys/coda/coda_fbsd.c#7 delete .. //depot/projects/nsched/sys/coda/coda_io.h#2 delete .. //depot/projects/nsched/sys/coda/coda_kernel.h#2 delete .. //depot/projects/nsched/sys/coda/coda_namecache.c#2 delete .. //depot/projects/nsched/sys/coda/coda_namecache.h#2 delete .. //depot/projects/nsched/sys/coda/coda_opstats.h#2 delete .. //depot/projects/nsched/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/nsched/sys/coda/coda_psdev.c#4 delete .. //depot/projects/nsched/sys/coda/coda_psdev.h#3 delete .. //depot/projects/nsched/sys/coda/coda_subr.c#3 delete .. //depot/projects/nsched/sys/coda/coda_subr.h#2 delete .. //depot/projects/nsched/sys/coda/coda_venus.c#4 delete .. //depot/projects/nsched/sys/coda/coda_venus.h#3 delete .. //depot/projects/nsched/sys/coda/coda_vfsops.c#8 delete .. //depot/projects/nsched/sys/coda/coda_vfsops.h#2 delete .. //depot/projects/nsched/sys/coda/coda_vnops.c#5 delete .. //depot/projects/nsched/sys/coda/coda_vnops.h#4 delete .. //depot/projects/nsched/sys/compat/freebsd32/Makefile#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 17 10:42:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55DD116A4D0; Sun, 17 Apr 2005 10:42:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BBF516A4CE for ; Sun, 17 Apr 2005 10:42:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16B5643D31 for ; Sun, 17 Apr 2005 10:42:41 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HAgf0D054348 for ; Sun, 17 Apr 2005 10:42:41 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HAgeTQ054345 for perforce@freebsd.org; Sun, 17 Apr 2005 10:42:40 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 17 Apr 2005 10:42:40 GMT Message-Id: <200504171042.j3HAgeTQ054345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 10:42:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=75366 Change 75366 by davidxu@davidxu_alona on 2005/04/17 10:42:05 Implement cpu_set_user_tls for sparc64. Affected files ... .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 (text+ko) ==== @@ -194,6 +194,15 @@ td->td_retval[1] = tf->tf_out[1]; } +void +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, + int tls_seg __unused) +{ + if (td == curthread) + flushw(); + td->td_frame->tf_global[7] = tls_base; +} + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child From owner-p4-projects@FreeBSD.ORG Sun Apr 17 10:49:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF4CB16A4D0; Sun, 17 Apr 2005 10:49:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9BAB16A4CE for ; Sun, 17 Apr 2005 10:49:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A453A43D45 for ; Sun, 17 Apr 2005 10:49:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HAnoiW054851 for ; Sun, 17 Apr 2005 10:49:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HAnojG054848 for perforce@freebsd.org; Sun, 17 Apr 2005 10:49:50 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 17 Apr 2005 10:49:50 GMT Message-Id: <200504171049.j3HAnojG054848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 10:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=75368 Change 75368 by davidxu@davidxu_alona on 2005/04/17 10:48:58 cpu_set_user_tls. Affected files ... .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#6 (text+ko) ==== @@ -360,6 +360,16 @@ tf->tf_regs[FRAME_FLAGS] = 0; /* full restore */ } +void +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, + int tls_seg __unused) +{ + if (td != curthread) + td->td_pcb->pcb_hw.apcb_unique = (unsigned long)tls_base; + else + alpha_pal_wrunique((uintptr_t)tls_base); +} + /* * Reset back to firmware. */ From owner-p4-projects@FreeBSD.ORG Sun Apr 17 11:15:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A15C16A4D0; Sun, 17 Apr 2005 11:15:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12A8C16A4CE for ; Sun, 17 Apr 2005 11:15:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC5C143D53 for ; Sun, 17 Apr 2005 11:15:21 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HBFLd0055802 for ; Sun, 17 Apr 2005 11:15:21 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HBFLi9055799 for perforce@freebsd.org; Sun, 17 Apr 2005 11:15:21 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 17 Apr 2005 11:15:21 GMT Message-Id: <200504171115.j3HBFLi9055799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 11:15:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=75369 Change 75369 by davidxu@davidxu_alona on 2005/04/17 11:15:04 cpu_set_user_tls. Affected files ... .. //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#7 (text+ko) ==== @@ -292,6 +292,13 @@ } void +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, + int tls_seg __unused) +{ + td->td_md.md_tp = tls_base; +} + +void cpu_thread_exit(struct thread *td) { } From owner-p4-projects@FreeBSD.ORG Sun Apr 17 11:43:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D292116A4D0; Sun, 17 Apr 2005 11:43:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD7CA16A4CE for ; Sun, 17 Apr 2005 11:43:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 992B743D41 for ; Sun, 17 Apr 2005 11:43:01 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HBh1DH057070 for ; Sun, 17 Apr 2005 11:43:01 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HBh1Y6057067 for perforce@freebsd.org; Sun, 17 Apr 2005 11:43:01 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 17 Apr 2005 11:43:01 GMT Message-Id: <200504171143.j3HBh1Y6057067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 11:43:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=75373 Change 75373 by davidxu@davidxu_alona on 2005/04/17 11:42:32 Fix compile. Affected files ... .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/vm_machdep.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/amd64/amd64/vm_machdep.c#7 (text+ko) ==== @@ -348,11 +348,11 @@ if (td == curthread) { critical_enter(); - td->pcb->pcb_fsbase = tls_base; - wrmsr(MSR_FSBASE, pcb->pcb_fsbase); - critical_leave(); + td->td_pcb->pcb_fsbase = (register_t)tls_base; + wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase); + critical_exit(); } else { - td->pcb->pcb_fsbase = tls_base; + td->td_pcb->pcb_fsbase = (register_t)tls_base; } } From owner-p4-projects@FreeBSD.ORG Sun Apr 17 11:44:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B2F316A4D0; Sun, 17 Apr 2005 11:44:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 764B016A4CE for ; Sun, 17 Apr 2005 11:44:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58A3743D53 for ; Sun, 17 Apr 2005 11:44:03 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HBi3AU057148 for ; Sun, 17 Apr 2005 11:44:03 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HBi3EX057145 for perforce@freebsd.org; Sun, 17 Apr 2005 11:44:03 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 17 Apr 2005 11:44:03 GMT Message-Id: <200504171144.j3HBi3EX057145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 11:44:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=75374 Change 75374 by davidxu@davidxu_alona on 2005/04/17 11:43:46 cpu_set_user_tls. Affected files ... .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#6 edit .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#6 edit .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#6 (text+ko) ==== @@ -209,6 +209,13 @@ } } +void +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, + int tls_seg __unused) +{ + td->td_frame->tf_special.tp = (unsigned long)tls_base; +} + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child ==== //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#6 (text+ko) ==== @@ -354,3 +354,10 @@ td->td_retval[0] = (register_t)entry; td->td_retval[1] = 0; } + +void +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, + int tls_seg __unused) +{ + td->td_frame->fixreg[2] = (register_t)tls_base; +} ==== //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#7 (text+ko) ==== @@ -183,6 +183,8 @@ struct trapframe *tf; uint64_t sp; + if (td == curthread) + flushw(); tf = td->td_frame; sp = (uint64_t)stack->ss_sp + stack->ss_size; tf->tf_out[0] = (uint64_t)arg; From owner-p4-projects@FreeBSD.ORG Sun Apr 17 17:41:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E891616A4D0; Sun, 17 Apr 2005 17:41:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7B0716A4CE for ; Sun, 17 Apr 2005 17:41:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C167943D53 for ; Sun, 17 Apr 2005 17:41:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HHf8Z3086063 for ; Sun, 17 Apr 2005 17:41:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HHeZYr085627 for perforce@freebsd.org; Sun, 17 Apr 2005 17:40:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 17 Apr 2005 17:40:35 GMT Message-Id: <200504171740.j3HHeZYr085627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 17:41:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=75402 Change 75402 by rwatson@rwatson_fledge on 2005/04/17 17:39:44 Integrated trustedbsd_base branch from FreeBSD CVS: - GEOM safety belt override documented. - bind9 update - telnet client security fix - bsnmp startup files - libthr is now libthread; libthr gdb support - no more gtar - pthread_condattr_{get,set}clock() - ltd/tls optimizations - libugidfw bug fix for additional uid/gids as usernames. - ATAmkIII, many more RAID formats - Fix for reading older dump files with restore - sched_* man pages. - sundry driver updates, additions, replacements, removals -- new arcmsr, cdce, nve, powernow. DRM, ACPI updates. ixgb locking. - powerd - UNIX domain socket LOCAL_CREDS, LOCAL_CONNWAIT - Much VFS locking. Centralized inode/vnode hash. - Critical section optimization and spinlock/critical section cleanup. - More stackgap removal. - No more mixed mode. - Plethora of armisms, amd64isms, alphaisms, etc. - Linux compat knows about O_NOFOLLOW and O_DIRECT - NDISisms galore. - Many USB2 fixes. - devfs randomizes major/minor; devname sysctl. - Various geom modules attempt to prevent recursive identification. - i386 system calls to get and set fsbase, gsbase. - rtc locking - ia64 kptr ddb command, improved stack unwinding - alq_open() accepts a cmode argument - kern.sched.preemption sysctl - sysctl_rman - sleepqueue fix - WITNESS hard-coding: NFS server, cdev, twe spin locks. - SO_NOSIGPIPE fixed - accept filter cleanup - m_copyup() - A variety of make changes MAC-related: - Socket/Giant locking fixes for socket labels in mac_{get,set}_fd(). - Introduction of MAC proc set*() credential entry points. - SIGTHR-related changes to p_cansignal() - mac_check_socket_{accept, poll, stat}() entry points. - Additional mac_check_vnode_mmap() flags - NFS credential compare routine. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#28 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#59 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#11 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#10 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#21 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#22 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#19 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/KNOWN_DEFECTS#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/config.guess#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/config.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/libtool.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/ltmain.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_api.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_internal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_lib.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_openssl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_parse.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_parse.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_result.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gssapi_link.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gssapictx.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/hmac_link.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/dst.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/gssapi.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/lib.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/result.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/key.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssl_link.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldh_link.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldsa_link.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/opensslrsa_link.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/dst_api.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/dst_internal.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/dst_lib.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/dst_openssl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/dst_parse.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/dst_parse.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/dst_result.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/gssapi_link.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/gssapictx.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/hmac_link.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/include/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/include/dst/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/include/dst/dst.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/include/dst/gssapi.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/include/dst/lib.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/include/dst/result.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/key.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/openssl_link.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/openssldh_link.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/openssldsa_link.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sec/dst/opensslrsa_link.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/make/includes.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/version#2 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnet/telnet.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/top/commands.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#5 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#5 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#41 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#44 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#28 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#8 integrate .. //depot/projects/trustedbsd/base/etc/netstart#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/weekly/330.catman#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#26 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bsnmpd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/cleanvar#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dumpon#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/lomac#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/mixer#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/random#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ugidfw#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.initdiskless#1 branch .. //depot/projects/trustedbsd/base/etc/snmpd.config#1 branch .. //depot/projects/trustedbsd/base/etc/syslog.conf#8 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#39 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#18 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/config.h#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/Makefile#6 integrate .. //depot/projects/trustedbsd/base/include/Makefile#43 integrate .. //depot/projects/trustedbsd/base/include/pthread.h#8 integrate .. //depot/projects/trustedbsd/base/include/time.h#8 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#22 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#35 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.h#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.mk#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/code.h#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_file.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/Makefile#4 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/Makefile.inc#6 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#2 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_atm/Makefile#2 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def#2 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_atm/atm_sys.c#2 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_mibII/Makefile#4 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#3 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_netgraph/Makefile#4 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def#2 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#8 delete .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h#2 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpsetsticky.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/arm/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/_fpmath.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/errlst.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fmtcheck.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fnmatch.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setmode.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tls.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/_set_tp.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_get_fsbase.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_get_gsbase.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_fsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_gsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_fsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_gsbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/byteorder.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gai_strerror.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getifmaddrs.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyport.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservent.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/res_comp.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_mkupdate.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_query.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/gen/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_time.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/netnamer.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rtime.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/softfloat/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcspn.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strspn.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/yp/yplib.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/change.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#32 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#26 integrate .. //depot/projects/trustedbsd/base/lib/libmd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha256.3#1 branch .. //depot/projects/trustedbsd/base/lib/libmd/sha256.h#1 branch .. //depot/projects/trustedbsd/base/lib/libmd/sha256c.c#1 branch .. //depot/projects/trustedbsd/base/lib/libmd/shadriver.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/include/atomic_ops.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/pthread_md.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/support/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/support/thr_support.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/alpha/_curthread.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/alpha/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/amd64/amd64/_setcurthread.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/arm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_curthread.S#4 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_setcurthread.c#10 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/ia64/ia64/_curthread.c#3 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/powerpc/powerpc/_curthread.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#3 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/sys/thr_error.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_attr.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_barrier.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cancel.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_clean.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_concurrency.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cond.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_condattr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_condattr_destroy.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_condattr_init.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_detach.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_event.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_exit.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_fork.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_join.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_kern.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_kill.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_list.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_main_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mattr_init.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex_prioceiling.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutexattr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutexattr_destroy.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_printf.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#12 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_resume_np.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_rwlock.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_self.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_seterrno.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sigmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_single_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spinlock.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_stack.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_subr.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_suspend_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_switch_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_symbols.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_syscalls.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.h#1 branch .. //depot/projects/trustedbsd/base/lib/libthread_db/libc_r_db.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libthr_db.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/thread_db.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/libugidfw.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/msun/alpha/fenv.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/alpha/fenv.h#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/amd64/e_sqrtf.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/fenv.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/amd64/fenv.h#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/amd64/s_llrintf.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/s_lrintf.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/s_remquo.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/s_remquof.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/s_scalbn.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/s_scalbnf.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/s_scalbnl.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/arm/fenv.h#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/fenv.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/fenv.h#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/s_ceill.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_copysignl.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_floorl.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_llrintf.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_lrintf.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_remquo.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_remquof.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_trunc.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_truncf.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/s_truncl.S#1 branch .. //depot/projects/trustedbsd/base/lib/msun/ia64/fenv.h#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/exp.3#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/feenableexcept.3#1 branch .. //depot/projects/trustedbsd/base/lib/msun/man/fenv.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/lround.3#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/math.3#5 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/remainder.3#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/round.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/trunc.3#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/powerpc/fenv.h#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/sparc64/fenv.h#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/k_rem_pio2f.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/math.h#20 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_exp2.c#1 branch .. //depot/projects/trustedbsd/base/lib/msun/src/s_exp2f.c#1 branch .. //depot/projects/trustedbsd/base/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_fmal.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_llround.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_llroundf.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_llroundl.c#1 branch .. //depot/projects/trustedbsd/base/lib/msun/src/s_lround.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_lroundf.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_lroundl.c#1 branch .. //depot/projects/trustedbsd/base/lib/msun/src/s_remquo.c#1 branch .. //depot/projects/trustedbsd/base/lib/msun/src/s_remquof.c#1 branch .. //depot/projects/trustedbsd/base/lib/msun/src/s_roundl.c#1 branch .. //depot/projects/trustedbsd/base/lib/msun/src/s_truncl.c#1 branch .. //depot/projects/trustedbsd/base/libexec/getty/chat.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/getty/extern.h#3 integrate .. //depot/projects/trustedbsd/base/libexec/getty/init.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/getty/main.c#9 integrate .. //depot/projects/trustedbsd/base/libexec/rexecd/rexecd.c#7 integrate .. //depot/projects/trustedbsd/base/libexec/rshd/rshd.c#10 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/arm/rtld_machdep.h#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/reloc.c#7 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#28 integrate .. //depot/projects/trustedbsd/base/libexec/save-entropy/save-entropy.sh#2 integrate .. //depot/projects/trustedbsd/base/release/Makefile#63 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/Makefile#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#12 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#58 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/install.sgml#16 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#12 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#88 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#3 delete .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#1 branch .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/share/examples/Makefile.relnotesng#9 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#15 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#1 branch .. //depot/projects/trustedbsd/base/release/scripts/package-trees.sh#1 branch .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#32 delete .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/atm/atmconfig/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/ffsinfo/ffsinfo.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/ffsinfo/ffsinfo.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/concat/gconcat.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/concat/geom_concat.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/geom_nop.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/nop/gnop.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/graid3.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/shsec/geom_shsec.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/shsec/gshsec.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/geom_stripe.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/gstripe.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.h#2 integrate .. //depot/projects/trustedbsd/base/sbin/growfs/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sbin/idmapd/idmapd.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#28 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#24 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.h#8 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#29 integrate .. //depot/projects/trustedbsd/base/sbin/md5/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/md5/md5.1#6 integrate .. //depot/projects/trustedbsd/base/sbin/md5/md5.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#18 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/mount_ufs/mount_ufs.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/nfsiod/nfsiod.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/reboot.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/restore/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/restore/dirs.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/restore/main.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.h#9 integrate .. //depot/projects/trustedbsd/base/sbin/restore/tape.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/sunlabel/sunlabel.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/sunlabel/sunlabel.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#21 integrate .. //depot/projects/trustedbsd/base/share/Makefile#8 integrate .. //depot/projects/trustedbsd/base/share/doc/bind9/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/refuse#8 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/refuse.README#9 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#34 integrate .. //depot/projects/trustedbsd/base/share/man/man3/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#54 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aac.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amr.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/arcmsr.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ataraid.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/atkbdc.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/carp.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cdce.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ehci.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/inet.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ip.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_bsdextended.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_fujitsu.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/scd.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/sr.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_ccatm.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_source.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/polling.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rc.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sched_4bsd.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/sched_ule.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_via8233.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/snd_via82c686.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/snd_vibes.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/tap.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ubser.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uftdi.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/unix.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/witness.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/xl.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/man/man5/drivers.conf.5#7 delete .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#34 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#45 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#25 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#41 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VFS_VGET.9#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/alq.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/devclass_get_drivers.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/devclass_get_maxunit.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/make_dev.9#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#19 integrate .. //depot/projects/trustedbsd/base/share/man/man9/rman.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/taskqueue.9#10 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#22 integrate .. //depot/projects/trustedbsd/base/share/misc/pci_vendors#21 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.files.mk#4 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.init.mk#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#24 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.obj.mk#15 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#21 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/autoconf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/critical.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/interrupt.c#20 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#40 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/timerreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#29 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#34 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/bus.h#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/include/critical.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/proc.h#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/imgact_osf1.c#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#21 integrate .. //depot/projects/trustedbsd/base/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/critical.c#7 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_disasm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/fpu.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mptable.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/sys_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/_types.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/asm.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/bus.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/bus_amd64.h#4 delete .. //depot/projects/trustedbsd/base/sys/amd64/include/bus_dma.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/cpufunc.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/critical.h#8 delete .. //depot/projects/trustedbsd/base/sys/amd64/include/endian.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/ieeefp.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/in_cksum.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/legacyvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/proc.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/profile.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/stdarg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/sysarch.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/tss.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/varargs.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/timerreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/critical.c#3 delete .. //depot/projects/trustedbsd/base/sys/arm/arm/fiq.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/locore.S#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/support.S#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/bus.h#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/include/critical.h#2 delete .. //depot/projects/trustedbsd/base/sys/arm/include/float.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/proc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biosacpi.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/vidconsole.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/vidconsole.c#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#20 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#18 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#26 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ch.c#12 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#48 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#16 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#15 integrate .. //depot/projects/trustedbsd/base/sys/coda/cnode.h#9 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#11 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_psdev.c#13 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_subr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_venus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/ia32/ia32_signal.h#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#33 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/hal_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/pe_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_hal.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/trustedbsd/base/sys/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/imgact_svr4.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#18 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.amd64#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.i386#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.pc98#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.sparc64#18 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#57 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#82 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#25 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#18 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.arm#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#49 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#43 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#16 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#39 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#39 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#31 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#37 delete .. //depot/projects/trustedbsd/base/sys/conf/majors.awk#2 delete .. //depot/projects/trustedbsd/base/sys/conf/options#57 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.amd64#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#26 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#28 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/nve/adapter.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/nve/basetype.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/nve/drvinfo.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/nve/os.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/nve/phy.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/crypto/cast128/cast128.c#5 delete .. //depot/projects/trustedbsd/base/sys/crypto/cast128/cast128.h#5 delete .. //depot/projects/trustedbsd/base/sys/crypto/cast128/cast128sb.h#2 delete .. //depot/projects/trustedbsd/base/sys/crypto/md5.c#6 delete .. //depot/projects/trustedbsd/base/sys/crypto/md5.h#3 delete .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael-alg-fst.c#5 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael-alg-fst.h#4 delete .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael-api-fst.c#8 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael-api-fst.h#5 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael.h#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_print.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_run.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_fujitsu.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_toshiba.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_battery.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_resource.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpiio.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/adlink/adlink.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic_cbus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-cbus.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-commands.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-dma.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-isa.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-lowlevel.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/ati_pcigart.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_agpsupport.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_auth.h#6 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_bufs.h#9 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_context.h#8 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_dma.h#9 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drawable.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.h#19 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_fops.h#10 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_ioctl.h#8 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_irq.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_lock.h#6 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_memory.h#11 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_memory_debug.h#4 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_os_freebsd.h#15 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_pci.h#4 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_sarea.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_scatter.h#6 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_sysctl.h#8 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_vm.h#11 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/mga.h#7 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_dma.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_drm.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_irq.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_state.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_warp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r128.h#8 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/r128_cce.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r128_drm.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r128_drv.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r128_drv.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r128_irq.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r128_state.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon.h#11 delete .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_cp.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drm.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_mem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_state.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/savage_bci.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 17 18:35:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD2CC16A4D0; Sun, 17 Apr 2005 18:35:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70F3816A4CE for ; Sun, 17 Apr 2005 18:35:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B68A43D45 for ; Sun, 17 Apr 2005 18:35:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HIZRWg002542 for ; Sun, 17 Apr 2005 18:35:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HIZI44002503 for perforce@freebsd.org; Sun, 17 Apr 2005 18:35:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 17 Apr 2005 18:35:18 GMT Message-Id: <200504171835.j3HIZI44002503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 18:35:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=75408 Change 75408 by rwatson@rwatson_fledge on 2005/04/17 18:34:51 Integrated trustedbsd_mac branch from trustedbsd_base: - GEOM safety belt override documented. - bind9 update - telnet client security fix - bsnmp startup files - libthr is now libthread; libthr gdb support - no more gtar - pthread_condattr_{get,set}clock() - ltd/tls optimizations - libugidfw bug fix for additional uid/gids as usernames. - ATAmkIII, many more RAID formats - Fix for reading older dump files with restore - sched_* man pages. - sundry driver updates, additions, replacements, removals -- new arcmsr, cdce, nve, powernow. DRM, ACPI updates. ixgb locking. - powerd - UNIX domain socket LOCAL_CREDS, LOCAL_CONNWAIT - Much VFS locking. Centralized inode/vnode hash. - Critical section optimization and spinlock/critical section cleanup. - More stackgap removal. - No more mixed mode. - Plethora of armisms, amd64isms, alphaisms, etc. - Linux compat knows about O_NOFOLLOW and O_DIRECT - NDISisms galore. - Many USB2 fixes. - devfs randomizes major/minor; devname sysctl. - Various geom modules attempt to prevent recursive identification. - i386 system calls to get and set fsbase, gsbase. - rtc locking - ia64 kptr ddb command, improved stack unwinding - alq_open() accepts a cmode argument - kern.sched.preemption sysctl - sysctl_rman - sleepqueue fix - WITNESS hard-coding: NFS server, cdev, twe spin locks. - SO_NOSIGPIPE fixed - accept filter cleanup - m_copyup() - A variety of make changes MAC-related: - Socket/Giant locking fixes for socket labels in mac_{get,set}_fd(). - Introduction of MAC proc set*() credential entry points. - SIGTHR-related changes to p_cansignal() - mac_check_socket_{accept, poll, stat}() entry points. - Additional mac_check_vnode_mmap() flags - NFS credential compare routine. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#25 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#54 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_io.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#23 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#23 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#19 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/CHANGES#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/KNOWN_DEFECTS#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/config.guess#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/config.sub#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/libtool.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/ltmain.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_api.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_internal.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_lib.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_openssl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_parse.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_parse.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_result.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/gssapi_link.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/gssapictx.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/hmac_link.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dst/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dst/dst.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dst/gssapi.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dst/lib.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dst/result.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/key.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssl_link.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssldh_link.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssldsa_link.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/opensslrsa_link.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/dst_api.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/dst_internal.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/dst_lib.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/dst_openssl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/dst_parse.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/dst_parse.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/dst_result.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/gssapi_link.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/gssapictx.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/hmac_link.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/include/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/include/dst/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/include/dst/dst.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/include/dst/gssapi.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/include/dst/lib.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/include/dst/result.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/key.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/openssl_link.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/openssldh_link.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/openssldsa_link.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sec/dst/opensslrsa_link.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/print.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/make/includes.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/version#2 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnet/telnet.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/top/commands.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.X#5 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.8#4 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#42 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#40 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#24 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11-4.dist#8 integrate .. //depot/projects/trustedbsd/mac/etc/netstart#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/weekly/330.catman#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#24 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bsnmpd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/cleanvar#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dumpon#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfw#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/lomac#5 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/mixer#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pf#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/random#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ugidfw#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.initdiskless#1 branch .. //depot/projects/trustedbsd/mac/etc/snmpd.config#1 branch .. //depot/projects/trustedbsd/mac/etc/syslog.conf#8 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#35 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#18 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libstdc++/config.h#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#46 integrate .. //depot/projects/trustedbsd/mac/include/pthread.h#8 integrate .. //depot/projects/trustedbsd/mac/include/time.h#8 integrate .. //depot/projects/trustedbsd/mac/include/unistd.h#19 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#34 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.mk#4 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/code.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_open_file.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_file.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libbsnmp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/Makefile#4 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/Makefile.inc#5 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#2 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_atm/Makefile#2 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def#2 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_atm/atm_sys.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_mibII/Makefile#4 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#3 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/Makefile#4 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def#2 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#6 delete .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/fpsetsticky.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/arm/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/_fpmath.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/errlst.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtcheck.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fnmatch.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/setmode.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/tls.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/_set_tp.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_fsbase.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_gsbase.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_fsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_gsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_fsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_gsbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/byteorder.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gai_strerror.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#17 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getifmaddrs.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnameinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyport.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservent.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/netdb_private.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/res_comp.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_mkupdate.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_query.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/gen/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_time.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_vc.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/netnamer.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rtime.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/softfloat/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#20 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#18 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwprintf.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcspn.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strspn.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/yp/yplib.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/change.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#32 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#23 integrate .. //depot/projects/trustedbsd/mac/lib/libmd/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libmd/sha.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libmd/sha256.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libmd/sha256.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libmd/sha256c.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmd/shadriver.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/arm/include/atomic_ops.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/pthread_md.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/pthread_md.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/support/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/support/thr_support.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/alpha/alpha/_curthread.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/arch/alpha/alpha/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/alpha/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/amd64/amd64/_setcurthread.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/arm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_curthread.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_setcurthread.c#10 delete .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/ia64/ia64/_curthread.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libthr/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/powerpc/powerpc/_curthread.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libthr/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/pthread.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/sys/thr_error.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_attr.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_barrier.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_cancel.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_clean.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_concurrency.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_cond.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_condattr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_condattr_destroy.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_condattr_init.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_create.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_detach.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_event.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_exit.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_fork.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_join.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_kern.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_kill.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_list.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_main_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mattr_init.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex_prioceiling.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutexattr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutexattr_destroy.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_printf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_pspinlock.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_resume_np.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_rwlock.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_self.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_seterrno.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_setschedparam.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sig.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sigmask.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_single_np.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_spinlock.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_stack.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_subr.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_suspend_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_switch_np.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_symbols.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_syscalls.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_umtx.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_umtx.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libthread_db/libc_r_db.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/thread_db.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/libugidfw.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/humanize_number.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/lib/msun/alpha/fenv.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/alpha/fenv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/amd64/e_sqrtf.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/fenv.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/amd64/fenv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/amd64/s_llrintf.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/s_lrintf.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/s_remquo.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/s_remquof.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/s_scalbn.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/s_scalbnf.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/s_scalbnl.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/arm/fenv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/fenv.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/fenv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_ceill.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_copysignl.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_floorl.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_llrintf.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_lrintf.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_remquo.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_remquof.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_trunc.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_truncf.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_truncl.S#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/ia64/fenv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/exp.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/feenableexcept.3#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/man/fenv.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/lround.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/math.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/remainder.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/round.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/trunc.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/powerpc/fenv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/sparc64/fenv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/k_rem_pio2f.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/math.h#18 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_exp2.c#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/src/s_exp2f.c#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_fmal.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_llround.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_llroundf.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_llroundl.c#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/src/s_lround.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_lroundf.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_lroundl.c#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/src/s_remquo.c#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/src/s_remquof.c#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/src/s_roundl.c#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/src/s_truncl.c#1 branch .. //depot/projects/trustedbsd/mac/libexec/getty/chat.c#6 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/extern.h#3 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/init.c#4 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/main.c#14 integrate .. //depot/projects/trustedbsd/mac/libexec/rexecd/rexecd.c#7 integrate .. //depot/projects/trustedbsd/mac/libexec/rshd/rshd.c#9 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/arm/rtld_machdep.h#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/reloc.c#7 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#24 integrate .. //depot/projects/trustedbsd/mac/libexec/save-entropy/save-entropy.sh#2 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#60 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/early-adopter/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#10 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#51 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/install.sgml#13 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#10 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#75 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#2 delete .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#1 branch .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#14 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/scripts/package-split.py#1 branch .. //depot/projects/trustedbsd/mac/release/scripts/package-trees.sh#1 branch .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#29 delete .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/atmconfig/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/camcontrol.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/camcontrol.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/devfs.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ffsinfo/ffsinfo.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ffsinfo/ffsinfo.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/concat/gconcat.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/concat/geom_concat.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/gmirror.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/nop/geom_nop.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/nop/gnop.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/shsec/geom_shsec.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/shsec/gshsec.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/stripe/gstripe.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/core/geom.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/core/geom.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/core/geom.h#2 integrate .. //depot/projects/trustedbsd/mac/sbin/growfs/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sbin/idmapd/idmapd.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#27 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#24 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.h#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#24 integrate .. //depot/projects/trustedbsd/mac/sbin/md5/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/md5/md5.1#6 integrate .. //depot/projects/trustedbsd/mac/sbin/md5/md5.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.8#17 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#18 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ufs/mount_ufs.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/nfsiod.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/reboot/reboot.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/dirs.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/main.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/restore.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/restore.h#8 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/tape.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/sunlabel/sunlabel.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/sunlabel/sunlabel.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/sysctl/sysctl.c#20 integrate .. //depot/projects/trustedbsd/mac/share/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/share/doc/bind9/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/refuse#8 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/refuse.README#9 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#31 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#48 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aac.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/amr.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/arcmsr.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ataraid.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/atkbdc.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/carp.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cdce.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ehci.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/geom.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/inet.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ip.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_bsdextended.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_fujitsu.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/scd.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/sr.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_ccatm.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_netflow.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_source.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/polling.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/rc.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sched_4bsd.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/sched_ule.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_via8233.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/snd_via82c686.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/snd_vibes.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/tap.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ubser.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/unix.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/witness.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/xl.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/drivers.conf.5#7 delete .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#31 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#37 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/release.7#22 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#39 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VFS_VGET.9#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/alq.9#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/devclass_get_drivers.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/devclass_get_maxunit.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/make_dev.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mbuf.9#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/rman.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/taskqueue.9#9 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#20 integrate .. //depot/projects/trustedbsd/mac/share/misc/pci_vendors#20 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.files.mk#4 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.incs.mk#3 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.init.mk#3 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#21 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#7 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.obj.mk#14 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.own.mk#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#21 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/autoconf.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/busdma_machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/critical.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/interrupt.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/timerreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#33 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/mac/sys/alpha/include/critical.h#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/proc.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/imgact_osf1.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_misc.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/critical.c#7 delete .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_disasm.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/fpu.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mptable.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/nexus.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/sys_machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/ia32/ia32_syscall.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/_types.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/asm.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus_amd64.h#4 delete .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus_dma.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/cpufunc.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/critical.h#8 delete .. //depot/projects/trustedbsd/mac/sys/amd64/include/endian.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/ieeefp.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/legacyvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/proc.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/profile.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/stdarg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/sysarch.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/tss.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/varargs.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/clock.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/timerreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/critical.c#3 delete .. //depot/projects/trustedbsd/mac/sys/arm/arm/fiq.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/locore.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/support.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/bus.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/include/critical.h#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/include/float.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmap.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/proc.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biosacpi.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/pxe.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/vidconsole.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/vidconsole.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_xpt.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_all.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_cd.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ch.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_sa.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/coda/cnode.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_psdev.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_subr.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_venus.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vfsops.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ia32/ia32_signal.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_socket.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/hal_var.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/ndis_var.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/pe_var.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_hal.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/trustedbsd/mac/sys/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.alpha#12 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.amd64#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.arm#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.i386#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.ia64#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.pc98#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.sparc64#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#59 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#112 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.alpha#24 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.arm#3 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#43 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.ia64#27 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#36 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#33 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.mk#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#34 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#27 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#30 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#33 delete .. //depot/projects/trustedbsd/mac/sys/conf/majors.awk#2 delete .. //depot/projects/trustedbsd/mac/sys/conf/options#70 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.amd64#8 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#24 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#25 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/nve/adapter.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/nve/basetype.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/nve/drvinfo.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/nve/os.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/nve/phy.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/cast128/cast128.c#5 delete .. //depot/projects/trustedbsd/mac/sys/crypto/cast128/cast128.h#5 delete .. //depot/projects/trustedbsd/mac/sys/crypto/cast128/cast128sb.h#2 delete .. //depot/projects/trustedbsd/mac/sys/crypto/md5.c#6 delete .. //depot/projects/trustedbsd/mac/sys/crypto/md5.h#3 delete .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-alg-fst.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-alg-fst.h#4 delete .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-api-fst.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-api-fst.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_print.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_run.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_fujitsu.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_toshiba.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_battery.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_cpu.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_ec.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_resource.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpiio.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/adlink/adlink.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic/aic_cbus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/arcmsr/arcmsr.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/arcmsr/arcmsr.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-card.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-cbus.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-commands.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-dma.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-isa.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata_if.m#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-tape.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-tape.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dpt/dpt_pci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/ati_pcigart.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drmP.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_agpsupport.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_auth.h#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_bufs.h#9 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_context.h#7 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_dma.h#9 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drawable.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#20 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_fops.h#10 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_ioctl.h#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_irq.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_lock.h#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_memory.h#10 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_memory_debug.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_os_freebsd.h#15 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_pci.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_sarea.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_scatter.h#6 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_sysctl.h#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_vm.h#11 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga.h#7 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_dma.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_drm.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_drv.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_drv.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_irq.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_state.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_warp.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128.h#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_cce.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_drm.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_drv.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_drv.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_irq.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_state.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon.h#10 delete .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_cp.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drm.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drv.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drv.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_mem.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_state.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/savage_bci.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 17 21:07:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0C5016A4D0; Sun, 17 Apr 2005 21:07:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6542B16A4CE for ; Sun, 17 Apr 2005 21:07:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F77343D55 for ; Sun, 17 Apr 2005 21:07:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HL7XFJ029881 for ; Sun, 17 Apr 2005 21:07:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HL7WSV029878 for perforce@freebsd.org; Sun, 17 Apr 2005 21:07:32 GMT (envelope-from wsalamon@computer.org) Date: Sun, 17 Apr 2005 21:07:32 GMT Message-Id: <200504172107.j3HL7WSV029878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 75413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 21:07:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=75413 Change 75413 by wsalamon@rickenbacker on 2005/04/17 21:07:09 Change the description of the arguments to be what is really passed into the kernel on the uap pointer. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libc/sys/auditon.2#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libc/sys/auditon.2#3 (text+ko) ==== @@ -36,16 +36,19 @@ .In sys/param.h .In bsm/audit.h .Ft int -.Fn auditon "struct thread *td, struct auditon_args *uap" +.Fn auditon "int cmd, void *data, int length" .Sh DESCRIPTION The .Nm system call is used to manipulate various audit control operations. -The -.Ft *uap -bit should always point to a an -.Em audit command -which may be any of the following: +.Ft *data +should point to a structure whose type depends on the command. +.Ft length +specifies the size of the +.Em data +in bytes. +.Ft cmd +may be any of the following: .Bl -tag -width ".It Dv A_GETPINFO_ADDR" .It Dv A_SETPOLICY Set audit policy flags. From owner-p4-projects@FreeBSD.ORG Sun Apr 17 21:09:37 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B407F16A4D0; Sun, 17 Apr 2005 21:09:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75FB916A4CE for ; Sun, 17 Apr 2005 21:09:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B8E743D1F for ; Sun, 17 Apr 2005 21:09:36 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HL9aOR029956 for ; Sun, 17 Apr 2005 21:09:36 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HL9ZB7029953 for perforce@freebsd.org; Sun, 17 Apr 2005 21:09:35 GMT (envelope-from wsalamon@computer.org) Date: Sun, 17 Apr 2005 21:09:35 GMT Message-Id: <200504172109.j3HL9ZB7029953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 75414 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 21:09:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=75414 Change 75414 by wsalamon@rickenbacker on 2005/04/17 21:09:12 Change the names of the triggers to be more generic, not specific to auditd. Change the logic in the case of no disk space to suspend auditing (unless hard-stop is set, then panic). Auditing will resume when the new log file is given to the kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#12 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#19 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#10 (text+ko) ==== @@ -389,43 +389,16 @@ } /* - * Read the control file for triggers and handle appropriately. - */ -int wait_for_triggers() -{ - int num; - unsigned int trigger; - - for (;;) { - num = read(triggerfd, &trigger, sizeof(trigger)); - if ((num == -1) && (errno != EINTR)) { - syslog(LOG_ERR, "%s: error %d\n", __FUNCTION__, errno); - return (-1); - } - if (num == 0) { - syslog(LOG_INFO, "%s: read EOF\n", __FUNCTION__); - return (-1); - } - syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); - if (trigger == AUDITD_TRIGGER_CLOSE_AND_DIE) - break; - else - handle_auditd_trigger(trigger); - } - syslog(LOG_INFO, "auditd exiting.\n"); - return(close_all()); -} - -/* * Suppress duplicate messages within a 30 second interval. * This should be enough to time to rotate log files without * thrashing from soft warnings generated before the log is * actually rotated. */ #define DUPLICATE_INTERVAL 30 -int handle_auditd_trigger(int flags) +void +handle_audit_trigger(int trigger) { - static int last_flags; + static int last_trigger; static time_t last_time; struct dir_ent *dirent; int rc; @@ -440,24 +413,21 @@ if(gettimeofday(&ts, &tzp) == 0) { tt = (time_t)ts.tv_sec; - if ((flags == last_flags) && + if ((trigger == last_trigger) && (tt < (last_time + DUPLICATE_INTERVAL))) { - return 0; + return; } - last_flags = flags; + last_trigger = trigger; last_time = tt; } - syslog(LOG_INFO, - "handle_audit_trigger() called within auditd with flags = %d\n", - flags); /* * Message processing is done here */ dirent = TAILQ_FIRST(&dir_q); - switch(flags) { + switch(trigger) { - case AUDITD_TRIGGER_LOW_SPACE: + case AUDIT_TRIGGER_LOW_SPACE: syslog(LOG_INFO, "Got low space trigger\n"); if(dirent && (dirent->softlim != 1)) { TAILQ_REMOVE(&dir_q, dirent, dirs); @@ -490,7 +460,7 @@ } break; - case AUDITD_TRIGGER_NO_SPACE: + case AUDIT_TRIGGER_NO_SPACE: syslog(LOG_INFO, "Got no space trigger\n"); /* delete current dir, go on to next */ @@ -507,7 +477,7 @@ break; - case AUDITD_TRIGGER_OPEN_NEW : + case AUDIT_TRIGGER_OPEN_NEW : syslog(LOG_INFO, "Got open new trigger\n"); /* create a new file and swap with the one being * used in kernel */ @@ -515,7 +485,7 @@ syslog(LOG_ERR, "Error swapping audit file\n"); break; - case AUDITD_TRIGGER_READ_FILE : + case AUDIT_TRIGGER_READ_FILE : syslog(LOG_INFO, "Got read file trigger\n"); if(read_control_file() == -1) { syslog(LOG_ERR, "Error in audit control file\n"); @@ -523,9 +493,37 @@ break; default : + syslog(LOG_ERR, "Got unknown trigger %d\n", trigger); break; } - return 0; + return; +} + +/* + * Read the control file for triggers and handle appropriately. + */ +int wait_for_triggers() +{ + int num; + unsigned int trigger; + + for (;;) { + num = read(triggerfd, &trigger, sizeof(trigger)); + if ((num == -1) && (errno != EINTR)) { + syslog(LOG_ERR, "%s: error %d\n", __FUNCTION__, errno); + return (-1); + } + if (num == 0) { + syslog(LOG_INFO, "%s: read EOF\n", __FUNCTION__); + return (-1); + } + syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); + if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) + break; + else + handle_audit_trigger(trigger); + } + return(close_all()); } /* @@ -625,7 +623,7 @@ int aufd; token_t *tok; - if ((triggerfd = open(AUDITD_TRIGGER_FILE, O_RDONLY, 0)) < 0) { + if ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)) < 0) { syslog(LOG_ERR, "Error opening trigger file\n"); fail_exit(); } @@ -707,6 +705,7 @@ setup(flags); rc = wait_for_triggers(); + syslog(LOG_INFO, "auditd exiting.\n"); exit (rc); } ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#12 (text+ko) ==== @@ -42,21 +42,23 @@ /* * File that will be read for trigger events from the kerenl */ -#define AUDITD_TRIGGER_FILE "/dev/audit" +#define AUDIT_TRIGGER_FILE "/dev/audit" /* * Minimum noumber of free blocks on the filesystem containing the audit - * log necessary to avoid a hard log rotation. + * log necessary to avoid a hard log rotation. DO NOT SET THIS VALUE TO 0 + * as the kernel does an unsigned compare, plus we want to leave a few blocks + * free so userspace can terminate the log, etc. */ -#define AUDIT_HARD_LIMIT_FREE_BLOCKS 16 +#define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 /* * Triggers for the audit daemon */ -#define AUDITD_TRIGGER_LOW_SPACE 1 -#define AUDITD_TRIGGER_OPEN_NEW 2 -#define AUDITD_TRIGGER_READ_FILE 3 -#define AUDITD_TRIGGER_CLOSE_AND_DIE 4 -#define AUDITD_TRIGGER_NO_SPACE 5 +#define AUDIT_TRIGGER_LOW_SPACE 1 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_NO_SPACE 5 /* * Pre-defined audit IDs ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#19 (text+ko) ==== @@ -328,6 +328,8 @@ struct vattr vattr; struct statfs *mnt_stat = &vp->v_mount->mnt_stat; +static int ctr = 0; + mtx_assert(&Giant, MA_OWNED); /* @@ -339,30 +341,33 @@ */ ret = VFS_STATFS(vp->v_mount, mnt_stat, td); if (ret) +{ goto out; +} ret = VOP_GETATTR(vp, &vattr, cred, td); if (ret) +{ goto out; +} /* update the global stats struct */ audit_fstat.af_currsz = vattr.va_size; - /* - * Send a message to the audit daemon when disk space is getting - * low. + /* * XXX Need to decide what to do if the trigger to the audit daemon * fails. */ /* * If we fall below minimum free blocks (hard limit), tell the audit - * daemon to force a rotation off of the file system. If we fall - * below the minimum percent free blocks (soft limit), then kindly - * suggest to the audit daemon to do something. + * daemon to force a rotation off of the file system. We also stop + * writing, which means this audit record is probably lost. + * If we fall below the minimum percent free blocks (soft limit), + * then kindly suggest to the audit daemon to do something. */ if (mnt_stat->f_bfree < AUDIT_HARD_LIMIT_FREE_BLOCKS) { - ret = send_trigger(AUDITD_TRIGGER_NO_SPACE); + ret = send_trigger(AUDIT_TRIGGER_NO_SPACE); if (ret != 0) { printf( "Failed audit_triggers(AUDIT_TRIGGER_NO_SPACE): %d\n", ret); @@ -371,12 +376,27 @@ * panic? */ } + /* Hopefully userspace did something about all the previous + * triggers that were sent prior to this critical condition. + * If fail-stop is set, then we're done; goodnight Gracie. + */ + if (audit_fail_stop) + panic("Audit log space exhausted and fail-stop set."); + else { + audit_suspended = 1; + ret = ENOSPC; + goto out; + } } else + /* + * Send a message to the audit daemon that disk space + * is getting low. + */ if (audit_qctrl.aq_minfree != 0) { temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree); if (mnt_stat->f_bfree < temp) { - ret = send_trigger(AUDITD_TRIGGER_LOW_SPACE); + ret = send_trigger(AUDIT_TRIGGER_LOW_SPACE); if (ret != 0) { printf( "Failed audit_triggers(AUDIT_TRIGGER_LOW_SPACE): %d\n", ret); @@ -393,10 +413,10 @@ (audit_file_rotate_wait == 0) && (vattr.va_size >= audit_fstat.af_filesz)) { audit_file_rotate_wait = 1; - ret = send_trigger(AUDITD_TRIGGER_OPEN_NEW); + ret = send_trigger(AUDIT_TRIGGER_OPEN_NEW); if (ret != 0) { printf( - "Failed audit_triggers(AUDITD_TRIGGER_OPEN_NEW): %d\n", ret); + "Failed audit_triggers(AUDIT_TRIGGER_OPEN_NEW): %d\n", ret); /* XXX what to do here? */ } } From owner-p4-projects@FreeBSD.ORG Sun Apr 17 21:33:06 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3746216A4D0; Sun, 17 Apr 2005 21:33:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECFB816A4CE for ; Sun, 17 Apr 2005 21:33:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D697B43D1F for ; Sun, 17 Apr 2005 21:33:05 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3HLX5hi031096 for ; Sun, 17 Apr 2005 21:33:05 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3HLX5Sj031093 for perforce@freebsd.org; Sun, 17 Apr 2005 21:33:05 GMT (envelope-from wsalamon@computer.org) Date: Sun, 17 Apr 2005 21:33:05 GMT Message-Id: <200504172133.j3HLX5Sj031093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 75417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 21:33:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=75417 Change 75417 by wsalamon@rickenbacker on 2005/04/17 21:32:55 Cleanup; remove cruft left over from debugging code. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#20 (text+ko) ==== @@ -328,8 +328,6 @@ struct vattr vattr; struct statfs *mnt_stat = &vp->v_mount->mnt_stat; -static int ctr = 0; - mtx_assert(&Giant, MA_OWNED); /* @@ -341,15 +339,11 @@ */ ret = VFS_STATFS(vp->v_mount, mnt_stat, td); if (ret) -{ goto out; -} ret = VOP_GETATTR(vp, &vattr, cred, td); if (ret) -{ goto out; -} /* update the global stats struct */ audit_fstat.af_currsz = vattr.va_size; From owner-p4-projects@FreeBSD.ORG Mon Apr 18 11:42:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 505FB16A4D0; Mon, 18 Apr 2005 11:42:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 108F116A4CE for ; Mon, 18 Apr 2005 11:42:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED45743D4C for ; Mon, 18 Apr 2005 11:42:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IBgbkg085116 for ; Mon, 18 Apr 2005 11:42:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IBgbs7085113 for perforce@freebsd.org; Mon, 18 Apr 2005 11:42:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Apr 2005 11:42:37 GMT Message-Id: <200504181142.j3IBgbs7085113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 11:42:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=75473 Change 75473 by rwatson@rwatson_paprika on 2005/04/18 11:42:09 Clean up local mis-merges from loop-back of SysV Sem labeling and access control. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#35 (text+ko) ==== @@ -623,6 +623,7 @@ } mtx_unlock(sema_mtxp); #endif + error = 0; rval = 0; @@ -986,7 +987,7 @@ semid = IPCID_TO_IX(semid); /* Convert back to zero origin */ if (semid < 0 || semid >= seminfo.semmni) - error = EINVAL; + return (EINVAL); /* Allocate memory for sem_ops */ if (nsops <= SMALL_SOPS) @@ -1245,7 +1246,6 @@ mtx_unlock(sema_mtxp); if (sops != small_sops) free(sops, M_SEM); - free(sops, M_SEM); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Apr 18 11:43:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23ED116A4D0; Mon, 18 Apr 2005 11:43:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB16F16A4CE for ; Mon, 18 Apr 2005 11:43:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADDED43D1F for ; Mon, 18 Apr 2005 11:43:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IBhdcx085207 for ; Mon, 18 Apr 2005 11:43:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IBhdbh085204 for perforce@freebsd.org; Mon, 18 Apr 2005 11:43:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Apr 2005 11:43:39 GMT Message-Id: <200504181143.j3IBhdbh085204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 11:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=75474 Change 75474 by rwatson@rwatson_paprika on 2005/04/18 11:43:15 Restore gratuitously wrong white space from CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#36 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#36 (text+ko) ==== @@ -623,7 +623,7 @@ } mtx_unlock(sema_mtxp); #endif - + error = 0; rval = 0; From owner-p4-projects@FreeBSD.ORG Mon Apr 18 11:46:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 633FD16A4D0; Mon, 18 Apr 2005 11:46:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D43316A4CF for ; Mon, 18 Apr 2005 11:46:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D71F743D3F for ; Mon, 18 Apr 2005 11:46:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IBkhqm085450 for ; Mon, 18 Apr 2005 11:46:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IBkhiv085447 for perforce@freebsd.org; Mon, 18 Apr 2005 11:46:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 18 Apr 2005 11:46:43 GMT Message-Id: <200504181146.j3IBkhiv085447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 11:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=75475 Change 75475 by rwatson@rwatson_paprika on 2005/04/18 11:46:11 Merge $FreeBSD$ from CVS to reduce diff size. Will conflict next integ, of course. Affected files ... .. //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#4 edit .. //depot/projects/trustedbsd/mac/sys/modules/mac_lomac/Makefile#3 edit .. //depot/projects/trustedbsd/mac/sys/modules/mac_partition/Makefile#3 edit .. //depot/projects/trustedbsd/mac/sys/modules/mac_seeotheruids/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/modules/mac_bsdextended/Makefile,v 1.1 2002/08/01 17:41:26 rwatson Exp $ .PATH: ${.CURDIR}/../../security/mac_bsdextended ==== //depot/projects/trustedbsd/mac/sys/modules/mac_lomac/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/modules/mac_lomac/Makefile,v 1.1 2002/11/26 17:35:44 rwatson Exp $ .PATH: ${.CURDIR}/../../security/mac_lomac ==== //depot/projects/trustedbsd/mac/sys/modules/mac_partition/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/modules/mac_partition/Makefile,v 1.1 2002/10/24 02:04:03 rwatson Exp $ .PATH: ${.CURDIR}/../../security/mac_partition ==== //depot/projects/trustedbsd/mac/sys/modules/mac_seeotheruids/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/modules/mac_seeotheruids/Makefile,v 1.1 2002/08/01 17:41:27 rwatson Exp $ .PATH: ${.CURDIR}/../../security/mac_seeotheruids From owner-p4-projects@FreeBSD.ORG Mon Apr 18 13:10:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B14B16A4D0; Mon, 18 Apr 2005 13:10:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7192416A4CE for ; Mon, 18 Apr 2005 13:10:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31F3E43D3F for ; Mon, 18 Apr 2005 13:10:26 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IDAQdl095502 for ; Mon, 18 Apr 2005 13:10:26 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IDAPoL095498 for perforce@freebsd.org; Mon, 18 Apr 2005 13:10:25 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 18 Apr 2005 13:10:25 GMT Message-Id: <200504181310.j3IDAPoL095498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 13:10:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=75479 Change 75479 by davidxu@davidxu_alona on 2005/04/18 13:09:48 cleanup tls code a bit. Affected files ... .. //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#7 edit .. //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#8 edit .. //depot/projects/davidxu_thread/src/sys/i386/i386/vm_machdep.c#9 edit .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#7 edit .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#16 edit .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#7 edit .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#8 edit .. //depot/projects/davidxu_thread/src/sys/sys/proc.h#14 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/alpha/alpha/vm_machdep.c#7 (text+ko) ==== @@ -361,9 +361,9 @@ } void -cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, - int tls_seg __unused) +cpu_set_user_tls(struct thread *td, void *tls_base) { + if (td != curthread) td->td_pcb->pcb_hw.apcb_unique = (unsigned long)tls_base; else ==== //depot/projects/davidxu_thread/src/sys/arm/arm/vm_machdep.c#8 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -292,10 +293,16 @@ } void -cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, - int tls_seg __unused) +cpu_set_user_tls(struct thread *td, void *tls_base) { - td->td_md.md_tp = tls_base; + + if (td != curthread) + td->td_md.md_tp = tls_base; + else { + critical_enter(); + *(void **)ARM_TP_ADDRESS = tls_base; + critical_exit(); + } } void ==== //depot/projects/davidxu_thread/src/sys/i386/i386/vm_machdep.c#9 (text+ko) ==== @@ -470,8 +470,7 @@ } void -cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, - int tls_seg __unused) +cpu_set_user_tls(struct thread *td, void *tls_base) { struct segment_descriptor sd; uint32_t base; @@ -493,14 +492,14 @@ sd.sd_xx = 0; sd.sd_def32 = 1; sd.sd_gran = 1; - mtx_lock_spin(&sched_lock); - /* current only uses %gs */ + critical_enter(); + /* set %gs */ td->td_pcb->pcb_gsd = sd; if (td == curthread) { PCPU_GET(fsgs_gdt)[1] = sd; load_gs(GSEL(GUGS_SEL, SEL_UPL)); } - mtx_unlock_spin(&sched_lock); + critical_exit(); } /* ==== //depot/projects/davidxu_thread/src/sys/ia64/ia64/vm_machdep.c#7 (text+ko) ==== @@ -210,8 +210,7 @@ } void -cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, - int tls_seg __unused) +cpu_set_user_tls(struct thread *td, void *tls_base) { td->td_frame->tf_special.tp = (unsigned long)tls_base; } ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#16 (text+ko) ==== @@ -248,7 +248,7 @@ /* Set upcall address to user thread entry function. */ cpu_set_upcall_kse(newtd, param.start_func, param.arg, &stack); /* Setup user TLS address and TLS pointer register. */ - cpu_set_user_tls(newtd, param.tls_base, param.tls_size, param.tls_seg); + cpu_set_user_tls(newtd, param.tls_base); if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { /* Treat initial thread as it has PTHREAD_SCOPE_PROCESS. */ p->p_procscopegrp = kg; ==== //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/vm_machdep.c#7 (text+ko) ==== @@ -356,8 +356,8 @@ } void -cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, - int tls_seg __unused) +cpu_set_user_tls(struct thread *td, void *tls_base) { + td->td_frame->fixreg[2] = (register_t)tls_base; } ==== //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#8 (text+ko) ==== @@ -197,9 +197,9 @@ } void -cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, - int tls_seg __unused) +cpu_set_user_tls(struct thread *td, void *tls_base) { + if (td == curthread) flushw(); td->td_frame->tf_global[7] = tls_base; ==== //depot/projects/davidxu_thread/src/sys/sys/proc.h#14 (text+ko) ==== @@ -893,7 +893,7 @@ void kseinit(void); void cpu_set_upcall(struct thread *td, struct thread *td0); void cpu_set_upcall_kse(struct thread *, void (*)(void *), void *, stack_t *); -void cpu_set_user_tls(struct thread *, void *tls_base, size_t tls_size, int tls_seg); +void cpu_set_user_tls(struct thread *, void *tls_base); void cpu_thread_clean(struct thread *); void cpu_thread_exit(struct thread *); void cpu_thread_setup(struct thread *td); From owner-p4-projects@FreeBSD.ORG Mon Apr 18 16:45:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 903FB16A4D0; Mon, 18 Apr 2005 16:45:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E01816A4CE for ; Mon, 18 Apr 2005 16:45:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19C6E43D31 for ; Mon, 18 Apr 2005 16:45:24 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IGjNCu005313 for ; Mon, 18 Apr 2005 16:45:23 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IGjNoE005310 for perforce@freebsd.org; Mon, 18 Apr 2005 16:45:23 GMT (envelope-from areisse@nailabs.com) Date: Mon, 18 Apr 2005 16:45:23 GMT Message-Id: <200504181645.j3IGjNoE005310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 75498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 16:45:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=75498 Change 75498 by areisse@areisse_ibook on 2005/04/18 16:45:05 Initial support for access vectors in a mach message trailer. A new entry point, mac_check_ipc_methods, returns an access vector mapping routine numbers to permitted/denied bits. This vector is then stored in the message trailer (if requested by the recipient). Currently, any access decisions are made using the sender's task label at the time of the sending, and the recipient port label at the time of receive. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/mac.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/message.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#3 (text+ko) ==== @@ -67,6 +67,7 @@ struct vnode; struct devnode; struct task; +struct msg_access_vector; struct mac_policy_ops { /* @@ -478,6 +479,9 @@ int (*mpo_audit_postselect)(struct ucred *cred, unsigned short syscode, void *args, int error, int retval); + + void (*mpo_check_ipc_methods)(struct label *task, + struct label *port, struct msg_access_vector *av); }; struct mac_policy_conf { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#2 (text+ko) ==== @@ -274,6 +274,18 @@ trailer->msgh_trailer_size = REQUESTED_TRAILER_SIZE(option); #if 1 + + if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_AV)) { + if (kmsg->ikm_sender != IO_NULL && + IP_VALID(kmsg->ikm_header.msgh_remote_port)) { + mac_check_ipc_methods + (&kmsg->ikm_sender->lh_label, + &((ipc_port_t)kmsg->ikm_header.msgh_remote_port)->ip_label, &trailer->msgh_av); + } + else + memset(trailer->msgh_av.av, 0, sizeof(msg_access_vector_t)); + } + if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_LABELS)) { if (kmsg->ikm_sender != IO_NULL) { ipc_object_t lh = &kmsg->ikm_sender->lh_object; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/mac.h#3 (text+ko) ==== @@ -25,6 +25,7 @@ * SUCH DAMAGE. */ +#include #include /* tasks */ @@ -58,3 +59,5 @@ int mac_check_port_hold_receive (struct label *task, struct label *port); int mac_check_task_service_access (task_t self, task_t obj, const char *perm); + +void mac_check_ipc_methods (struct label *task, struct label *port, msg_access_vector_t *av); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/message.h#2 (text+ko) ==== @@ -331,6 +331,11 @@ mach_port_name_t sender; } msg_labels_t; +typedef struct msg_access_vector +{ + unsigned int av[4]; +} msg_access_vector_t; + typedef struct { mach_msg_trailer_type_t msgh_trailer_type; @@ -339,6 +344,7 @@ security_token_t msgh_sender; audit_token_t msgh_audit; msg_labels_t msgh_labels; + msg_access_vector_t msgh_av; } mach_msg_mac_trailer_t; #define MACH_MSG_TRAILER_MINIMUM_SIZE sizeof(mach_msg_trailer_t) @@ -513,6 +519,7 @@ #define MACH_RCV_TRAILER_SENDER 2 #define MACH_RCV_TRAILER_AUDIT 3 #define MACH_RCV_TRAILER_LABELS 4 +#define MACH_RCV_TRAILER_AV 8 #define MACH_RCV_TRAILER_TYPE(x) (((x) & 0xf) << 28) #define MACH_RCV_TRAILER_ELEMENTS(x) (((x) & 0xf) << 24) ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ */ #include +#include void mac_init_port_label (struct label *l) @@ -171,3 +172,27 @@ return (error); } + +void +mac_check_ipc_methods(struct label *task, struct label *port, + msg_access_vector_t *av) +{ + struct mac_policy_conf *mpc; + int entrycount; + + memset(av, 0xff, sizeof(msg_access_vector_t)); + + LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { + if (mpc->mpc_ops->mpo_check_ipc_methods != NULL) + mpc->mpc_ops->mpo_check_ipc_methods( + task, port, av); + } + if ((entrycount = mac_policy_list_conditional_busy()) != 0) { + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { + if (mpc->mpc_ops->mpo_check_ipc_methods != NULL) + mpc->mpc_ops->mpo_check_ipc_methods( + task, port, av); + } + mac_policy_list_unbusy(); + } +} From owner-p4-projects@FreeBSD.ORG Mon Apr 18 16:47:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFF8F16A4D0; Mon, 18 Apr 2005 16:47:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C26316A4CE for ; Mon, 18 Apr 2005 16:47:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27F6043D1F for ; Mon, 18 Apr 2005 16:47:27 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IGlRqn012256 for ; Mon, 18 Apr 2005 16:47:27 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IGlQgU012253 for perforce@freebsd.org; Mon, 18 Apr 2005 16:47:26 GMT (envelope-from areisse@nailabs.com) Date: Mon, 18 Apr 2005 16:47:26 GMT Message-Id: <200504181647.j3IGlQgU012253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 75499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 16:47:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=75499 Change 75499 by areisse@areisse_ibook on 2005/04/18 16:46:31 Fix the include file path used by mkflask. Add support for check_ipc_methods, in a very simple manner. Four extra classes are introduced, port_methods1..4. Any denied permissions in those classes are removed from the permitted set managed by check_ipc_methods. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/mkflask.sh#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#2 (text+ko) ==== @@ -37,6 +37,11 @@ #define SECCLASS_SHM 28 #define SECCLASS_IPC 29 #define SECCLASS_MACH_PORT 30 +#define SECCLASS_PORT_METHODS1 31 +#define SECCLASS_PORT_METHODS2 32 +#define SECCLASS_PORT_METHODS3 33 +#define SECCLASS_PORT_METHODS4 34 +#define SECCLASS_MACH_TASK 35 /* * Security identifier indices for initial entities ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/mkflask.sh#2 (text+ko) ==== @@ -25,7 +25,7 @@ printf("#ifndef _LINUX_FLASK_H_\n") > outfile; printf("#define _LINUX_FLASK_H_\n") > outfile; - printf("\n#include \n") > outfile; + printf("\n#include \n") > outfile; printf("\n/*\n * Security object class definitions\n */\n") > outfile; printf("/* This file is automatically generated. Do not edit. */\n") > debugfile; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#2 (text+ko) ==== @@ -42,6 +42,11 @@ class mach_port +class port_methods1 +class port_methods2 +class port_methods3 +class port_methods4 + #classes only used by name class mach_task ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#2 (text+ko) ==== @@ -1249,6 +1249,32 @@ NULL, NULL); } +extern int selinux_enforcing; + +static void +sebsd_check_ipc_methods(struct label *subj, struct label *obj, + msg_access_vector_t *av) +{ + struct task_security_struct *tsec, *psec; + int i; + + psec = SLOT(obj); + tsec = SLOT(subj); + + if (!selinux_enforcing) + return; + + for (i = 0; i < 4; i++) + { + struct av_decision avd; + security_class_t tclass = SECCLASS_PORT_METHODS1 + i; + + avc_has_perm_noaudit (tsec->sid, psec->sid, tclass, 0xffffffff, NULL, &avd); + + av->av[i] &= avd.allowed; + } +} + static int sebsd_check_mount (struct ucred *cred, struct vnode *vp, struct label *vl, const char *vfc_name, struct label *mntlabel) @@ -2673,6 +2699,8 @@ // .mpo_check_sysv_shmdt = sebsd_check_sysv_shmdt, .mpo_check_sysv_shmget = sebsd_check_sysv_shmget, + .mpo_check_ipc_methods = sebsd_check_ipc_methods, + .mpo_syscall = sebsd_syscall }; From owner-p4-projects@FreeBSD.ORG Mon Apr 18 16:51:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71F6C16A4D0; Mon, 18 Apr 2005 16:51:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4871816A4CE for ; Mon, 18 Apr 2005 16:51:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5360E43D48 for ; Mon, 18 Apr 2005 16:51:37 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IGpbvf012499 for ; Mon, 18 Apr 2005 16:51:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IGpWDq012492 for perforce@freebsd.org; Mon, 18 Apr 2005 16:51:32 GMT (envelope-from sam@freebsd.org) Date: Mon, 18 Apr 2005 16:51:32 GMT Message-Id: <200504181651.j3IGpWDq012492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 75500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 16:51:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=75500 Change 75500 by sam@sam_ebb on 2005/04/18 16:51:01 IFC @ 75499 Affected files ... .. //depot/projects/wifi/UPDATING#14 integrate .. //depot/projects/wifi/bin/hostname/hostname.1#3 integrate .. //depot/projects/wifi/bin/sh/sh.1#6 integrate .. //depot/projects/wifi/contrib/top/commands.c#2 integrate .. //depot/projects/wifi/contrib/top/top.c#2 integrate .. //depot/projects/wifi/etc/Makefile#4 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#14 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#7 integrate .. //depot/projects/wifi/etc/rc.d/bsnmpd#1 branch .. //depot/projects/wifi/etc/rc.d/cleanvar#2 integrate .. //depot/projects/wifi/etc/snmpd.config#1 branch .. //depot/projects/wifi/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/wifi/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/wifi/lib/libc/i386/gen/_set_tp.c#3 integrate .. //depot/projects/wifi/lib/libc/i386/sys/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libc/i386/sys/i386_get_fsbase.c#1 branch .. //depot/projects/wifi/lib/libc/i386/sys/i386_get_gsbase.c#1 branch .. //depot/projects/wifi/lib/libc/i386/sys/i386_set_fsbase.c#1 branch .. //depot/projects/wifi/lib/libc/i386/sys/i386_set_gsbase.c#1 branch .. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#7 integrate .. //depot/projects/wifi/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getservbyname.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getservbyport.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getservent.c#3 integrate .. //depot/projects/wifi/lib/libc/net/netdb_private.h#1 branch .. //depot/projects/wifi/lib/libc/net/res_query.c#2 integrate .. //depot/projects/wifi/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/wifi/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/wifi/lib/libdisk/disk.c#4 integrate .. //depot/projects/wifi/lib/libpthread/arch/i386/i386/pthread_md.c#3 integrate .. //depot/projects/wifi/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/wifi/lib/libthr/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/wifi/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/wifi/lib/libthread_db/libthr_db.c#4 integrate .. //depot/projects/wifi/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/wifi/lib/libugidfw/ugidfw.c#3 integrate .. //depot/projects/wifi/lib/msun/Makefile#10 integrate .. //depot/projects/wifi/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/msun/amd64/e_sqrtf.S#1 branch .. //depot/projects/wifi/lib/msun/amd64/s_llrintf.S#1 branch .. //depot/projects/wifi/lib/msun/amd64/s_lrintf.S#1 branch .. //depot/projects/wifi/lib/msun/amd64/s_scalbn.S#1 branch .. //depot/projects/wifi/lib/msun/amd64/s_scalbnf.S#1 branch .. //depot/projects/wifi/lib/msun/amd64/s_scalbnl.S#1 branch .. //depot/projects/wifi/lib/msun/i387/Makefile.inc#4 integrate .. //depot/projects/wifi/lib/msun/i387/s_ceill.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_copysignl.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_floorl.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_llrintf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_lrintf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_trunc.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_truncf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_truncl.S#1 branch .. //depot/projects/wifi/lib/msun/man/trunc.3#2 integrate .. //depot/projects/wifi/lib/msun/src/math.h#8 integrate .. //depot/projects/wifi/lib/msun/src/s_truncl.c#1 branch .. //depot/projects/wifi/libexec/rexecd/rexecd.c#7 integrate .. //depot/projects/wifi/libexec/rtld-elf/i386/reloc.c#3 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#3 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#2 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 integrate .. //depot/projects/wifi/release/scripts/package-split.py#3 integrate .. //depot/projects/wifi/sbin/devd/devd.cc#3 integrate .. //depot/projects/wifi/sbin/dump/main.c#4 integrate .. //depot/projects/wifi/sbin/geom/class/mirror/gmirror.8#7 integrate .. //depot/projects/wifi/sbin/idmapd/idmapd.c#2 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/wifi/share/Makefile#2 integrate .. //depot/projects/wifi/share/examples/etc/make.conf#13 integrate .. //depot/projects/wifi/share/examples/ppi/ppilcd.c#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#19 integrate .. //depot/projects/wifi/share/man/man4/amr.4#7 integrate .. //depot/projects/wifi/share/man/man4/ata.4#5 integrate .. //depot/projects/wifi/share/man/man4/ataraid.4#1 branch .. //depot/projects/wifi/share/man/man4/polling.4#5 integrate .. //depot/projects/wifi/share/man/man4/tap.4#3 integrate .. //depot/projects/wifi/share/man/man4/ucom.4#2 integrate .. //depot/projects/wifi/share/man/man4/unix.4#2 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#10 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/wifi/share/man/man9/Makefile#10 integrate .. //depot/projects/wifi/share/man/man9/alq.9#4 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#4 integrate .. //depot/projects/wifi/sys/alpha/alpha/interrupt.c#5 integrate .. //depot/projects/wifi/sys/alpha/alpha/trap.c#4 integrate .. //depot/projects/wifi/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/wifi/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/mptable.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/wifi/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/wifi/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/wifi/sys/amd64/include/bus.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/bus_amd64.h#5 delete .. //depot/projects/wifi/sys/amd64/include/ieeefp.h#4 integrate .. //depot/projects/wifi/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/tss.h#3 integrate .. //depot/projects/wifi/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/wifi/sys/arm/arm/support.S#4 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#10 integrate .. //depot/projects/wifi/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/wifi/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/wifi/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/wifi/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/wifi/sys/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/wifi/sys/conf/Makefile.alpha#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#6 integrate .. //depot/projects/wifi/sys/conf/Makefile.i386#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.pc98#4 integrate .. //depot/projects/wifi/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/wifi/sys/conf/Makefile.sparc64#4 integrate .. //depot/projects/wifi/sys/conf/NOTES#18 integrate .. //depot/projects/wifi/sys/conf/files#22 integrate .. //depot/projects/wifi/sys/conf/files.arm#4 integrate .. //depot/projects/wifi/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/wifi/sys/conf/options.amd64#3 integrate .. //depot/projects/wifi/sys/conf/options.i386#5 integrate .. //depot/projects/wifi/sys/conf/options.pc98#4 integrate .. //depot/projects/wifi/sys/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/wifi/sys/ddb/db_print.c#3 integrate .. //depot/projects/wifi/sys/ddb/db_run.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/wifi/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/wifi/sys/dev/ata/ata-card.c#6 integrate .. //depot/projects/wifi/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/wifi/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/wifi/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/wifi/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/wifi/sys/dev/drm/ati_pcigart.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_agpsupport.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_auth.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_bufs.h#5 delete .. //depot/projects/wifi/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_context.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_dma.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_drawable.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_drv.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_fops.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_ioctl.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_irq.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_lock.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_memory.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_memory_debug.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_os_freebsd.h#4 delete .. //depot/projects/wifi/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_pci.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_sarea.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_scatter.h#3 delete .. //depot/projects/wifi/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_sysctl.h#4 delete .. //depot/projects/wifi/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/wifi/sys/dev/drm/drm_vm.h#3 delete .. //depot/projects/wifi/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/wifi/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/wifi/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/wifi/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/wifi/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/wifi/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/wifi/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/wifi/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/wifi/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/wifi/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/wifi/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/wifi/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/wifi/sys/dev/drm/mga.h#3 delete .. //depot/projects/wifi/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/mga_drm.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/mga_warp.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/r128.h#3 delete .. //depot/projects/wifi/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/r128_drm.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/radeon.h#3 delete .. //depot/projects/wifi/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_mem.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/wifi/sys/dev/drm/savage_bci.c#1 branch .. //depot/projects/wifi/sys/dev/drm/savage_drm.h#1 branch .. //depot/projects/wifi/sys/dev/drm/savage_drv.c#1 branch .. //depot/projects/wifi/sys/dev/drm/savage_drv.h#1 branch .. //depot/projects/wifi/sys/dev/drm/savage_state.c#1 branch .. //depot/projects/wifi/sys/dev/drm/sis.h#3 delete .. //depot/projects/wifi/sys/dev/drm/sis_drm.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/sis_drv.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/tdfx.h#3 delete .. //depot/projects/wifi/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/wifi/sys/dev/drm/tdfx_drv.h#1 branch .. //depot/projects/wifi/sys/dev/ed/if_ed98.h#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/wifi/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/wifi/sys/dev/ida/ida.c#3 integrate .. //depot/projects/wifi/sys/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/wifi/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/ida/idareg.h#2 integrate .. //depot/projects/wifi/sys/dev/ida/idavar.h#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#14 integrate .. //depot/projects/wifi/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/wifi/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/wifi/sys/dev/ppbus/pps.c#5 integrate .. //depot/projects/wifi/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_externs.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_fwif.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_fwimg.c#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_init.c#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_intr.c#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_io.c#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_ioctl.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_misc.c#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_cl_share.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl_cam.c#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl_externs.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl_freebsd.c#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl_includes.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl_ioctl.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl_share.h#1 branch .. //depot/projects/wifi/sys/dev/twa/tw_osl_types.h#1 branch .. //depot/projects/wifi/sys/dev/twa/twa.c#4 delete .. //depot/projects/wifi/sys/dev/twa/twa.h#5 delete .. //depot/projects/wifi/sys/dev/twa/twa_cam.c#4 delete .. //depot/projects/wifi/sys/dev/twa/twa_externs.h#3 delete .. //depot/projects/wifi/sys/dev/twa/twa_freebsd.c#5 delete .. //depot/projects/wifi/sys/dev/twa/twa_fwimg.c#3 delete .. //depot/projects/wifi/sys/dev/twa/twa_globals.c#4 delete .. //depot/projects/wifi/sys/dev/twa/twa_includes.h#2 delete .. //depot/projects/wifi/sys/dev/twa/twa_ioctl.h#3 delete .. //depot/projects/wifi/sys/dev/twa/twa_reg.h#3 delete .. //depot/projects/wifi/sys/dev/wi/if_wi.c#14 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#10 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_vnops.c#9 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#12 integrate .. //depot/projects/wifi/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_lookup.c#5 integrate .. //depot/projects/wifi/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/wifi/sys/i386/bios/apm.c#3 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#12 integrate .. //depot/projects/wifi/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/wifi/sys/i386/i386/mptable.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/wifi/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/wifi/sys/i386/include/clock.h#4 integrate .. //depot/projects/wifi/sys/i386/include/pc/display.h#2 integrate .. //depot/projects/wifi/sys/i386/include/pcb.h#2 integrate .. //depot/projects/wifi/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/wifi/sys/i386/include/segments.h#2 integrate .. //depot/projects/wifi/sys/i386/include/sysarch.h#4 integrate .. //depot/projects/wifi/sys/i386/isa/clock.c#4 integrate .. //depot/projects/wifi/sys/i386/linux/linux.h#2 integrate .. //depot/projects/wifi/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/wifi/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/wifi/sys/ia64/ia64/db_trace.c#3 integrate .. //depot/projects/wifi/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/wifi/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/wifi/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/wifi/sys/ia64/ia64/unwind.c#3 integrate .. //depot/projects/wifi/sys/isa/isahint.c#2 integrate .. //depot/projects/wifi/sys/isa/isavar.h#4 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_alq.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_mac.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_proc.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_prot.c#8 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/wifi/sys/kern/subr_param.c#5 integrate .. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#8 integrate .. //depot/projects/wifi/sys/kern/sys_socket.c#6 integrate .. //depot/projects/wifi/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/wifi/sys/kern/tty.c#8 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/wifi/sys/modules/Makefile#19 integrate .. //depot/projects/wifi/sys/modules/apm/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/drm/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/drm/drm/Makefile#1 branch .. //depot/projects/wifi/sys/modules/drm/mach64/Makefile#1 branch .. //depot/projects/wifi/sys/modules/twa/Makefile#2 integrate .. //depot/projects/wifi/sys/net/if.c#12 integrate .. //depot/projects/wifi/sys/net/if_tap.c#6 integrate .. //depot/projects/wifi/sys/net/iso88025.h#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_cisco.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_echo.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/wifi/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/wifi/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/wifi/sys/pc98/apm/apm_bioscall.s#2 integrate .. //depot/projects/wifi/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/wifi/sys/pc98/i386/machdep.c#9 integrate .. //depot/projects/wifi/sys/pc98/include/bus_memio.h#2 integrate .. //depot/projects/wifi/sys/pc98/include/bus_pio.h#2 integrate .. //depot/projects/wifi/sys/pc98/include/clock.h#2 integrate .. //depot/projects/wifi/sys/pc98/include/pc/display.h#2 integrate .. //depot/projects/wifi/sys/pc98/pc98/isa_dma.c#3 integrate .. //depot/projects/wifi/sys/pc98/pc98/olpt.c#3 integrate .. //depot/projects/wifi/sys/pc98/pc98/scterm-sck.c#2 integrate .. //depot/projects/wifi/sys/pci/if_dc.c#5 integrate .. //depot/projects/wifi/sys/pci/if_pcn.c#5 integrate .. //depot/projects/wifi/sys/powerpc/powermac/ata_kauai.c#6 integrate .. //depot/projects/wifi/sys/powerpc/powermac/ata_macio.c#6 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/trap.c#5 integrate .. //depot/projects/wifi/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/wifi/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/wifi/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/wifi/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/wifi/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/wifi/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/wifi/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/wifi/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/wifi/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/wifi/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/wifi/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/wifi/sys/sparc64/sbus/lsi64854.c#3 integrate .. //depot/projects/wifi/sys/sparc64/sbus/lsi64854reg.h#2 integrate .. //depot/projects/wifi/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/wifi/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/wifi/sys/sys/alq.h#3 integrate .. //depot/projects/wifi/sys/sys/ata.h#3 integrate .. //depot/projects/wifi/sys/sys/kernel.h#7 integrate .. //depot/projects/wifi/sys/sys/mac.h#3 integrate .. //depot/projects/wifi/sys/sys/mac_policy.h#4 integrate .. //depot/projects/wifi/sys/sys/mouse.h#3 integrate .. //depot/projects/wifi/sys/sys/param.h#9 integrate .. //depot/projects/wifi/sys/sys/proc.h#12 integrate .. //depot/projects/wifi/sys/sys/socket.h#5 integrate .. //depot/projects/wifi/sys/sys/sysctl.h#6 integrate .. //depot/projects/wifi/sys/sys/un.h#3 integrate .. //depot/projects/wifi/sys/sys/unpcb.h#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#15 integrate .. //depot/projects/wifi/sys/vm/vm_meter.c#6 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/wifi/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/wifi/tools/regression/mac/mac_bsdextended/Makefile#1 branch .. //depot/projects/wifi/tools/regression/mac/mac_bsdextended/test_ugidfw.c#1 branch .. //depot/projects/wifi/tools/regression/msdosfs/msdosfstest-2.sh#1 branch .. //depot/projects/wifi/tools/regression/msdosfs/msdosfstest-3.sh#1 branch .. //depot/projects/wifi/tools/regression/msdosfs/msdosfstest.sh#2 integrate .. //depot/projects/wifi/tools/regression/usr.bin/Makefile#3 integrate .. //depot/projects/wifi/tools/regression/usr.bin/printf/Makefile#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.b.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.d.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.f.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.m1.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.m2.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.m3.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.m4.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.s.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.sh#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/printf/regress.t#1 branch .. //depot/projects/wifi/tools/tools/ath/80211stats.c#9 integrate .. //depot/projects/wifi/tools/tools/ministat/ministat.c#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/Makefile#4 integrate .. //depot/projects/wifi/tools/tools/nanobsd/i386.diskimage#5 integrate .. //depot/projects/wifi/tools/tools/nanobsd/make.conf#8 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/wifi/usr.bin/make/var.c#13 integrate .. //depot/projects/wifi/usr.bin/printf/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/printf/printf.1#4 integrate .. //depot/projects/wifi/usr.bin/printf/printf.c#4 integrate .. //depot/projects/wifi/usr.bin/tar/Makefile#6 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/wifi/usr.bin/tar/configure.ac.in#4 integrate .. //depot/projects/wifi/usr.bin/tar/fts.c#3 integrate .. //depot/projects/wifi/usr.bin/tar/read.c#3 integrate .. //depot/projects/wifi/usr.bin/tar/util.c#2 integrate .. //depot/projects/wifi/usr.bin/tar/write.c#4 integrate .. //depot/projects/wifi/usr.bin/top/machine.c#3 integrate .. //depot/projects/wifi/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/wifi/usr.sbin/mixer/mixer.c#2 integrate .. //depot/projects/wifi/usr.sbin/moused/moused.8#5 integrate .. //depot/projects/wifi/usr.sbin/moused/moused.c#3 integrate .. //depot/projects/wifi/usr.sbin/syslogd/syslogd.8#6 integrate .. //depot/projects/wifi/usr.sbin/syslogd/syslogd.c#7 integrate Differences ... ==== //depot/projects/wifi/UPDATING#14 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20050415: + The NO_MIXED_MODE kernel option has been removed from the i386 + amd64 platforms as its use has been superceded by the new local + APIC timer code. Any kernel config files containing this option + should be updated. + 20050227: The on-disk format of LC_CTYPE files was changed to be machine independent. Please make sure NOT to use NO_CLEAN buildworld @@ -325,4 +331,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $ +$FreeBSD: src/UPDATING,v 1.401 2005/04/18 14:33:18 scottl Exp $ ==== //depot/projects/wifi/bin/hostname/hostname.1#3 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.17 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $ .\" -.Dd April 28, 1995 +.Dd April 18, 2005 .Dt HOSTNAME 1 .Os .Sh NAME @@ -46,7 +46,7 @@ The super-user can set the hostname by supplying an argument; this is usually done in the network initialization script -.Pa /etc/rc.network , +.Pa /etc/rc.d/hostname , normally run at boot time. This script uses the ==== //depot/projects/wifi/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.99 2005/03/04 13:16:50 keramida Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.100 2005/04/15 14:53:29 keramida Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -196,6 +196,12 @@ Enable asynchronous notification of background job completion. (UNIMPLEMENTED) +.It Fl c Li string +Read commands from the +.Ar string +operand instead of from the standard input. +Keep in mind that this option only accepts a single string as its +argument, hence multi-word strings must be quoted. .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . @@ -303,13 +309,6 @@ .El .Pp The -.Fl c -option may be used to pass its string argument to the shell -to be interpreted as input. -Keep in mind that this option only accepts a single string as its -argument, hence multi-word strings must be quoted. -.Pp -The .Fl /+o option takes as its only argument the long name of an option to be enabled or disabled. @@ -1643,9 +1642,9 @@ .Pp The following environment variables affect the execution of .Ic fc : -.Bl -tag -width indent +.Bl -tag -width ".Ev HISTSIZE" .It Ev FCEDIT -Name of the editor to use. +Name of the editor to use for history editing. .It Ev HISTSIZE The number of previous commands that are accessible. .El @@ -2051,12 +2050,86 @@ Otherwise the shell will return the exit status of the last command executed, or if the exit builtin is used with a numeric argument, it will return the argument. +.Sh ENVIRONMENT +The following environment variables affect the execution of +.Nm : +.Bl -tag -width ".Ev HISTSIZE" +.It Ev CDPATH +The search path used with the +.Ic cd +built-in. +.It Ev EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Ev FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Ev HISTSIZE +The number of previous commands that are accessible. +.It Ev HOME +The starting directory of +.Nm . +.It Ev IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Ev MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Ev MAILPATH . +.It Ev MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This environment setting overrides the +.Ev MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Ev PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Ev PS1 +The primary prompt string, which defaults to +.Dq $ \ , +unless you are the superuser, in which case it defaults to +.Dq # \ . +.It Ev PS2 +The secondary prompt string, which defaults to +.Dq \*[Gt] \ . +.It Ev TERM +The default terminal setting for the shell. +This is inherited by children of the shell, and is used in the history +editing modes. +.El .Sh SEE ALSO .Xr builtin 1 , +.Xr chsh 1 , .Xr echo 1 , +.Xr ed 1 , +.Xr emacs 1 , .Xr expr 1 , +.Xr getopt 1 , .Xr pwd 1 , -.Xr test 1 +.Xr test 1 , +.Xr umask 2 , +.Xr vi 1 , +.Xr execve 2 , +.Xr getrlimit 2 , +.Xr editrc 5 .Sh HISTORY A .Nm ==== //depot/projects/wifi/contrib/top/commands.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.10 2004/08/16 07:51:21 alfred Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.11 2005/04/14 15:02:03 keramida Exp $ */ /* @@ -78,7 +78,7 @@ #ifdef ORDER if (displaymode == DISP_CPU) fputs("\ -o - specify sort order (pri, size, res, cpu, time)\n", stdout); +o - specify sort order (pri, size, res, cpu, time, threads)\n", stdout); else fputs("\ o - specify sort order (vcsw, ivcsw, read, write, fault, total)\n", stdout); ==== //depot/projects/wifi/contrib/top/top.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.15 2004/08/16 07:51:21 alfred Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.16 2005/04/14 15:02:03 keramida Exp $ */ /* @@ -84,6 +84,7 @@ static int max_topn; /* maximum displayable processes */ /* miscellaneous things */ +struct process_select ps; char *myname = "top"; jmp_buf jmp_int; @@ -179,7 +180,6 @@ char *iptr; char no_command = 1; struct timeval timeout; - struct process_select ps; #ifdef ORDER char *order_name = NULL; int order_index = 0; @@ -987,8 +987,10 @@ case CMD_thrtog: ps.thread = !ps.thread; new_message(MT_standout | MT_delayed, - " %sisplaying threads.", - ps.thread ? "D" : "Not d"); + "Displaying threads %s", + ps.thread ? "separately" : "as a count"); + header_text = format_header(uname_field); + reset_display(); putchar('\r'); break; case CMD_viewtog: ==== //depot/projects/wifi/etc/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.341 2005/03/02 00:44:39 brooks Exp $ +# $FreeBSD: src/etc/Makefile,v 1.342 2005/04/17 10:47:57 glebius Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -13,8 +13,8 @@ mac.conf motd netconfig network.subr networks newsyslog.conf \ pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ - rc.subr remote rpc services \ - shells sysctl.conf syslog.conf usbd.conf \ + rc.subr remote rpc services shells \ + snmpd.config sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ==== //depot/projects/wifi/etc/defaults/rc.conf#14 (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.247 2005/04/12 15:21:51 thomas Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.248 2005/04/17 10:47:58 glebius Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -247,6 +247,12 @@ nis_yppasswdd_enable="NO" # Run rpc.yppasswdd at boot time (or NO). nis_yppasswdd_flags="" # Flags to rpc.yppasswdd (if enabled). +### SNMP daemon ### +# Be sure to understand the security implications of running SNMP v1/v2 +# in your network. +bsnmpd_enable="NO" # Run the SNMP daemon (or NO). +bsnmpd_flags="" # Flags for bsnmpd. + ### Network routing options: ### defaultrouter="NO" # Set to default gateway (or NO). static_routes="" # Set to static route list (or leave empty). ==== //depot/projects/wifi/etc/rc.d/Makefile#7 (text+ko) ==== @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.51 2005/04/17 10:47:58 glebius Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 \ - bgfsck bootparams \ + bgfsck bootparams bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/wifi/etc/rc.d/cleanvar#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.8 2005/04/14 03:56:06 csjp Exp $ # # PROVIDE: cleanvar @@ -18,6 +18,8 @@ ( cd "$dir" && for file in .* * do + # Skip over logging sockets + [ -S "$file" -a "$file" = "log" ] && continue [ ."$file" = .. -o ."$file" = ... ] && continue if [ -d "$file" -a ! -L "$file" ] then ==== //depot/projects/wifi/games/fortune/datfiles/fortunes#11 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.174 2005/04/10 10:53:26 schweikh Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.175 2005/04/13 06:11:49 phk Exp $ % ======================================================================= @@ -15198,6 +15198,11 @@ Computerspeak for "information". Properly pronounced the way Bostonians pronounce the word for a female child. % +Data is not information; +Information is not knowledge; +Knowledge is not wisdom; + -- Gary Flake +% Dave Mack: "Your stupidity, Allen, is simply not up to par." Allen Gwinn: "Yours is." % ==== //depot/projects/wifi/lib/libarchive/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.33 2005/04/17 17:48:50 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.02.016 +VERSION= 1.02.017 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} @@ -204,7 +204,7 @@ cat ${.CURDIR}/configure.ac.in | \ sed 's/@VERSION@/${VERSION}/' | \ cat > ${DIST_WORK_DIR}/configure.ac - (cd ${DIST_WORK_DIR} && aclocal && autoheader && autoconf && automake -a --foreign) + (cd ${DIST_WORK_DIR} && aclocal19 && autoheader259 && autoconf259 && automake19 -a --foreign) (cd ${DIST_WORK_DIR} && ./configure && make distcheck && make dist) mv ${DIST_WORK_DIR}/${DISTFILE} ${.OBJDIR} @echo ================================================== ==== //depot/projects/wifi/lib/libarchive/archive_read_extract.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.39 2005/04/17 22:49:00 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -482,9 +482,9 @@ return (ARCHIVE_WARN); } r = archive_read_data_into_fd(a, fd); + close(fd); extract->pst = NULL; /* Cached stat data no longer valid. */ r2 = restore_metadata(a, entry, flags); - close(fd); return (err_combine(r, r2)); } ==== //depot/projects/wifi/lib/libc/gen/sysctl.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.64 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.65 2005/04/18 02:10:37 das Exp $ .\" .Dd January 23, 2001 .Dt SYSCTL 3 @@ -436,14 +436,14 @@ with which the system attempts to comply. .It Li KERN_PROC -Return the entire process table, or a subset of it. -An array of pairs of +Return selected information about specific running processes. +.Pp +For the following names, an array of pairs of .Va struct proc followed by corresponding .Va struct eproc structures is returned, whose size depends on the current number of such objects in the system. -The third and fourth level names are as follows: .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It "Third level name Fourth level is:" .It "KERN_PROC_ALL None" @@ -459,9 +459,15 @@ follow each other. The total size of array is returned. It is also possible for a process to set its own process title this way. +If the third level name is KERN_PROC_PATHNAME, the path of the +process' text file is stored. +For KERN_PROC_PATHNAME, a process ID of +.Li -1 +implies the current process. .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It Sy "Third level name Fourth level is:" .It "KERN_PROC_ARGS A process ID" +.It "KERN_PROC_PATHNAME A process ID" .El .It Li KERN_PROF Return profiling information about the kernel. ==== //depot/projects/wifi/lib/libc/i386/gen/_set_tp.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.2 2004/11/06 03:28:26 peter Exp $ + * $FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.3 2005/04/14 00:02:37 peter Exp $ */ #include @@ -36,8 +36,11 @@ { #ifndef COMPAT_32BIT union descriptor ldt; - int sel; + int error, sel; + error = i386_set_gsbase(tp); + if (error == 0) + return; memset(&ldt, 0, sizeof(ldt)); ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ ldt.sd.sd_lobase = ((uintptr_t)tp) & 0xffffff; ==== //depot/projects/wifi/lib/libc/i386/sys/Makefile.inc#3 (text+ko) ==== @@ -1,9 +1,10 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.28 2004/11/06 03:28:26 peter Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.29 2005/04/14 00:01:35 peter Exp $ .if !defined(COMPAT_32BIT) SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c +SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_set_fsbase.c i386_set_gsbase.c .else SRCS+= _amd64_get_fsbase.c _amd64_get_gsbase.c _amd64_set_fsbase.c _amd64_set_gsbase.c .endif ==== //depot/projects/wifi/lib/libc/net/getaddrinfo.c#7 (text+ko) ==== @@ -63,10 +63,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.62 2005/04/06 15:36:34 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.65 2005/04/15 18:15:12 ume Exp $"); #include "namespace.h" -#include "reentrant.h" #include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 18 16:52:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9ED416A4D0; Mon, 18 Apr 2005 16:52:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E0B016A4CE for ; Mon, 18 Apr 2005 16:52:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3854643D45 for ; Mon, 18 Apr 2005 16:52:39 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IGqdrM012575 for ; Mon, 18 Apr 2005 16:52:39 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IGqctg012572 for perforce@freebsd.org; Mon, 18 Apr 2005 16:52:38 GMT (envelope-from areisse@nailabs.com) Date: Mon, 18 Apr 2005 16:52:38 GMT Message-Id: <200504181652.j3IGqctg012572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 75501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 16:52:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=75501 Change 75501 by areisse@areisse_ibook on 2005/04/18 16:51:36 Support for reading the access control vector (mac_check_ipc_methods) from the message trailer. The bit corresponding to the current routine is extracted from the vector and supplied to the server implementation. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/parser.y#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#2 (text+ko) ==== @@ -141,6 +141,7 @@ [Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syMsgLabels); [Ss][Ee][Rr][Vv][Ee][Rr][Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syServerMsgLabels); [Uu][Ss][Ee][Rr][Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syUserMsgLabels); +[Aa][Cc][Cc][Ee][Ss][Ss][Ff][Ll][Aa][Gg] RETURN(syServerAccessFlag); [Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syAuditToken); [Ss][Ee][Rr][Vv][Ee][Rr][Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syServerAuditToken); [Uu][Ss][Ee][Rr][Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syUserAuditToken); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/parser.y#2 (text+ko) ==== @@ -107,6 +107,7 @@ %token syMsgLabels %token syUserMsgLabels %token syServerMsgLabels +%token syServerAccessFlag %token syAuditToken %token syUserAuditToken %token syServerAuditToken @@ -691,6 +692,7 @@ | syMsgLabels { $$ = akMsgLabels; } | syServerMsgLabels { $$ = akServerMsgLabels; } | syUserMsgLabels { $$ = akUserMsgLabels; } + | syServerAccessFlag { $$ = akServerAccessFlag; } | syAuditToken { $$ = akAuditToken; } | syServerAuditToken { $$ = akServerAuditToken; } | syUserAuditToken { $$ = akUserAuditToken; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#2 (text+ko) ==== @@ -220,6 +220,9 @@ case akeMsgLabels: printf("MsgLabels\t"); break; + case akeAccessFlag: + printf("AccessFlag\t"); + break; case akeAuditToken: printf("AuditToken\t"); break; @@ -1212,6 +1215,9 @@ if (akIdent(arg->argKind) == akeMsgLabels) itCheckMsgLabelsType(arg->argVarName, arg->argType); + if (akIdent(arg->argKind) == akeAccessFlag) + itCheckIntType(arg->argVarName, arg->argType); + if (akIdent(arg->argKind) == akeMsgSeqno) itCheckIntType(arg->argVarName, arg->argType); /* @@ -1489,6 +1495,7 @@ boolean_t sectoken = FALSE; boolean_t audittoken = FALSE; boolean_t msglabels = FALSE; + boolean_t msgav = FALSE; for (arg = rt->rtArgs; arg != argNULL; arg = arg->argNext) if (akCheckAll(arg->argKind, akbReturn|akbUserImplicit)) { @@ -1498,8 +1505,14 @@ audittoken = TRUE; else if (akIdent(arg->argKind) == akeMsgLabels) msglabels = TRUE; + else if (akIdent(arg->argKind) == akeAccessFlag) + msgav = TRUE; } + if (msgav == TRUE) + msgop->argVarName = strconcat(msgop->argVarName, + "|MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AV)"); + if (msglabels == TRUE) msgop->argVarName = strconcat(msgop->argVarName, "|MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_LABELS)"); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.h#2 (text+ko) ==== @@ -78,7 +78,8 @@ #define akeSecToken (17) /* an argument from the trailer: the security token */ #define akeAuditToken (18) /* an argument from the trailer: the audit token */ #define akeMsgLabels (19) /* an argument from the trailer: message labels */ -#define akeSendTime (20) /* pointed at by rtWaitTime */ +#define akeAccessFlag (20) /* the bit for this routine from the access vector in the trailer */ +#define akeSendTime (21) /* pointed at by rtWaitTime */ #define akeBITS (0x0000003f) #define akbRequest (0x00000040) /* has a msg_type in request */ @@ -245,6 +246,8 @@ #define akMsgLabels akAddFeature(akeMsgLabels, \ akbServerArg|akbServerImplicit|akbSend|akbSendRcv| \ akbUserArg|akbUserImplicit|akbReturn|akbReturnRcv) +#define akServerAccessFlag akAddFeature(akeAccessFlag, \ + akbServerArg|akbServerImplicit|akbSend|akbSendRcv) #define akServerAuditToken akAddFeature(akeAuditToken, \ akbServerArg|akbServerImplicit|akbSend|akbSendRcv) ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#2 (text+ko) ==== @@ -1042,6 +1042,17 @@ char who[20] = {0}; /* + * Get the access control decision for this routine from the + * vector supplied in the trailer. + */ + if (akIdent(arg->argKind) == akeAccessFlag) { + unsigned int ave = arg->argRoutine->rtNumber; + sprintf(buffer, "(0 != (TrailerP->msgh_av.av[%d] & %d))", + ave >> 5, 1 << (ave & 0x1f)); + return buffer; + } + + /* * Inside the kernel, the request and reply port fields * really hold ipc_port_t values, not mach_port_t values. * Hence we must cast the values. From owner-p4-projects@FreeBSD.ORG Mon Apr 18 22:40:09 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D250816A4D0; Mon, 18 Apr 2005 22:40:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 926D416A4CE for ; Mon, 18 Apr 2005 22:40:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99DD243D1D for ; Mon, 18 Apr 2005 22:40:07 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IMe761035910 for ; Mon, 18 Apr 2005 22:40:07 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IMe3Wa035907 for perforce@freebsd.org; Mon, 18 Apr 2005 22:40:03 GMT (envelope-from peter@freebsd.org) Date: Mon, 18 Apr 2005 22:40:03 GMT Message-Id: <200504182240.j3IMe3Wa035907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 75527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 22:40:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=75527 Change 75527 by peter@peter_daintree on 2005/04/18 22:39:43 IFC @75526 Affected files ... .. //depot/projects/hammer/UPDATING#75 integrate .. //depot/projects/hammer/bin/hostname/hostname.1#5 integrate .. //depot/projects/hammer/etc/Makefile#38 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#53 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#34 integrate .. //depot/projects/hammer/etc/rc.d/bsnmpd#1 branch .. //depot/projects/hammer/etc/snmpd.config#1 branch .. //depot/projects/hammer/kerberos5/Makefile.inc#12 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#21 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#8 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.c#4 integrate .. //depot/projects/hammer/lib/libc/net/getservbyname.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getservbyport.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getservent.c#5 integrate .. //depot/projects/hammer/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#17 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#16 integrate .. //depot/projects/hammer/lib/libugidfw/libugidfw.3#5 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#9 integrate .. //depot/projects/hammer/lib/msun/Makefile#27 integrate .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/msun/amd64/e_sqrtf.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_llrintf.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_lrintf.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_scalbn.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_scalbnf.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_scalbnl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/msun/i387/s_ceill.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_copysignl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_floorl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_llrintf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_lrintf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_trunc.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_truncf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_truncl.S#1 branch .. //depot/projects/hammer/lib/msun/man/trunc.3#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#30 integrate .. //depot/projects/hammer/lib/msun/src/s_truncl.c#1 branch .. //depot/projects/hammer/libexec/rexecd/rexecd.c#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#92 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#13 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 integrate .. //depot/projects/hammer/release/scripts/package-split.py#3 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#10 integrate .. //depot/projects/hammer/sbin/dump/main.c#15 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#9 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#40 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#40 integrate .. //depot/projects/hammer/share/examples/ppi/ppilcd.c#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#69 integrate .. //depot/projects/hammer/share/man/man4/amr.4#12 integrate .. //depot/projects/hammer/share/man/man4/ata.4#14 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#1 branch .. //depot/projects/hammer/share/man/man4/ipw.4#1 branch .. //depot/projects/hammer/share/man/man4/iwi.4#1 branch .. //depot/projects/hammer/share/man/man4/polling.4#15 integrate .. //depot/projects/hammer/share/man/man4/ral.4#1 branch .. //depot/projects/hammer/share/man/man4/ucom.4#5 integrate .. //depot/projects/hammer/share/man/man4/ural.4#1 branch .. //depot/projects/hammer/share/man/man5/rc.conf.5#53 integrate .. //depot/projects/hammer/share/man/man9/alq.9#6 integrate .. //depot/projects/hammer/sys/alpha/include/_bus.h#1 branch .. //depot/projects/hammer/sys/alpha/include/bus.h#17 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#64 integrate .. //depot/projects/hammer/sys/amd64/include/_bus.h#1 branch .. //depot/projects/hammer/sys/amd64/include/bus.h#10 integrate .. //depot/projects/hammer/sys/arm/include/_bus.h#1 branch .. //depot/projects/hammer/sys/arm/include/bus.h#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/pxe.c#5 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/hammer/sys/compat/ndis/winx64_wrap.S#3 integrate .. //depot/projects/hammer/sys/conf/NOTES#87 integrate .. //depot/projects/hammer/sys/conf/files#111 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#47 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#48 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#28 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#54 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#29 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#22 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#12 integrate .. //depot/projects/hammer/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/hammer/sys/dev/drm/ati_pcigart.h#5 delete .. //depot/projects/hammer/sys/dev/drm/drm.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.h#5 delete .. //depot/projects/hammer/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_auth.h#6 delete .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#12 delete .. //depot/projects/hammer/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_context.h#7 delete .. //depot/projects/hammer/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_dma.h#8 delete .. //depot/projects/hammer/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_drawable.h#5 delete .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#18 delete .. //depot/projects/hammer/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_fops.h#10 delete .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.h#8 delete .. //depot/projects/hammer/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_irq.h#5 delete .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_lock.h#6 delete .. //depot/projects/hammer/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_memory.h#7 delete .. //depot/projects/hammer/sys/dev/drm/drm_memory_debug.h#4 delete .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#16 delete .. //depot/projects/hammer/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_pci.h#4 delete .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sarea.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_scatter.h#5 delete .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#9 delete .. //depot/projects/hammer/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#11 delete .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/hammer/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/hammer/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/hammer/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/hammer/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/hammer/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/hammer/sys/dev/drm/mga.h#7 delete .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drm.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/mga_irq.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/mga_state.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_warp.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128.h#8 delete .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drm.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/r128_irq.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128_state.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/radeon.h#10 delete .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_mem.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/savage_bci.c#1 branch .. //depot/projects/hammer/sys/dev/drm/savage_drm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/savage_drv.c#1 branch .. //depot/projects/hammer/sys/dev/drm/savage_drv.h#1 branch .. //depot/projects/hammer/sys/dev/drm/savage_state.c#1 branch .. //depot/projects/hammer/sys/dev/drm/sis.h#5 delete .. //depot/projects/hammer/sys/dev/drm/sis_drm.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/sis_mm.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx.h#6 delete .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.h#1 branch .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#8 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#6 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9xreg.h#4 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#5 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#1 branch .. //depot/projects/hammer/sys/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/hammer/sys/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#1 branch .. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#1 branch .. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#1 branch .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#33 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#1 branch .. //depot/projects/hammer/sys/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/hammer/sys/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/hammer/sys/dev/ral/if_ralrate.c#1 branch .. //depot/projects/hammer/sys/dev/ral/if_ralrate.h#1 branch .. //depot/projects/hammer/sys/dev/ral/if_ralreg.h#1 branch .. //depot/projects/hammer/sys/dev/ral/if_ralvar.h#1 branch .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#1 branch .. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#59 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#11 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#18 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#67 integrate .. //depot/projects/hammer/sys/i386/include/_bus.h#1 branch .. //depot/projects/hammer/sys/i386/include/bus.h#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#43 integrate .. //depot/projects/hammer/sys/ia64/ia64/unwind.c#11 integrate .. //depot/projects/hammer/sys/ia64/include/_bus.h#1 branch .. //depot/projects/hammer/sys/ia64/include/bus.h#15 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#24 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#14 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#17 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#21 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#48 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#54 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#81 integrate .. //depot/projects/hammer/sys/modules/Makefile#74 integrate .. //depot/projects/hammer/sys/modules/apm/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/drm/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/drm/drm/Makefile#1 branch .. //depot/projects/hammer/sys/modules/drm/mach64/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ipw/Makefile#1 branch .. //depot/projects/hammer/sys/modules/iwi/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ral/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ural/Makefile#1 branch .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#29 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.h#11 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#21 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#53 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#13 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#13 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#29 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#25 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#10 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#23 integrate .. //depot/projects/hammer/sys/pc98/apm/apm_bioscall.s#3 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#41 integrate .. //depot/projects/hammer/sys/pc98/include/_bus.h#1 branch .. //depot/projects/hammer/sys/pc98/include/bus.h#2 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#43 integrate .. //depot/projects/hammer/sys/powerpc/include/_bus.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/bus.h#12 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#12 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#6 integrate .. //depot/projects/hammer/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#13 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#31 integrate .. //depot/projects/hammer/sys/sparc64/include/_bus.h#1 branch .. //depot/projects/hammer/sys/sparc64/include/bus.h#19 integrate .. //depot/projects/hammer/sys/sparc64/include/cpufunc.h#6 integrate .. //depot/projects/hammer/sys/sparc64/include/pcpu.h#5 integrate .. //depot/projects/hammer/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sbus/lsi64854.c#3 integrate .. //depot/projects/hammer/sys/sparc64/sbus/lsi64854reg.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#17 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#15 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#41 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#15 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#8 integrate .. //depot/projects/hammer/sys/sys/alq.h#5 integrate .. //depot/projects/hammer/sys/sys/kernel.h#16 integrate .. //depot/projects/hammer/sys/sys/mac.h#23 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#25 integrate .. //depot/projects/hammer/sys/sys/proc.h#79 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#26 integrate .. //depot/projects/hammer/sys/sys/systm.h#35 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#34 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/hammer/tools/regression/mac/mac_bsdextended/Makefile#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_bsdextended/test_ugidfw.c#1 branch .. //depot/projects/hammer/tools/regression/msdosfs/msdosfstest-2.sh#1 branch .. //depot/projects/hammer/tools/regression/msdosfs/msdosfstest-3.sh#1 branch .. //depot/projects/hammer/tools/regression/msdosfs/msdosfstest.sh#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#35 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#12 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#23 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#13 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#8 integrate .. //depot/projects/hammer/usr.bin/tar/configure.ac.in#4 integrate .. //depot/projects/hammer/usr.bin/tar/fts.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#14 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#8 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#14 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#13 integrate Differences ... ==== //depot/projects/hammer/UPDATING#75 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20050415: + The NO_MIXED_MODE kernel option has been removed from the i386 + amd64 platforms as its use has been superceded by the new local + APIC timer code. Any kernel config files containing this option + should be updated. + 20050227: The on-disk format of LC_CTYPE files was changed to be machine independent. Please make sure NOT to use NO_CLEAN buildworld @@ -325,4 +331,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $ +$FreeBSD: src/UPDATING,v 1.401 2005/04/18 14:33:18 scottl Exp $ ==== //depot/projects/hammer/bin/hostname/hostname.1#5 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.17 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $ .\" -.Dd April 28, 1995 +.Dd April 18, 2005 .Dt HOSTNAME 1 .Os .Sh NAME @@ -46,7 +46,7 @@ The super-user can set the hostname by supplying an argument; this is usually done in the network initialization script -.Pa /etc/rc.network , +.Pa /etc/rc.d/hostname , normally run at boot time. This script uses the ==== //depot/projects/hammer/etc/Makefile#38 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.341 2005/03/02 00:44:39 brooks Exp $ +# $FreeBSD: src/etc/Makefile,v 1.342 2005/04/17 10:47:57 glebius Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -13,8 +13,8 @@ mac.conf motd netconfig network.subr networks newsyslog.conf \ pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ - rc.subr remote rpc services \ - shells sysctl.conf syslog.conf usbd.conf \ + rc.subr remote rpc services shells \ + snmpd.config sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ==== //depot/projects/hammer/etc/defaults/rc.conf#53 (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.247 2005/04/12 15:21:51 thomas Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.248 2005/04/17 10:47:58 glebius Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -247,6 +247,12 @@ nis_yppasswdd_enable="NO" # Run rpc.yppasswdd at boot time (or NO). nis_yppasswdd_flags="" # Flags to rpc.yppasswdd (if enabled). +### SNMP daemon ### +# Be sure to understand the security implications of running SNMP v1/v2 +# in your network. +bsnmpd_enable="NO" # Run the SNMP daemon (or NO). +bsnmpd_flags="" # Flags for bsnmpd. + ### Network routing options: ### defaultrouter="NO" # Set to default gateway (or NO). static_routes="" # Set to static route list (or leave empty). ==== //depot/projects/hammer/etc/rc.d/Makefile#34 (text+ko) ==== @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.51 2005/04/17 10:47:58 glebius Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 \ - bgfsck bootparams \ + bgfsck bootparams bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/hammer/kerberos5/Makefile.inc#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.25 2005/04/18 22:03:21 imp Exp $ NO_LINT= @@ -48,4 +48,4 @@ .endfor .endfor -.endif defined(SRCS) +.endif # defined(SRCS) ==== //depot/projects/hammer/lib/libarchive/Makefile#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.33 2005/04/17 17:48:50 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.02.016 +VERSION= 1.02.017 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} @@ -204,7 +204,7 @@ cat ${.CURDIR}/configure.ac.in | \ sed 's/@VERSION@/${VERSION}/' | \ cat > ${DIST_WORK_DIR}/configure.ac - (cd ${DIST_WORK_DIR} && aclocal && autoheader && autoconf && automake -a --foreign) + (cd ${DIST_WORK_DIR} && aclocal19 && autoheader259 && autoconf259 && automake19 -a --foreign) (cd ${DIST_WORK_DIR} && ./configure && make distcheck && make dist) mv ${DIST_WORK_DIR}/${DISTFILE} ${.OBJDIR} @echo ================================================== ==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.39 2005/04/17 22:49:00 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -482,9 +482,9 @@ return (ARCHIVE_WARN); } r = archive_read_data_into_fd(a, fd); + close(fd); extract->pst = NULL; /* Cached stat data no longer valid. */ r2 = restore_metadata(a, entry, flags); - close(fd); return (err_combine(r, r2)); } ==== //depot/projects/hammer/lib/libc/gen/sysctl.3#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.64 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.65 2005/04/18 02:10:37 das Exp $ .\" .Dd January 23, 2001 .Dt SYSCTL 3 @@ -436,14 +436,14 @@ with which the system attempts to comply. .It Li KERN_PROC -Return the entire process table, or a subset of it. -An array of pairs of +Return selected information about specific running processes. +.Pp +For the following names, an array of pairs of .Va struct proc followed by corresponding .Va struct eproc structures is returned, whose size depends on the current number of such objects in the system. -The third and fourth level names are as follows: .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It "Third level name Fourth level is:" .It "KERN_PROC_ALL None" @@ -459,9 +459,15 @@ follow each other. The total size of array is returned. It is also possible for a process to set its own process title this way. +If the third level name is KERN_PROC_PATHNAME, the path of the +process' text file is stored. +For KERN_PROC_PATHNAME, a process ID of +.Li -1 +implies the current process. .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It Sy "Third level name Fourth level is:" .It "KERN_PROC_ARGS A process ID" +.It "KERN_PROC_PATHNAME A process ID" .El .It Li KERN_PROF Return profiling information about the kernel. ==== //depot/projects/hammer/lib/libc/net/getnameinfo.c#4 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.14 2003/05/01 19:03:14 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.16 2005/04/17 04:00:55 delphij Exp $"); #include #include @@ -109,9 +109,6 @@ if (sa == NULL) return EAI_FAIL; - if (sa->sa_len != salen) - return EAI_FAIL; - family = sa->sa_family; for (i = 0; afdl[i].a_af; i++) if (afdl[i].a_af == family) { ==== //depot/projects/hammer/lib/libc/net/getservbyname.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.5 2005/04/15 18:09:39 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -49,8 +49,8 @@ int error; #ifdef YP - sed->getservbyname_yp = (char *)name; - sed->getservbyproto_yp = (char *)proto; + sed->yp_name = (char *)name; + sed->yp_proto = (char *)proto; #endif setservent_r(sed->stayopen, sed); @@ -69,8 +69,8 @@ endservent_r(sed); #ifdef YP - sed->getservbyname_yp = NULL; - sed->getservbyproto_yp = NULL; + sed->yp_name = NULL; + sed->yp_proto = NULL; #endif return (error); @@ -81,7 +81,7 @@ { struct servdata *sd; - if ((sd = _servdata_init()) == NULL) + if ((sd = __servdata_init()) == NULL) return (NULL); if (getservbyname_r(name, proto, &sd->serv, &sd->data) != 0) return (NULL); ==== //depot/projects/hammer/lib/libc/net/getservbyport.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.5 2005/04/15 18:09:39 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -48,8 +48,8 @@ int error; #ifdef YP - sed->getservbyport_yp = port; - sed->getservbyproto_yp = (char *)proto; + sed->yp_port = port; + sed->yp_proto = (char *)proto; #endif setservent_r(sed->stayopen, sed); @@ -63,8 +63,8 @@ endservent_r(sed); #ifdef YP - sed->getservbyport_yp = 0; - sed->getservbyproto_yp = NULL; + sed->yp_port = 0; + sed->yp_proto = NULL; #endif return (error); @@ -75,7 +75,7 @@ { struct servdata *sd; - if ((sd = _servdata_init()) == NULL) + if ((sd = __servdata_init()) == NULL) return (NULL); if (getservbyport_r(port, proto, &sd->serv, &sd->data) != 0) return (NULL); ==== //depot/projects/hammer/lib/libc/net/getservent.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.14 2005/04/15 18:09:39 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.18 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -66,10 +66,10 @@ fclose(sed->fp); sed->fp = NULL; } - if (sed->key) { - free(sed->key); - sed->key = NULL; - } +#ifdef YP + free(sed->yp_key); + sed->yp_key = NULL; +#endif } static void @@ -91,7 +91,7 @@ } struct servdata * -_servdata_init(void) +__servdata_init(void) { struct servdata *sd; @@ -119,11 +119,11 @@ char buf[YPMAXRECORD + 2]; int rv; - snprintf(buf, sizeof(buf), "%d/%s", - ntohs(sed->getservbyport_yp), sed->getservbyproto_yp); + snprintf(buf, sizeof(buf), "%d/%s", ntohs(sed->yp_port), + sed->yp_proto); - sed->getservbyport_yp = 0; - sed->getservbyproto_yp = NULL; + sed->yp_port = 0; + sed->yp_proto = NULL; if (!sed->yp_domain) { if (yp_get_default_domain(&sed->yp_domain)) @@ -168,11 +168,10 @@ return (0); } - snprintf(buf, sizeof(buf), "%s/%s", sed->getservbyname_yp, - sed->getservbyproto_yp); + snprintf(buf, sizeof(buf), "%s/%s", sed->yp_name, sed->yp_proto); - sed->getservbyname_yp = 0; - sed->getservbyproto_yp = NULL; + sed->yp_name = 0; + sed->yp_proto = NULL; if (yp_match(sed->yp_domain, "services.byname", buf, strlen(buf), &result, &resultlen)) { @@ -198,23 +197,23 @@ return (0); } - if (!sed->stepping_yp) { - if (sed->key) - free(sed->key); - rv = yp_first(sed->yp_domain, "services.byname", &sed->key, - &sed->keylen, &result, &resultlen); + if (!sed->yp_stepping) { + free(sed->yp_key); + rv = yp_first(sed->yp_domain, "services.byname", &sed->yp_key, + &sed->yp_keylen, &result, &resultlen); if (rv) { - sed->stepping_yp = 0; + sed->yp_stepping = 0; return(0); } - sed->stepping_yp = 1; + sed->yp_stepping = 1; } else { - lastkey = sed->key; - rv = yp_next(sed->yp_domain, "services.byname", sed->key, - sed->keylen, &sed->key, &sed->keylen, &result, &resultlen); + lastkey = sed->yp_key; + rv = yp_next(sed->yp_domain, "services.byname", sed->yp_key, + sed->yp_keylen, &sed->yp_key, &sed->yp_keylen, &result, + &resultlen); free(lastkey); if (rv) { - sed->stepping_yp = 0; + sed->yp_stepping = 0; return (0); } } @@ -243,8 +242,10 @@ { servent_data_clear(sed); sed->stayopen = 0; - sed->stepping_yp = 0; +#ifdef YP + sed->yp_stepping = 0; sed->yp_domain = NULL; +#endif } int @@ -255,7 +256,7 @@ long l; #ifdef YP - if (sed->stepping_yp && _getservent_yp(sed)) { + if (sed->yp_stepping && _getservent_yp(sed)) { p = sed->line; goto unpack; } @@ -268,11 +269,11 @@ return (-1); #ifdef YP if (*p == '+' && _yp_check(NULL)) { - if (sed->getservbyname_yp != NULL) { + if (sed->yp_name != NULL) { if (!_getservbyname_yp(sed)) goto tryagain; } - else if (sed->getservbyport_yp != 0) { + else if (sed->yp_port != 0) { if (!_getservbyport_yp(sed)) goto tryagain; } @@ -326,7 +327,7 @@ { struct servdata *sd; - if ((sd = _servdata_init()) == NULL) + if ((sd = __servdata_init()) == NULL) return; setservent_r(f, &sd->data); } @@ -336,7 +337,7 @@ { struct servdata *sd; - if ((sd = _servdata_init()) == NULL) + if ((sd = __servdata_init()) == NULL) return; endservent_r(&sd->data); } @@ -346,7 +347,7 @@ { struct servdata *sd; - if ((sd = _servdata_init()) == NULL) + if ((sd = __servdata_init()) == NULL) return (NULL); if (getservent_r(&sd->serv, &sd->data) != 0) return (NULL); ==== //depot/projects/hammer/lib/libc/net/netdb_private.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.1 2005/04/15 18:09:39 ume Exp $ + * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.3 2005/04/18 18:34:58 ume Exp $ */ #ifndef _NETDB_PRIVATE_H_ @@ -38,13 +38,13 @@ int stayopen; char line[BUFSIZ + 1]; #ifdef YP - int stepping_yp; - char *getservbyname_yp; - char *getservbyproto_yp; - int getservbyport_yp; + int yp_stepping; + char *yp_name; + char *yp_proto; + int yp_port; char *yp_domain; - char *key; - int keylen; + char *yp_key; + int yp_keylen; #endif }; @@ -53,13 +53,13 @@ struct servent_data data; }; -#define endservent_r _endservent_r -#define getservbyname_r _getservbyname_r -#define getservbyport_r _getservbyport_r -#define getservent_r _getservent_r -#define setservent_r _setservent_r +#define endservent_r __endservent_r +#define getservbyname_r __getservbyname_r +#define getservbyport_r __getservbyport_r +#define getservent_r __getservent_r +#define setservent_r __setservent_r -struct servdata *_servdata_init(void); +struct servdata *__servdata_init(void); void endservent_r(struct servent_data *); int getservbyname_r(const char *, const char *, struct servent *, struct servent_data *); ==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.68 2004/08/26 06:25:28 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.69 2005/04/16 22:36:51 das Exp $"); /* * Actual printf innards. @@ -1093,16 +1093,22 @@ * ``The result of converting a zero value with an * explicit precision of zero is no characters.'' * -- ANSI X3J11 + * + * ``The C Standard is clear enough as is. The call + * printf("%#.0o", 0) should print 0.'' + * -- Defect Report #151 */ cp = buf + BUF; if (flags & INTMAX_SIZE) { - if (ujval != 0 || prec != 0) + if (ujval != 0 || prec != 0 || + (flags & ALT && base == 8)) cp = __ujtoa(ujval, cp, base, flags & ALT, xdigs, flags & GROUPING, thousands_sep, grouping); } else { - if (ulval != 0 || prec != 0) + if (ulval != 0 || prec != 0 || + (flags & ALT && base == 8)) cp = __ultoa(ulval, cp, base, flags & ALT, xdigs, flags & GROUPING, thousands_sep, ==== //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#16 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.23 2004/08/26 06:25:28 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.24 2005/04/16 22:36:51 das Exp $"); /* * Actual wprintf innards. @@ -1092,16 +1092,22 @@ * ``The result of converting a zero value with an * explicit precision of zero is no characters.'' * -- ANSI X3J11 + * + * ``The C Standard is clear enough as is. The call + * printf("%#.0o", 0) should print 0.'' + * -- Defect Report #151 */ cp = buf + BUF; if (flags & INTMAX_SIZE) { - if (ujval != 0 || prec != 0) + if (ujval != 0 || prec != 0 || + (flags & ALT && base == 8)) cp = __ujtoa(ujval, cp, base, flags & ALT, xdigs, flags & GROUPING, thousands_sep, grouping); } else { - if (ulval != 0 || prec != 0) + if (ulval != 0 || prec != 0 || + (flags & ALT && base == 8)) cp = __ultoa(ulval, cp, base, flags & ALT, xdigs, flags & GROUPING, thousands_sep, ==== //depot/projects/hammer/lib/libugidfw/libugidfw.3#5 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.6 2004/07/02 23:52:19 ru Exp $ +.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.7 2005/04/16 11:32:46 rwatson Exp $ .\" .Dd February 25, 2004 .Os @@ -39,6 +39,8 @@ .Sh LIBRARY .Lb libugidfw .Sh SYNOPSIS +.In sys/types.h +.In security/mac_bsdextended/mac_bsdextended.h .In ugidfw.h .Sh DESCRIPTION The ==== //depot/projects/hammer/lib/libugidfw/ugidfw.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002, 2004 Networks Associates Technology, Inc. + * Copyright (c) 2002-2005 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Network Associates @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.8 2005/03/28 09:37:44 pjd Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.9 2005/04/16 11:58:55 rwatson Exp $ */ #include #include @@ -341,13 +341,19 @@ len = snprintf(errstr, buflen, "uid short"); return (-1); } - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - len = snprintf(errstr, buflen, "invalid uid: '%s'", - argv[current+1]); - return (-1); + pwd = getpwnam(argv[current+1]); + if (pwd != NULL) + uid = pwd->pw_uid; + else { + value = strtol(argv[current+1], &endp, 10); + if (*endp != '\0') { + len = snprintf(errstr, buflen, + "invalid uid: '%s'", + argv[current+1]); + return (-1); + } + uid = value; } - uid = value; uid_seen = 1; current += 2; } else if (strcmp("gid", argv[current]) == 0) { @@ -360,13 +366,19 @@ len = snprintf(errstr, buflen, "gid short"); return (-1); } - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - len = snprintf(errstr, buflen, "invalid gid: '%s'", - argv[current+1]); - return (-1); + grp = getgrnam(argv[current+1]); + if (grp != NULL) + gid = grp->gr_gid; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 20 03:43:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A07C16A4CE; Wed, 20 Apr 2005 03:43:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E1F516A4CE for ; Wed, 20 Apr 2005 03:43:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E582343D2D for ; Wed, 20 Apr 2005 03:43:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3K3ho1F057740 for ; Wed, 20 Apr 2005 03:43:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3K3hoPS057737 for perforce@freebsd.org; Wed, 20 Apr 2005 03:43:50 GMT (envelope-from sam@freebsd.org) Date: Wed, 20 Apr 2005 03:43:50 GMT Message-Id: <200504200343.j3K3hoPS057737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 75600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 03:43:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=75600 Change 75600 by sam@sam_ebb on 2005/04/20 03:43:30 catch up with return type change Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#49 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#49 (text+ko) ==== @@ -518,7 +518,7 @@ m_adj(m, FF_LLC_SIZE); m = ieee80211_decap_fastframe(ic, ni, m); if (m == NULL) - return; + return type; } } #undef FF_LLC_SIZE From owner-p4-projects@FreeBSD.ORG Wed Apr 20 05:21:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E828016A4D0; Wed, 20 Apr 2005 05:21:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD9A516A4CE for ; Wed, 20 Apr 2005 05:21:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9E4743D3F for ; Wed, 20 Apr 2005 05:21:54 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3K5Lskg067943 for ; Wed, 20 Apr 2005 05:21:54 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3K5LoOw067940 for perforce@freebsd.org; Wed, 20 Apr 2005 05:21:50 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 20 Apr 2005 05:21:50 GMT Message-Id: <200504200521.j3K5LoOw067940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 05:21:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=75604 Change 75604 by davidxu@davidxu_celeron on 2005/04/20 05:21:24 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/UPDATING#9 integrate .. //depot/projects/davidxu_thread/src/bin/hostname/hostname.1#3 integrate .. //depot/projects/davidxu_thread/src/bin/sh/sh.1#6 integrate .. //depot/projects/davidxu_thread/src/etc/Makefile#5 integrate .. //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#12 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/davidxu_thread/src/etc/rc.d/bsnmpd#1 branch .. //depot/projects/davidxu_thread/src/etc/snmpd.config#1 branch .. //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/davidxu_thread/src/kerberos5/Makefile.inc#3 integrate .. //depot/projects/davidxu_thread/src/lib/Makefile#6 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/Makefile#6 integrate .. //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/davidxu_thread/src/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getproto.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getprotoent.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getprotoname.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getservbyname.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getservbyport.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/getservent.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/name6.c#6 integrate .. //depot/projects/davidxu_thread/src/lib/libc/net/netdb_private.h#1 branch .. //depot/projects/davidxu_thread/src/lib/libc/net/res_query.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/davidxu_thread/src/lib/libpmc/Makefile#1 branch .. //depot/projects/davidxu_thread/src/lib/libpmc/libpmc.c#1 branch .. //depot/projects/davidxu_thread/src/lib/libpmc/pmc.3#1 branch .. //depot/projects/davidxu_thread/src/lib/libpmc/pmc.h#1 branch .. //depot/projects/davidxu_thread/src/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/libugidfw/ugidfw.c#3 integrate .. //depot/projects/davidxu_thread/src/lib/msun/Makefile#9 integrate .. //depot/projects/davidxu_thread/src/lib/msun/amd64/Makefile.inc#5 integrate .. //depot/projects/davidxu_thread/src/lib/msun/amd64/e_sqrtf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/amd64/s_llrintf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/amd64/s_lrintf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/amd64/s_scalbn.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/amd64/s_scalbnf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/amd64/s_scalbnl.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/Makefile.inc#6 integrate .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_ceill.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_copysignl.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_floorl.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_llrintf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_lrintf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_trunc.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_truncf.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/i387/s_truncl.S#1 branch .. //depot/projects/davidxu_thread/src/lib/msun/man/trunc.3#2 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/math.h#8 integrate .. //depot/projects/davidxu_thread/src/lib/msun/src/s_truncl.c#1 branch .. //depot/projects/davidxu_thread/src/libexec/rexecd/rexecd.c#10 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#3 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/davidxu_thread/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/davidxu_thread/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate .. //depot/projects/davidxu_thread/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 integrate .. //depot/projects/davidxu_thread/src/release/scripts/package-split.py#3 integrate .. //depot/projects/davidxu_thread/src/sbin/devd/devd.cc#3 integrate .. //depot/projects/davidxu_thread/src/sbin/devfs/devfs.8#6 integrate .. //depot/projects/davidxu_thread/src/sbin/dump/main.c#3 integrate .. //depot/projects/davidxu_thread/src/sbin/geom/class/mirror/gmirror.8#6 integrate .. //depot/projects/davidxu_thread/src/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/davidxu_thread/src/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/davidxu_thread/src/share/doc/papers/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/share/doc/papers/hwpmc/Makefile#1 branch .. //depot/projects/davidxu_thread/src/share/doc/papers/hwpmc/hwpmc.ms#1 branch .. //depot/projects/davidxu_thread/src/share/examples/hwpmc/README#1 branch .. //depot/projects/davidxu_thread/src/share/examples/ppi/ppilcd.c#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/Makefile#13 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/amr.4#7 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ata.4#5 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ataraid.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/cpufreq.4#5 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/hwpmc.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/ipw.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/iwi.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/polling.4#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ral.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man4/ucom.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ural.4#1 branch .. //depot/projects/davidxu_thread/src/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/Makefile#9 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/alq.9#5 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/sleepqueue.9#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/davidxu_thread/src/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/alpha/include/bus.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/mptable.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/bus_amd64.h#5 delete .. //depot/projects/davidxu_thread/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/amd64/include/tss.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/arm/include/bus.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/kern_windrv.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/NOTES#10 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files#11 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.amd64#10 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.i386#12 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.pc98#6 integrate .. //depot/projects/davidxu_thread/src/sys/conf/kmod.mk#8 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options#9 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options.amd64#3 integrate .. //depot/projects/davidxu_thread/src/sys/conf/options.pc98#3 integrate .. //depot/projects/davidxu_thread/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/ati_pcigart.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_agpsupport.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_auth.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_bufs.h#5 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_context.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_dma.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_drawable.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_drv.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_fops.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_ioctl.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_irq.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_lock.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_memory.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_memory_debug.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_os_freebsd.h#4 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_pci.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_sarea.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_scatter.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_sysctl.h#4 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/drm_vm.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_drm.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/mga_warp.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/r128.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/r128_drm.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_mem.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/savage_bci.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/savage_drm.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/savage_drv.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/savage_drv.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/savage_state.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/drm/sis.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/sis_drm.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/sis_drv.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/tdfx.h#3 delete .. //depot/projects/davidxu_thread/src/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/drm/tdfx_drv.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ipw/if_ipw.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/iwi/if_iwi.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/iwi/if_iwireg.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/iwi/if_iwivar.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ral/if_ral.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ral/if_ralrate.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ral/if_ralrate.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ral/if_ralreg.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/ral/if_ralvar.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_ural.c#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_uralreg.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/usb/if_uralvar.h#1 branch .. //depot/projects/davidxu_thread/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/fs/msdosfs/msdosfs_lookup.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/geom/geom_kern.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/davidxu_thread/src/sys/i386/conf/NOTES#9 integrate .. //depot/projects/davidxu_thread/src/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/davidxu_thread/src/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/i386/include/bus.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/ia64/unwind.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/ia64/include/bus.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_alq.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_pmc.c#1 branch .. //depot/projects/davidxu_thread/src/sys/kern/kern_proc.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_prot.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_sig.c#10 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/kern/subr_param.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/davidxu_thread/src/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/davidxu_thread/src/sys/modules/Makefile#11 integrate .. //depot/projects/davidxu_thread/src/sys/modules/apm/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/cpufreq/Makefile#5 integrate .. //depot/projects/davidxu_thread/src/sys/modules/drm/Makefile#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/drm/drm/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/drm/mach64/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/hwpmc/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/ipw/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/iwi/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/ral/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/modules/ural/Makefile#1 branch .. //depot/projects/davidxu_thread/src/sys/net/if.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_echo.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/apm/apm_bioscall.s#2 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/include/bus.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/pci/if_dc.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/powerpc/include/bus.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/_bus.h#1 branch .. //depot/projects/davidxu_thread/src/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sbus/lsi64854reg.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/alq.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/ata.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/kernel.h#4 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mac.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/param.h#9 integrate .. //depot/projects/davidxu_thread/src/sys/sys/pmc.h#1 branch .. //depot/projects/davidxu_thread/src/sys/sys/pmckern.h#1 branch .. //depot/projects/davidxu_thread/src/sys/sys/proc.h#15 integrate .. //depot/projects/davidxu_thread/src/sys/sys/sched.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/sysctl.h#6 integrate .. //depot/projects/davidxu_thread/src/sys/sys/systm.h#9 integrate .. //depot/projects/davidxu_thread/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/davidxu_thread/src/tools/regression/mac/mac_bsdextended/Makefile#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/mac/mac_bsdextended/test_ugidfw.c#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/msdosfs/msdosfstest-2.sh#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/msdosfs/msdosfstest-3.sh#1 branch .. //depot/projects/davidxu_thread/src/tools/regression/msdosfs/msdosfstest.sh#2 integrate .. //depot/projects/davidxu_thread/src/tools/tools/nanobsd/make.conf#7 integrate .. //depot/projects/davidxu_thread/src/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/Makefile#5 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/bsdtar.1#7 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/bsdtar.h#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/configure.ac.in#5 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/fts.c#3 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/read.c#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/util.c#2 integrate .. //depot/projects/davidxu_thread/src/usr.bin/tar/write.c#4 integrate .. //depot/projects/davidxu_thread/src/usr.bin/top/machine.c#4 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/Makefile#6 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/pmccontrol/Makefile#1 branch .. //depot/projects/davidxu_thread/src/usr.sbin/pmccontrol/pmccontrol.8#1 branch .. //depot/projects/davidxu_thread/src/usr.sbin/pmccontrol/pmccontrol.c#1 branch .. //depot/projects/davidxu_thread/src/usr.sbin/pmcstat/Makefile#1 branch .. //depot/projects/davidxu_thread/src/usr.sbin/pmcstat/pmcstat.8#1 branch .. //depot/projects/davidxu_thread/src/usr.sbin/pmcstat/pmcstat.c#1 branch Differences ... ==== //depot/projects/davidxu_thread/src/UPDATING#9 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20050415: + The NO_MIXED_MODE kernel option has been removed from the i386 + amd64 platforms as its use has been superceded by the new local + APIC timer code. Any kernel config files containing this option + should be updated. + 20050227: The on-disk format of LC_CTYPE files was changed to be machine independent. Please make sure NOT to use NO_CLEAN buildworld @@ -325,4 +331,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $ +$FreeBSD: src/UPDATING,v 1.401 2005/04/18 14:33:18 scottl Exp $ ==== //depot/projects/davidxu_thread/src/bin/hostname/hostname.1#3 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.17 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $ .\" -.Dd April 28, 1995 +.Dd April 18, 2005 .Dt HOSTNAME 1 .Os .Sh NAME @@ -46,7 +46,7 @@ The super-user can set the hostname by supplying an argument; this is usually done in the network initialization script -.Pa /etc/rc.network , +.Pa /etc/rc.d/hostname , normally run at boot time. This script uses the ==== //depot/projects/davidxu_thread/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.99 2005/03/04 13:16:50 keramida Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.100 2005/04/15 14:53:29 keramida Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -196,6 +196,12 @@ Enable asynchronous notification of background job completion. (UNIMPLEMENTED) +.It Fl c Li string +Read commands from the +.Ar string +operand instead of from the standard input. +Keep in mind that this option only accepts a single string as its +argument, hence multi-word strings must be quoted. .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . @@ -303,13 +309,6 @@ .El .Pp The -.Fl c -option may be used to pass its string argument to the shell -to be interpreted as input. -Keep in mind that this option only accepts a single string as its -argument, hence multi-word strings must be quoted. -.Pp -The .Fl /+o option takes as its only argument the long name of an option to be enabled or disabled. @@ -1643,9 +1642,9 @@ .Pp The following environment variables affect the execution of .Ic fc : -.Bl -tag -width indent +.Bl -tag -width ".Ev HISTSIZE" .It Ev FCEDIT -Name of the editor to use. +Name of the editor to use for history editing. .It Ev HISTSIZE The number of previous commands that are accessible. .El @@ -2051,12 +2050,86 @@ Otherwise the shell will return the exit status of the last command executed, or if the exit builtin is used with a numeric argument, it will return the argument. +.Sh ENVIRONMENT +The following environment variables affect the execution of +.Nm : +.Bl -tag -width ".Ev HISTSIZE" +.It Ev CDPATH +The search path used with the +.Ic cd +built-in. +.It Ev EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Ev FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Ev HISTSIZE +The number of previous commands that are accessible. +.It Ev HOME +The starting directory of +.Nm . +.It Ev IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Ev MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Ev MAILPATH . +.It Ev MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This environment setting overrides the +.Ev MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Ev PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Ev PS1 +The primary prompt string, which defaults to +.Dq $ \ , +unless you are the superuser, in which case it defaults to +.Dq # \ . +.It Ev PS2 +The secondary prompt string, which defaults to +.Dq \*[Gt] \ . +.It Ev TERM +The default terminal setting for the shell. +This is inherited by children of the shell, and is used in the history +editing modes. +.El .Sh SEE ALSO .Xr builtin 1 , +.Xr chsh 1 , .Xr echo 1 , +.Xr ed 1 , +.Xr emacs 1 , .Xr expr 1 , +.Xr getopt 1 , .Xr pwd 1 , -.Xr test 1 +.Xr test 1 , +.Xr umask 2 , +.Xr vi 1 , +.Xr execve 2 , +.Xr getrlimit 2 , +.Xr editrc 5 .Sh HISTORY A .Nm ==== //depot/projects/davidxu_thread/src/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.341 2005/03/02 00:44:39 brooks Exp $ +# $FreeBSD: src/etc/Makefile,v 1.342 2005/04/17 10:47:57 glebius Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -13,8 +13,8 @@ mac.conf motd netconfig network.subr networks newsyslog.conf \ pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ - rc.subr remote rpc services \ - shells sysctl.conf syslog.conf usbd.conf \ + rc.subr remote rpc services shells \ + snmpd.config sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ==== //depot/projects/davidxu_thread/src/etc/defaults/rc.conf#12 (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.247 2005/04/12 15:21:51 thomas Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.248 2005/04/17 10:47:58 glebius Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -247,6 +247,12 @@ nis_yppasswdd_enable="NO" # Run rpc.yppasswdd at boot time (or NO). nis_yppasswdd_flags="" # Flags to rpc.yppasswdd (if enabled). +### SNMP daemon ### +# Be sure to understand the security implications of running SNMP v1/v2 +# in your network. +bsnmpd_enable="NO" # Run the SNMP daemon (or NO). +bsnmpd_flags="" # Flags for bsnmpd. + ### Network routing options: ### defaultrouter="NO" # Set to default gateway (or NO). static_routes="" # Set to static route list (or leave empty). ==== //depot/projects/davidxu_thread/src/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.51 2005/04/17 10:47:58 glebius Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 \ - bgfsck bootparams \ + bgfsck bootparams bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/groff/tmac/mdoc.local#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.45 2005/01/25 09:37:37 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.47 2005/04/19 13:26:58 jkoshy Exp $ .\" .\" %beginstrip% . @@ -48,6 +48,7 @@ .ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) +.ds doc-str-Lb-libpmc Performance Monitoring Counters API (libpmc, \-lpmc) .ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) .ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) .ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) ==== //depot/projects/davidxu_thread/src/kerberos5/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.25 2005/04/18 22:03:21 imp Exp $ NO_LINT= @@ -48,4 +48,4 @@ .endfor .endfor -.endif defined(SRCS) +.endif # defined(SRCS) ==== //depot/projects/davidxu_thread/src/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.203 2005/04/02 01:40:12 davidxu Exp $ +# $FreeBSD: src/lib/Makefile,v 1.204 2005/04/19 04:01:21 jkoshy Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,7 +31,7 @@ ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ - ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ + ${_libpmc} ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -59,6 +59,7 @@ .if ${MACHINE_ARCH} == "i386" _libncp= libncp +_libpmc= libpmc _libsmb= libsmb _libvgl= libvgl .endif @@ -89,6 +90,7 @@ .if ${MACHINE_ARCH} == "amd64" _libncp= libncp +_libpmc= libpmc _libsmb= libsmb .endif ==== //depot/projects/davidxu_thread/src/lib/libarchive/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.33 2005/04/17 17:48:50 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.02.016 +VERSION= 1.02.017 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} @@ -204,7 +204,7 @@ cat ${.CURDIR}/configure.ac.in | \ sed 's/@VERSION@/${VERSION}/' | \ cat > ${DIST_WORK_DIR}/configure.ac - (cd ${DIST_WORK_DIR} && aclocal && autoheader && autoconf && automake -a --foreign) + (cd ${DIST_WORK_DIR} && aclocal19 && autoheader259 && autoconf259 && automake19 -a --foreign) (cd ${DIST_WORK_DIR} && ./configure && make distcheck && make dist) mv ${DIST_WORK_DIR}/${DISTFILE} ${.OBJDIR} @echo ================================================== ==== //depot/projects/davidxu_thread/src/lib/libarchive/archive_read_extract.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.39 2005/04/17 22:49:00 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -482,9 +482,9 @@ return (ARCHIVE_WARN); } r = archive_read_data_into_fd(a, fd); + close(fd); extract->pst = NULL; /* Cached stat data no longer valid. */ r2 = restore_metadata(a, entry, flags); - close(fd); return (err_combine(r, r2)); } ==== //depot/projects/davidxu_thread/src/lib/libc/gen/sysctl.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.64 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.65 2005/04/18 02:10:37 das Exp $ .\" .Dd January 23, 2001 .Dt SYSCTL 3 @@ -436,14 +436,14 @@ with which the system attempts to comply. .It Li KERN_PROC -Return the entire process table, or a subset of it. -An array of pairs of +Return selected information about specific running processes. +.Pp +For the following names, an array of pairs of .Va struct proc followed by corresponding .Va struct eproc structures is returned, whose size depends on the current number of such objects in the system. -The third and fourth level names are as follows: .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It "Third level name Fourth level is:" .It "KERN_PROC_ALL None" @@ -459,9 +459,15 @@ follow each other. The total size of array is returned. It is also possible for a process to set its own process title this way. +If the third level name is KERN_PROC_PATHNAME, the path of the +process' text file is stored. +For KERN_PROC_PATHNAME, a process ID of +.Li -1 +implies the current process. .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It Sy "Third level name Fourth level is:" .It "KERN_PROC_ARGS A process ID" +.It "KERN_PROC_PATHNAME A process ID" .El .It Li KERN_PROF Return profiling information about the kernel. ==== //depot/projects/davidxu_thread/src/lib/libc/net/getaddrinfo.c#5 (text+ko) ==== @@ -63,10 +63,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.63 2005/04/14 11:44:43 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.65 2005/04/15 18:15:12 ume Exp $"); #include "namespace.h" -#include "reentrant.h" #include #include #include @@ -286,14 +285,6 @@ static int res_querydomainN(const char *, const char *, struct res_target *); -/* - * XXX: Many dependencies are not thread-safe. Still, we cannot use - * getaddrinfo() in conjunction with other functions which call them. - */ -static mutex_t _getaddrinfo_thread_lock = MUTEX_INITIALIZER; -#define THREAD_LOCK() mutex_lock(&_getaddrinfo_thread_lock); -#define THREAD_UNLOCK() mutex_unlock(&_getaddrinfo_thread_lock); - /* XXX macros that make external reference is BAD. */ #define GET_AI(ai, afd, addr) \ @@ -1441,13 +1432,9 @@ break; } - THREAD_LOCK(); - if ((sp = getservbyname(servname, proto)) == NULL) { - THREAD_UNLOCK(); + if ((sp = getservbyname(servname, proto)) == NULL) return EAI_SERVICE; - } port = sp->s_port; - THREAD_UNLOCK(); } if (!matchonly) { @@ -2283,7 +2270,7 @@ /* resolver logic */ -extern const char *__hostalias(const char *); +extern const char *_res_hostalias(const char *, char *, size_t); /* * Formulate a normal query, send, and await answer. @@ -2418,6 +2405,7 @@ u_int dots; int trailing_dot, ret, saved_herrno; int got_nodata = 0, got_servfail = 0, tried_as_is = 0; + char abuf[MAXDNAME]; if ((_res.options & RES_INIT) == 0 && res_init() == -1) { h_errno = NETDB_INTERNAL; @@ -2436,7 +2424,7 @@ /* * if there aren't any dots, it could be a user-level alias */ - if (!dots && (cp = __hostalias(name)) != NULL) + if (!dots && (cp = _res_hostalias(name, abuf, sizeof(abuf))) != NULL) return (res_queryN(cp, target)); /* ==== //depot/projects/davidxu_thread/src/lib/libc/net/gethostbydns.c#2 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.46 2004/07/21 17:26:40 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.47 2005/04/15 14:42:29 ume Exp $"); #include #include @@ -96,6 +96,8 @@ static char hostbuf[8*1024]; static u_char host_addr[16]; /* IPv4 or IPv6 */ +extern const char *_res_hostalias(const char *, char *, size_t); + #ifdef RESOLVSORT static void addrsort(char **, int); #endif @@ -477,6 +479,7 @@ const char *cp; char *bp, *ep; int n, size, type, len; + char abuf[MAXDNAME]; name = va_arg(ap, const char *); af = va_arg(ap, int); @@ -510,7 +513,8 @@ * this is also done in res_query() since we are not the only * function that looks up host names. */ - if (!strchr(name, '.') && (cp = __hostalias(name))) + if (!strchr(name, '.') && + (cp = _res_hostalias(name, abuf, sizeof abuf))) name = cp; /* ==== //depot/projects/davidxu_thread/src/lib/libc/net/getnameinfo.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.14 2003/05/01 19:03:14 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.16 2005/04/17 04:00:55 delphij Exp $"); #include #include @@ -109,9 +109,6 @@ if (sa == NULL) return EAI_FAIL; - if (sa->sa_len != salen) - return EAI_FAIL; - family = sa->sa_family; for (i = 0; afdl[i].a_af; i++) if (afdl[i].a_af == family) { ==== //depot/projects/davidxu_thread/src/lib/libc/net/getproto.c#2 (text+ko) ==== @@ -35,23 +35,33 @@ static char sccsid[] = "@(#)getproto.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.3 2002/03/21 18:49:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); #include +#include "netdb_private.h" -extern int _proto_stayopen; +int +getprotobynumber_r(int proto, struct protoent *pe, struct protoent_data *ped) +{ + int error; + + setprotoent_r(ped->stayopen, ped); + while ((error = getprotoent_r(pe, ped)) == 0) + if (pe->p_proto == proto) + break; + if (!ped->stayopen) + endprotoent_r(ped); + return (error); +} struct protoent * -getprotobynumber(proto) - int proto; +getprotobynumber(int proto) { - struct protoent *p; + struct protodata *pd; - setprotoent(_proto_stayopen); - while ( (p = getprotoent()) ) - if (p->p_proto == proto) - break; - if (!_proto_stayopen) - endprotoent(); - return (p); + if ((pd = __protodata_init()) == NULL) + return (NULL); + if (getprotobynumber_r(proto, &pd->proto, &pd->data) != 0) + return (NULL); + return (&pd->proto); } ==== //depot/projects/davidxu_thread/src/lib/libc/net/getprotoent.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getprotoent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.3 2005/01/03 11:07:45 sobomax Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 20 13:40:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A72616A4D0; Wed, 20 Apr 2005 13:40:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A50F16A4CE for ; Wed, 20 Apr 2005 13:40:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 951E343D49 for ; Wed, 20 Apr 2005 13:40:03 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3KDe3ie015822 for ; Wed, 20 Apr 2005 13:40:03 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3KDe3BM015819 for perforce@freebsd.org; Wed, 20 Apr 2005 13:40:03 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 20 Apr 2005 13:40:03 GMT Message-Id: <200504201340.j3KDe3BM015819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 13:40:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=75623 Change 75623 by davidxu@davidxu_alona on 2005/04/20 13:39:06 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/ohci.4#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/twe.4#4 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/uhci.4#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/usb.4#2 integrate .. //depot/projects/davidxu_thread/src/sys/conf/files.pc98#7 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/kern/kern_fork.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/modules/Makefile#12 integrate .. //depot/projects/davidxu_thread/src/sys/modules/apm/Makefile#3 integrate .. //depot/projects/davidxu_thread/src/sys/net/if.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_var.h#7 integrate .. //depot/projects/davidxu_thread/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_message.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/apm/apm_bioscall.S#1 branch .. //depot/projects/davidxu_thread/src/sys/pc98/apm/apm_bioscall.s#3 delete Differences ... ==== //depot/projects/davidxu_thread/src/lib/libpmc/libpmc.c#2 (text+ko) ==== @@ -22,12 +22,10 @@ * 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/lib/libpmc/libpmc.c,v 1.1 2005/04/19 04:01:21 jkoshy Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.1 2005/04/19 04:01:21 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.2 2005/04/20 05:36:43 jkoshy Exp $"); #include #include ==== //depot/projects/davidxu_thread/src/share/man/man4/ohci.4#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ohci.4,v 1.17 2004/09/05 22:31:03 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ohci.4,v 1.18 2005/04/20 07:33:09 simon Exp $ .\" -.Dd September 6, 2004 +.Dd April 20, 2005 .Dt OHCI 4 .Os .Sh NAME @@ -62,6 +62,7 @@ .El .Pp .Sh SEE ALSO +.Xr ehci 4 , .Xr uhci 4 .Sh HISTORY The ==== //depot/projects/davidxu_thread/src/share/man/man4/twe.4#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/twe.4,v 1.13 2005/02/27 13:15:51 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/twe.4,v 1.14 2005/04/20 10:41:09 brueffer Exp $ .\" .Dd August 15, 2004 .Dt TWE 4 @@ -38,7 +38,7 @@ .Nm driver provides support for AMCC's 3ware 5000/6000/7000/8000 series PATA/SATA RAID adapters. -These adapters were formerly know as +These adapters were formerly known as .Dq 3ware Escalade . .Pp These devices support 2, 4, 8, or 12 ATA disk drives ==== //depot/projects/davidxu_thread/src/share/man/man4/uhci.4#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uhci.4,v 1.17 2005/02/09 18:07:16 ru Exp $ +.\" $FreeBSD: src/share/man/man4/uhci.4,v 1.18 2005/04/20 07:33:09 simon Exp $ .\" -.Dd September 6, 2004 +.Dd April 20, 2005 .Dt UHCI 4 .Os .Sh NAME @@ -53,6 +53,7 @@ VIA 83C572 .El .Sh SEE ALSO +.Xr ehci 4 , .Xr ohci 4 .Sh HISTORY The ==== //depot/projects/davidxu_thread/src/share/man/man4/usb.4#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/usb.4,v 1.31 2004/06/23 23:25:58 markus Exp $ +.\" $FreeBSD: src/share/man/man4/usb.4,v 1.32 2005/04/20 07:33:09 simon Exp $ .\" -.Dd February 21, 1999 +.Dd April 20, 2005 .Dt USB 4 .Os .Sh NAME @@ -393,6 +393,7 @@ .Pp .Xr aue 4 , .Xr cue 4 , +.Xr ehci 4 , .Xr kue 4 , .Xr ohci 4 , .Xr pci 4 , ==== //depot/projects/davidxu_thread/src/sys/conf/files.pc98#7 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.319 2005/04/19 21:40:07 imp Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.320 2005/04/20 12:28:19 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -346,7 +346,7 @@ libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard -pc98/apm/apm_bioscall.s optional apm +pc98/apm/apm_bioscall.S optional apm pc98/i386/busio.s standard pc98/i386/busiosubr.c standard pc98/i386/machdep.c standard ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.243 2005/04/18 21:21:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.244 2005/04/20 12:51:54 sos Exp $"); #include "opt_ata.h" #include @@ -69,7 +69,6 @@ static void ata_interrupt(void *); static void ata_boot_attach(void); device_t ata_add_child(device_t parent, struct ata_device *atadev, int unit); -static int ata_identify(device_t dev); /* global vars */ MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); @@ -597,7 +596,7 @@ return child; } -static int +int ata_identify(device_t dev) { struct ata_channel *ch = device_get_softc(dev); ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#9 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.95 2005/04/19 12:33:26 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.96 2005/04/20 12:51:54 sos Exp $ */ /* ATA register defines */ @@ -453,6 +453,7 @@ int ata_reinit(device_t dev); int ata_suspend(device_t dev); int ata_resume(device_t dev); +int ata_identify(device_t dev); void ata_default_registers(struct ata_channel *ch); void ata_udelay(int interval); char *ata_mode2str(int mode); ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-chipset.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.110 2005/04/17 13:37:57 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.111 2005/04/20 12:51:54 sos Exp $"); #include "opt_ata.h" #include @@ -294,8 +294,7 @@ device_printf(tp->dev, "CONNECTED\n"); ata_sata_connect(ch); - bus_generic_probe(tp->dev); - bus_generic_attach(tp->dev); + ata_identify(tp->dev); } if (tp->action == ATA_C_DETACH) { if (!device_get_children(tp->dev, &children, &nchildren)) { ==== //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_mod.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_mod.c,v 1.2 2005/04/19 21:12:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_mod.c,v 1.3 2005/04/20 04:43:30 jkoshy Exp $"); #include #include @@ -303,7 +303,7 @@ static int pmc_debugflags_parse(char *newstr, char *fence) { - char c, *e, *p, *q; + char c, *p, *q; unsigned int tmpflags; int level; char tmpbuf[4]; /* 3 character keyword + '\0' */ @@ -312,7 +312,6 @@ level = 0xF; /* max verbosity */ p = newstr; - e = newstr + strlen(p); for (; p < fence && (c = *p);) { @@ -331,7 +330,7 @@ else if (strncmp(tmpbuf, S, 3) == 0) \ tmpflags |= __PMCDFMIN(F) - if (e - p > 6 && strncmp(p, "level=", 6) == 0) { + if (fence - p > 6 && strncmp(p, "level=", 6) == 0) { p += 6; /* skip over keyword */ level = strtoul(p, &q, 16); } ==== //depot/projects/davidxu_thread/src/sys/kern/kern_fork.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.250 2005/04/04 21:53:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.251 2005/04/20 13:14:52 davidxu Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -471,6 +471,7 @@ __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); td2->td_sigstk = td->td_sigstk; + td2->td_sigmask = td->td_sigmask; /* * Duplicate sub-structures as needed. ==== //depot/projects/davidxu_thread/src/sys/modules/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.440 2005/04/19 04:01:24 jkoshy Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.441 2005/04/20 04:57:38 jkoshy Exp $ # oldcard -- specialized use for debugging only. # owi -- totally unsupported for debugging only. @@ -91,7 +91,7 @@ hifn \ hme \ ${_hptmv} \ - hwpmc \ + ${_hwpmc} \ ${_i2c} \ ${_ibcs2} \ ${_ichwd} \ @@ -328,6 +328,7 @@ _ext2fs= ext2fs _fe= fe _hfa= hfa +_hwpmc= hwpmc _i2c= i2c _ibcs2= ibcs2 _ie= ie @@ -420,6 +421,7 @@ _drm= drm _em= em _ext2fs= ext2fs +_hwpmc= hwpmc _i2c= i2c _ida= ida _iir= iir ==== //depot/projects/davidxu_thread/src/sys/modules/apm/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/apm/Makefile,v 1.8 2005/04/17 10:41:59 nyan Exp $ +# $FreeBSD: src/sys/modules/apm/Makefile,v 1.9 2005/04/20 12:28:20 nyan Exp $ .PATH: ${.CURDIR}/../../i386/bios .if ${MACHINE} == "pc98" @@ -8,16 +8,11 @@ KMOD= apm SRCS= apm.c apm.h .if ${MACHINE} == "pc98" -SRCS+= apm_bioscall.s +SRCS+= apm_bioscall.S .endif SRCS+= device_if.h bus_if.h EXPORT_SYMS= apm_display \ apm_softc -.if ${MACHINE} == "pc98" -apm_bioscall.o: apm_bioscall.s - ${CC} -x assembler-with-cpp -DLOCORE ${CFLAGS} -c ${.IMPSRC} -.endif - .include ==== //depot/projects/davidxu_thread/src/sys/net/if.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.226 2005/04/15 01:51:26 cperciva Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.227 2005/04/20 09:30:54 glebius Exp $ */ #include "opt_compat.h" @@ -112,6 +112,7 @@ static int if_rtdel(struct radix_node *, void *); static int ifhwioctl(u_long, struct ifnet *, caddr_t, struct thread *); static void if_start_deferred(void *context, int pending); +static void do_link_state_change(void *, int); #ifdef INET6 /* * XXX: declare here to avoid to include many inet6 related files.. @@ -385,6 +386,7 @@ struct ifaddr *ifa; TASK_INIT(&ifp->if_starttask, 0, if_start_deferred, ifp); + TASK_INIT(&ifp->if_linktask, 0, do_link_state_change, ifp); IF_AFDATA_LOCK_INIT(ifp); ifp->if_afdata_initialized = 0; IFNET_WLOCK(); @@ -542,6 +544,11 @@ struct ifnet *iter; int found; + /* + * Remove/wait for pending events. + */ + taskqueue_drain(taskqueue_swi, &ifp->if_linktask); + EVENTHANDLER_INVOKE(ifnet_departure_event, ifp); #ifdef DEV_CARP /* Maybe hook to the generalized departure handler above?!? */ @@ -988,19 +995,30 @@ void (*vlan_link_state_p)(struct ifnet *, int); /* XXX: private from if_vlan */ /* - * Handle a change in the interface link state. + * Handle a change in the interface link state. To avoid LORs + * between driver lock and upper layer locks, as well as possible + * recursions, we post event to taskqueue, and all job + * is done in static do_link_state_change(). */ void if_link_state_change(struct ifnet *ifp, int link_state) { - int link; - /* Return if state hasn't changed. */ if (ifp->if_link_state == link_state) return; ifp->if_link_state = link_state; + taskqueue_enqueue(taskqueue_swi, &ifp->if_linktask); +} + +static void +do_link_state_change(void *arg, int pending) +{ + struct ifnet *ifp = (struct ifnet *)arg; + int link_state = ifp->if_link_state; + int link; + /* Notify that the link state has changed. */ rt_ifmsg(ifp); if (link_state == LINK_STATE_UP) @@ -1020,6 +1038,8 @@ if (ifp->if_carp) carp_carpdev_state(ifp->if_carp); #endif + if (pending > 1) + if_printf(ifp, "%d link states coalesced\n", pending); if (log_link_state_change) log(LOG_NOTICE, "%s: link state changed to %s\n", ifp->if_xname, (link_state == LINK_STATE_UP) ? "UP" : "DOWN" ); ==== //depot/projects/davidxu_thread/src/sys/net/if_var.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.94 2005/03/01 10:59:14 glebius Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.95 2005/04/20 09:30:54 glebius Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -194,6 +194,7 @@ int if_afdata_initialized; struct mtx if_afdata_mtx; struct task if_starttask; /* task for IFF_NEEDSGIANT */ + struct task if_linktask; /* task for link change events */ }; typedef void if_init_f_t(void *); ==== //depot/projects/davidxu_thread/src/sys/net/if_vlan.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan.c,v 1.77 2005/02/18 22:31:19 ru Exp $ + * $FreeBSD: src/sys/net/if_vlan.c,v 1.78 2005/04/20 12:16:41 glebius Exp $ */ /* @@ -62,7 +62,6 @@ #include #include #include -#include #ifdef INET #include @@ -224,7 +223,7 @@ */ extern void (*vlan_input_p)(struct ifnet *, struct mbuf *); -/* For MII eyes only... */ +/* For if_link_state_change() eyes only... */ extern void (*vlan_link_state_p)(struct ifnet *, int); static int @@ -819,11 +818,9 @@ VLAN_LOCK(); LIST_FOREACH(ifv, &ifv_list, ifv_list) { - if (ifv->ifv_p == ifp) { - ifv->ifv_if.if_link_state = ifv->ifv_p->if_link_state; - rt_ifmsg(&(ifv->ifv_if)); - KNOTE_UNLOCKED(&ifp->if_klist, link); - } + if (ifv->ifv_p == ifp) + if_link_state_change(&ifv->ifv_if, + ifv->ifv_p->if_link_state); } VLAN_UNLOCK(); } ==== //depot/projects/davidxu_thread/src/sys/netgraph/ng_eiface.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.29 2005/03/14 20:49:48 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.30 2005/04/20 12:22:33 glebius Exp $ */ #include @@ -74,7 +74,7 @@ /* Node private data */ struct ng_eiface_private { struct arpcom arpcom; /* per-interface network data */ - struct ifnet *ifp; /* This interface */ +#define sc_ifp arpcom.ac_if int unit; /* Interface unit number */ node_p node; /* Our netgraph node */ hook_p ether; /* Hook for ethernet stream */ @@ -188,7 +188,7 @@ ng_eiface_init(void *xsc) { priv_p sc = xsc; - struct ifnet *ifp = sc->ifp; + struct ifnet *ifp = &sc->sc_ifp; int s; s = splimp(); @@ -339,7 +339,6 @@ /* Link them together */ ifp->if_softc = priv; - priv->ifp = ifp; /* Get an interface unit number */ priv->unit = alloc_unr(ng_eiface_unit); @@ -397,7 +396,7 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook) { const priv_p priv = NG_NODE_PRIVATE(node); - struct ifnet *const ifp = priv->ifp; + struct ifnet *const ifp = &priv->sc_ifp; struct ng_mesg *resp = NULL; int error = 0; struct ng_mesg *msg; @@ -510,7 +509,7 @@ ng_eiface_rcvdata(hook_p hook, item_p item) { const priv_p priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); - struct ifnet *const ifp = priv->ifp; + struct ifnet *const ifp = &priv->sc_ifp; struct mbuf *m; NGI_GET_M(item, m); @@ -547,7 +546,7 @@ ng_eiface_rmnode(node_p node) { const priv_p priv = NG_NODE_PRIVATE(node); - struct ifnet *const ifp = priv->ifp; + struct ifnet *const ifp = &priv->sc_ifp; ether_ifdetach(ifp); free_unr(ng_eiface_unit, priv->unit); ==== //depot/projects/davidxu_thread/src/sys/netgraph/ng_message.h#3 (text+ko) ==== @@ -37,7 +37,7 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.26 2005/02/05 23:23:14 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_message.h,v 1.27 2005/04/20 12:18:22 glebius Exp $ * $Whistle: ng_message.h,v 1.12 1999/01/25 01:17:44 archie Exp $ */ @@ -405,7 +405,28 @@ sizeof((rsp)->header.cmdstr)); \ (rsp)->header.flags |= NGF_RESP; \ } while (0) + +/* + * Make a copy of message. Sets "copy" to NULL if fails. + */ +#define NG_COPYMESSAGE(copy, msg, how) \ + do { \ + MALLOC((copy), struct ng_mesg *, sizeof(struct ng_mesg) + \ + (msg)->header.arglen, M_NETGRAPH_MSG, (how) | M_ZERO); \ + if ((copy) == NULL) \ + break; \ + (copy)->header.version = NG_VERSION; \ + (copy)->header.arglen = (msg)->header.arglen; \ + (copy)->header.token = (msg)->header.token; \ + (copy)->header.typecookie = (msg)->header.typecookie; \ + (copy)->header.cmd = (msg)->header.cmd; \ + (copy)->header.flags = (msg)->header.flags; \ + bcopy((msg)->header.cmdstr, (copy)->header.cmdstr, \ + sizeof((copy)->header.cmdstr)); \ + if ((msg)->header.arglen > 0) \ + bcopy((msg)->data, (copy)->data, (msg)->header.arglen); \ + } while (0) + #endif /* _KERNEL */ #endif /* _NETGRAPH_NG_MESSAGE_H_ */ - ==== //depot/projects/davidxu_thread/src/sys/netinet/ip_carp.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.22 2005/03/30 11:44:43 glebius Exp $ */ +/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.23 2005/04/20 09:32:05 glebius Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -150,7 +150,6 @@ TAILQ_HEAD(, carp_softc) vhif_vrs; int vhif_nvrs; - struct callout cif_tmo; struct ifnet *vhif_ifp; struct mtx vhif_mtx; }; @@ -209,7 +208,6 @@ static int carp_set_addr(struct carp_softc *, struct sockaddr_in *); static int carp_del_addr(struct carp_softc *, struct sockaddr_in *); -static void carp_carpdev_state1(void *); static void carp_carpdev_state_locked(struct carp_if *); static void carp_sc_state_locked(struct carp_softc *); #ifdef INET6 @@ -426,7 +424,6 @@ CARP_LOCK(cif); TAILQ_REMOVE(&cif->vhif_vrs, sc, sc_list); if (!--cif->vhif_nvrs) { - callout_drain(&cif->cif_tmo); sc->sc_carpdev->if_carp = NULL; CARP_LOCK_DESTROY(cif); FREE(cif, M_CARP); @@ -1428,7 +1425,6 @@ CARP_LOCK(cif); cif->vhif_ifp = ifp; TAILQ_INIT(&cif->vhif_vrs); - callout_init(&cif->cif_tmo, NET_CALLOUT_MPSAFE); ifp->if_carp = cif; } else { @@ -1505,7 +1501,6 @@ imo->imo_multicast_ifp = NULL; TAILQ_REMOVE(&cif->vhif_vrs, sc, sc_list); if (!--cif->vhif_nvrs) { - callout_drain(&cif->cif_tmo); sc->sc_carpdev->if_carp = NULL; CARP_LOCK_DESTROY(cif); FREE(cif, M_IFADDR); @@ -1614,7 +1609,6 @@ CARP_LOCK(cif); cif->vhif_ifp = ifp; TAILQ_INIT(&cif->vhif_vrs); - callout_init(&cif->cif_tmo, NET_CALLOUT_MPSAFE); ifp->if_carp = cif; } else { @@ -1702,7 +1696,6 @@ im6o->im6o_multicast_ifp = NULL; TAILQ_REMOVE(&cif->vhif_vrs, sc, sc_list); if (!--cif->vhif_nvrs) { - callout_drain(&cif->cif_tmo); CARP_LOCK_DESTROY(cif); sc->sc_carpdev->if_carp = NULL; FREE(cif, M_IFADDR); @@ -2056,20 +2049,6 @@ { struct carp_if *cif = v; - /* - * We came here from interrupt handler of network - * card. To avoid multiple LORs, we will queue function - * for later. - */ - - callout_reset(&cif->cif_tmo, 1, carp_carpdev_state1, v); -} - -void -carp_carpdev_state1(void *v) -{ - struct carp_if *cif = v; - CARP_LOCK(cif); carp_carpdev_state_locked(cif); CARP_UNLOCK(cif); From owner-p4-projects@FreeBSD.ORG Wed Apr 20 16:02:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7096416A4D0; Wed, 20 Apr 2005 16:02:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C25C16A4CE for ; Wed, 20 Apr 2005 16:02:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4194F43D55 for ; Wed, 20 Apr 2005 16:02:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3KG2v1e022292 for ; Wed, 20 Apr 2005 16:02:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3KG2uWK022289 for perforce@freebsd.org; Wed, 20 Apr 2005 16:02:56 GMT (envelope-from sam@freebsd.org) Date: Wed, 20 Apr 2005 16:02:56 GMT Message-Id: <200504201602.j3KG2uWK022289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 75627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 16:02:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=75627 Change 75627 by sam@sam_ebb on 2005/04/20 16:02:46 IFC @ 75626 Affected files ... .. //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/wifi/kerberos5/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/Makefile#6 integrate .. //depot/projects/wifi/lib/libc/net/getproto.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getprotoent.c#3 integrate .. //depot/projects/wifi/lib/libc/net/getprotoname.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getservbyname.c#3 integrate .. //depot/projects/wifi/lib/libc/net/getservbyport.c#3 integrate .. //depot/projects/wifi/lib/libc/net/getservent.c#4 integrate .. //depot/projects/wifi/lib/libc/net/name6.c#4 integrate .. //depot/projects/wifi/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/wifi/lib/libpmc/Makefile#1 branch .. //depot/projects/wifi/lib/libpmc/libpmc.c#1 branch .. //depot/projects/wifi/lib/libpmc/pmc.3#1 branch .. //depot/projects/wifi/lib/libpmc/pmc.h#1 branch .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#3 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 integrate .. //depot/projects/wifi/sbin/devfs/devfs.8#6 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/wifi/share/doc/papers/Makefile#2 integrate .. //depot/projects/wifi/share/doc/papers/hwpmc/Makefile#1 branch .. //depot/projects/wifi/share/doc/papers/hwpmc/hwpmc.ms#1 branch .. //depot/projects/wifi/share/examples/hwpmc/README#1 branch .. //depot/projects/wifi/share/man/man4/Makefile#20 integrate .. //depot/projects/wifi/share/man/man4/cpufreq.4#6 integrate .. //depot/projects/wifi/share/man/man4/hwpmc.4#1 branch .. //depot/projects/wifi/share/man/man4/ipw.4#1 branch .. //depot/projects/wifi/share/man/man4/iwi.4#2 integrate .. //depot/projects/wifi/share/man/man4/ohci.4#2 integrate .. //depot/projects/wifi/share/man/man4/ral.4#1 branch .. //depot/projects/wifi/share/man/man4/twe.4#4 integrate .. //depot/projects/wifi/share/man/man4/uhci.4#3 integrate .. //depot/projects/wifi/share/man/man4/ural.4#1 branch .. //depot/projects/wifi/share/man/man4/usb.4#2 integrate .. //depot/projects/wifi/share/man/man9/sleepqueue.9#3 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#5 integrate .. //depot/projects/wifi/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/wifi/sys/alpha/include/_bus.h#1 branch .. //depot/projects/wifi/sys/alpha/include/bus.h#6 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/wifi/sys/amd64/include/_bus.h#1 branch .. //depot/projects/wifi/sys/amd64/include/bus.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/arm/include/_bus.h#1 branch .. //depot/projects/wifi/sys/arm/include/bus.h#5 integrate .. //depot/projects/wifi/sys/conf/NOTES#19 integrate .. //depot/projects/wifi/sys/conf/files#23 integrate .. //depot/projects/wifi/sys/conf/files.amd64#11 integrate .. //depot/projects/wifi/sys/conf/files.i386#16 integrate .. //depot/projects/wifi/sys/conf/files.pc98#8 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#12 integrate .. //depot/projects/wifi/sys/conf/options#15 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/wifi/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/wifi/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/wifi/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#1 branch .. //depot/projects/wifi/sys/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral.c#1 branch .. //depot/projects/wifi/sys/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/wifi/sys/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/wifi/sys/dev/ral/if_ralrate.c#1 branch .. //depot/projects/wifi/sys/dev/ral/if_ralrate.h#1 branch .. //depot/projects/wifi/sys/dev/ral/if_ralreg.h#1 branch .. //depot/projects/wifi/sys/dev/ral/if_ralvar.h#1 branch .. //depot/projects/wifi/sys/dev/usb/if_ural.c#1 branch .. //depot/projects/wifi/sys/dev/usb/if_uralreg.h#1 branch .. //depot/projects/wifi/sys/dev/usb/if_uralvar.h#1 branch .. //depot/projects/wifi/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/wifi/sys/geom/geom_kern.c#4 integrate .. //depot/projects/wifi/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/wifi/sys/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/wifi/sys/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/wifi/sys/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/wifi/sys/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/wifi/sys/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/wifi/sys/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/wifi/sys/i386/conf/NOTES#13 integrate .. //depot/projects/wifi/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/wifi/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/wifi/sys/i386/include/_bus.h#1 branch .. //depot/projects/wifi/sys/i386/include/bus.h#3 integrate .. //depot/projects/wifi/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/ia64/include/_bus.h#1 branch .. //depot/projects/wifi/sys/ia64/include/bus.h#5 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_pmc.c#1 branch .. //depot/projects/wifi/sys/kern/kern_sig.c#9 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#11 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/wifi/sys/modules/Makefile#20 integrate .. //depot/projects/wifi/sys/modules/apm/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/cpufreq/Makefile#6 integrate .. //depot/projects/wifi/sys/modules/hwpmc/Makefile#1 branch .. //depot/projects/wifi/sys/modules/ipw/Makefile#1 branch .. //depot/projects/wifi/sys/modules/iwi/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/ral/Makefile#1 branch .. //depot/projects/wifi/sys/modules/ural/Makefile#1 branch .. //depot/projects/wifi/sys/net/if.c#13 integrate .. //depot/projects/wifi/sys/net/if_var.h#11 integrate .. //depot/projects/wifi/sys/net/if_vlan.c#5 integrate .. //depot/projects/wifi/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_message.h#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/wifi/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/wifi/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/wifi/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/wifi/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/wifi/sys/pc98/apm/apm_bioscall.S#1 branch .. //depot/projects/wifi/sys/pc98/apm/apm_bioscall.s#3 delete .. //depot/projects/wifi/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/wifi/sys/pc98/include/_bus.h#1 branch .. //depot/projects/wifi/sys/pc98/include/bus.h#2 integrate .. //depot/projects/wifi/sys/pc98/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/powerpc/include/_bus.h#1 branch .. //depot/projects/wifi/sys/powerpc/include/bus.h#6 integrate .. //depot/projects/wifi/sys/powerpc/powermac/ata_kauai.c#7 integrate .. //depot/projects/wifi/sys/powerpc/powermac/ata_macio.c#7 integrate .. //depot/projects/wifi/sys/sparc64/include/_bus.h#1 branch .. //depot/projects/wifi/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/wifi/sys/sys/param.h#10 integrate .. //depot/projects/wifi/sys/sys/pmc.h#1 branch .. //depot/projects/wifi/sys/sys/pmckern.h#1 branch .. //depot/projects/wifi/sys/sys/proc.h#13 integrate .. //depot/projects/wifi/sys/sys/sched.h#3 integrate .. //depot/projects/wifi/sys/sys/systm.h#12 integrate .. //depot/projects/wifi/tools/tools/nanobsd/make.conf#9 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.1#6 integrate .. //depot/projects/wifi/usr.sbin/Makefile#9 integrate .. //depot/projects/wifi/usr.sbin/pmccontrol/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/pmccontrol/pmccontrol.8#1 branch .. //depot/projects/wifi/usr.sbin/pmccontrol/pmccontrol.c#1 branch .. //depot/projects/wifi/usr.sbin/pmcstat/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.8#1 branch .. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.c#1 branch Differences ... ==== //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.45 2005/01/25 09:37:37 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.47 2005/04/19 13:26:58 jkoshy Exp $ .\" .\" %beginstrip% . @@ -48,6 +48,7 @@ .ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) +.ds doc-str-Lb-libpmc Performance Monitoring Counters API (libpmc, \-lpmc) .ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) .ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) .ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) ==== //depot/projects/wifi/kerberos5/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.25 2005/04/18 22:03:21 imp Exp $ NO_LINT= @@ -48,4 +48,4 @@ .endfor .endfor -.endif defined(SRCS) +.endif # defined(SRCS) ==== //depot/projects/wifi/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.203 2005/04/02 01:40:12 davidxu Exp $ +# $FreeBSD: src/lib/Makefile,v 1.204 2005/04/19 04:01:21 jkoshy Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,7 +31,7 @@ ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ - ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ + ${_libpmc} ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -59,6 +59,7 @@ .if ${MACHINE_ARCH} == "i386" _libncp= libncp +_libpmc= libpmc _libsmb= libsmb _libvgl= libvgl .endif @@ -89,6 +90,7 @@ .if ${MACHINE_ARCH} == "amd64" _libncp= libncp +_libpmc= libpmc _libsmb= libsmb .endif ==== //depot/projects/wifi/lib/libc/net/getproto.c#2 (text+ko) ==== @@ -35,23 +35,33 @@ static char sccsid[] = "@(#)getproto.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.3 2002/03/21 18:49:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); #include +#include "netdb_private.h" -extern int _proto_stayopen; +int +getprotobynumber_r(int proto, struct protoent *pe, struct protoent_data *ped) +{ + int error; + + setprotoent_r(ped->stayopen, ped); + while ((error = getprotoent_r(pe, ped)) == 0) + if (pe->p_proto == proto) + break; + if (!ped->stayopen) + endprotoent_r(ped); + return (error); +} struct protoent * -getprotobynumber(proto) - int proto; +getprotobynumber(int proto) { - struct protoent *p; + struct protodata *pd; - setprotoent(_proto_stayopen); - while ( (p = getprotoent()) ) - if (p->p_proto == proto) - break; - if (!_proto_stayopen) - endprotoent(); - return (p); + if ((pd = __protodata_init()) == NULL) + return (NULL); + if (getprotobynumber_r(proto, &pd->proto, &pd->data) != 0) + return (NULL); + return (&pd->proto); } ==== //depot/projects/wifi/lib/libc/net/getprotoent.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getprotoent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.3 2005/01/03 11:07:45 sobomax Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); #include #include @@ -43,53 +43,101 @@ #include #include #include +#include "namespace.h" +#include "reentrant.h" +#include "un-namespace.h" +#include "netdb_private.h" + +static struct protodata protodata; +static thread_key_t protodata_key; +static once_t protodata_init_once = ONCE_INITIALIZER; +static int protodata_thr_keycreated = 0; + +static void +protoent_data_clear(struct protoent_data *ped) +{ + if (ped->fp) { + fclose(ped->fp); + ped->fp = NULL; + } +} + +static void +protodata_free(void *ptr) +{ + struct protodata *pd = ptr; + + if (pd == NULL) + return; + protoent_data_clear(&pd->data); + free(pd); +} + +static void +protodata_keycreate(void) +{ + protodata_thr_keycreated = + (thr_keycreate(&protodata_key, protodata_free) == 0); +} -#define MAXALIASES 35 +struct protodata * +__protodata_init(void) +{ + struct protodata *pd; -static FILE *protof = NULL; -static char line[BUFSIZ+1]; -static struct protoent proto; -static char *proto_aliases[MAXALIASES]; -int _proto_stayopen; + if (thr_main() != 0) + return (&protodata); + if (thr_once(&protodata_init_once, protodata_keycreate) != 0 || + !protodata_thr_keycreated) + return (NULL); + if ((pd = thr_getspecific(protodata_key)) != NULL) + return (pd); + if ((pd = calloc(1, sizeof(*pd))) == NULL) + return (NULL); + if (thr_setspecific(protodata_key, pd) == 0) + return (pd); + free(pd); + return (NULL); +} void -setprotoent(f) - int f; +setprotoent_r(int f, struct protoent_data *ped) { - if (protof == NULL) - protof = fopen(_PATH_PROTOCOLS, "r" ); + if (ped->fp == NULL) + ped->fp = fopen(_PATH_PROTOCOLS, "r"); else - rewind(protof); - _proto_stayopen |= f; + rewind(ped->fp); + ped->stayopen |= f; } void -endprotoent() +endprotoent_r(struct protoent_data *ped) { - if (protof) { - fclose(protof); - protof = NULL; + if (ped->fp) { + fclose(ped->fp); + ped->fp = NULL; } - _proto_stayopen = 0; + ped->stayopen = 0; } -struct protoent * -getprotoent() +int +getprotoent_r(struct protoent *pe, struct protoent_data *ped) { char *p; - char *cp, **q; + char *cp, **q, *endp; + long l; - if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL) - return (NULL); + if (ped->fp == NULL && (ped->fp = fopen(_PATH_PROTOCOLS, "r")) == NULL) + return (-1); again: - if ((p = fgets(line, BUFSIZ, protof)) == NULL) - return (NULL); + if ((p = fgets(ped->line, BUFSIZ, ped->fp)) == NULL) + return (-1); if (*p == '#') goto again; cp = strpbrk(p, "#\n"); if (cp != NULL) *cp = '\0'; - proto.p_name = p; + pe->p_name = p; cp = strpbrk(p, " \t"); if (cp == NULL) goto again; @@ -99,8 +147,11 @@ p = strpbrk(cp, " \t"); if (p != NULL) *p++ = '\0'; - proto.p_proto = atoi(cp); - q = proto.p_aliases = proto_aliases; + l = strtol(cp, &endp, 10); + if (endp == cp || *endp != '\0' || l < 0 || l > USHRT_MAX) + goto again; + pe->p_proto = l; + q = pe->p_aliases = ped->aliases; if (p != NULL) { cp = p; while (cp && *cp) { @@ -108,7 +159,7 @@ cp++; continue; } - if (q < &proto_aliases[MAXALIASES - 1]) + if (q < &ped->aliases[PROTOENT_MAXALIASES - 1]) *q++ = cp; cp = strpbrk(cp, " \t"); if (cp != NULL) @@ -116,5 +167,37 @@ } } *q = NULL; - return (&proto); + return (0); +} + +void +setprotoent(int f) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return; + setprotoent_r(f, &pd->data); +} + +void +endprotoent(void) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return; + endprotoent_r(&pd->data); +} + +struct protoent * +getprotoent(void) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return (NULL); + if (getprotoent_r(&pd->proto, &pd->data) != 0) + return (NULL); + return (&pd->proto); } ==== //depot/projects/wifi/lib/libc/net/getprotoname.c#2 (text+ko) ==== @@ -35,30 +35,41 @@ static char sccsid[] = "@(#)getprotoname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.3 2002/03/21 18:49:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); #include #include +#include "netdb_private.h" -extern int _proto_stayopen; - -struct protoent * -getprotobyname(name) - const char *name; +int +getprotobyname_r(const char *name, struct protoent *pe, + struct protoent_data *ped) { - struct protoent *p; char **cp; + int error; - setprotoent(_proto_stayopen); - while ( (p = getprotoent()) ) { - if (strcmp(p->p_name, name) == 0) + setprotoent_r(ped->stayopen, ped); + while ((error = getprotoent_r(pe, ped)) == 0) { + if (strcmp(pe->p_name, name) == 0) break; - for (cp = p->p_aliases; *cp != 0; cp++) + for (cp = pe->p_aliases; *cp != 0; cp++) if (strcmp(*cp, name) == 0) goto found; } found: - if (!_proto_stayopen) - endprotoent(); - return (p); + if (!ped->stayopen) + endprotoent_r(ped); + return (error); +} + +struct protoent * +getprotobyname(const char *name) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return (NULL); + if (getprotobyname_r(name, &pd->proto, &pd->data) != 0) + return (NULL); + return (&pd->proto); } ==== //depot/projects/wifi/lib/libc/net/getservbyname.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.6 2005/04/17 14:42:52 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -49,8 +49,8 @@ int error; #ifdef YP - sed->getservbyname_yp = (char *)name; - sed->getservbyproto_yp = (char *)proto; + sed->yp_name = (char *)name; + sed->yp_proto = (char *)proto; #endif setservent_r(sed->stayopen, sed); @@ -69,8 +69,8 @@ endservent_r(sed); #ifdef YP - sed->getservbyname_yp = NULL; - sed->getservbyproto_yp = NULL; + sed->yp_name = NULL; + sed->yp_proto = NULL; #endif return (error); ==== //depot/projects/wifi/lib/libc/net/getservbyport.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.6 2005/04/17 14:42:52 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -48,8 +48,8 @@ int error; #ifdef YP - sed->getservbyport_yp = port; - sed->getservbyproto_yp = (char *)proto; + sed->yp_port = port; + sed->yp_proto = (char *)proto; #endif setservent_r(sed->stayopen, sed); @@ -63,8 +63,8 @@ endservent_r(sed); #ifdef YP - sed->getservbyport_yp = 0; - sed->getservbyproto_yp = NULL; + sed->yp_port = 0; + sed->yp_proto = NULL; #endif return (error); ==== //depot/projects/wifi/lib/libc/net/getservent.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.17 2005/04/18 03:45:23 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.18 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -67,8 +67,8 @@ sed->fp = NULL; } #ifdef YP - free(sed->key); - sed->key = NULL; + free(sed->yp_key); + sed->yp_key = NULL; #endif } @@ -119,11 +119,11 @@ char buf[YPMAXRECORD + 2]; int rv; - snprintf(buf, sizeof(buf), "%d/%s", - ntohs(sed->getservbyport_yp), sed->getservbyproto_yp); + snprintf(buf, sizeof(buf), "%d/%s", ntohs(sed->yp_port), + sed->yp_proto); - sed->getservbyport_yp = 0; - sed->getservbyproto_yp = NULL; + sed->yp_port = 0; + sed->yp_proto = NULL; if (!sed->yp_domain) { if (yp_get_default_domain(&sed->yp_domain)) @@ -168,11 +168,10 @@ return (0); } - snprintf(buf, sizeof(buf), "%s/%s", sed->getservbyname_yp, - sed->getservbyproto_yp); + snprintf(buf, sizeof(buf), "%s/%s", sed->yp_name, sed->yp_proto); - sed->getservbyname_yp = 0; - sed->getservbyproto_yp = NULL; + sed->yp_name = 0; + sed->yp_proto = NULL; if (yp_match(sed->yp_domain, "services.byname", buf, strlen(buf), &result, &resultlen)) { @@ -198,22 +197,23 @@ return (0); } - if (!sed->stepping_yp) { - free(sed->key); - rv = yp_first(sed->yp_domain, "services.byname", &sed->key, - &sed->keylen, &result, &resultlen); + if (!sed->yp_stepping) { + free(sed->yp_key); + rv = yp_first(sed->yp_domain, "services.byname", &sed->yp_key, + &sed->yp_keylen, &result, &resultlen); if (rv) { - sed->stepping_yp = 0; + sed->yp_stepping = 0; return(0); } - sed->stepping_yp = 1; + sed->yp_stepping = 1; } else { - lastkey = sed->key; - rv = yp_next(sed->yp_domain, "services.byname", sed->key, - sed->keylen, &sed->key, &sed->keylen, &result, &resultlen); + lastkey = sed->yp_key; + rv = yp_next(sed->yp_domain, "services.byname", sed->yp_key, + sed->yp_keylen, &sed->yp_key, &sed->yp_keylen, &result, + &resultlen); free(lastkey); if (rv) { - sed->stepping_yp = 0; + sed->yp_stepping = 0; return (0); } } @@ -243,7 +243,7 @@ servent_data_clear(sed); sed->stayopen = 0; #ifdef YP - sed->stepping_yp = 0; + sed->yp_stepping = 0; sed->yp_domain = NULL; #endif } @@ -256,7 +256,7 @@ long l; #ifdef YP - if (sed->stepping_yp && _getservent_yp(sed)) { + if (sed->yp_stepping && _getservent_yp(sed)) { p = sed->line; goto unpack; } @@ -269,11 +269,11 @@ return (-1); #ifdef YP if (*p == '+' && _yp_check(NULL)) { - if (sed->getservbyname_yp != NULL) { + if (sed->yp_name != NULL) { if (!_getservbyname_yp(sed)) goto tryagain; } - else if (sed->getservbyport_yp != 0) { + else if (sed->yp_port != 0) { if (!_getservbyport_yp(sed)) goto tryagain; } ==== //depot/projects/wifi/lib/libc/net/name6.c#4 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.44 2005/04/09 14:20:18 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.45 2005/04/19 12:28:17 ume Exp $"); #include "namespace.h" #if defined(YP) || defined(ICMPNL) @@ -453,35 +453,6 @@ free(ptr); } -#if 0 - -/* XXX: should be deprecated */ -struct hostent * -getnodebyname(const char *name, int af, int flags) -{ - return getipnodebyname(name, af, flags, &h_errno); -} - -#ifdef __warn_references -__warn_references(getnodebyname, - "warning: getnodebyname() deprecated, " - "should use getaddrinfo() or getipnodebyname()"); -#endif - -struct hostent * -getnodebyaddr(const void *src, size_t len, int af) -{ - return getipnodebyaddr(src, len, af, &h_errno); -} - -#ifdef __warn_references -__warn_references(getnodebyaddr, - "warning: getnodebyaddr() deprecated, " - "should use getnameinfo() or getipnodebyaddr()"); -#endif - -#endif - /* * Private utility functions */ @@ -1814,7 +1785,6 @@ u_char c, *cp; char *bp; struct hostent hbuf; - int na; #ifdef INET6 static const char hex[] = "0123456789abcdef"; #endif @@ -1861,7 +1831,6 @@ hbuf.h_name = NULL; hbuf.h_addrtype = af; hbuf.h_length = addrlen; - na = 0; buf = malloc(sizeof(*buf)); if (buf == NULL) { ==== //depot/projects/wifi/lib/libc/net/netdb_private.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.2 2005/04/17 14:42:52 ume Exp $ + * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.4 2005/04/19 14:41:13 ume Exp $ */ #ifndef _NETDB_PRIVATE_H_ @@ -30,21 +30,34 @@ #include /* XXX: for BUFSIZ */ +#define PROTOENT_MAXALIASES 35 #define SERVENT_MAXALIASES 35 +struct protoent_data { + FILE *fp; + char *aliases[PROTOENT_MAXALIASES]; + int stayopen; + char line[BUFSIZ + 1]; +}; + +struct protodata { + struct protoent proto; + struct protoent_data data; +}; + struct servent_data { FILE *fp; char *aliases[SERVENT_MAXALIASES]; int stayopen; char line[BUFSIZ + 1]; #ifdef YP - int stepping_yp; - char *getservbyname_yp; - char *getservbyproto_yp; - int getservbyport_yp; + int yp_stepping; + char *yp_name; + char *yp_proto; + int yp_port; char *yp_domain; - char *key; - int keylen; + char *yp_key; + int yp_keylen; #endif }; @@ -53,19 +66,30 @@ struct servent_data data; }; +#define endprotoent_r __endprotoent_r #define endservent_r __endservent_r +#define getprotobyname_r __getprotobyname_r +#define getprotobynumber_r __getprotobynumber_r +#define getprotoent_r __getprotoent_r #define getservbyname_r __getservbyname_r #define getservbyport_r __getservbyport_r #define getservent_r __getservent_r +#define setprotoent_r __setprotoent_r #define setservent_r __setservent_r +struct protodata *__protodata_init(void); struct servdata *__servdata_init(void); +void endprotoent_r(struct protoent_data *); void endservent_r(struct servent_data *); +int getprotobyname_r(const char *, struct protoent *, struct protoent_data *); +int getprotobynumber_r(int, struct protoent *, struct protoent_data *); +int getprotoent_r(struct protoent *, struct protoent_data *); int getservbyname_r(const char *, const char *, struct servent *, struct servent_data *); int getservbyport_r(int, const char *, struct servent *, struct servent_data *); int getservent_r(struct servent *, struct servent_data *); +void setprotoent_r(int, struct protoent_data *); void setservent_r(int, struct servent_data *); #endif /* _NETDB_PRIVATE_H_ */ ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/errata/article.sgml#2 (text+ko) ==== @@ -37,7 +37,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.72 2004/09/05 14:53:33 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73 2005/04/19 09:42:25 hrs Exp $ 2000 @@ -45,6 +45,7 @@ 2002 2003 2004 + 2005 The &os; Documentation Project ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#3 (text+ko) ==== @@ -1,9 +1,9 @@ - + &os;/&arch; &release.current; Hardware Notes - The FreeBSD Documentation Project + The &os; Documentation Project 2000 @@ -12,6 +12,6 @@ 2003 2004 2005 - The FreeBSD Documentation Project + The &os; Documentation Project ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + &os;/&arch; &release.current; Installation Instructions @@ -13,6 +13,7 @@ 2002 2003 2004 + 2005 The &os; Documentation Project ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/readme/article.sgml#2 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.36 2004/09/17 16:29:46 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.37 2005/04/19 09:43:53 hrs Exp $ 2000 @@ -20,6 +20,7 @@ 2002 2003 2004 + 2005 The &os; Documentation Project ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.845 2005/04/18 08:29:25 den Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.848 2005/04/19 18:52:52 brueffer Exp $ 2000 @@ -323,6 +323,14 @@ in the &man.acpi.4; driver. These can individually be disabled by setting device hints such as hint.ichss.0.disabled="1". + The &man.hwpmc.4;, hardware performance + monitoring counter driver has been added. + This driver virtualizes the hardware performance monitoring + facilities in modern CPUs and provides support for using + these facilities from user level processes. For more details, + see manual pages of &man.hwpmc.4;, associated libraries, + and associated userland utilities. + Support for the OLDCARD subsystem has been removed. The NEWCARD system is now used for all PCCARD device support. @@ -421,6 +429,12 @@ The &man.hme.4; driver is now MPSAFE. &merged; + The &man.ipw.4; (for Intel PRO/Wireless 2100), + &man.iwi.4; (for Intel PRO/Wireless 2200BG/2225BG/2915ABG), + &man.ral.4; (for Ralink Technology RT2500), + and &man.ural.4; (for Ralink Technology RT2500USB) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 21 03:12:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ED6116A4D0; Thu, 21 Apr 2005 03:12:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAE2416A4CE for ; Thu, 21 Apr 2005 03:12:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17E1643D64 for ; Thu, 21 Apr 2005 03:12:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3L3CjZT071618 for ; Thu, 21 Apr 2005 03:12:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3L3Ciw7071615 for perforce@freebsd.org; Thu, 21 Apr 2005 03:12:44 GMT (envelope-from sam@freebsd.org) Date: Thu, 21 Apr 2005 03:12:44 GMT Message-Id: <200504210312.j3L3Ciw7071615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 75655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 03:12:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=75655 Change 75655 by sam@sam_ebb on 2005/04/21 03:11:59 IFC @ 75654 Affected files ... .. //depot/projects/wifi/lib/Makefile#7 integrate .. //depot/projects/wifi/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/wifi/share/man/man9/Makefile#11 integrate .. //depot/projects/wifi/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/wifi/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/wifi/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/conf/NOTES#20 integrate .. //depot/projects/wifi/sys/ddb/ddb.h#3 integrate .. //depot/projects/wifi/sys/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/wifi/sys/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/wifi/sys/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/wifi/sys/hwpmc/hwpmc_pentium.c#2 integrate .. //depot/projects/wifi/sys/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/wifi/sys/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#14 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#4 integrate .. //depot/projects/wifi/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/wifi/sys/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/wifi/sys/modules/Makefile#21 integrate .. //depot/projects/wifi/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/wifi/sys/pc98/include/_bus.h#2 integrate .. //depot/projects/wifi/sys/powerpc/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/wifi/sys/sparc64/include/pmc_mdep.h#1 branch .. //depot/projects/wifi/sys/sys/kdb.h#3 integrate .. //depot/projects/wifi/sys/sys/pmc.h#2 integrate .. //depot/projects/wifi/usr.sbin/Makefile#10 integrate Differences ... ==== //depot/projects/wifi/lib/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.204 2005/04/19 04:01:21 jkoshy Exp $ +# $FreeBSD: src/lib/Makefile,v 1.205 2005/04/20 20:50:32 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,7 +31,7 @@ ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ - ${_libpmc} ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ + libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -59,7 +59,6 @@ .if ${MACHINE_ARCH} == "i386" _libncp= libncp -_libpmc= libpmc _libsmb= libsmb _libvgl= libvgl .endif @@ -90,7 +89,6 @@ .if ${MACHINE_ARCH} == "amd64" _libncp= libncp -_libpmc= libpmc _libsmb= libsmb .endif ==== //depot/projects/wifi/lib/libpmc/libpmc.c#2 (text+ko) ==== @@ -22,20 +22,16 @@ * 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/lib/libpmc/libpmc.c,v 1.1 2005/04/19 04:01:21 jkoshy Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.1 2005/04/19 04:01:21 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.3 2005/04/20 20:48:24 marcel Exp $"); #include #include #include #include -#include - #include #include #include @@ -47,7 +43,7 @@ #include /* Function prototypes */ -#if __i386__ +#if defined(__i386__) static int k7_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); static int p6_allocate_pmc(enum pmc_event _pe, char *_ctrspec, @@ -56,7 +52,7 @@ struct pmc_op_pmcallocate *_pmc_config); static int p5_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); -#elif __amd64__ +#elif defined(__amd64__) static int k8_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif @@ -154,6 +150,7 @@ #define PMCMASK(N,V) { .pm_name = #N, .pm_value = (V) } #define NULLMASK PMCMASK(NULL,0) +#if defined(__i386__) || defined(__amd64__) static int pmc_parse_mask(const struct pmc_masks *pmask, char *p, uint32_t *evmask) { @@ -177,12 +174,13 @@ } return c; } +#endif #define KWMATCH(p,kw) (strcasecmp((p), (kw)) == 0) #define KWPREFIXMATCH(p,kw) (strncasecmp((p), (kw), sizeof((kw)) - 1) == 0) #define EV_ALIAS(N,S) { .pm_alias = N, .pm_spec = S } -#if __i386__ +#if defined(__i386__) /* * AMD K7 (Athlon) CPUs. @@ -1238,7 +1236,7 @@ return -1 || pe || ctrspec || pmc_config; /* shut up gcc */ } -#elif __amd64__ +#elif defined(__amd64__) /* * AMD K8 PMCs. @@ -1636,7 +1634,7 @@ /* set parser pointer */ switch (cpu_info.pm_cputype) { -#if __i386__ +#if defined(__i386__) case PMC_CPU_AMD_K7: pmc_mdep_event_aliases = k7_aliases; pmc_mdep_allocate_pmc = k7_allocate_pmc; @@ -1656,7 +1654,7 @@ pmc_mdep_event_aliases = p4_aliases; pmc_mdep_allocate_pmc = p4_allocate_pmc; break; -#elif __amd64__ +#elif defined(__amd64__) case PMC_CPU_AMD_K8: pmc_mdep_event_aliases = k8_aliases; pmc_mdep_allocate_pmc = k8_allocate_pmc; @@ -2119,7 +2117,7 @@ * Architecture specific APIs */ -#if __i386__ || __amd64__ +#if defined(__i386__) || defined(__amd64__) int pmc_x86_get_msr(pmc_id_t pmc, uint32_t *msr) ==== //depot/projects/wifi/share/man/man9/Makefile#11 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.257 2005/04/15 10:57:34 pjd Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.258 2005/04/20 19:11:05 glebius Exp $ MAN= accept_filter.9 \ accf_data.9 \ accf_http.9 \ acl.9 \ + alloc_unr.9 \ alq.9 \ altq.9 \ atomic.9 \ @@ -334,7 +335,11 @@ zero_copy.9 \ zone.9 -MLINKS= alq.9 ALQ.9 \ +MLINKS= alloc_unr.9 alloc_unrl.9 \ + alloc_unr.9 delete_unrhdr.9 \ + alloc_unr.9 free_unr.9 \ + alloc_unr.9 new_unrhdr.9 +MLINKS+=alq.9 ALQ.9 \ alq.9 alq_close.9 \ alq.9 alq_flush.9 \ alq.9 alq_get.9 \ ==== //depot/projects/wifi/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.282 2005/04/12 23:18:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.283 2005/04/20 20:52:45 ps Exp $"); /* * AMD64 Trap and System call handling @@ -623,7 +623,7 @@ } #ifdef KDB - if (kdb_trap(type, 0, frame)) + if ((debugger_on_panic || kdb_active) && kdb_trap(type, 0, frame)) return; #endif printf("trap number = %d\n", type); ==== //depot/projects/wifi/sys/amd64/conf/NOTES#9 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.31 2005/04/19 22:16:46 imp Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.32 2005/04/20 22:19:51 marcel Exp $ # # @@ -56,19 +56,6 @@ ##################################################################### -# PERFORMANCE MONITORING OPTIONS - -# -# The hwpmc driver that allows the use of in-CPU performance monitoring -# counters for performance monitoring. The base kernel needs to configured -# with the 'options' line, while the hwpmc device can be either compiled -# in or loaded as a loadable kernel module. -# -device hwpmc # Driver (also a loadable module) -options HWPMC_HOOKS # Other necessary kernel hooks - - -##################################################################### # NETWORKING OPTIONS # ==== //depot/projects/wifi/sys/amd64/include/pmc_mdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.1 2005/04/19 04:01:22 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.2 2005/04/20 20:22:33 marcel Exp $ */ /* Machine dependent interfaces */ @@ -31,7 +31,7 @@ #ifndef _MACHINE_PMC_MDEP_H #define _MACHINE_PMC_MDEP_H 1 -#include +#include /* AMD K7 PMCs */ ==== //depot/projects/wifi/sys/conf/NOTES#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1311 2005/04/19 22:16:45 imp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1312 2005/04/20 22:19:51 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -422,6 +422,19 @@ ##################################################################### +# PERFORMANCE MONITORING OPTIONS + +# +# The hwpmc driver that allows the use of in-CPU performance monitoring +# counters for performance monitoring. The base kernel needs to configured +# with the 'options' line, while the hwpmc device can be either compiled +# in or loaded as a loadable kernel module. +# +device hwpmc # Driver (also a loadable module) +options HWPMC_HOOKS # Other necessary kernel hooks + + +##################################################################### # NETWORKING OPTIONS # ==== //depot/projects/wifi/sys/ddb/ddb.h#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/ddb/ddb.h,v 1.37 2004/11/01 22:15:14 jhb Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.38 2005/04/20 20:52:45 ps Exp $ */ /* @@ -71,7 +71,6 @@ extern int db_indent; extern int db_inst_count; extern int db_load_count; -extern int debugger_on_panic; extern int db_store_count; extern db_expr_t db_radix; extern db_expr_t db_max_width; ==== //depot/projects/wifi/sys/hwpmc/hwpmc_amd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_amd.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_amd.c,v 1.2 2005/04/20 20:26:39 marcel Exp $"); /* Support for the AMD K7 and later processors */ @@ -34,12 +34,11 @@ #include #include #include +#include #include #include #include -#include -#include /* AMD K7 and K8 PMCs */ ==== //depot/projects/wifi/sys/hwpmc/hwpmc_intel.c#2 (text+ko) ==== @@ -25,19 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_intel.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_intel.c,v 1.2 2005/04/20 20:26:39 marcel Exp $"); #include #include #include +#include #include #include #include #include #include -#include -#include struct pmc_mdep * pmc_intel_initialize(void) ==== //depot/projects/wifi/sys/hwpmc/hwpmc_mod.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_mod.c,v 1.2 2005/04/19 21:12:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_mod.c,v 1.4 2005/04/20 20:26:39 marcel Exp $"); #include #include @@ -50,8 +50,6 @@ #include #include -#include -#include /* * Types @@ -303,7 +301,7 @@ static int pmc_debugflags_parse(char *newstr, char *fence) { - char c, *e, *p, *q; + char c, *p, *q; unsigned int tmpflags; int level; char tmpbuf[4]; /* 3 character keyword + '\0' */ @@ -312,7 +310,6 @@ level = 0xF; /* max verbosity */ p = newstr; - e = newstr + strlen(p); for (; p < fence && (c = *p);) { @@ -331,7 +328,7 @@ else if (strncmp(tmpbuf, S, 3) == 0) \ tmpflags |= __PMCDFMIN(F) - if (e - p > 6 && strncmp(p, "level=", 6) == 0) { + if (fence - p > 6 && strncmp(p, "level=", 6) == 0) { p += 6; /* skip over keyword */ level = strtoul(p, &q, 16); } ==== //depot/projects/wifi/sys/hwpmc/hwpmc_pentium.c#2 (text+ko) ==== @@ -25,19 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_pentium.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_pentium.c,v 1.2 2005/04/20 20:26:39 marcel Exp $"); #include #include #include +#include #include #include #include #include #include -#include -#include /* * Intel Pentium PMCs ==== //depot/projects/wifi/sys/hwpmc/hwpmc_piv.c#2 (text+ko) ==== @@ -25,19 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_piv.c,v 1.2 2005/04/19 21:40:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_piv.c,v 1.3 2005/04/20 20:26:39 marcel Exp $"); #include #include #include +#include #include #include #include #include #include -#include -#include /* * PENTIUM 4 SUPPORT ==== //depot/projects/wifi/sys/hwpmc/hwpmc_ppro.c#2 (text+ko) ==== @@ -25,19 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_ppro.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_ppro.c,v 1.2 2005/04/20 20:26:39 marcel Exp $"); #include #include #include +#include #include #include #include #include #include -#include -#include /* * PENTIUM PRO SUPPORT ==== //depot/projects/wifi/sys/i386/conf/NOTES#14 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1195 2005/04/19 22:16:46 imp Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1196 2005/04/20 22:19:51 marcel Exp $ # # @@ -214,19 +214,6 @@ ##################################################################### -# PERFORMANCE MONITORING OPTIONS - -# -# The hwpmc driver that allows the use of in-CPU performance monitoring -# counters for performance monitoring. The base kernel needs to configured -# with the 'options' line, while the hwpmc device can be either compiled -# in or loaded as a loadable kernel module. -# -device hwpmc # Driver (also a loadable module) -options HWPMC_HOOKS # Other necessary kernel hooks - - -##################################################################### # NETWORKING OPTIONS # ==== //depot/projects/wifi/sys/i386/i386/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.271 2005/04/12 23:18:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.272 2005/04/20 20:52:45 ps Exp $"); /* * 386 Trap and System call handling @@ -798,7 +798,7 @@ } #ifdef KDB - if (kdb_trap(type, 0, frame)) + if ((debugger_on_panic || kdb_active) && kdb_trap(type, 0, frame)) return; #endif printf("trap number = %d\n", type); ==== //depot/projects/wifi/sys/i386/include/pmc_mdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.1 2005/04/19 04:01:24 jkoshy Exp $ + * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.2 2005/04/20 20:22:33 marcel Exp $ */ /* Machine dependent interfaces */ @@ -31,7 +31,8 @@ #ifndef _MACHINE_PMC_MDEP_H #define _MACHINE_PMC_MDEP_H 1 -#include +#include +#include /* AMD K7 PMCs */ ==== //depot/projects/wifi/sys/kern/kern_pmc.c#2 (text+ko) ==== @@ -21,14 +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. - * */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_pmc.c,v 1.1 2005/04/19 04:01:24 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_pmc.c,v 1.2 2005/04/20 20:30:59 marcel Exp $"); -#ifdef HWPMC_HOOKS - #include #include @@ -78,5 +75,3 @@ return 0; #endif } - -#endif /* HWPMC_HOOKS */ ==== //depot/projects/wifi/sys/modules/Makefile#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.441 2005/04/20 04:57:38 jkoshy Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.442 2005/04/20 22:03:33 marcel Exp $ # oldcard -- specialized use for debugging only. # owi -- totally unsupported for debugging only. @@ -91,7 +91,7 @@ hifn \ hme \ ${_hptmv} \ - ${_hwpmc} \ + hwpmc \ ${_i2c} \ ${_ibcs2} \ ${_ichwd} \ @@ -328,7 +328,6 @@ _ext2fs= ext2fs _fe= fe _hfa= hfa -_hwpmc= hwpmc _i2c= i2c _ibcs2= ibcs2 _ie= ie @@ -421,7 +420,6 @@ _drm= drm _em= em _ext2fs= ext2fs -_hwpmc= hwpmc _i2c= i2c _ida= ida _iir= iir ==== //depot/projects/wifi/sys/pc98/conf/NOTES#9 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.54 2005/04/19 22:16:46 imp Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.55 2005/04/20 22:19:51 marcel Exp $ # # @@ -177,19 +177,6 @@ ##################################################################### -# PERFORMANCE MONITORING OPTIONS - -# -# The hwpmc driver that allows the use of in-CPU performance monitoring -# counters for performance monitoring. The base kernel needs to configured -# with the 'options' line, while the hwpmc device can be either compiled -# in or loaded as a loadable kernel module. -# -device hwpmc # Driver (also a loadable module) -options HWPMC_HOOKS # Other necessary kernel hooks - - -##################################################################### # NETWORKING OPTIONS # ==== //depot/projects/wifi/sys/pc98/include/_bus.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/pc98/include/_bus.h,v 1.1 2005/04/18 21:45:34 imp Exp $ + * $FreeBSD: src/sys/pc98/include/_bus.h,v 1.3 2005/04/19 21:07:00 imp Exp $ */ #ifndef PC98_INCLUDE__BUS_H @@ -37,38 +37,7 @@ typedef u_int bus_addr_t; typedef u_int bus_size_t; -/* - * Access methods for bus resources and address space. - */ -struct bus_space_tag { -#define BUS_SPACE_IO 0 -#define BUS_SPACE_MEM 1 - u_int bs_tag; /* bus space flags */ - - struct bus_space_access_methods bs_da; /* direct access */ - struct bus_space_access_methods bs_ra; /* relocate access */ -#if 0 - struct bus_space_access_methods bs_ida; /* indexed direct access */ -#endif -}; typedef struct bus_space_tag *bus_space_tag_t; - -/* - * bus space handle - */ -struct bus_space_handle { - bus_addr_t bsh_base; - size_t bsh_sz; - - bus_addr_t bsh_iat[BUS_SPACE_IAT_MAXSIZE]; - size_t bsh_maxiatsz; - size_t bsh_iatsz; - - struct resource **bsh_res; - size_t bsh_ressz; - - struct bus_space_access_methods bsh_bam; -}; typedef struct bus_space_handle *bus_space_handle_t; #endif /* PC98_INCLUDE__BUS_H */ ==== //depot/projects/wifi/sys/powerpc/powerpc/trap.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.53 2005/04/12 23:18:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.54 2005/04/20 20:52:46 ps Exp $"); #include "opt_ktrace.h" @@ -93,8 +93,6 @@ extern char *syscallnames[]; -extern int debugger_on_panic; /* XXX */ - struct powerpc_exception { u_int vector; char *name; ==== //depot/projects/wifi/sys/sys/kdb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/kdb.h,v 1.4 2005/01/07 02:29:23 imp Exp $ + * $FreeBSD: src/sys/sys/kdb.h,v 1.5 2005/04/20 20:52:46 ps Exp $ */ #ifndef _SYS_KDB_H_ @@ -57,6 +57,7 @@ struct trapframe; extern int kdb_active; /* Non-zero while in debugger. */ +extern int debugger_on_panic; /* enter the debugger on panic. */ extern struct kdb_dbbe *kdb_dbbe; /* Default debugger backend or NULL. */ extern struct trapframe *kdb_frame; /* Frame to kdb_trap(). */ extern struct pcb *kdb_thrctx; /* Current context. */ ==== //depot/projects/wifi/sys/sys/pmc.h#2 (text+ko) ==== @@ -23,12 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/pmc.h,v 1.1 2005/04/19 04:01:25 jkoshy Exp $ + * $FreeBSD: src/sys/sys/pmc.h,v 1.2 2005/04/20 20:19:24 marcel Exp $ */ #ifndef _SYS_PMC_H_ #define _SYS_PMC_H_ +#include + #define PMC_MODULE_NAME "hwpmc" #define PMC_NAME_MAX 16 /* HW counter name size */ #define PMC_CLASS_MAX 4 /* #classes of PMCs in a CPU */ @@ -1115,10 +1117,6 @@ } pm_amd; } pm_md; -#else - -#error Unsupported PMC architecture. - #endif }; ==== //depot/projects/wifi/usr.sbin/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.329 2005/04/19 14:27:43 jkoshy Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.330 2005/04/20 20:51:37 marcel Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -113,8 +113,8 @@ ${_pcvt} \ periodic \ pkg_install \ - ${_pmccontrol} \ - ${_pmcstat} \ + pmccontrol \ + pmcstat \ ${_pnpinfo} \ powerd \ ppp \ @@ -287,8 +287,6 @@ _mptable= mptable _ndiscvt= ndiscvt _pccard= pccard -_pmccontrol= pmccontrol -_pmcstat= pmcstat _pnpinfo= pnpinfo .if !defined(NO_LIBPTHREAD) _pppctl= pppctl @@ -333,8 +331,6 @@ _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt -_pmccontrol= pmccontrol -_pmcstat= pmcstat .if !defined(NO_LIBPTHREAD) _pppctl= pppctl .endif From owner-p4-projects@FreeBSD.ORG Thu Apr 21 07:25:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9810A16A4D1; Thu, 21 Apr 2005 07:25:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 556EF16A4CE for ; Thu, 21 Apr 2005 07:25:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 329D343D3F for ; Thu, 21 Apr 2005 07:25:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3L7PoGE087224 for ; Thu, 21 Apr 2005 07:25:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3L7PnUE087218 for perforce@freebsd.org; Thu, 21 Apr 2005 07:25:49 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 21 Apr 2005 07:25:49 GMT Message-Id: <200504210725.j3L7PnUE087218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 07:25:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=75659 Change 75659 by davidxu@davidxu_celeron on 2005/04/21 07:25:24 thr_create2 -> thr_new. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#13 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#13 (text+ko) ==== @@ -182,7 +182,7 @@ if (new_thread->attr.flags & PTHREAD_SCOPE_SYSTEM) param.flags |= THR_SYSTEM_SCOPE; /* Schedule the new thread. */ - ret = thr_create2(¶m, sizeof(param)); + ret = thr_new(¶m, sizeof(param)); #if 0 ret = thr_create(&uc, &new_thread->tid, 0); __sys_sigprocmask(SIG_SETMASK, &oldsigmask, NULL); From owner-p4-projects@FreeBSD.ORG Thu Apr 21 07:25:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAF9716A4F0; Thu, 21 Apr 2005 07:25:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5974216A4CF for ; Thu, 21 Apr 2005 07:25:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3C2743D31 for ; Thu, 21 Apr 2005 07:25:49 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3L7PnwT087215 for ; Thu, 21 Apr 2005 07:25:49 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3L7Pnen087212 for perforce@freebsd.org; Thu, 21 Apr 2005 07:25:49 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 21 Apr 2005 07:25:49 GMT Message-Id: <200504210725.j3L7Pnen087212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 07:25:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=75658 Change 75658 by davidxu@davidxu_celeron on 2005/04/21 07:24:56 rename thr_create2 to thr_new. merge most code in thr_new and thr_create. Affected files ... .. //depot/projects/davidxu_thread/src/sys/kern/init_sysent.c#9 edit .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#17 edit .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.c#9 edit .. //depot/projects/davidxu_thread/src/sys/kern/syscalls.master#9 edit .. //depot/projects/davidxu_thread/src/sys/sys/syscall.h#8 edit .. //depot/projects/davidxu_thread/src/sys/sys/syscall.mk#8 edit .. //depot/projects/davidxu_thread/src/sys/sys/sysproto.h#8 edit .. //depot/projects/davidxu_thread/src/sys/sys/thr.h#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/kern/init_sysent.c#9 (text+ko) ==== @@ -483,5 +483,5 @@ { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)lkmressys }, /* 452 = setaudit_addr */ { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)lkmressys }, /* 453 = auditctl */ { SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op }, /* 454 = _umtx_op */ - { SYF_MPSAFE | AS(thr_create2_args), (sy_call_t *)thr_create2 }, /* 455 = thr_create2 */ + { SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new }, /* 455 = thr_new */ }; ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#17 (text+ko) ==== @@ -57,6 +57,13 @@ SYSCTL_INT(_kern_threads, OID_AUTO, thr_concurrency, CTLFLAG_RW, &thr_concurrency, 0, "a concurrency value if not default"); +static int create_thread(struct thread *td, mcontext_t *ctx, + void (*start_func)(void *), void *arg, + char *stack_base, size_t stack_size, + char *tls_base, + long *child_tid, long *parent_tid, + int flags); + /* * System call interface. */ @@ -64,128 +71,42 @@ thr_create(struct thread *td, struct thr_create_args *uap) /* ucontext_t *ctx, long *id, int flags */ { - struct thread *newtd; ucontext_t ctx; - long id; int error; - struct ksegrp *kg, *newkg; - struct proc *p; - int scope_sys, linkkg; - p = td->td_proc; - kg = td->td_ksegrp; if ((error = copyin(uap->ctx, &ctx, sizeof(ctx)))) return (error); - /* Have race condition but it is cheap. */ - if ((p->p_numksegrps >= max_groups_per_proc) || - (p->p_numthreads >= max_threads_per_proc)) { - return (EPROCLIM); - } + error = create_thread(td, &ctx.uc_mcontext, NULL, NULL, + NULL, 0, NULL, uap->id, NULL, uap->flags); + return (error); +} - scope_sys = (uap->flags & THR_SYSTEM_SCOPE) != 0; - if (thr_scope == 1) - scope_sys = 0; - else if (thr_scope == 2) - scope_sys = 1; +int +thr_new(struct thread *td, struct thr_new_args *uap) + /* struct thr_param * */ +{ + struct thr_param param; + int error; - /* Initialize our td and new ksegrp.. */ - newtd = thread_alloc(); - - /* - * Try the copyout as soon as we allocate the td so we don't have to - * tear things down in a failure case below. - */ - id = newtd->td_tid; - if ((error = copyout(&id, uap->id, sizeof(long)))) { - thread_free(newtd); + if (uap->param_size != sizeof(param)) + return (EINVAL); + if ((error = copyin(uap->param, ¶m, sizeof(param)))) return (error); - } - bzero(&newtd->td_startzero, - __rangeof(struct thread, td_startzero, td_endzero)); - bcopy(&td->td_startcopy, &newtd->td_startcopy, - __rangeof(struct thread, td_startcopy, td_endcopy)); - newtd->td_proc = td->td_proc; - newtd->td_ucred = crhold(td->td_ucred); - - /* Set up our machine context. */ - cpu_set_upcall(newtd, td); - error = set_mcontext(newtd, &ctx.uc_mcontext); - if (error != 0) { - thread_free(newtd); - crfree(td->td_ucred); - goto out; - } - - if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { - p->p_procscopegrp = kg; - mtx_lock_spin(&sched_lock); - sched_set_concurrency(kg, - thr_concurrency ? thr_concurrency : (2*mp_ncpus)); - mtx_unlock_spin(&sched_lock); - } - - linkkg = 0; - if (scope_sys) { - linkkg = 1; - newkg = ksegrp_alloc(); - bzero(&newkg->kg_startzero, - __rangeof(struct ksegrp, kg_startzero, kg_endzero)); - bcopy(&kg->kg_startcopy, &newkg->kg_startcopy, - __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); - sched_init_concurrency(newkg); - PROC_LOCK(td->td_proc); - } else { -retry: - PROC_LOCK(td->td_proc); - if ((newkg = p->p_procscopegrp) == NULL) { - PROC_UNLOCK(p); - newkg = ksegrp_alloc(); - bzero(&newkg->kg_startzero, - __rangeof(struct ksegrp, kg_startzero, kg_endzero)); - bcopy(&kg->kg_startcopy, &newkg->kg_startcopy, - __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); - PROC_LOCK(p); - if (p->p_procscopegrp == NULL) { - p->p_procscopegrp = newkg; - sched_init_concurrency(newkg); - sched_set_concurrency(newkg, - thr_concurrency ? thr_concurrency : (2*mp_ncpus)); - linkkg = 1; - } else { - PROC_UNLOCK(p); - ksegrp_free(newkg); - goto retry; - } - } - } - - td->td_proc->p_flag |= P_HADTHREADS; - newtd->td_sigmask = td->td_sigmask; - mtx_lock_spin(&sched_lock); - if (linkkg) - ksegrp_link(newkg, p); - thread_link(newtd, newkg); - PROC_UNLOCK(p); - - /* let the scheduler know about these things. */ - if (linkkg) - sched_fork_ksegrp(td, newkg); - sched_fork_thread(td, newtd); - TD_SET_CAN_RUN(newtd); - if ((uap->flags & THR_SUSPENDED) == 0) - setrunqueue(newtd, SRQ_BORING); - mtx_unlock_spin(&sched_lock); - -out: + error = create_thread(td, NULL, param.start_func, param.arg, + param.stack_base, param.stack_size, param.tls_base, + param.child_tid, param.parent_tid, param.flags); return (error); } -int -thr_create2(struct thread *td, struct thr_create2_args *uap) - /* struct thr_param * */ +static int +create_thread(struct thread *td, mcontext_t *ctx, + void (*start_func)(void *), void *arg, + char *stack_base, size_t stack_size, + char *tls_base, + long *child_tid, long *parent_tid, + int flags) { - struct thr_param param; stack_t stack; struct thread *newtd; struct ksegrp *kg, *newkg; @@ -193,12 +114,9 @@ long id; int error, scope_sys, linkkg; + error = 0; p = td->td_proc; kg = td->td_ksegrp; - if (uap->param_size != sizeof(param)) - return (EINVAL); - if ((error = copyin(uap->param, ¶m, sizeof(param)))) - return (error); /* Have race condition but it is cheap. */ if ((p->p_numksegrps >= max_groups_per_proc) || @@ -207,7 +125,7 @@ } /* Check PTHREAD_SCOPE_SYSTEM */ - scope_sys = (param.flags & THR_SYSTEM_SCOPE) != 0; + scope_sys = (flags & THR_SYSTEM_SCOPE) != 0; /* sysctl overrides user's flag */ if (thr_scope == 1) @@ -228,9 +146,11 @@ * memory is freed before parent thread can access it. */ id = newtd->td_tid; - if ((error = copyout(&id, param.child_tid, sizeof(long))) || - (error = copyout(&id, param.parent_tid, sizeof(long)))) { - thread_free(newtd); + if ((child_tid != NULL && + (error = copyout(&id, child_tid, sizeof(long)))) || + (parent_tid != NULL && + (error = copyout(&id, parent_tid, sizeof(long))))) { + thread_free(newtd); return (error); } bzero(&newtd->td_startzero, @@ -240,15 +160,25 @@ newtd->td_proc = td->td_proc; newtd->td_ucred = crhold(td->td_ucred); - /* Set up our machine context. */ - stack.ss_sp = param.stack_base; - stack.ss_size = param.stack_size; - /* Fork user context from current thread. */ cpu_set_upcall(newtd, td); - /* Set upcall address to user thread entry function. */ - cpu_set_upcall_kse(newtd, param.start_func, param.arg, &stack); - /* Setup user TLS address and TLS pointer register. */ - cpu_set_user_tls(newtd, param.tls_base); + + if (ctx != NULL) { /* old way to set user context */ + error = set_mcontext(newtd, ctx); + if (error != 0) { + thread_free(newtd); + crfree(td->td_ucred); + return (error); + } + } else { + /* Set up our machine context. */ + stack.ss_sp = stack_base; + stack.ss_size = stack_size; + /* Set upcall address to user thread entry function. */ + cpu_set_upcall_kse(newtd, start_func, arg, &stack); + /* Setup user TLS address and TLS pointer register. */ + cpu_set_user_tls(newtd, tls_base); + } + if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { /* Treat initial thread as it has PTHREAD_SCOPE_PROCESS. */ p->p_procscopegrp = kg; @@ -310,7 +240,7 @@ sched_fork_ksegrp(td, newkg); sched_fork_thread(td, newtd); TD_SET_CAN_RUN(newtd); - if ((param.flags & THR_SUSPENDED) == 0) + if ((flags & THR_SUSPENDED) == 0) setrunqueue(newtd, SRQ_BORING); mtx_unlock_spin(&sched_lock); ==== //depot/projects/davidxu_thread/src/sys/kern/syscalls.c#9 (text+ko) ==== @@ -462,5 +462,5 @@ "setaudit_addr", /* 452 = setaudit_addr */ "auditctl", /* 453 = auditctl */ "_umtx_op", /* 454 = _umtx_op */ - "thr_create2", /* 455 = thr_create2 */ + "thr_new", /* 455 = thr_new */ }; ==== //depot/projects/davidxu_thread/src/sys/kern/syscalls.master#9 (text+ko) ==== @@ -645,7 +645,7 @@ 453 MNOSTD { int auditctl(int cmd, char *path); } 454 MSTD { int _umtx_op(struct umtx *umtx, int op, long id, void *uaddr,\ void *uaddr2); } -455 MSTD { int thr_create2(struct thr_param *param, int param_size); } +455 MSTD { int thr_new(struct thr_param *param, int param_size); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/davidxu_thread/src/sys/sys/syscall.h#8 (text+ko) ==== @@ -368,5 +368,5 @@ #define SYS_setaudit_addr 452 #define SYS_auditctl 453 #define SYS__umtx_op 454 -#define SYS_thr_create2 455 +#define SYS_thr_new 455 #define SYS_MAXSYSCALL 456 ==== //depot/projects/davidxu_thread/src/sys/sys/syscall.mk#8 (text+ko) ==== @@ -310,4 +310,4 @@ setaudit_addr.o \ auditctl.o \ _umtx_op.o \ - thr_create2.o + thr_new.o ==== //depot/projects/davidxu_thread/src/sys/sys/sysproto.h#8 (text+ko) ==== @@ -1349,7 +1349,7 @@ char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; }; -struct thr_create2_args { +struct thr_new_args { char param_l_[PADL_(struct thr_param *)]; struct thr_param * param; char param_r_[PADR_(struct thr_param *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; @@ -1659,7 +1659,7 @@ int setaudit_addr(struct thread *, struct setaudit_addr_args *); int auditctl(struct thread *, struct auditctl_args *); int _umtx_op(struct thread *, struct _umtx_op_args *); -int thr_create2(struct thread *, struct thr_create2_args *); +int thr_new(struct thread *, struct thr_new_args *); #ifdef COMPAT_43 ==== //depot/projects/davidxu_thread/src/sys/sys/thr.h#8 (text+ko) ==== @@ -55,7 +55,7 @@ #ifndef _KERNEL int thr_create(ucontext_t *ctx, long *id, int flags); -int thr_create2(struct thr_param *param, int param_size); +int thr_new(struct thr_param *param, int param_size); int thr_self(long *id); void thr_exit(long *state); int thr_kill(long id, int sig); From owner-p4-projects@FreeBSD.ORG Thu Apr 21 13:38:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E03C216A4D0; Thu, 21 Apr 2005 13:38:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9A3716A4CE for ; Thu, 21 Apr 2005 13:38:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 333A443D3F for ; Thu, 21 Apr 2005 13:38:26 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3LDcQdB016253 for ; Thu, 21 Apr 2005 13:38:26 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3LDcPDO016245 for perforce@freebsd.org; Thu, 21 Apr 2005 13:38:25 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 21 Apr 2005 13:38:25 GMT Message-Id: <200504211338.j3LDcPDO016245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 13:38:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=75666 Change 75666 by davidxu@davidxu_alona on 2005/04/21 13:37:37 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/lib/Makefile#7 integrate .. //depot/projects/davidxu_thread/src/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/Makefile#10 integrate .. //depot/projects/davidxu_thread/src/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/davidxu_thread/src/share/mklocale/be_BY.CP1131.src#2 integrate .. //depot/projects/davidxu_thread/src/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/davidxu_thread/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/conf/NOTES#11 integrate .. //depot/projects/davidxu_thread/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_pentium.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/davidxu_thread/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/davidxu_thread/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/davidxu_thread/src/sys/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/modules/Makefile#13 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/davidxu_thread/src/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/davidxu_thread/src/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/davidxu_thread/src/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/davidxu_thread/src/sys/powerpc/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/powerpc/powerpc/trap.c#7 integrate .. //depot/projects/davidxu_thread/src/sys/sparc64/include/pmc_mdep.h#1 branch .. //depot/projects/davidxu_thread/src/sys/sys/kdb.h#3 integrate .. //depot/projects/davidxu_thread/src/sys/sys/pmc.h#2 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/Makefile#7 integrate Differences ... ==== //depot/projects/davidxu_thread/src/lib/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.204 2005/04/19 04:01:21 jkoshy Exp $ +# $FreeBSD: src/lib/Makefile,v 1.205 2005/04/20 20:50:32 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,7 +31,7 @@ ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ - ${_libpmc} ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ + libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -59,7 +59,6 @@ .if ${MACHINE_ARCH} == "i386" _libncp= libncp -_libpmc= libpmc _libsmb= libsmb _libvgl= libvgl .endif @@ -90,7 +89,6 @@ .if ${MACHINE_ARCH} == "amd64" _libncp= libncp -_libpmc= libpmc _libsmb= libsmb .endif ==== //depot/projects/davidxu_thread/src/lib/libpmc/libpmc.c#3 (text+ko) ==== @@ -25,15 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.2 2005/04/20 05:36:43 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.4 2005/04/21 05:50:25 jkoshy Exp $"); #include #include #include #include -#include - #include #include #include @@ -45,7 +43,7 @@ #include /* Function prototypes */ -#if __i386__ +#if defined(__i386__) static int k7_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); static int p6_allocate_pmc(enum pmc_event _pe, char *_ctrspec, @@ -54,7 +52,7 @@ struct pmc_op_pmcallocate *_pmc_config); static int p5_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); -#elif __amd64__ +#elif defined(__amd64__) static int k8_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif @@ -152,6 +150,7 @@ #define PMCMASK(N,V) { .pm_name = #N, .pm_value = (V) } #define NULLMASK PMCMASK(NULL,0) +#if defined(__i386__) || defined(__amd64__) static int pmc_parse_mask(const struct pmc_masks *pmask, char *p, uint32_t *evmask) { @@ -175,26 +174,27 @@ } return c; } +#endif #define KWMATCH(p,kw) (strcasecmp((p), (kw)) == 0) #define KWPREFIXMATCH(p,kw) (strncasecmp((p), (kw), sizeof((kw)) - 1) == 0) #define EV_ALIAS(N,S) { .pm_alias = N, .pm_spec = S } -#if __i386__ +#if defined(__i386__) /* * AMD K7 (Athlon) CPUs. */ static struct pmc_event_alias k7_aliases[] = { -EV_ALIAS("branches", "k7-retired-branches"), -EV_ALIAS("branch-mispredicts", "k7-retired-branches-mispredicted"), -EV_ALIAS("cycles", "tsc"), -EV_ALIAS("dc-misses", "k7-dc-misses,mask=moesi"), -EV_ALIAS("ic-misses", "k7-ic-misses"), -EV_ALIAS("instructions", "k7-retired-instructions"), -EV_ALIAS("interrupts", "k7-hardware-interrupts"), -EV_ALIAS(NULL, NULL) + EV_ALIAS("branches", "k7-retired-branches"), + EV_ALIAS("branch-mispredicts", "k7-retired-branches-mispredicted"), + EV_ALIAS("cycles", "tsc"), + EV_ALIAS("dc-misses", "k7-dc-misses,mask=moesi"), + EV_ALIAS("ic-misses", "k7-ic-misses"), + EV_ALIAS("instructions", "k7-retired-instructions"), + EV_ALIAS("interrupts", "k7-hardware-interrupts"), + EV_ALIAS(NULL, NULL) }; #define K7_KW_COUNT "count" @@ -299,7 +299,11 @@ */ static struct pmc_event_alias p4_aliases[] = { - EV_ALIAS("cycles", "tsc"), + EV_ALIAS("branches", "p4-branch-retired,mask=mmtp+mmtm"), + EV_ALIAS("branch-mispredicts", "p4-mispred-branch-retired"), + EV_ALIAS("cycles", "tsc"), + EV_ALIAS("instructions", + "p4-instr-retired,mask=nbogusntag+nbogustag"), EV_ALIAS(NULL, NULL) }; @@ -512,7 +516,8 @@ NULLMASK }; -static const struct pmc_masks p4_mask_rmbt[] = { /* retired mispred branch type */ +static const struct pmc_masks p4_mask_rmbt[] = { + /* retired mispred branch type */ __P4MASK(conditional, 1), __P4MASK(call, 2), __P4MASK(return, 3), @@ -902,12 +907,14 @@ */ static struct pmc_event_alias p6_aliases[] = { -EV_ALIAS("branches", "p6-br-inst-retired"), -EV_ALIAS("branch-mispredicts", "p6-br-miss-pred-retired"), -EV_ALIAS("cycles", "tsc"), -EV_ALIAS("instructions", "p6-inst-retired"), -EV_ALIAS("interrupts", "p6-hw-int-rx"), -EV_ALIAS(NULL, NULL) + EV_ALIAS("branches", "p6-br-inst-retired"), + EV_ALIAS("branch-mispredicts", "p6-br-miss-pred-retired"), + EV_ALIAS("cycles", "tsc"), + EV_ALIAS("dc-misses", "p6-dcu-lines-in"), + EV_ALIAS("ic-misses", "p6-ifu-ifetch-miss"), + EV_ALIAS("instructions", "p6-inst-retired"), + EV_ALIAS("interrupts", "p6-hw-int-rx"), + EV_ALIAS(NULL, NULL) }; #define P6_KW_CMASK "cmask" @@ -1236,7 +1243,7 @@ return -1 || pe || ctrspec || pmc_config; /* shut up gcc */ } -#elif __amd64__ +#elif defined(__amd64__) /* * AMD K8 PMCs. @@ -1246,7 +1253,14 @@ */ static struct pmc_event_alias k8_aliases[] = { - EV_ALIAS("cycles", "tsc"), + EV_ALIAS("branches", "k8-fr-retired-taken-branches"), + EV_ALIAS("branch-mispredicts", + "k8-fr-retired-taken-branches-mispredicted"), + EV_ALIAS("cycles", "tsc"), + EV_ALIAS("dc-misses", "k8-dc-miss"), + EV_ALIAS("ic-misses", "k8-ic-miss"), + EV_ALIAS("instructions", "k8-fr-retired-x86-instructions"), + EV_ALIAS("interrupts", "k8-fr-taken-hardware-interrupts"), EV_ALIAS(NULL, NULL) }; @@ -1634,7 +1648,7 @@ /* set parser pointer */ switch (cpu_info.pm_cputype) { -#if __i386__ +#if defined(__i386__) case PMC_CPU_AMD_K7: pmc_mdep_event_aliases = k7_aliases; pmc_mdep_allocate_pmc = k7_allocate_pmc; @@ -1654,7 +1668,7 @@ pmc_mdep_event_aliases = p4_aliases; pmc_mdep_allocate_pmc = p4_allocate_pmc; break; -#elif __amd64__ +#elif defined(__amd64__) case PMC_CPU_AMD_K8: pmc_mdep_event_aliases = k8_aliases; pmc_mdep_allocate_pmc = k8_allocate_pmc; @@ -2117,7 +2131,7 @@ * Architecture specific APIs */ -#if __i386__ || __amd64__ +#if defined(__i386__) || defined(__amd64__) int pmc_x86_get_msr(pmc_id_t pmc, uint32_t *msr) ==== //depot/projects/davidxu_thread/src/share/man/man9/Makefile#10 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.257 2005/04/15 10:57:34 pjd Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.258 2005/04/20 19:11:05 glebius Exp $ MAN= accept_filter.9 \ accf_data.9 \ accf_http.9 \ acl.9 \ + alloc_unr.9 \ alq.9 \ altq.9 \ atomic.9 \ @@ -334,7 +335,11 @@ zero_copy.9 \ zone.9 -MLINKS= alq.9 ALQ.9 \ +MLINKS= alloc_unr.9 alloc_unrl.9 \ + alloc_unr.9 delete_unrhdr.9 \ + alloc_unr.9 free_unr.9 \ + alloc_unr.9 new_unrhdr.9 +MLINKS+=alq.9 ALQ.9 \ alq.9 alq_close.9 \ alq.9 alq_flush.9 \ alq.9 alq_get.9 \ ==== //depot/projects/davidxu_thread/src/share/mklocale/be_BY.CP1131.src#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * Belarusian language. Standard (1933) grammar. + * Belarusian language. Modern/standard (1959) grammar. * Prepared by Yury Tarasievich - * $FreeBSD: src/share/mklocale/be_BY.CP1131.src,v 1.1 2003/12/20 11:18:42 ache Exp $ + * $FreeBSD: src/share/mklocale/be_BY.CP1131.src,v 1.2 2005/04/21 09:15:19 ache Exp $ */ ENCODING "NONE" -VARIABLE Belarusian CP1131 (based on: Russian Alternative code table (CP866) by ) +VARIABLE Belarusian CP1131 (extending the and based on: Russian Alternative code table (CP866) by ) # # This is a comment ==== //depot/projects/davidxu_thread/src/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.282 2005/04/12 23:18:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.283 2005/04/20 20:52:45 ps Exp $"); /* * AMD64 Trap and System call handling @@ -623,7 +623,7 @@ } #ifdef KDB - if (kdb_trap(type, 0, frame)) + if ((debugger_on_panic || kdb_active) && kdb_trap(type, 0, frame)) return; #endif printf("trap number = %d\n", type); ==== //depot/projects/davidxu_thread/src/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.31 2005/04/19 22:16:46 imp Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.32 2005/04/20 22:19:51 marcel Exp $ # # @@ -56,19 +56,6 @@ ##################################################################### -# PERFORMANCE MONITORING OPTIONS - -# -# The hwpmc driver that allows the use of in-CPU performance monitoring -# counters for performance monitoring. The base kernel needs to configured -# with the 'options' line, while the hwpmc device can be either compiled -# in or loaded as a loadable kernel module. -# -device hwpmc # Driver (also a loadable module) -options HWPMC_HOOKS # Other necessary kernel hooks - - -##################################################################### # NETWORKING OPTIONS # ==== //depot/projects/davidxu_thread/src/sys/amd64/include/pmc_mdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.1 2005/04/19 04:01:22 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.2 2005/04/20 20:22:33 marcel Exp $ */ /* Machine dependent interfaces */ @@ -31,7 +31,7 @@ #ifndef _MACHINE_PMC_MDEP_H #define _MACHINE_PMC_MDEP_H 1 -#include +#include /* AMD K7 PMCs */ ==== //depot/projects/davidxu_thread/src/sys/conf/NOTES#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1311 2005/04/19 22:16:45 imp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1312 2005/04/20 22:19:51 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -422,6 +422,19 @@ ##################################################################### +# PERFORMANCE MONITORING OPTIONS + +# +# The hwpmc driver that allows the use of in-CPU performance monitoring +# counters for performance monitoring. The base kernel needs to configured +# with the 'options' line, while the hwpmc device can be either compiled +# in or loaded as a loadable kernel module. +# +device hwpmc # Driver (also a loadable module) +options HWPMC_HOOKS # Other necessary kernel hooks + + +##################################################################### # NETWORKING OPTIONS # ==== //depot/projects/davidxu_thread/src/sys/ddb/ddb.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/ddb.h,v 1.37 2004/11/01 22:15:14 jhb Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.38 2005/04/20 20:52:45 ps Exp $ */ /* @@ -71,7 +71,6 @@ extern int db_indent; extern int db_inst_count; extern int db_load_count; -extern int debugger_on_panic; extern int db_store_count; extern db_expr_t db_radix; extern db_expr_t db_max_width; ==== //depot/projects/davidxu_thread/src/sys/dev/acpica/Osd/OsdSchedule.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.30 2004/12/02 00:25:35 marks Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.31 2005/04/21 06:13:48 njl Exp $ */ /* @@ -50,6 +50,13 @@ ACPI_MODULE_NAME("SCHEDULE") /* + * Allow the user to tune the number of task threads we start. It seems + * some systems have problems with increased parallelism. + */ +static int acpi_max_threads = ACPI_MAX_THREADS; +TUNABLE_INT("debug.acpi.max_threads", &acpi_max_threads); + +/* * This is a little complicated due to the fact that we need to build and then * free a 'struct task' for each task we enqueue. */ @@ -130,7 +137,7 @@ err = 0; STAILQ_INIT(&acpi_task_queue); - for (i = 0; i < ACPI_MAX_THREADS; i++) { + for (i = 0; i < acpi_max_threads; i++) { err = kthread_create(acpi_task_thread, NULL, &acpi_kthread_proc, 0, 0, "acpi_task%d", i); if (err != 0) { ==== //depot/projects/davidxu_thread/src/sys/dev/acpica/acpivar.h#11 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.93 2005/04/10 19:07:08 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.94 2005/04/21 06:13:48 njl Exp $ */ #ifndef _ACPIVAR_H_ @@ -421,9 +421,8 @@ int *rid, struct resource **dst); ACPI_HANDLE acpi_GetReference(ACPI_HANDLE scope, ACPI_OBJECT *obj); -#ifndef ACPI_MAX_THREADS -#define ACPI_MAX_THREADS 1 -#endif +/* Default number of task queue threads to start. */ +#define ACPI_MAX_THREADS 3 /* ACPI task kernel thread initialization. */ int acpi_task_thread_init(void); ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.244 2005/04/20 12:51:54 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.245 2005/04/21 11:13:39 sos Exp $"); #include "opt_ata.h" #include @@ -60,7 +60,7 @@ static d_ioctl_t ata_ioctl; static struct cdevsw ata_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, /* we need this as newbus isn't safe */ + .d_flags = D_NEEDGIANT, /* we need this as newbus isn't mpsafe */ .d_ioctl = ata_ioctl, .d_name = "ata", }; @@ -68,7 +68,7 @@ /* prototypes */ static void ata_interrupt(void *); static void ata_boot_attach(void); -device_t ata_add_child(device_t parent, struct ata_device *atadev, int unit); +static device_t ata_add_child(device_t parent, struct ata_device *atadev, int unit); /* global vars */ MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); @@ -80,7 +80,6 @@ /* local vars */ static struct intr_config_hook *ata_delayed_attach = NULL; -static struct root_hold_token *ata_root_hold_token; static int ata_dma = 1; static int atapi_dma = 1; @@ -144,12 +143,9 @@ return error; } - /* do not attach devices if we are in early boot */ - if (ata_delayed_attach) - return 0; - - /* probe and attach devices on this channel */ - ata_identify(dev); + /* probe and attach devices on this channel unless we are in early boot */ + if (!ata_delayed_attach) + ata_identify(dev); return 0; } @@ -188,6 +184,7 @@ device_t *children; int nchildren, i; + /* check that we have a vaild channel to reinit */ if (!ch || !ch->r_irq) return ENXIO; @@ -198,7 +195,7 @@ while (ATA_LOCKING(dev, ATA_LF_LOCK) != ch->unit) tsleep(&dev, PRIBIO, "atarini", 1); - /* grap the channel lock */ + /* unconditionally grap the channel lock */ mtx_lock(&ch->state_mtx); ch->state = ATA_STALL_QUEUE; mtx_unlock(&ch->state_mtx); @@ -212,7 +209,12 @@ for (i = 0; i < nchildren; i++) { if (children[i] && device_is_attached(children[i])) if (ATA_REINIT(children[i])) { - if (ch->running->dev == children[i]) { + /* + * if we have a running request and its device matches + * this child we need to inform the request that the + * device is gone and remove it from ch->running + */ + if (ch->running && ch->running->dev == children[i]) { device_printf(ch->running->dev, "FAILURE - device detached\n"); ch->running->dev = NULL; @@ -225,7 +227,7 @@ mtx_unlock(&Giant); /* newbus suckage dealt with, release Giant */ } - /* catch running request if any */ + /* catch request in ch->running if we havn't already */ ata_catch_inflight(ch); /* we're done release the channel for new work */ @@ -247,10 +249,11 @@ { struct ata_channel *ch; + /* check for valid device */ if (!dev || !(ch = device_get_softc(dev))) return ENXIO; - /* wait for the channel to be IDLE before when enter suspend mode */ + /* wait for the channel to be IDLE before entering suspend mode */ while (1) { mtx_lock(&ch->state_mtx); if (ch->state == ATA_IDLE) { @@ -271,10 +274,11 @@ struct ata_channel *ch; int error; + /* check for valid device */ if (!dev || !(ch = device_get_softc(dev))) return ENXIO; - /* reinit the devices, we dont know what mode/state they have */ + /* reinit the devices, we dont know what mode/state they are in */ error = ata_reinit(dev); /* kick off requests on the queue */ @@ -304,18 +308,15 @@ } /* check for the right state */ - if (ch->state == ATA_ACTIVE || ch->state == ATA_STALL_QUEUE) { - request->flags |= ATA_R_INTR_SEEN; - } - else { + if (ch->state != ATA_ACTIVE && ch->state != ATA_STALL_QUEUE) { device_printf(request->dev, "interrupt state=%d unexpected\n", ch->state); break; } /* - * we have the HW locks, so start the tranaction for this request - * if it finishes immediately we dont need to wait for interrupt + * we have the HW locks, so end the tranaction for this request + * if it finishes immediately otherwise wait for next interrupt */ if (ch->hw.end_transaction(request) == ATA_OP_FINISHED) { ch->running = NULL; @@ -326,9 +327,6 @@ ata_finish(request); return; } - else { - request->flags &= ~ATA_R_INTR_SEEN; - } } while (0); mtx_unlock(&ch->state_mtx); } @@ -559,13 +557,13 @@ ata_identify(ch->dev); } } - root_mount_rel(ata_root_hold_token); } + /* * misc support functions */ -device_t +static device_t ata_add_child(device_t parent, struct ata_device *atadev, int unit) { struct ata_channel *ch = device_get_softc(parent); @@ -815,7 +813,6 @@ return EIO; } ata_delayed_attach->ich_func = (void*)ata_boot_attach; - ata_root_hold_token = root_mount_hold("ATA"); if (config_intrhook_establish(ata_delayed_attach) != 0) { printf("ata: config_intrhook_establish failed\n"); free(ata_delayed_attach, M_TEMP); ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-all.h#10 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.96 2005/04/20 12:51:54 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.97 2005/04/21 11:13:39 sos Exp $ */ /* ATA register defines */ @@ -277,12 +277,10 @@ #define ATA_R_CONTROL 0x00000001 #define ATA_R_READ 0x00000002 #define ATA_R_WRITE 0x00000004 -#define ATA_R_DMA 0x00000008 - -#define ATA_R_ATAPI 0x00000010 +#define ATA_R_ATAPI 0x00000008 +#define ATA_R_DMA 0x00000010 #define ATA_R_QUIET 0x00000020 -#define ATA_R_INTR_SEEN 0x00000040 -#define ATA_R_TIMEOUT 0x00000080 +#define ATA_R_TIMEOUT 0x00000040 #define ATA_R_ORDERED 0x00000100 #define ATA_R_AT_HEAD 0x00000200 @@ -468,6 +466,7 @@ void ata_queue_request(struct ata_request *request); void ata_start(device_t dev); void ata_finish(struct ata_request *request); +void ata_timeout(struct ata_request *); void ata_catch_inflight(struct ata_channel *ch); void ata_fail_requests(struct ata_channel *ch, device_t dev); char *ata_cmd2str(struct ata_request *request); ==== //depot/projects/davidxu_thread/src/sys/dev/ata/ata-lowlevel.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.60 2005/04/14 08:48:45 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.61 2005/04/21 11:13:39 sos Exp $"); #include "opt_ata.h" #include @@ -162,7 +162,7 @@ ch->hw.command = ata_generic_command; } -/* must be called with ATA channel locked */ +/* must be called with ATA channel locked and state_mtx held */ static int ata_begin_transaction(struct ata_request *request) { @@ -192,7 +192,7 @@ device_printf(request->dev, "error issueing %s command\n", ata_cmd2str(request)); request->result = EIO; - break; + goto begin_finished; } /* device reset doesn't interrupt */ @@ -204,7 +204,7 @@ } while (request->status & ATA_S_BUSY && timeout--); if (request->status & ATA_S_ERROR) request->error = ATA_IDX_INB(ch, ATA_ERROR); - break; + goto begin_finished; } /* if write command output the data */ @@ -213,12 +213,12 @@ (ATA_S_READY | ATA_S_DSC | ATA_S_DRQ)) < 0) { device_printf(request->dev,"timeout waiting for write DRQ"); request->result = EIO; - break; + goto begin_finished; } ata_pio_write(request, request->transfersize); } } - return ATA_OP_CONTINUES; + goto begin_continue; /* ATA DMA data transfer commands */ case ATA_R_DMA: @@ -227,7 +227,7 @@ request->flags & ATA_R_READ)) { device_printf(request->dev, "setting up DMA failed\n"); request->result = EIO; - break; + goto begin_finished; } /* issue command */ @@ -237,16 +237,16 @@ device_printf(request->dev, "error issueing %s command\n", ata_cmd2str(request)); request->result = EIO; - break; + goto begin_finished; } /* start DMA engine */ if (ch->dma->start(ch)) { device_printf(request->dev, "error starting DMA\n"); request->result = EIO; - break; + goto begin_finished; } - return ATA_OP_CONTINUES; + goto begin_continue; /* ATAPI PIO commands */ case ATA_R_ATAPI: @@ -256,7 +256,7 @@ DELAY(10); if (!(ATA_IDX_INB(ch, ATA_ALTSTAT) & ATA_S_DSC)) request->result = EBUSY; - break; + goto begin_finished; } /* start ATAPI operation */ @@ -264,12 +264,12 @@ request->transfersize << 8, 0, 0)) { device_printf(request->dev, "error issuing ATA PACKET command\n"); request->result = EIO; - break; + goto begin_finished; } /* command interrupt device ? just return and wait for interrupt */ if ((atadev->param.config & ATA_DRQ_MASK) == ATA_DRQ_INTR) - return ATA_OP_CONTINUES; + goto begin_continue; /* wait for ready to write ATAPI command block */ { @@ -286,7 +286,7 @@ if (timeout <= 0) { device_printf(request->dev,"timeout waiting for ATAPI ready\n"); request->result = EIO; - break; + goto begin_finished; } } @@ -298,7 +298,7 @@ (int16_t *)request->u.atapi.ccb, (atadev->param.config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_12 ? 6 : 8); - return ATA_OP_CONTINUES; + goto begin_continue; case ATA_R_ATAPI|ATA_R_DMA: /* is this just a POLL DSC command ? */ @@ -307,7 +307,7 @@ DELAY(10); if (!(ATA_IDX_INB(ch, ATA_ALTSTAT) & ATA_S_DSC)) request->result = EBUSY; - break; + goto begin_finished; } /* check sanity, setup SG list and DMA engine */ @@ -315,14 +315,14 @@ request->flags & ATA_R_READ)) { device_printf(request->dev, "setting up DMA failed\n"); request->result = EIO; - break; + goto begin_finished; } /* start ATAPI operation */ if (ch->hw.command(atadev, ATA_PACKET_CMD, 0, 0, ATA_F_DMA)) { device_printf(request->dev, "error issuing ATAPI packet command\n"); request->result = EIO; - break; + goto begin_finished; } /* wait for ready to write ATAPI command block */ @@ -340,7 +340,7 @@ if (timeout <= 0) { device_printf(request->dev,"timeout waiting for ATAPI ready\n"); request->result = EIO; - break; + goto begin_finished; } } @@ -356,17 +356,25 @@ /* start DMA engine */ if (ch->dma->start(ch)) { request->result = EIO; - break; + goto begin_finished; } - return ATA_OP_CONTINUES; + goto begin_continue; } + /* NOT REACHED */ + printf("ata_begin_transaction OOPS!!!\n"); - /* request finish here */ +begin_finished: if (ch->dma && ch->dma->flags & ATA_DMA_LOADED) ch->dma->unload(ch); return ATA_OP_FINISHED; + +begin_continue: + callout_reset(&request->callout, request->timeout * hz, + (timeout_t*)ata_timeout, request); + return ATA_OP_CONTINUES; } +/* must be called with ATA channel locked and state_mtx held */ static int ata_end_transaction(struct ata_request *request) { @@ -386,8 +394,7 @@ /* on timeouts we have no data or anything so just return */ if (request->flags & ATA_R_TIMEOUT) - //return ATA_OP_FINISHED; - break; + goto end_finished; /* on control commands read back registers to the request struct */ if (request->flags & ATA_R_CONTROL) { @@ -418,8 +425,7 @@ /* if we got an error we are done with the HW */ if (request->status & ATA_S_ERROR) { request->error = ATA_IDX_INB(ch, ATA_ERROR); - //return ATA_OP_FINISHED; - break; + goto end_finished; } /* are we moving data ? */ @@ -431,8 +437,7 @@ (ATA_S_READY | ATA_S_DSC | ATA_S_DRQ)) < 0) { device_printf(request->dev, "timeout waiting for read DRQ"); request->result = EIO; - //return ATA_OP_FINISHED; - break; + goto end_finished; } ata_pio_read(request, request->transfersize); } @@ -457,23 +462,21 @@ device_printf(request->dev, "timeout waiting for write DRQ"); request->status = ATA_IDX_INB(ch, ATA_STATUS); - //return ATA_OP_FINISHED; - break; + goto end_finished; } /* output data and return waiting for new interrupt */ ata_pio_write(request, request->transfersize); - return ATA_OP_CONTINUES; + goto end_continue; } /* if data read command, return & wait for interrupt */ if (request->flags & ATA_R_READ) - return ATA_OP_CONTINUES; + goto end_continue; } } /* done with HW */ - //return ATA_OP_FINISHED; - break; + goto end_finished; /* ATA DMA data transfer commands */ case ATA_R_DMA: @@ -494,8 +497,7 @@ ch->dma->unload(ch); /* done with HW */ - //return ATA_OP_FINISHED; - break; + goto end_finished; /* ATAPI PIO commands */ case ATA_R_ATAPI: @@ -503,8 +505,7 @@ /* on timeouts we have no data or anything so just return */ if (request->flags & ATA_R_TIMEOUT) - //return ATA_OP_FINISHED; - break; + goto end_finished; switch ((ATA_IDX_INB(ch, ATA_IREASON) & (ATA_I_CMD | ATA_I_IN)) | (request->status & ATA_S_DRQ)) { @@ -516,14 +517,13 @@ if (!(request->status & ATA_S_DRQ)) { device_printf(request->dev, "command interrupt without DRQ\n"); request->status = ATA_S_ERROR; - //return ATA_OP_FINISHED; - break; + goto end_finished; } ATA_IDX_OUTSW_STRM(ch, ATA_DATA, (int16_t *)request->u.atapi.ccb, (atadev->param.config & ATA_PROTO_MASK)== ATA_PROTO_ATAPI_12 ? 6 : 8); /* return wait for interrupt */ - return ATA_OP_CONTINUES; + goto end_continue; case ATAPI_P_WRITE: if (request->flags & ATA_R_READ) { @@ -531,7 +531,7 @@ device_printf(request->dev, "%s trying to write on read buffer\n", ata_cmd2str(request)); - //return ATA_OP_FINISHED; + goto end_finished; break; } ata_pio_write(request, length); @@ -541,7 +541,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 21 14:13:09 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F347416A4D0; Thu, 21 Apr 2005 14:13:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6881616A4CE for ; Thu, 21 Apr 2005 14:13:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BDB843D45 for ; Thu, 21 Apr 2005 14:13:08 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3LED83A017658 for ; Thu, 21 Apr 2005 14:13:08 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3LED7VC017655 for perforce@freebsd.org; Thu, 21 Apr 2005 14:13:07 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 21 Apr 2005 14:13:07 GMT Message-Id: <200504211413.j3LED7VC017655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 14:13:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=75667 Change 75667 by davidxu@davidxu_alona on 2005/04/21 14:12:28 fix compile. Affected files ... .. //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#9 (text+ko) ==== @@ -202,7 +202,7 @@ if (td == curthread) flushw(); - td->td_frame->tf_global[7] = tls_base; + td->td_frame->tf_global[7] = (uint64_t) tls_base; } /* From owner-p4-projects@FreeBSD.ORG Thu Apr 21 14:17:14 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56DCC16A4D0; Thu, 21 Apr 2005 14:17:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1045A16A4CE for ; Thu, 21 Apr 2005 14:17:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4CFE43D41 for ; Thu, 21 Apr 2005 14:17:13 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3LEHD45017873 for ; Thu, 21 Apr 2005 14:17:13 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3LEHDOC017870 for perforce@freebsd.org; Thu, 21 Apr 2005 14:17:13 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 21 Apr 2005 14:17:13 GMT Message-Id: <200504211417.j3LEHDOC017870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 14:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=75668 Change 75668 by davidxu@davidxu_alona on 2005/04/21 14:16:33 IFC. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/davidxu_thread/src/share/man/man4/faith.4#3 integrate .. //depot/projects/davidxu_thread/src/usr.sbin/faithd/ftp.c#2 integrate Differences ... ==== //depot/projects/davidxu_thread/src/lib/libc/amd64/sys/cerror.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.13 2003/04/30 18:16:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.14 2005/04/21 12:47:08 kan Exp $"); #include "SYS.h" @@ -55,7 +55,7 @@ pushq %rax call PIC_PLT(CNAME(__error)) popq %rcx - movq %rcx,(%rax) + movl %ecx,(%rax) movq $-1,%rax movq $-1,%rdx ret ==== //depot/projects/davidxu_thread/src/share/man/man4/faith.4#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/share/man/man4/faith.4,v 1.13 2005/02/09 18:07:16 ru Exp $ +.\" $FreeBSD: src/share/man/man4/faith.4,v 1.14 2005/04/21 13:27:13 suz Exp $ .\" .Dd April 10, 1999 .Dt FAITH 4 @@ -127,9 +127,7 @@ .%A Jun-ichiro itojun Hagino .%A Kazu Yamamoto .%T "An IPv6-to-IPv4 transport relay translator" -.%R internet draft -.%N draft-ietf-ngtrans-tcpudp-relay-04.txt -.%O work in progress material +.%O RFC3142 .Re .Sh HISTORY The FAITH IPv6-to-IPv4 TCP relay translator was first appeared in ==== //depot/projects/davidxu_thread/src/usr.sbin/faithd/ftp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $KAME: ftp.c,v 1.23 2003/08/19 21:20:33 itojun Exp $ */ +/* $KAME: ftp.c,v 1.24 2005/03/16 05:05:48 itojun Exp $ */ /* * Copyright (C) 1997 and 1998 WIDE Project. @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/faithd/ftp.c,v 1.10 2003/11/14 17:34:08 ume Exp $ + * $FreeBSD: src/usr.sbin/faithd/ftp.c,v 1.11 2005/04/21 13:21:48 suz Exp $ */ #include @@ -967,9 +967,11 @@ n = 0; if (n) write(src, sbuf, n); + freeaddrinfo(res); return n; } + freeaddrinfo(res); memcpy(&data6, res->ai_addr, res->ai_addrlen); goto sendport; From owner-p4-projects@FreeBSD.ORG Thu Apr 21 23:19:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD8D116A4D0; Thu, 21 Apr 2005 23:19:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3C2016A4CE for ; Thu, 21 Apr 2005 23:19:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF3A043D54 for ; Thu, 21 Apr 2005 23:19:03 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3LNJ3dI062636 for ; Thu, 21 Apr 2005 23:19:03 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3LNJ2M0062633 for perforce@freebsd.org; Thu, 21 Apr 2005 23:19:02 GMT (envelope-from marcel@freebsd.org) Date: Thu, 21 Apr 2005 23:19:02 GMT Message-Id: <200504212319.j3LNJ2M0062633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 75687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2005 23:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=75687 Change 75687 by marcel@marcel_nfs on 2005/04/21 23:18:39 IFC @75684 Affected files ... .. //depot/projects/ia64/UPDATING#77 integrate .. //depot/projects/ia64/bin/hostname/hostname.1#6 integrate .. //depot/projects/ia64/etc/Makefile#48 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#62 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#33 integrate .. //depot/projects/ia64/etc/rc.d/bsnmpd#1 branch .. //depot/projects/ia64/etc/snmpd.config#1 branch .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#26 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#16 integrate .. //depot/projects/ia64/lib/Makefile#53 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#10 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/ia64/lib/libc/gen/sysctl.3#14 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.c#7 integrate .. //depot/projects/ia64/lib/libc/net/getproto.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getprotoent.c#4 integrate .. //depot/projects/ia64/lib/libc/net/getprotoname.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getservbyname.c#4 integrate .. //depot/projects/ia64/lib/libc/net/getservbyport.c#4 integrate .. //depot/projects/ia64/lib/libc/net/getservent.c#8 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#16 integrate .. //depot/projects/ia64/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#24 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#15 integrate .. //depot/projects/ia64/lib/libpmc/Makefile#1 branch .. //depot/projects/ia64/lib/libpmc/libpmc.c#1 branch .. //depot/projects/ia64/lib/libpmc/pmc.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc.h#1 branch .. //depot/projects/ia64/lib/msun/Makefile#17 integrate .. //depot/projects/ia64/libexec/rexecd/rexecd.c#9 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#38 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#18 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#150 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#10 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 integrate .. //depot/projects/ia64/release/scripts/package-split.py#2 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#14 integrate .. //depot/projects/ia64/sbin/devfs/devfs.8#11 integrate .. //depot/projects/ia64/sbin/dump/main.c#24 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#43 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#44 integrate .. //depot/projects/ia64/share/doc/papers/Makefile#5 integrate .. //depot/projects/ia64/share/doc/papers/hwpmc/Makefile#1 branch .. //depot/projects/ia64/share/doc/papers/hwpmc/hwpmc.ms#1 branch .. //depot/projects/ia64/share/examples/hwpmc/README#1 branch .. //depot/projects/ia64/share/examples/ppi/ppilcd.c#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#85 integrate .. //depot/projects/ia64/share/man/man4/ataraid.4#2 integrate .. //depot/projects/ia64/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/ia64/share/man/man4/faith.4#4 integrate .. //depot/projects/ia64/share/man/man4/hwpmc.4#1 branch .. //depot/projects/ia64/share/man/man4/ipw.4#1 branch .. //depot/projects/ia64/share/man/man4/iwi.4#1 branch .. //depot/projects/ia64/share/man/man4/ohci.4#5 integrate .. //depot/projects/ia64/share/man/man4/ral.4#1 branch .. //depot/projects/ia64/share/man/man4/twe.4#6 integrate .. //depot/projects/ia64/share/man/man4/ucom.4#6 integrate .. //depot/projects/ia64/share/man/man4/uhci.4#5 integrate .. //depot/projects/ia64/share/man/man4/ural.4#1 branch .. //depot/projects/ia64/share/man/man4/usb.4#13 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#63 integrate .. //depot/projects/ia64/share/man/man9/Makefile#54 integrate .. //depot/projects/ia64/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/ia64/share/man/man9/sleepqueue.9#6 integrate .. //depot/projects/ia64/share/man/man9/taskqueue.9#10 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#30 integrate .. //depot/projects/ia64/share/mklocale/be_BY.CP1131.src#2 integrate .. //depot/projects/ia64/sys/alpha/include/_bus.h#1 branch .. //depot/projects/ia64/sys/alpha/include/bus.h#19 integrate .. //depot/projects/ia64/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/amd64/amd64/trap.c#19 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/ia64/sys/amd64/include/_bus.h#1 branch .. //depot/projects/ia64/sys/amd64/include/bus.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/arm/include/_bus.h#1 branch .. //depot/projects/ia64/sys/arm/include/bus.h#7 integrate .. //depot/projects/ia64/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/boot/i386/libi386/pxe.c#5 integrate .. //depot/projects/ia64/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#91 integrate .. //depot/projects/ia64/sys/conf/files#130 integrate .. //depot/projects/ia64/sys/conf/files.amd64#27 integrate .. //depot/projects/ia64/sys/conf/files.i386#65 integrate .. //depot/projects/ia64/sys/conf/files.pc98#54 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#45 integrate .. //depot/projects/ia64/sys/conf/options#85 integrate .. //depot/projects/ia64/sys/ddb/ddb.h#12 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#16 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#35 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#61 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#29 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#43 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#41 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#30 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#28 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.h#17 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#38 integrate .. //depot/projects/ia64/sys/dev/ciss/cissreg.h#8 integrate .. //depot/projects/ia64/sys/dev/ciss/cissvar.h#8 integrate .. //depot/projects/ia64/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/ia64/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/ia64/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/ia64/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#58 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#9 integrate .. //depot/projects/ia64/sys/dev/fxp/rcvbundl.h#3 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#15 integrate .. //depot/projects/ia64/sys/dev/ipw/if_ipw.c#1 branch .. //depot/projects/ia64/sys/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/ia64/sys/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#1 branch .. //depot/projects/ia64/sys/dev/iwi/if_iwireg.h#1 branch .. //depot/projects/ia64/sys/dev/iwi/if_iwivar.h#1 branch .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#47 integrate .. //depot/projects/ia64/sys/dev/ral/if_ral.c#1 branch .. //depot/projects/ia64/sys/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/ia64/sys/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/ia64/sys/dev/ral/if_ralrate.c#1 branch .. //depot/projects/ia64/sys/dev/ral/if_ralrate.h#1 branch .. //depot/projects/ia64/sys/dev/ral/if_ralreg.h#1 branch .. //depot/projects/ia64/sys/dev/ral/if_ralvar.h#1 branch .. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/if_ural.c#1 branch .. //depot/projects/ia64/sys/dev/usb/if_uralreg.h#1 branch .. //depot/projects/ia64/sys/dev/usb/if_uralvar.h#1 branch .. //depot/projects/ia64/sys/dev/usb/usbdevs#68 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_lookup.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#26 integrate .. //depot/projects/ia64/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/ia64/sys/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/ia64/sys/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/ia64/sys/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/ia64/sys/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/ia64/sys/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/ia64/sys/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/ia64/sys/i386/conf/NOTES#65 integrate .. //depot/projects/ia64/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/ia64/sys/i386/i386/local_apic.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#30 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#46 integrate .. //depot/projects/ia64/sys/i386/include/_bus.h#1 branch .. //depot/projects/ia64/sys/i386/include/bus.h#4 integrate .. //depot/projects/ia64/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#89 integrate .. //depot/projects/ia64/sys/ia64/include/_bus.h#1 branch .. //depot/projects/ia64/sys/ia64/include/bus.h#20 integrate .. //depot/projects/ia64/sys/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/kern/kern_exec.c#74 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#63 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#60 integrate .. //depot/projects/ia64/sys/kern/kern_pmc.c#1 branch .. //depot/projects/ia64/sys/kern/kern_proc.c#62 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#83 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#30 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#43 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#24 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#40 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#42 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#79 integrate .. //depot/projects/ia64/sys/modules/Makefile#85 integrate .. //depot/projects/ia64/sys/modules/apm/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/hwpmc/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ipw/Makefile#1 branch .. //depot/projects/ia64/sys/modules/iwi/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ral/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ural/Makefile#1 branch .. //depot/projects/ia64/sys/net/if.c#44 integrate .. //depot/projects/ia64/sys/net/if_var.h#30 integrate .. //depot/projects/ia64/sys/net/if_vlan.c#24 integrate .. //depot/projects/ia64/sys/netgraph/ng_eiface.c#15 integrate .. //depot/projects/ia64/sys/netgraph/ng_ksocket.c#18 integrate .. //depot/projects/ia64/sys/netgraph/ng_message.h#10 integrate .. //depot/projects/ia64/sys/netgraph/ng_vlan.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#36 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.h#15 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#24 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#46 integrate .. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#10 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#25 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.h#8 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#31 integrate .. //depot/projects/ia64/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#51 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#35 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#27 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#28 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#27 integrate .. //depot/projects/ia64/sys/nfsserver/nfs.h#12 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#34 integrate .. //depot/projects/ia64/sys/pc98/apm/apm_bioscall.S#1 branch .. //depot/projects/ia64/sys/pc98/apm/apm_bioscall.s#3 delete .. //depot/projects/ia64/sys/pc98/conf/NOTES#27 integrate .. //depot/projects/ia64/sys/pc98/include/_bus.h#1 branch .. //depot/projects/ia64/sys/pc98/include/bus.h#2 integrate .. //depot/projects/ia64/sys/pc98/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/pci/if_dc.c#63 integrate .. //depot/projects/ia64/sys/powerpc/include/_bus.h#1 branch .. //depot/projects/ia64/sys/powerpc/include/bus.h#16 integrate .. //depot/projects/ia64/sys/powerpc/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/powerpc/powermac/ata_kauai.c#8 integrate .. //depot/projects/ia64/sys/powerpc/powermac/ata_macio.c#14 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#33 integrate .. //depot/projects/ia64/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#10 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#26 integrate .. //depot/projects/ia64/sys/sparc64/include/_bus.h#1 branch .. //depot/projects/ia64/sys/sparc64/include/bus.h#25 integrate .. //depot/projects/ia64/sys/sparc64/include/pmc_mdep.h#1 branch .. //depot/projects/ia64/sys/sparc64/sbus/lsi64854.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sbus/lsi64854reg.h#2 integrate .. //depot/projects/ia64/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#25 integrate .. //depot/projects/ia64/sys/sys/kdb.h#3 integrate .. //depot/projects/ia64/sys/sys/kernel.h#25 integrate .. //depot/projects/ia64/sys/sys/mac.h#30 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#27 integrate .. //depot/projects/ia64/sys/sys/param.h#66 integrate .. //depot/projects/ia64/sys/sys/pmc.h#1 branch .. //depot/projects/ia64/sys/sys/pmckern.h#1 branch .. //depot/projects/ia64/sys/sys/proc.h#94 integrate .. //depot/projects/ia64/sys/sys/sched.h#11 integrate .. //depot/projects/ia64/sys/sys/sysctl.h#29 integrate .. //depot/projects/ia64/sys/sys/systm.h#44 integrate .. //depot/projects/ia64/tools/regression/msdosfs/msdosfstest-2.sh#1 branch .. //depot/projects/ia64/tools/regression/msdosfs/msdosfstest-3.sh#1 branch .. //depot/projects/ia64/tools/regression/msdosfs/msdosfstest.sh#2 integrate .. //depot/projects/ia64/tools/tools/nanobsd/make.conf#9 integrate .. //depot/projects/ia64/tools/tools/netrate/netsend/netsend.c#7 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#53 integrate .. //depot/projects/ia64/usr.bin/tar/Makefile#7 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar.1#8 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar.c#8 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar.h#5 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar_platform.h#7 integrate .. //depot/projects/ia64/usr.bin/tar/configure.ac.in#4 integrate .. //depot/projects/ia64/usr.bin/tar/fts.c#4 integrate .. //depot/projects/ia64/usr.bin/tar/read.c#7 integrate .. //depot/projects/ia64/usr.bin/tar/util.c#4 integrate .. //depot/projects/ia64/usr.bin/tar/write.c#7 integrate .. //depot/projects/ia64/usr.sbin/Makefile#71 integrate .. //depot/projects/ia64/usr.sbin/faithd/ftp.c#4 integrate .. //depot/projects/ia64/usr.sbin/pmccontrol/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/pmccontrol/pmccontrol.8#1 branch .. //depot/projects/ia64/usr.sbin/pmccontrol/pmccontrol.c#1 branch .. //depot/projects/ia64/usr.sbin/pmcstat/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.8#1 branch .. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.c#1 branch Differences ... ==== //depot/projects/ia64/UPDATING#77 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20050415: + The NO_MIXED_MODE kernel option has been removed from the i386 + amd64 platforms as its use has been superceded by the new local + APIC timer code. Any kernel config files containing this option + should be updated. + 20050227: The on-disk format of LC_CTYPE files was changed to be machine independent. Please make sure NOT to use NO_CLEAN buildworld @@ -325,4 +331,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $ +$FreeBSD: src/UPDATING,v 1.401 2005/04/18 14:33:18 scottl Exp $ ==== //depot/projects/ia64/bin/hostname/hostname.1#6 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.17 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $ .\" -.Dd April 28, 1995 +.Dd April 18, 2005 .Dt HOSTNAME 1 .Os .Sh NAME @@ -46,7 +46,7 @@ The super-user can set the hostname by supplying an argument; this is usually done in the network initialization script -.Pa /etc/rc.network , +.Pa /etc/rc.d/hostname , normally run at boot time. This script uses the ==== //depot/projects/ia64/etc/Makefile#48 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.341 2005/03/02 00:44:39 brooks Exp $ +# $FreeBSD: src/etc/Makefile,v 1.342 2005/04/17 10:47:57 glebius Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -13,8 +13,8 @@ mac.conf motd netconfig network.subr networks newsyslog.conf \ pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ - rc.subr remote rpc services \ - shells sysctl.conf syslog.conf usbd.conf \ + rc.subr remote rpc services shells \ + snmpd.config sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ==== //depot/projects/ia64/etc/defaults/rc.conf#62 (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.247 2005/04/12 15:21:51 thomas Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.248 2005/04/17 10:47:58 glebius Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -247,6 +247,12 @@ nis_yppasswdd_enable="NO" # Run rpc.yppasswdd at boot time (or NO). nis_yppasswdd_flags="" # Flags to rpc.yppasswdd (if enabled). +### SNMP daemon ### +# Be sure to understand the security implications of running SNMP v1/v2 +# in your network. +bsnmpd_enable="NO" # Run the SNMP daemon (or NO). +bsnmpd_flags="" # Flags for bsnmpd. + ### Network routing options: ### defaultrouter="NO" # Set to default gateway (or NO). static_routes="" # Set to static route list (or leave empty). ==== //depot/projects/ia64/etc/rc.d/Makefile#33 (text+ko) ==== @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.51 2005/04/17 10:47:58 glebius Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 \ - bgfsck bootparams \ + bgfsck bootparams bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#26 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.45 2005/01/25 09:37:37 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.47 2005/04/19 13:26:58 jkoshy Exp $ .\" .\" %beginstrip% . @@ -48,6 +48,7 @@ .ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) +.ds doc-str-Lb-libpmc Performance Monitoring Counters API (libpmc, \-lpmc) .ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) .ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) .ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) ==== //depot/projects/ia64/kerberos5/Makefile.inc#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.25 2005/04/18 22:03:21 imp Exp $ NO_LINT= @@ -48,4 +48,4 @@ .endfor .endfor -.endif defined(SRCS) +.endif # defined(SRCS) ==== //depot/projects/ia64/lib/Makefile#53 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.203 2005/04/02 01:40:12 davidxu Exp $ +# $FreeBSD: src/lib/Makefile,v 1.205 2005/04/20 20:50:32 marcel Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -31,7 +31,7 @@ ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ - ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ + libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} ==== //depot/projects/ia64/lib/libarchive/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.33 2005/04/17 17:48:50 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.02.016 +VERSION= 1.02.017 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} @@ -204,7 +204,7 @@ cat ${.CURDIR}/configure.ac.in | \ sed 's/@VERSION@/${VERSION}/' | \ cat > ${DIST_WORK_DIR}/configure.ac - (cd ${DIST_WORK_DIR} && aclocal && autoheader && autoconf && automake -a --foreign) + (cd ${DIST_WORK_DIR} && aclocal19 && autoheader259 && autoconf259 && automake19 -a --foreign) (cd ${DIST_WORK_DIR} && ./configure && make distcheck && make dist) mv ${DIST_WORK_DIR}/${DISTFILE} ${.OBJDIR} @echo ================================================== ==== //depot/projects/ia64/lib/libarchive/archive_read_extract.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.39 2005/04/17 22:49:00 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -482,9 +482,9 @@ return (ARCHIVE_WARN); } r = archive_read_data_into_fd(a, fd); + close(fd); extract->pst = NULL; /* Cached stat data no longer valid. */ r2 = restore_metadata(a, entry, flags); - close(fd); return (err_combine(r, r2)); } ==== //depot/projects/ia64/lib/libc/amd64/sys/cerror.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.13 2003/04/30 18:16:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.14 2005/04/21 12:47:08 kan Exp $"); #include "SYS.h" @@ -55,7 +55,7 @@ pushq %rax call PIC_PLT(CNAME(__error)) popq %rcx - movq %rcx,(%rax) + movl %ecx,(%rax) movq $-1,%rax movq $-1,%rdx ret ==== //depot/projects/ia64/lib/libc/gen/sysctl.3#14 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.64 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.65 2005/04/18 02:10:37 das Exp $ .\" .Dd January 23, 2001 .Dt SYSCTL 3 @@ -436,14 +436,14 @@ with which the system attempts to comply. .It Li KERN_PROC -Return the entire process table, or a subset of it. -An array of pairs of +Return selected information about specific running processes. +.Pp +For the following names, an array of pairs of .Va struct proc followed by corresponding .Va struct eproc structures is returned, whose size depends on the current number of such objects in the system. -The third and fourth level names are as follows: .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It "Third level name Fourth level is:" .It "KERN_PROC_ALL None" @@ -459,9 +459,15 @@ follow each other. The total size of array is returned. It is also possible for a process to set its own process title this way. +If the third level name is KERN_PROC_PATHNAME, the path of the +process' text file is stored. +For KERN_PROC_PATHNAME, a process ID of +.Li -1 +implies the current process. .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent .It Sy "Third level name Fourth level is:" .It "KERN_PROC_ARGS A process ID" +.It "KERN_PROC_PATHNAME A process ID" .El .It Li KERN_PROF Return profiling information about the kernel. ==== //depot/projects/ia64/lib/libc/net/getnameinfo.c#7 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.14 2003/05/01 19:03:14 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.16 2005/04/17 04:00:55 delphij Exp $"); #include #include @@ -109,9 +109,6 @@ if (sa == NULL) return EAI_FAIL; - if (sa->sa_len != salen) - return EAI_FAIL; - family = sa->sa_family; for (i = 0; afdl[i].a_af; i++) if (afdl[i].a_af == family) { ==== //depot/projects/ia64/lib/libc/net/getproto.c#3 (text+ko) ==== @@ -35,23 +35,33 @@ static char sccsid[] = "@(#)getproto.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.3 2002/03/21 18:49:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); #include +#include "netdb_private.h" -extern int _proto_stayopen; +int +getprotobynumber_r(int proto, struct protoent *pe, struct protoent_data *ped) +{ + int error; + + setprotoent_r(ped->stayopen, ped); + while ((error = getprotoent_r(pe, ped)) == 0) + if (pe->p_proto == proto) + break; + if (!ped->stayopen) + endprotoent_r(ped); + return (error); +} struct protoent * -getprotobynumber(proto) - int proto; +getprotobynumber(int proto) { - struct protoent *p; + struct protodata *pd; - setprotoent(_proto_stayopen); - while ( (p = getprotoent()) ) - if (p->p_proto == proto) - break; - if (!_proto_stayopen) - endprotoent(); - return (p); + if ((pd = __protodata_init()) == NULL) + return (NULL); + if (getprotobynumber_r(proto, &pd->proto, &pd->data) != 0) + return (NULL); + return (&pd->proto); } ==== //depot/projects/ia64/lib/libc/net/getprotoent.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getprotoent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.3 2005/01/03 11:07:45 sobomax Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); #include #include @@ -43,53 +43,101 @@ #include #include #include +#include "namespace.h" +#include "reentrant.h" +#include "un-namespace.h" +#include "netdb_private.h" + +static struct protodata protodata; +static thread_key_t protodata_key; +static once_t protodata_init_once = ONCE_INITIALIZER; +static int protodata_thr_keycreated = 0; + +static void +protoent_data_clear(struct protoent_data *ped) +{ + if (ped->fp) { + fclose(ped->fp); + ped->fp = NULL; + } +} + +static void +protodata_free(void *ptr) +{ + struct protodata *pd = ptr; + + if (pd == NULL) + return; + protoent_data_clear(&pd->data); + free(pd); +} + +static void +protodata_keycreate(void) +{ + protodata_thr_keycreated = + (thr_keycreate(&protodata_key, protodata_free) == 0); +} -#define MAXALIASES 35 +struct protodata * +__protodata_init(void) +{ + struct protodata *pd; -static FILE *protof = NULL; -static char line[BUFSIZ+1]; -static struct protoent proto; -static char *proto_aliases[MAXALIASES]; -int _proto_stayopen; + if (thr_main() != 0) + return (&protodata); + if (thr_once(&protodata_init_once, protodata_keycreate) != 0 || + !protodata_thr_keycreated) + return (NULL); + if ((pd = thr_getspecific(protodata_key)) != NULL) + return (pd); + if ((pd = calloc(1, sizeof(*pd))) == NULL) + return (NULL); + if (thr_setspecific(protodata_key, pd) == 0) + return (pd); + free(pd); + return (NULL); +} void -setprotoent(f) - int f; +setprotoent_r(int f, struct protoent_data *ped) { - if (protof == NULL) - protof = fopen(_PATH_PROTOCOLS, "r" ); + if (ped->fp == NULL) + ped->fp = fopen(_PATH_PROTOCOLS, "r"); else - rewind(protof); - _proto_stayopen |= f; + rewind(ped->fp); + ped->stayopen |= f; } void -endprotoent() +endprotoent_r(struct protoent_data *ped) { - if (protof) { - fclose(protof); - protof = NULL; + if (ped->fp) { + fclose(ped->fp); + ped->fp = NULL; } - _proto_stayopen = 0; + ped->stayopen = 0; } -struct protoent * -getprotoent() +int +getprotoent_r(struct protoent *pe, struct protoent_data *ped) { char *p; - char *cp, **q; + char *cp, **q, *endp; + long l; - if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL) - return (NULL); + if (ped->fp == NULL && (ped->fp = fopen(_PATH_PROTOCOLS, "r")) == NULL) + return (-1); again: - if ((p = fgets(line, BUFSIZ, protof)) == NULL) - return (NULL); + if ((p = fgets(ped->line, BUFSIZ, ped->fp)) == NULL) + return (-1); if (*p == '#') goto again; cp = strpbrk(p, "#\n"); if (cp != NULL) *cp = '\0'; - proto.p_name = p; + pe->p_name = p; cp = strpbrk(p, " \t"); if (cp == NULL) goto again; @@ -99,8 +147,11 @@ p = strpbrk(cp, " \t"); if (p != NULL) *p++ = '\0'; - proto.p_proto = atoi(cp); - q = proto.p_aliases = proto_aliases; + l = strtol(cp, &endp, 10); + if (endp == cp || *endp != '\0' || l < 0 || l > USHRT_MAX) + goto again; + pe->p_proto = l; + q = pe->p_aliases = ped->aliases; if (p != NULL) { cp = p; while (cp && *cp) { @@ -108,7 +159,7 @@ cp++; continue; } - if (q < &proto_aliases[MAXALIASES - 1]) + if (q < &ped->aliases[PROTOENT_MAXALIASES - 1]) *q++ = cp; cp = strpbrk(cp, " \t"); if (cp != NULL) @@ -116,5 +167,37 @@ } } *q = NULL; - return (&proto); + return (0); +} + +void +setprotoent(int f) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return; + setprotoent_r(f, &pd->data); +} + +void +endprotoent(void) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return; + endprotoent_r(&pd->data); +} + +struct protoent * +getprotoent(void) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return (NULL); + if (getprotoent_r(&pd->proto, &pd->data) != 0) + return (NULL); + return (&pd->proto); } ==== //depot/projects/ia64/lib/libc/net/getprotoname.c#3 (text+ko) ==== @@ -35,30 +35,41 @@ static char sccsid[] = "@(#)getprotoname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.3 2002/03/21 18:49:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getprotoname.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); #include #include +#include "netdb_private.h" -extern int _proto_stayopen; - -struct protoent * -getprotobyname(name) - const char *name; +int +getprotobyname_r(const char *name, struct protoent *pe, + struct protoent_data *ped) { - struct protoent *p; char **cp; + int error; - setprotoent(_proto_stayopen); - while ( (p = getprotoent()) ) { - if (strcmp(p->p_name, name) == 0) + setprotoent_r(ped->stayopen, ped); + while ((error = getprotoent_r(pe, ped)) == 0) { + if (strcmp(pe->p_name, name) == 0) break; - for (cp = p->p_aliases; *cp != 0; cp++) + for (cp = pe->p_aliases; *cp != 0; cp++) if (strcmp(*cp, name) == 0) goto found; } found: - if (!_proto_stayopen) - endprotoent(); - return (p); + if (!ped->stayopen) + endprotoent_r(ped); + return (error); +} + +struct protoent * +getprotobyname(const char *name) +{ + struct protodata *pd; + + if ((pd = __protodata_init()) == NULL) + return (NULL); + if (getprotobyname_r(name, &pd->proto, &pd->data) != 0) + return (NULL); + return (&pd->proto); } ==== //depot/projects/ia64/lib/libc/net/getservbyname.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.5 2005/04/15 18:09:39 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -49,8 +49,8 @@ int error; #ifdef YP - sed->getservbyname_yp = (char *)name; - sed->getservbyproto_yp = (char *)proto; + sed->yp_name = (char *)name; + sed->yp_proto = (char *)proto; #endif setservent_r(sed->stayopen, sed); @@ -69,8 +69,8 @@ endservent_r(sed); #ifdef YP - sed->getservbyname_yp = NULL; - sed->getservbyproto_yp = NULL; + sed->yp_name = NULL; + sed->yp_proto = NULL; #endif return (error); @@ -81,7 +81,7 @@ { struct servdata *sd; - if ((sd = _servdata_init()) == NULL) + if ((sd = __servdata_init()) == NULL) return (NULL); if (getservbyname_r(name, proto, &sd->serv, &sd->data) != 0) return (NULL); ==== //depot/projects/ia64/lib/libc/net/getservbyport.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.5 2005/04/15 18:09:39 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -48,8 +48,8 @@ int error; #ifdef YP - sed->getservbyport_yp = port; - sed->getservbyproto_yp = (char *)proto; + sed->yp_port = port; + sed->yp_proto = (char *)proto; #endif setservent_r(sed->stayopen, sed); @@ -63,8 +63,8 @@ endservent_r(sed); #ifdef YP - sed->getservbyport_yp = 0; - sed->getservbyproto_yp = NULL; + sed->yp_port = 0; + sed->yp_proto = NULL; #endif return (error); @@ -75,7 +75,7 @@ { struct servdata *sd; - if ((sd = _servdata_init()) == NULL) + if ((sd = __servdata_init()) == NULL) return (NULL); if (getservbyport_r(port, proto, &sd->serv, &sd->data) != 0) return (NULL); ==== //depot/projects/ia64/lib/libc/net/getservent.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.14 2005/04/15 18:09:39 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.18 2005/04/18 18:34:58 ume Exp $"); #include #include @@ -66,10 +66,10 @@ fclose(sed->fp); sed->fp = NULL; } - if (sed->key) { - free(sed->key); - sed->key = NULL; - } +#ifdef YP + free(sed->yp_key); + sed->yp_key = NULL; +#endif } static void @@ -91,7 +91,7 @@ } struct servdata * -_servdata_init(void) +__servdata_init(void) { struct servdata *sd; @@ -119,11 +119,11 @@ char buf[YPMAXRECORD + 2]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 22 06:05:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DCE816A4D2; Fri, 22 Apr 2005 06:05:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F9CC16A4CE for ; Fri, 22 Apr 2005 06:05:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2B7843D46 for ; Fri, 22 Apr 2005 06:05:17 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3M65H9d004370 for ; Fri, 22 Apr 2005 06:05:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3M65HFY004367 for perforce@freebsd.org; Fri, 22 Apr 2005 06:05:17 GMT (envelope-from marcel@freebsd.org) Date: Fri, 22 Apr 2005 06:05:17 GMT Message-Id: <200504220605.j3M65HFY004367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 75699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 06:05:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=75699 Change 75699 by marcel@marcel_nfs on 2005/04/22 06:04:59 IFC @75698 Affected files ... .. //depot/projects/ia64/lib/libc/i386/string/bcmp.S#3 integrate .. //depot/projects/ia64/sys/conf/files.ia64#59 integrate .. //depot/projects/ia64/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/support.s#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#20 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock_if.m#3 delete .. //depot/projects/ia64/sys/ia64/ia64/eficlock.c#5 delete .. //depot/projects/ia64/sys/ia64/include/clockvar.h#3 delete .. //depot/projects/ia64/sys/kern/vfs_bio.c#78 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#80 integrate Differences ... ==== //depot/projects/ia64/lib/libc/i386/string/bcmp.S#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.9 2005/04/21 23:07:20 alc Exp $"); /* * bcmp (void *b1, void *b2, size_t len) @@ -43,7 +43,6 @@ pushl %esi movl 12(%esp),%edi movl 16(%esp),%esi - xorl %eax,%eax /* clear return value */ cld /* set compare direction forward */ movl 20(%esp),%ecx /* compare by words */ @@ -56,9 +55,9 @@ andl $3,%ecx repe cmpsb - je L2 - -L1: incl %eax -L2: popl %esi +L1: + setne %al + movsbl %al,%eax + popl %esi popl %edi ret ==== //depot/projects/ia64/sys/conf/files.ia64#59 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.75 2005/04/04 21:53:53 jhb Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.76 2005/04/22 05:04:57 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -88,13 +88,11 @@ ia64/ia64/autoconf.c standard ia64/ia64/busdma_machdep.c standard ia64/ia64/clock.c standard -ia64/ia64/clock_if.m standard ia64/ia64/context.S standard ia64/ia64/db_interface.c optional ddb ia64/ia64/db_trace.c optional ddb ia64/ia64/dump_machdep.c standard ia64/ia64/efi.c standard -ia64/ia64/eficlock.c standard ia64/ia64/elf_machdep.c standard ia64/ia64/exception.S standard ia64/ia64/gdb_machdep.c optional gdb ==== //depot/projects/ia64/sys/dev/esp/ncr53c9x.c#5 (text+ko) ==== @@ -104,7 +104,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/esp/ncr53c9x.c,v 1.9 2005/04/17 17:44:01 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/esp/ncr53c9x.c,v 1.10 2005/04/22 03:37:10 scottl Exp $"); #include #include @@ -2228,6 +2228,11 @@ * a DATA transfer. Print a diagnostic * if the DMA counter and TC bit * appear to be out of sync. + * + * XXX This is fatal and usually means that + * the DMA engine is hopelessly out of + * sync with reality. A disk is likely + * getting spammed at this point. */ device_printf(sc->sc_dev, "!TC on DATA XFER" " [intr %x, stat %x, step %d]" @@ -2237,6 +2242,7 @@ sc->sc_espstep, sc->sc_prevphase, ecb ? ecb->dleft : -1); + panic("esp: unrecoverable DMA error"); } } } ==== //depot/projects/ia64/sys/i386/i386/support.s#16 (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/i386/i386/support.s,v 1.106 2004/11/16 20:42:31 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.107 2005/04/21 23:07:20 alc Exp $ */ #include "opt_npx.h" @@ -1401,7 +1401,6 @@ movl 12(%esp),%edi movl 16(%esp),%esi movl 20(%esp),%edx - xorl %eax,%eax movl %edx,%ecx shrl $2,%ecx @@ -1414,10 +1413,9 @@ andl $3,%ecx repe cmpsb - je 2f 1: - incl %eax -2: + setne %al + movsbl %al,%eax popl %esi popl %edi ret ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#20 (text+ko) ==== @@ -1,44 +1,31 @@ /*- - * Copyright (c) 1988 University of Utah. - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2005 Marcel Moolenaar + * All rights reserved. * - * This code is derived from software contributed to Berkeley by - * the Systems Programming Group of the University of Utah Computer - * Science Department and Ralph Campbell. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: Utah Hdr: clock.c 1.18 91/01/21 - * - * @(#)clock.c 8.1 (Berkeley) 6/10/93 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.24 2005/01/06 22:18:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.25 2005/04/22 05:04:58 marcel Exp $"); #include #include @@ -50,40 +37,72 @@ #include #include -#include #include - -#define SECMIN ((unsigned)60) /* seconds per minute */ -#define SECHOUR ((unsigned)(60*SECMIN)) /* seconds per hour */ -#define SECDAY ((unsigned)(24*SECHOUR)) /* seconds per day */ -#define SECYR ((unsigned)(365*SECDAY)) /* seconds per common year */ +#include -/* - * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we - * can use a simple formula for leap years. - * XXX time_t is 64-bits on ia64. - */ -#define LEAPYEAR(y) (((y) % 4) == 0) - static int sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS); -int disable_rtc_set; /* disable resettodr() if != 0 */ +int disable_rtc_set; /* disable resettodr() if != 0 */ SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set, CTLFLAG_RW, &disable_rtc_set, 0, ""); -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ +int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, CTLFLAG_RW, &wall_cmos_clock, 0, ""); -int adjkerntz; /* local offset from GMT in seconds */ +int adjkerntz; /* local offset from GMT in seconds */ SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); -kobj_t clockdev; -int todr_initialized; +static int +sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) +{ + int error; + + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (!error && req->newptr) + resettodr(); + return (error); +} uint64_t ia64_clock_reload; +static int clock_initialized = 0; + +static short dayyr[12] = { + 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 +}; + +/* + * Leap years + * + * Our well-known calendar, the Gregorian calendar, is intended to be of the + * same length as the cycle of the seasons (the tropical year). However, the + * tropical year is approximately 365.2422 days. If the calendar year always + * consisted of 365 days, it would be short of the tropical year by about + * 0.2422 days every year. Over a century, the beginning of spring in the + * northern hemisphere would shift from March 20 to April 13. + * + * When Pope Gregory XIII instituted the Gregorian calendar in 1582, the + * calendar was shifted to make the beginning of spring fall on March 21 and + * a new system of leap days was introduced. Instead of intercalating a leap + * day every fourth year, 97 leap days would be introduced every 400 years, + * according to the following rule: + * + * Years evenly divisible by 4 are leap years, with the exception of + * centurial years that are not evenly divisible by 400. + * + * Thus, the average Gregorian calendar year is 365.2425 days in length. This + * agrees to within half a minute of the length of the tropical year. + */ + +static __inline +int isleap(int yr) +{ + + return ((yr % 4) ? 0 : (yr % 100) ? 1 : (yr % 400) ? 0 : 1); +} + #ifndef SMP static timecounter_get_t ia64_get_timecount; @@ -102,34 +121,6 @@ } #endif -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -void -clockattach(kobj_t dev) -{ - - if (clockdev) - panic("clockattach: multiple clocks"); - - clockdev = dev; - -#ifdef EVCNT_COUNTERS - evcnt_attach(dev, "intr", &clock_intr_evcnt); -#endif - - /* Get the clock started. */ - CLOCK_INIT(clockdev); -} - void pcpu_initclock(void) { @@ -176,88 +167,59 @@ /* nothing to do */ } -/* - * This code is defunct after 2099. - * Will Unix still be here then?? - */ -static short dayyr[12] = { - 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 -}; - -/* - * Initialize the time of day register, based on the time base which is, - * e.g. from a filesystem. Base provides the time to within six months, - * and the time of year clock (if any) provides the rest. - */ void inittodr(time_t base) { - struct clocktime ct; + struct efi_tm tm; struct timespec ts; - time_t deltat; - int badbase, days, s, yr; + long days; + int yr; + + efi_get_time(&tm); + + /* + * This code was written in 2005, so logically EFI cannot return + * a year smaller than that. Assume the EFI clock is out of whack + * in that case and reset the EFI clock. + */ + if (tm.tm_year < 2005) { + printf("WARNING: CHECK AND RESET THE DATE!\n"); + memset(&tm, 0, sizeof(tm)); + tm.tm_year = 2005; + tm.tm_mon = tm.tm_mday = 1; + if (efi_set_time(&tm)) + printf("ERROR: COULD NOT RESET EFI CLOCK!\n"); + } - if (base < 5*SECYR) { - printf("WARNING: preposterous time in filesystem"); - /* read the system clock anyway */ - base = 6*SECYR + 186*SECDAY + SECDAY/2; - badbase = 1; - } else - badbase = 0; + days = 0L; + for (yr = 1970; yr < (int)tm.tm_year; yr++) + days += isleap(yr) ? 366L : 365L; + days += dayyr[tm.tm_mon - 1] + tm.tm_mday - 1L; + if (isleap(tm.tm_year) && tm.tm_mon > 2) + days++; - CLOCK_GET(clockdev, base, &ct); - todr_initialized = 1; + ts.tv_sec = ((days * 24L + tm.tm_hour) * 60L + tm.tm_min) * 60L + + tm.tm_sec + ((wall_cmos_clock) ? adjkerntz : 0L); + ts.tv_nsec = tm.tm_nsec; - /* simple sanity checks */ - if (ct.year < 70 || ct.mon < 1 || ct.mon > 12 || ct.day < 1 || - ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) { - /* - * Believe the time in the filesystem for lack of - * anything better, resetting the TODR. - */ - s = splclock(); + /* + * The EFI clock is supposed to be a real-time clock, whereas the + * base argument is coming from a saved (as on disk) time. It's + * impossible for a saved time to represent a time in the future, + * so we expect the EFI clock to be larger. If not, the EFI clock + * may not be reliable and we trust the base. + * Warn if the EFI clock was off by 2 or more days. + */ + if (ts.tv_sec < base) { + days = (base - ts.tv_sec) / (60L * 60L * 24L); + if (days >= 2) + printf("WARNING: EFI clock lost %ld days!\n", days); ts.tv_sec = base; ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - if (!badbase) { - printf("WARNING: preposterous clock chip time\n"); - resettodr(); - } - goto bad; } - days = 0; - for (yr = 70; yr < ct.year; yr++) - days += LEAPYEAR(yr) ? 366 : 365; - days += dayyr[ct.mon - 1] + ct.day - 1; - if (LEAPYEAR(yr) && ct.mon > 2) - days++; - /* now have days since Jan 1, 1970; the rest is easy... */ - s = splclock(); - ts.tv_sec = - days * SECDAY + ct.hour * SECHOUR + ct.min * SECMIN + ct.sec; - if (wall_cmos_clock) - ts.tv_sec += adjkerntz; - ts.tv_nsec = 0; tc_setclock(&ts); - splx(s); - - if (!badbase) { - /* - * See if we gained/lost two or more days; - * if so, assume something is amiss. - */ - deltat = ts.tv_sec - base; - if (deltat < 0) - deltat = -deltat; - if (deltat < 2 * SECDAY) - return; - printf("WARNING: clock %s %ld days", - ts.tv_sec < base ? "lost" : "gained", deltat / SECDAY); - } -bad: - printf(" -- CHECK AND RESET THE DATE!\n"); + clock_initialized = 1; } /* @@ -270,49 +232,35 @@ void resettodr() { - struct clocktime ct; - unsigned long tm; - int s, t, t2; + struct efi_tm tm; + long t; + int x; - if (!todr_initialized || disable_rtc_set) + if (!clock_initialized || disable_rtc_set) return; - s = splclock(); - tm = time_second; - splx(s); + efi_get_time(&tm); + tm.tm_nsec = 0; - /* Calculate local time to put in RTC */ - tm -= (wall_cmos_clock ? adjkerntz : 0); + t = time_second - ((wall_cmos_clock) ? adjkerntz : 0L); - /* compute the day of week. */ - t2 = tm / SECDAY; - ct.dow = (t2 + 4) % 7; /* 1/1/1970 was thursday */ + tm.tm_sec = t % 60; t /= 60L; + tm.tm_min = t % 60; t /= 60L; + tm.tm_hour = t % 24; t /= 24L; - /* compute the year */ - ct.year = 69; - t = t2; /* XXX ? */ - while (t2 >= 0) { /* whittle off years */ - t = t2; - ct.year++; - t2 -= LEAPYEAR(ct.year) ? 366 : 365; + tm.tm_year = 1970; + x = (isleap(tm.tm_year)) ? 366 : 365; + while (t > x) { + t -= x; + tm.tm_year++; + x = (isleap(tm.tm_year)) ? 366 : 365; } - /* t = month + day; separate */ - t2 = LEAPYEAR(ct.year); - for (ct.mon = 1; ct.mon < 12; ct.mon++) - if (t < dayyr[ct.mon] + (t2 && ct.mon > 1)) - break; - - ct.day = t - dayyr[ct.mon - 1] + 1; - if (t2 && ct.mon > 2) - ct.day--; - - /* the rest is easy */ - t = tm % SECDAY; - ct.hour = t / SECHOUR; - t %= 3600; - ct.min = t / SECMIN; - ct.sec = t % SECMIN; - - CLOCK_SET(clockdev, &ct); + x = 11; + while (t < dayyr[x]) + x--; + tm.tm_mon = x + 1; + tm.tm_mday = t - dayyr[x] + 1; + if (efi_set_time(&tm)) + printf("ERROR: COULD NOT RESET EFI CLOCK!\n"); } ==== //depot/projects/ia64/sys/kern/vfs_bio.c#78 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.482 2005/03/25 00:20:37 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.483 2005/04/22 00:53:20 jeff Exp $"); #include #include @@ -1831,6 +1831,12 @@ buf_deallocate(bp); if (bp->b_vflags & BV_BKGRDINPROG) panic("losing buffer 3"); + KASSERT(bp->b_vp == NULL, + ("bp: %p still has vnode %p. qindex: %d", + bp, bp->b_vp, qindex)); + KASSERT((bp->b_xflags & (BX_VNCLEAN|BX_VNDIRTY)) == 0, + ("bp: %p still on a buffer list. xflags %X", + bp, bp->b_xflags)); if (bp->b_bufsize) allocbuf(bp, 0); ==== //depot/projects/ia64/sys/kern/vfs_subr.c#80 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.616 2005/04/18 21:11:47 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.617 2005/04/22 00:57:05 jeff Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -821,10 +821,12 @@ } msleep(&vnlruproc_sig, &vnode_free_list_mtx, PVFS, "vlruwk", hz); +#if 0 /* XXX Not all VFS_VGET/ffs_vget callers check returns. */ if (numvnodes > desiredvnodes) { mtx_unlock(&vnode_free_list_mtx); return (ENFILE); } +#endif } numvnodes++; mtx_unlock(&vnode_free_list_mtx); From owner-p4-projects@FreeBSD.ORG Fri Apr 22 13:04:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09E9A16A4D0; Fri, 22 Apr 2005 13:04:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4FB516A4CE for ; Fri, 22 Apr 2005 13:04:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E57F43D3F for ; Fri, 22 Apr 2005 13:04:55 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MD4tVR061562 for ; Fri, 22 Apr 2005 13:04:55 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MD4tOb061559 for perforce@freebsd.org; Fri, 22 Apr 2005 13:04:55 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 22 Apr 2005 13:04:55 GMT Message-Id: <200504221304.j3MD4tOb061559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75713 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 13:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=75713 Change 75713 by davidxu@davidxu_tiger on 2005/04/22 13:04:41 thr_new refine. Affected files ... .. //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#13 edit .. //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#14 edit .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#18 edit .. //depot/projects/davidxu_thread/src/sys/kern/kern_thread.c#10 edit .. //depot/projects/davidxu_thread/src/sys/sys/thr.h#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#13 (text+ko) ==== @@ -747,6 +747,7 @@ } if (ourstatus->value.sig == TARGET_SIGNAL_TRAP) check_event(ret); +#if 0 /* this is a hack, if an event won't cause gdb to stop, for example, SIGARLM, gdb resumes the process immediatly without setting inferior_ptid to the new thread returned here, this is a bug @@ -757,6 +758,7 @@ delete_thread (inferior_ptid); inferior_ptid = ret; } +#endif } return (ret); ==== //depot/projects/davidxu_thread/src/lib/libthr/thread/thr_create.c#14 (text+ko) ==== @@ -53,8 +53,6 @@ _pthread_create(pthread_t * thread, const pthread_attr_t * attr, void *(*start_routine) (void *), void *arg) { - ucontext_t uc; - sigset_t sigmask, oldsigmask; struct pthread *curthread, *new_thread; struct thr_param param; int ret = 0, locked; @@ -71,6 +69,8 @@ if ((new_thread = _thr_alloc(curthread)) == NULL) return (EAGAIN); + memset(¶m, 0, sizeof(param)); + if (attr == NULL || *attr == NULL) /* Use the default thread attributes: */ new_thread->attr = _pthread_attr_default; @@ -109,13 +109,6 @@ new_thread->arg = arg; new_thread->cancelflags = PTHREAD_CANCEL_ENABLE | PTHREAD_CANCEL_DEFERRED; -#if 0 - getcontext(&uc); - SIGFILLSET(uc.uc_sigmask); - uc.uc_stack.ss_sp = new_thread->attr.stackaddr_attr; - uc.uc_stack.ss_size = new_thread->attr.stacksize_attr; - makecontext(&uc, (void (*)(void))thread_start, 1, new_thread); -#endif /* * Check if this thread is to inherit the scheduling * attributes from its parent: @@ -148,17 +141,7 @@ if (new_thread->attr.suspend == THR_CREATE_SUSPENDED) new_thread->flags = THR_FLAGS_SUSPENDED; new_thread->state = PS_RUNNING; -#if 0 - /* - * Thread created by thr_create() inherits currrent thread - * sigmask, however, before new thread setup itself correctly, - * it can not handle signal, so we should masks all signals here. - */ - SIGFILLSET(sigmask); - SIGDELSET(sigmask, SIGTRAP); - __sys_sigprocmask(SIG_SETMASK, &sigmask, &oldsigmask); - new_thread->sigmask = oldsigmask; -#endif + /* Add the new thread. */ _thr_link(curthread, new_thread); /* Return thread pointer eariler so that new thread can use it. */ @@ -168,25 +151,19 @@ locked = 1; } else locked = 0; - param.start_func = thread_start; + param.start_func = (void (*)(void *)) thread_start; param.arg = new_thread; param.stack_base = new_thread->attr.stackaddr_attr; param.stack_size = new_thread->attr.stacksize_attr; - param.tls_base = new_thread->tcb; + param.tls_base = (char *)new_thread->tcb; param.tls_size = sizeof(struct tcb); - param.tls_seg = 0; param.child_tid = &new_thread->tid; param.parent_tid = &new_thread->tid; - param.user_crit = 0; param.flags = 0; if (new_thread->attr.flags & PTHREAD_SCOPE_SYSTEM) param.flags |= THR_SYSTEM_SCOPE; /* Schedule the new thread. */ ret = thr_new(¶m, sizeof(param)); -#if 0 - ret = thr_create(&uc, &new_thread->tid, 0); - __sys_sigprocmask(SIG_SETMASK, &oldsigmask, NULL); -#endif if (ret != 0) { if (locked) THR_THREAD_UNLOCK(curthread, new_thread); @@ -239,12 +216,6 @@ static void thread_start(struct pthread *curthread) { -#if 0 - _tcb_set(curthread->tcb); - - /* Thread was created with all signals blocked, unblock them. */ - __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); -#endif if (curthread->flags & THR_FLAGS_NEED_SUSPEND) _thr_suspend_check(curthread); ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#18 (text+ko) ==== @@ -89,7 +89,7 @@ struct thr_param param; int error; - if (uap->param_size != sizeof(param)) + if (uap->param_size < sizeof(param)) return (EINVAL); if ((error = copyin(uap->param, ¶m, sizeof(param)))) return (error); ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thread.c#10 (text+ko) ==== ==== //depot/projects/davidxu_thread/src/sys/sys/thr.h#9 (text+ko) ==== @@ -42,11 +42,10 @@ size_t stack_size; /* stack size. */ char *tls_base; /* tls base address. */ size_t tls_size; /* tls size. */ - int tls_seg; /* which seg is to set for tls. */ long *child_tid; /* address to store new TID. */ long *parent_tid; /* parent accesses the new TID here. */ - int *user_crit; /* reserved */ - int flags; + int flags; /* thread flags. */ + void *spare[4]; /* TODO: cpu affinity mask etc. */ }; /* From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:41:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13C9416A4D2; Fri, 22 Apr 2005 18:41:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B18F316A4CE for ; Fri, 22 Apr 2005 18:41:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 316E343D41 for ; Fri, 22 Apr 2005 18:41:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MIfiIt087106 for ; Fri, 22 Apr 2005 18:41:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MIfhU9087103 for perforce@freebsd.org; Fri, 22 Apr 2005 18:41:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:41:43 GMT Message-Id: <200504221841.j3MIfhU9087103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=75722 Change 75722 by rwatson@rwatson_paprika on 2005/04/22 18:41:40 Integrate Apple Darwin74 bsm library components and tools from Apple vendor branch to OpenBSM working branch. They, along with a couple of other misc bits, will form the foundation for OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/trustedbsd/openbsm/etc/audit_class#1 branch .. //depot/projects/trustedbsd/openbsm/etc/audit_control#1 branch .. //depot/projects/trustedbsd/openbsm/etc/audit_event#1 branch .. //depot/projects/trustedbsd/openbsm/etc/audit_user#1 branch .. //depot/projects/trustedbsd/openbsm/etc/audit_warn#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#1 branch .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#1 branch .. //depot/projects/trustedbsd/openbsm/man/audit_control5#1 branch .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#1 branch .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#1 branch .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:43:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DCF016A4D0; Fri, 22 Apr 2005 18:43:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41DF516A4CE for ; Fri, 22 Apr 2005 18:43:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C63443D1D for ; Fri, 22 Apr 2005 18:43:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MIhl0B087517 for ; Fri, 22 Apr 2005 18:43:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MIhkbn087514 for perforce@freebsd.org; Fri, 22 Apr 2005 18:43:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:43:46 GMT Message-Id: <200504221843.j3MIhkbn087514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:43:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=75723 Change 75723 by rwatson@rwatson_paprika on 2005/04/22 18:43:02 Replicate FreeBSD BSM change into OpenBSM tree: use syslog for audit log warnings by default, so that they can be easily processed using default log mechanisms. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_warn#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_warn#2 (text+ko) ==== @@ -1,3 +1,2 @@ #!/bin/sh -TIME=$(date "+%h %d %H:%M:%S") -echo "$TIME audit warning: $@" >> /etc/security/audit_messages +logger -p security.warning "audit warning: $@" From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:44:49 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5831316A4D0; Fri, 22 Apr 2005 18:44:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18ED816A4CE for ; Fri, 22 Apr 2005 18:44:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0ADF43D31 for ; Fri, 22 Apr 2005 18:44:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MIim0b087543 for ; Fri, 22 Apr 2005 18:44:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MIimJ2087540 for perforce@freebsd.org; Fri, 22 Apr 2005 18:44:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:44:48 GMT Message-Id: <200504221844.j3MIimJ2087540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:44:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=75724 Change 75724 by rwatson@rwatson_paprika on 2005/04/22 18:44:33 BSD Makefiles for bin tree. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#1 add .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:48:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B839C16A4D0; Fri, 22 Apr 2005 18:48:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B0DB16A4CE for ; Fri, 22 Apr 2005 18:48:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BE4A43D1D for ; Fri, 22 Apr 2005 18:48:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MImsVB087758 for ; Fri, 22 Apr 2005 18:48:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MImstQ087755 for perforce@freebsd.org; Fri, 22 Apr 2005 18:48:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:48:54 GMT Message-Id: <200504221848.j3MImstQ087755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:48:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=75725 Change 75725 by rwatson@rwatson_paprika on 2005/04/22 18:48:06 Integrate /usr/include/bsm include files from Apple Darwin74 XNU tree to the OpenBSM project tree. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#1 branch .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:51:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A52D116A4E4; Fri, 22 Apr 2005 18:51:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 426AC16A4D1 for ; Fri, 22 Apr 2005 18:51:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 190EF43D2F for ; Fri, 22 Apr 2005 18:51:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MIpw1h088189 for ; Fri, 22 Apr 2005 18:51:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MIpw85088186 for perforce@freebsd.org; Fri, 22 Apr 2005 18:51:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:51:58 GMT Message-Id: <200504221851.j3MIpw85088186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:52:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=75727 Change 75727 by rwatson@rwatson_paprika on 2005/04/22 18:51:36 Initial Makefile for libbsm in OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:53:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C8116A4F8; Fri, 22 Apr 2005 18:53:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81A7E16A4D5 for ; Fri, 22 Apr 2005 18:53:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4219043D5D for ; Fri, 22 Apr 2005 18:53:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MIr1GH088283 for ; Fri, 22 Apr 2005 18:53:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MIr0R7088280 for perforce@freebsd.org; Fri, 22 Apr 2005 18:53:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:53:00 GMT Message-Id: <200504221853.j3MIr0R7088280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:53:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=75729 Change 75729 by rwatson@rwatson_paprika on 2005/04/22 18:52:22 Include libbsm.h consistently across all library .c files. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* uint32_t */ #include /* syslog() */ #include /* syslog() */ -#include "libbsm.h" +#include /* if 1, assumes a kernel that sends the right notification */ #define AUDIT_NOTIFICATION_ENABLED 1 ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include /* syslog() */ #include /* syslog() */ #include -#include "libbsm.h" +#include /* * XXX Write up in a separate white paper. From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:54:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A12A16A4D0; Fri, 22 Apr 2005 18:54:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C5E816A4CE for ; Fri, 22 Apr 2005 18:54:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B69C43D62 for ; Fri, 22 Apr 2005 18:54:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MIs2Qv088504 for ; Fri, 22 Apr 2005 18:54:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MIs2iA088500 for perforce@freebsd.org; Fri, 22 Apr 2005 18:54:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:54:02 GMT Message-Id: <200504221854.j3MIs2iA088500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:54:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=75730 Change 75730 by rwatson@rwatson_paprika on 2005/04/22 18:53:14 Fix branch specification. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#1 branch .. //depot/projects/trustedbsd/openbsm/man/audit_control5#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 22 18:54:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86DF516A4E4; Fri, 22 Apr 2005 18:54:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1C5516A4CE for ; Fri, 22 Apr 2005 18:54:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54A2443D54 for ; Fri, 22 Apr 2005 18:54:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MIs3r8088515 for ; Fri, 22 Apr 2005 18:54:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MIs3sO088509 for perforce@freebsd.org; Fri, 22 Apr 2005 18:54:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 18:54:03 GMT Message-Id: <200504221854.j3MIs3sO088509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 18:54:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=75731 Change 75731 by rwatson@rwatson_paprika on 2005/04/22 18:53:26 Add man page Makefile for OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 22 19:11:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AF9816A4D0; Fri, 22 Apr 2005 19:11:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FDB916A4CE for ; Fri, 22 Apr 2005 19:11:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8D3A43D39 for ; Fri, 22 Apr 2005 19:11:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MJBOMQ089392 for ; Fri, 22 Apr 2005 19:11:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MJBO4X089388 for perforce@freebsd.org; Fri, 22 Apr 2005 19:11:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 19:11:24 GMT Message-Id: <200504221911.j3MJBO4X089388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 19:11:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=75733 Change 75733 by rwatson@rwatson_paprika on 2005/04/22 19:11:23 Add OpenBSM README. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 22 19:18:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A8F616A4D0; Fri, 22 Apr 2005 19:18:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E48716A4CE for ; Fri, 22 Apr 2005 19:18:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40F5A43D3F for ; Fri, 22 Apr 2005 19:18:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MJIarM089727 for ; Fri, 22 Apr 2005 19:18:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MJIZZZ089724 for perforce@freebsd.org; Fri, 22 Apr 2005 19:18:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 19:18:35 GMT Message-Id: <200504221918.j3MJIZZZ089724@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 19:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=75735 Change 75735 by rwatson@rwatson_paprika on 2005/04/22 19:17:57 Replicate from TrustedBSD: Don't expose struct socket to userspace, but do it in a FreeBSD or Darwin way. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#2 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#2 (text+ko) ==== @@ -24,9 +24,9 @@ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H +#include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#2 (text+ko) ==== @@ -281,11 +281,13 @@ token_t *au_to_return32(char status, u_int32_t ret); token_t *au_to_return64(char status, u_int64_t ret); token_t *au_to_seq(long audit_count); +#if defined(_KERNEL) || defined(KERNEL) token_t *au_to_socket(struct socket *so); token_t *au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, struct sockaddr *ta); token_t *au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, struct sockaddr *ta); +#endif token_t *au_to_sock_inet(struct sockaddr_in *so); token_t *au_to_sock_inet32(struct sockaddr_in *so); token_t *au_to_sock_inet128(struct sockaddr_in6 *so); From owner-p4-projects@FreeBSD.ORG Fri Apr 22 19:19:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F35116A4D0; Fri, 22 Apr 2005 19:19:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 220CB16A4CE for ; Fri, 22 Apr 2005 19:19:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08E3D43D2D for ; Fri, 22 Apr 2005 19:19:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MJJbt3089765 for ; Fri, 22 Apr 2005 19:19:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MJJbJk089762 for perforce@freebsd.org; Fri, 22 Apr 2005 19:19:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Apr 2005 19:19:37 GMT Message-Id: <200504221919.j3MJJbJk089762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 19:19:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=75736 Change 75736 by rwatson@rwatson_paprika on 2005/04/22 19:19:30 #ifdef DARWIN (is that the right ifdef?) Apple-specific notification APIs, mach port include. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#2 (text+ko) ==== @@ -45,7 +45,9 @@ #include #include +#ifdef DARWIN #include /* audit_token_t */ +#endif #define AU_PRS_SUCCESS 1 #define AU_PRS_FAILURE 2 @@ -838,6 +840,7 @@ void au_print_tok(FILE *outfp, tokenstr_t *tok, char *del, char raw, char sfrm); __END_DECLS +#ifdef DARWIN /* * Apple-internal "wrapping" and utility definitions and prototypes. */ @@ -906,6 +909,8 @@ int au_get_state(void); __END_DECLS +#endif /* !DARWIN */ + /* OpenSSH compatibility */ #define cannot_audit(x) (au_get_state() == AUC_NOAUDIT) From owner-p4-projects@FreeBSD.ORG Sat Apr 23 01:49:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E47E416A4D0; Sat, 23 Apr 2005 01:49:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93BD116A4CE for ; Sat, 23 Apr 2005 01:49:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE0AD43D31 for ; Sat, 23 Apr 2005 01:49:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3N1nWwa023197 for ; Sat, 23 Apr 2005 01:49:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3N1nWrJ023194 for perforce@freebsd.org; Sat, 23 Apr 2005 01:49:32 GMT (envelope-from marcel@freebsd.org) Date: Sat, 23 Apr 2005 01:49:32 GMT Message-Id: <200504230149.j3N1nWrJ023194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 75758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 01:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=75758 Change 75758 by marcel@marcel_nfs on 2005/04/23 01:48:42 IFC @75757 Affected files ... .. //depot/projects/ia64/contrib/cvs/src/login.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/patch.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.c#7 integrate .. //depot/projects/ia64/games/factor/Makefile#7 integrate .. //depot/projects/ia64/gnu/lib/libdialog/Makefile#9 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#26 integrate .. //depot/projects/ia64/lib/libatm/Makefile#7 integrate .. //depot/projects/ia64/lib/libopie/Makefile#7 integrate .. //depot/projects/ia64/lib/libutil/login_cap.c#9 integrate .. //depot/projects/ia64/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#26 integrate .. //depot/projects/ia64/sys/conf/files#131 integrate .. //depot/projects/ia64/sys/conf/files.amd64#28 integrate .. //depot/projects/ia64/sys/conf/files.i386#66 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#51 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#46 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#59 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#10 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#30 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#19 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakecode.S#6 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#39 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#53 integrate .. //depot/projects/ia64/sys/modules/Makefile#86 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/puc/Makefile#1 branch .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/ia64/sys/sys/lock.h#12 integrate .. //depot/projects/ia64/sys/sys/mutex.h#25 integrate .. //depot/projects/ia64/sys/sys/vnode.h#49 integrate .. //depot/projects/ia64/usr.sbin/config/main.c#9 integrate Differences ... ==== //depot/projects/ia64/contrib/cvs/src/login.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * * Allow user to log in for an authenticating server. * - * $FreeBSD: src/contrib/cvs/src/login.c,v 1.8 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/login.c,v 1.9 2005/04/22 17:58:25 simon Exp $ */ #include "cvs.h" @@ -116,7 +116,7 @@ if (isspace(*(linebuf + 1))) /* special case since strtoul ignores leading white space */ - entry_version = 0; + q = linebuf + 1; else entry_version = strtoul (linebuf + 1, &q, 10); ==== //depot/projects/ia64/contrib/cvs/src/patch.c#6 (text+ko) ==== @@ -10,6 +10,8 @@ * Create a Larry Wall format "patch" file between a previous release and the * current head of a module, or between two releases. Can specify the * release as either a date or a revision number. + * + * $FreeBSD: src/contrib/cvs/src/patch.c,v 1.2 2005/04/22 17:58:25 simon Exp $ */ #include @@ -385,6 +387,7 @@ struct utimbuf t; char *vers_tag, *vers_head; char *rcs = NULL; + char *rcs_orig = NULL; RCSNode *rcsfile; FILE *fp1, *fp2, *fp3; int ret = 0; @@ -415,7 +418,7 @@ if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC)) isattic = 1; - rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5); + rcs_orig = rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5); (void) sprintf (rcs, "%s%s", finfo->file, RCSEXT); /* if vers_head is NULL, may have been removed from the release */ @@ -757,8 +760,8 @@ free (vers_tag); if (vers_head != NULL) free (vers_head); - if (rcs != NULL) - free (rcs); + if (rcs_orig) + free (rcs_orig); return ret; } ==== //depot/projects/ia64/contrib/cvs/src/rcs.c#7 (text+ko) ==== @@ -7,7 +7,7 @@ * The routines contained in this file do all the rcs file parsing and * manipulation * - * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.27 2004/07/06 08:10:38 des Exp $ + * $FreeBSD: src/contrib/cvs/src/rcs.c,v 1.28 2005/04/22 17:58:25 simon Exp $ */ #include @@ -3041,8 +3041,7 @@ if (retval != NULL) return (retval); - if (!force_tag_match || - (vers != NULL && RCS_datecmp (vers->date, date) <= 0)) + if (vers && (!force_tag_match || RCS_datecmp (vers->date, date) <= 0)) return xstrdup (vers->version); else return NULL; @@ -4139,7 +4138,7 @@ size_t len; int free_value = 0; char *log = NULL; - size_t loglen; + size_t loglen = 0; Node *vp = NULL; #ifdef PRESERVE_PERMISSIONS_SUPPORT uid_t rcs_owner = (uid_t) -1; @@ -7457,7 +7456,7 @@ for (ln = 0; ln < headlines.nlines; ++ln) { - char buf[80]; + char *buf; /* Period which separates year from month in date. */ char *ym; /* Period which separates month from day in date. */ @@ -7468,10 +7467,12 @@ if (prvers == NULL) prvers = vers; + buf = xmalloc (strlen (prvers->version) + 24); sprintf (buf, "%-12s (%-8.8s ", prvers->version, prvers->author); cvs_output (buf, 0); + free (buf); /* Now output the date. */ ym = strchr (prvers->date, '.'); ==== //depot/projects/ia64/games/factor/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.9 2004/12/21 10:15:59 ru Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.10 2005/04/22 18:57:32 trhodes Exp $ PROG= factor SRCS= factor.c pr_tbl.c @@ -7,8 +7,8 @@ .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL +DPADD= ${LIBCRYPTO} LDADD= -lcrypto -DPADD= ${LIBCRYPTO} .endif MAN= factor.6 ==== //depot/projects/ia64/gnu/lib/libdialog/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libdialog -# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.41 2004/12/21 12:05:10 ru Exp $ +# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.42 2005/04/22 18:57:32 trhodes Exp $ LIB= dialog INCS= dialog.h @@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE +DPADD= ${LIBNCURSES} LDADD= -lncurses -DPADD= ${LIBNCURSES} .if !defined(NO_HTML) FILES= ${EXAMPLES:C;^;${.CURDIR}/TESTS/;} ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.54 2005/01/26 13:56:27 kan Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.55 2005/04/22 18:57:32 trhodes Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -17,8 +17,8 @@ CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated +DPADD= ${LIBM} LDADD= -lm -DPADD= ${LIBM} # libstdc++ sources SRCS+= allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc debug_list.cc \ ==== //depot/projects/ia64/lib/libatm/Makefile#7 (text+ko) ==== @@ -21,15 +21,15 @@ # notice must be reproduced on all copies. # # @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $ -# $FreeBSD: src/lib/libatm/Makefile,v 1.11 2004/05/14 13:31:20 cognet Exp $ +# $FreeBSD: src/lib/libatm/Makefile,v 1.12 2005/04/22 18:57:31 trhodes Exp $ LIB= atm SHLIBDIR?= /lib SRCS= atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c INCS= libatm.h +DPADD= ${LIBMD} LDADD= -lmd -DPADD= ${LIBMD} .if ${MACHINE_ARCH} == "arm" WARNS?= 3 ==== //depot/projects/ia64/lib/libopie/Makefile#7 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for libopie # -# $FreeBSD: src/lib/libopie/Makefile,v 1.19 2004/10/01 15:38:07 kensmith Exp $ +# $FreeBSD: src/lib/libopie/Makefile,v 1.20 2005/04/22 18:57:31 trhodes Exp $ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} @@ -26,8 +26,8 @@ ACCESSFILE?= \"/etc/opieaccess\" CFLAGS+= -DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE} +DPADD= ${LIBMD} LDADD= -lmd -DPADD= ${LIBMD} MAN= ${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5 ==== //depot/projects/ia64/lib/libutil/login_cap.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.32 2004/05/11 11:05:26 dds Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.33 2005/04/22 23:11:57 trhodes Exp $"); #include #include @@ -341,7 +341,7 @@ /* * login_getcapstr() * Given a login_cap entry, and a capability name, return the - * value defined for that capability, a defualt if not found, or + * value defined for that capability, a default if not found, or * an error string on error. */ ==== //depot/projects/ia64/lib/msun/src/s_ceill.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.1 2005/01/13 09:11:40 stefanf Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.3 2005/04/22 09:57:55 stefanf Exp $"; #endif /* @@ -50,6 +50,8 @@ } while (0) #endif +static const double huge = 1.0e300; + long double ceill(long double x) { @@ -58,13 +60,14 @@ if (e < MANH_SIZE - 1) { if (e < 0) { /* raise inexact if x != 0 */ - if (u.bits.exp > 0 || (u.bits.manh | u.bits.manl) != 0) - u.e = u.bits.sign ? 0.0 : 1.0; + if (huge + (double)x > 0.0) + if (u.bits.exp > 0 || + (u.bits.manh | u.bits.manl) != 0) + u.e = u.bits.sign ? 0.0 : 1.0; } else { uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); if (((u.bits.manh & m) | u.bits.manl) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (!u.bits.sign) { #ifdef LDBL_IMPLICIT_NBIT if (e == 0) @@ -73,14 +76,15 @@ #endif INC_MANH(u, 1llu << (MANH_SIZE - e - 1)); } - u.bits.manh &= ~m; - u.bits.manl = 0; + if (huge + (double)x > 0.0) { /* raise inexact flag */ + u.bits.manh &= ~m; + u.bits.manl = 0; + } } } else if (e < LDBL_MANT_DIG - 1) { uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); if ((u.bits.manl & m) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (!u.bits.sign) { if (e == MANH_SIZE - 1) INC_MANH(u, 1); @@ -91,7 +95,8 @@ INC_MANH(u, 1); } } - u.bits.manl &= ~m; + if (huge + (double)x > 0.0) /* raise inexact flag */ + u.bits.manl &= ~m; } return (u.e); } ==== //depot/projects/ia64/lib/msun/src/s_floorl.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.1 2005/01/12 22:10:46 stefanf Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.3 2005/04/22 09:57:55 stefanf Exp $"; #endif /* @@ -50,6 +50,8 @@ } while (0) #endif +static const double huge = 1.0e300; + long double floorl(long double x) { @@ -58,13 +60,14 @@ if (e < MANH_SIZE - 1) { if (e < 0) { /* raise inexact if x != 0 */ - if (u.bits.exp > 0 || (u.bits.manh | u.bits.manl) != 0) - u.e = u.bits.sign ? -1.0 : 0.0; + if (huge + (double)x > 0.0) + if (u.bits.exp > 0 || + (u.bits.manh | u.bits.manl) != 0) + u.e = u.bits.sign ? -1.0 : 0.0; } else { uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); if (((u.bits.manh & m) | u.bits.manl) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (u.bits.sign) { #ifdef LDBL_IMPLICIT_NBIT if (e == 0) @@ -73,14 +76,15 @@ #endif INC_MANH(u, 1llu << (MANH_SIZE - e - 1)); } - u.bits.manh &= ~m; - u.bits.manl = 0; + if (huge + (double)x > 0.0) { /* raise inexact flag */ + u.bits.manh &= ~m; + u.bits.manl = 0; + } } } else if (e < LDBL_MANT_DIG - 1) { uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); if ((u.bits.manl & m) == 0) return (x); /* x is integral */ - /* raise inexact flag */ if (u.bits.sign) { if (e == MANH_SIZE - 1) INC_MANH(u, 1); @@ -91,7 +95,8 @@ INC_MANH(u, 1); } } - u.bits.manl &= ~m; + if (huge + (double)x > 0.0) /* raise inexact flag */ + u.bits.manl &= ~m; } return (u.e); } ==== //depot/projects/ia64/lib/msun/src/s_truncl.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.1 2005/04/16 21:12:47 das Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.3 2005/04/22 09:57:55 stefanf Exp $"; #endif /* @@ -36,6 +36,8 @@ #define MANH_SIZE LDBL_MANH_SIZE #endif +static const double huge = 1.0e300; + long double truncl(long double x) { @@ -44,19 +46,23 @@ if (e < MANH_SIZE - 1) { if (e < 0) { /* raise inexact if x != 0 */ - u.e = 0.0; + if (huge + (double)x > 0.0) + u.e = 0.0; } else { uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); if (((u.bits.manh & m) | u.bits.manl) == 0) return (x); /* x is integral */ - u.bits.manh &= ~m; - u.bits.manl = 0; + if (huge + (double)x > 0.0) { /* raise inexact flag */ + u.bits.manh &= ~m; + u.bits.manl = 0; + } } } else if (e < LDBL_MANT_DIG - 1) { uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); if ((u.bits.manl & m) == 0) return (x); /* x is integral */ - u.bits.manl &= ~m; + if (huge + (double)x > 0.0) /* raise inexact flag */ + u.bits.manl &= ~m; } return (u.e); } ==== //depot/projects/ia64/share/man/man4/acpi.4#26 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.50 2005/02/23 07:23:35 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.51 2005/04/22 23:21:09 njl Exp $ .\" .Dd February 13, 2005 .Dt ACPI 4 @@ -99,6 +99,11 @@ Name of the DSDT table to load, if loading is enabled. .It Va debug.acpi.disabled Selectively disables portions of ACPI for debugging purposes. +.It Va debug.acpi.max_threads +Specify the number of task threads that are started on boot. +Limiting this to 1 may help work around various BIOSes that cannot +handle parallel requests. +The default value is 3. .It Va debug.acpi.quirks Override any automatic quirks completely. .It Va hint.acpi.0.disabled ==== //depot/projects/ia64/sys/conf/files#131 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1015 2005/04/19 04:01:23 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1016 2005/04/22 20:00:41 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -19,19 +19,39 @@ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" -aic7xxx_{seq.h,reg.h,reg_print.c} optional ahc \ - compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ - no-obj no-implicit-rule before-depend \ - clean "aic7xxx_seq.h aic7xxx_reg.h aic7xxx_reg_print.c" \ +aic7xxx_seq.h optional ahc \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic7xxx_seq.h" \ + dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic7xxx_reg.h optional ahc \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic7xxx_reg.h" \ + dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic7xxx_reg_print.c optional ahc \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ + no-obj no-implicit-rule local \ + clean "aic7xxx_reg_print.c" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local -aic79xx_{seq.h,reg.h,reg_print.c} optional ahd pci \ +aic79xx_seq.h optional ahd pci \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic79xx_seq.h" \ + dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic79xx_reg.h optional ahd pci \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ + no-obj no-implicit-rule before-depend local \ + clean "aic79xx_reg.h" \ + dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic79xx_reg_print.c optional ahd pci \ compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ - no-obj no-implicit-rule before-depend \ - clean "aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c" \ - dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" + no-obj no-implicit-rule local \ + clean "aic79xx_reg_print.c" \ + dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local ==== //depot/projects/ia64/sys/conf/files.amd64#28 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.62 2005/04/19 04:01:23 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.63 2005/04/22 19:55:52 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -65,7 +65,8 @@ os+%DIKED-nve.h optional nve pci \ dependency "$S/contrib/dev/nve/os.h" \ compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \ - no-implicit-rule no-obj before-depend + no-implicit-rule no-obj before-depend \ + clean "os+%DIKED-nve.h" # amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi ==== //depot/projects/ia64/sys/conf/files.i386#66 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.528 2005/04/19 21:40:07 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.529 2005/04/22 19:55:52 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,7 +69,8 @@ os+%DIKED-nve.h optional nve pci \ dependency "$S/contrib/dev/nve/os.h" \ compile-with "sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \ - no-implicit-rule no-obj before-depend + no-implicit-rule no-obj before-depend \ + clean "os+%DIKED-nve.h" # hptmvraid.o optional hptmv \ dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \ ==== //depot/projects/ia64/sys/conf/kern.post.mk#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.78 2005/04/03 04:33:42 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.80 2005/04/22 19:58:22 ru Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -109,8 +109,8 @@ kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ - ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ - vers.c vnode_if.c vnode_if.h \ + ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags vers.c \ + vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} @@ -138,17 +138,12 @@ ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h -kernel-depend: - rm -f .olddep - if [ -f .depend ]; then mv .depend .olddep; fi - ${MAKE} _kernel-depend - +kernel-depend: .depend # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ +.depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${MFILES:T:S/.m$/.h/} - if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \ MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS} ==== //depot/projects/ia64/sys/conf/kmod.mk#46 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.190 2005/04/19 18:29:11 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.192 2005/04/22 17:39:58 ru Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -195,7 +195,6 @@ all: objwarn ${PROG} beforedepend: ${_ILINKS} -beforedepend: cleandepend # Ensure that the links exist without depending on it when it exists which # causes all the modules to be rebuilt when the directory pointed to changes. @@ -400,6 +399,20 @@ ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks .endif +.if ${SRCS:Massym.s} != "" +CLEANFILES+= assym.s genassym.o +assym.s: genassym.o +.if !exists(@) +assym.s: @ +.else +assym.s: @/kern/genassym.sh +.endif + sh @/kern/genassym.sh genassym.o > ${.TARGET} +genassym.o: @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c @ machine + ${CC} -c ${CFLAGS:N-fno-common} \ + @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c +.endif + lint: ${SRCS} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC:M*.c} ==== //depot/projects/ia64/sys/contrib/pf/net/pf.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.27 2005/04/13 21:05:55 glebius Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.28 2005/04/22 09:53:46 glebius Exp $ */ /* $OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */ /* add $OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */ /* add $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ @@ -4065,9 +4065,9 @@ (*state)->dst.seqdiff = (*state)->src.seqhi - (*state)->dst.seqlo; (*state)->src.seqhi = (*state)->src.seqlo + + (*state)->dst.max_win; + (*state)->dst.seqhi = (*state)->dst.seqlo + (*state)->src.max_win; - (*state)->dst.seqhi = (*state)->dst.seqlo + - (*state)->dst.max_win; (*state)->src.wscale = (*state)->dst.wscale = 0; (*state)->src.state = (*state)->dst.state = TCPS_ESTABLISHED; ==== //depot/projects/ia64/sys/dev/fxp/if_fxp.c#59 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.232 2005/04/21 19:34:57 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.233 2005/04/22 13:05:53 mux Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -579,7 +579,9 @@ * too, but that's already enabled by the code above. * Be careful to do this only on the right devices. */ - if (sc->revision >= FXP_REV_82550) { + if (sc->revision == FXP_REV_82550 || sc->revision == FXP_REV_82550_C || + sc->revision == FXP_REV_82551_E || sc->revision == FXP_REV_82551_F + || sc->revision == FXP_REV_82551_10) { sc->rfa_size = sizeof (struct fxp_rfa); sc->tx_cmd = FXP_CB_COMMAND_IPCBXMIT; sc->flags |= FXP_FLAG_EXT_RFA; @@ -2643,7 +2645,7 @@ D102_B_CPUSAVER_DWORD, D102_B_CPUSAVER_BUNDLE_MAX_DWORD }, { FXP_REV_82550_C, UCODE(fxp_ucode_d102c), D102_C_CPUSAVER_DWORD, D102_C_CPUSAVER_BUNDLE_MAX_DWORD }, - { FXP_REV_82551, UCODE(fxp_ucode_d102e), + { FXP_REV_82551_F, UCODE(fxp_ucode_d102e), D102_E_CPUSAVER_DWORD, D102_E_CPUSAVER_BUNDLE_MAX_DWORD }, { 0, NULL, 0, 0, 0 } }; ==== //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.38 2005/04/21 19:34:57 mux Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.39 2005/04/22 13:05:53 mux Exp $ */ #define FXP_VENDORID_INTEL 0x8086 @@ -468,4 +468,6 @@ #define FXP_REV_82559S_A 9 /* 82559S A stepping */ #define FXP_REV_82550 12 #define FXP_REV_82550_C 13 /* 82550 C stepping */ -#define FXP_REV_82551 15 /* 82551 */ +#define FXP_REV_82551_E 14 /* 82551 */ +#define FXP_REV_82551_F 15 /* 82551 */ +#define FXP_REV_82551_10 16 /* 82551 */ ==== //depot/projects/ia64/sys/dev/puc/pucdata.c#30 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.50 2005/02/09 18:38:28 wilko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.51 2005/04/22 07:49:35 imp Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -846,6 +846,15 @@ * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports. */ + /* Oxford Semiconductor OX12PCI840 PCI Parallel port */ + { "Oxford Semiconductor OX12PCI840 Parallel port", + { 0x1415, 0x8403, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + }, + }, + /* Oxford Semiconductor OX16PCI954 PCI UARTs */ { "Oxford Semiconductor OX16PCI954 UARTs", { 0x1415, 0x9501, 0, 0 }, @@ -870,24 +879,15 @@ }, }, - /* Oxford Semiconductor OX16PCI954 PCI Parallel port */ - { "Oxford Semiconductor OX16PCI954 Parallel port", - { 0x1415, 0x9513, 0, 0 }, + /* Oxford Semiconductor OXCB950 PCI/CardBus UARTs */ + { "Oxford Semiconductor OXCB950 UART", + { 0x1415, 0x950b, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, }, }, - /* Oxford Semiconductor OX12PCI840 PCI Parallel port */ - { "Oxford Semiconductor OX12PCI840 Parallel port", - { 0x1415, 0x8403, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, - }, - }, - /* * Oxford Semiconductor OX9160/OX16PCI954 PCI UARTS * Second chip on Exsys EX-41098 8x cards @@ -903,6 +903,15 @@ }, }, + /* Oxford Semiconductor OX16PCI954 PCI Parallel port */ + { "Oxford Semiconductor OX16PCI954 Parallel port", + { 0x1415, 0x9513, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + }, + }, + /* NetMos 2S1P PCI 16C650 : 2S, 1P */ { "NetMos NM9835 Dual UART and 1284 Printer port", { 0x9710, 0x9835, 0, 0 }, ==== //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#19 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.86 2005/03/17 12:00:05 jeff Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.87 2005/04/22 22:42:44 jeff Exp $ */ /* @@ -530,7 +530,7 @@ * vop lock. */ if (nn != NULL && (lvp = NULLVPTOLOWERVP(vp)) != NULL) { - VI_LOCK(lvp); + VI_LOCK_FLAGS(lvp, MTX_DUPOK); VI_UNLOCK(vp); /* * We have to hold the vnode here to solve a potential ==== //depot/projects/ia64/sys/i386/acpica/acpi_wakecode.S#6 (text+ko) ==== @@ -24,15 +24,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.9 2004/01/01 22:57:22 njl Exp $ + * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.10 2005/04/22 09:53:04 iedowse Exp $ */ #define LOCORE #include -#include #include +#include "assym.s" + .align 4 .code16 wakeup_16: @@ -99,7 +100,7 @@ wakeup_sw32: /* Switch to protected mode by intersegmental jump */ - ljmpl $0x8,$0x12345678 /* Code location, to be replaced */ + ljmpl $KCSEL,$0x12345678 /* Code location, to be replaced */ .code32 wakeup_32: @@ -111,12 +112,12 @@ nop /* Set up segment registers for protected mode */ - movw $0x10,%ax /* KDSEL to segment registers */ + movw $KDSEL,%ax /* KDSEL to segment registers */ movw %ax,%ds movw %ax,%es movw %ax,%gs movw %ax,%ss - movw $0x18,%ax /* KPSEL to %fs */ + movw $KPSEL,%ax /* KPSEL to %fs */ movw %ax,%fs movl %esi,%esp /* physical address stack pointer */ ==== //depot/projects/ia64/sys/kern/kern_mac.c#39 (text+ko) ==== @@ -38,11 +38,12 @@ * Framework for extensible kernel access control. This file contains * Kernel and userland interface to the framework, policy registration * and composition. Per-object interfaces, controls, and labeling may be - * found in src/sys/mac/. Sample policies may be found in src/sys/mac*. + * found in src/sys/security/mac/. Sample policies may be found in + * src/sys/security/mac_*. */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.116 2005/04/16 18:33:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.117 2005/04/22 19:09:12 trhodes Exp $"); #include "opt_mac.h" #include "opt_devfs.h" ==== //depot/projects/ia64/sys/kern/subr_witness.c#53 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.192 2005/04/12 22:07:11 vkashyap Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.194 2005/04/22 22:43:31 jeff Exp $"); #include "opt_ddb.h" #include "opt_witness.h" @@ -333,8 +333,10 @@ /* * CDEV */ + { "system map", &lock_class_mtx_sleep }, + { "vm page queue mutex", &lock_class_mtx_sleep }, + { "vnode interlock", &lock_class_mtx_sleep }, { "cdev", &lock_class_mtx_sleep }, - { "system map", &lock_class_mtx_sleep }, { NULL, NULL }, /* * spin locks @@ -791,7 +793,8 @@ lock1 = &(*lock_list)->ll_children[(*lock_list)->ll_count - 1]; w1 = lock1->li_lock->lo_witness; if (w1 == w) { - if (w->w_same_squawked || (lock->lo_flags & LO_DUPOK)) + if (w->w_same_squawked || (lock->lo_flags & LO_DUPOK) || + (flags & LOP_DUPOK)) return; w->w_same_squawked = 1; printf("acquiring duplicate lock of same type: \"%s\"\n", ==== //depot/projects/ia64/sys/modules/Makefile#86 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.442 2005/04/20 22:03:33 marcel Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.443 2005/04/22 07:59:50 imp Exp $ # oldcard -- specialized use for debugging only. # owi -- totally unsupported for debugging only. @@ -184,6 +184,7 @@ procfs \ pseudofs \ ${_pst} \ + ${_puc} \ ral \ ${_random} \ ${_ray} \ @@ -200,6 +201,7 @@ scd \ ${_scsi_low} \ sf \ + ${_sio} \ sis \ sk \ ${_smbfs} \ @@ -346,10 +348,12 @@ _pcfclock= pcfclock _pecoff= pecoff _pst= pst +_puc= puc _ray= ray _safe= safe _sbni= sbni _scsi_low= scsi_low +_sio= sio _smbfs= smbfs _sound= sound _speaker= speaker @@ -462,7 +466,6 @@ _iir= iir _mly= mly _pccard= pccard -_ray= ray _scsi_low= scsi_low _smbfs= smbfs _sound= sound ==== //depot/projects/ia64/sys/modules/acpi/acpi/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.9 2005/02/24 20:48:06 njl Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.10 2005/04/22 09:53:03 iedowse Exp $ .PATH: ${.CURDIR}/../../../contrib/dev/acpica \ ${.CURDIR}/../../../pci \ @@ -77,11 +77,11 @@ # Machine-specific code such as sleep/wakeup SRCS+= acpi_machdep.c acpi_wakecode.h acpi_wakeup.c .if ${MACHINE} == "i386" -SRCS+= madt.c +SRCS+= madt.c assym.s .endif CLEANFILES+= acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin ${DBSRC:.c=.o} -acpi_wakecode.h: acpi_wakecode.S +acpi_wakecode.h: acpi_wakecode.S assym.s ${MAKE} -f ${.CURDIR}/../../../${MACHINE_ARCH}/acpica/Makefile \ MAKESRCPATH=${.CURDIR}/../../../${MACHINE_ARCH}/acpica >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:30:31 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FBF516A4DC; Sat, 23 Apr 2005 11:30:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD62F16A4CF for ; Sat, 23 Apr 2005 11:30:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CDEA43D41 for ; Sat, 23 Apr 2005 11:30:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBUUCc062545 for ; Sat, 23 Apr 2005 11:30:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBUULw062542 for perforce@freebsd.org; Sat, 23 Apr 2005 11:30:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:30:30 GMT Message-Id: <200504231130.j3NBUULw062542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:30:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=75787 Change 75787 by rwatson@rwatson_paprika on 2005/04/23 11:30:16 Add include for portability to FreeBSD. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#2 (text+ko) ==== @@ -26,6 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:31:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBEB316A4D0; Sat, 23 Apr 2005 11:31:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A442416A4CE for ; Sat, 23 Apr 2005 11:31:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6248F43D45 for ; Sat, 23 Apr 2005 11:31:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBVWDO062616 for ; Sat, 23 Apr 2005 11:31:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBVWKi062613 for perforce@freebsd.org; Sat, 23 Apr 2005 11:31:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:31:32 GMT Message-Id: <200504231131.j3NBVWKi062613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=75788 Change 75788 by rwatson@rwatson_paprika on 2005/04/23 11:30:41 Don't pollute global name space with 'delim'. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include -char *delim = ","; +static const char *delim = ","; /* * Convert the character representation of audit values From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:31:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D1D116A4EF; Sat, 23 Apr 2005 11:31:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CEE0816A4CE for ; Sat, 23 Apr 2005 11:31:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3C1843D45 for ; Sat, 23 Apr 2005 11:31:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBVW2q062622 for ; Sat, 23 Apr 2005 11:31:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBVW9f062619 for perforce@freebsd.org; Sat, 23 Apr 2005 11:31:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:31:32 GMT Message-Id: <200504231131.j3NBVW9f062619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:31:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=75789 Change 75789 by rwatson@rwatson_paprika on 2005/04/23 11:31:22 Include so we get the gettimeofday() prototype on FreeBSD. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#2 (text+ko) ==== @@ -26,10 +26,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include + #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:32:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C38CE16A4D0; Sat, 23 Apr 2005 11:32:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 895F216A4CE for ; Sat, 23 Apr 2005 11:32:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7287943D62 for ; Sat, 23 Apr 2005 11:32:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBWYT1062735 for ; Sat, 23 Apr 2005 11:32:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBWYDL062732 for perforce@freebsd.org; Sat, 23 Apr 2005 11:32:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:32:34 GMT Message-Id: <200504231132.j3NBWYDL062732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:32:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=75790 Change 75790 by rwatson@rwatson_paprika on 2005/04/23 11:31:51 Wrap audittoken_t mach port audit behavior in #ifdef __APPLE__. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#3 (text+ko) ==== @@ -320,6 +320,7 @@ /* END OF au_write() WRAPPERS */ +#ifdef __APPLE__ void audit_token_to_au32( audit_token_t atoken, @@ -351,4 +352,4 @@ tidp->port = (dev_t)atoken.val[7]; } } - +#endif /* !__APPLE__ */ From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:33:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8888516A4D0; Sat, 23 Apr 2005 11:33:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C7DC16A4CE for ; Sat, 23 Apr 2005 11:33:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 307B643D2D for ; Sat, 23 Apr 2005 11:33:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBXai9062772 for ; Sat, 23 Apr 2005 11:33:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBXZZo062769 for perforce@freebsd.org; Sat, 23 Apr 2005 11:33:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:33:35 GMT Message-Id: <200504231133.j3NBXZZo062769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:33:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=75791 Change 75791 by rwatson@rwatson_paprika on 2005/04/23 11:32:40 Use __APPLE__ instead of DARWIN. Ifdef more carefully. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#3 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include -#ifdef DARWIN +#ifdef __APPLE__ #include /* audit_token_t */ #endif @@ -840,7 +840,7 @@ void au_print_tok(FILE *outfp, tokenstr_t *tok, char *del, char raw, char sfrm); __END_DECLS -#ifdef DARWIN +#ifdef __APPLE__ /* * Apple-internal "wrapping" and utility definitions and prototypes. */ @@ -850,6 +850,7 @@ #ifdef __APPLE_API_PRIVATE #define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change" #endif +#endif /* !__APPLE__ */ /* * au_get_state() return values @@ -909,8 +910,6 @@ int au_get_state(void); __END_DECLS -#endif /* !DARWIN */ - /* OpenSSH compatibility */ #define cannot_audit(x) (au_get_state() == AUC_NOAUDIT) @@ -1150,6 +1149,7 @@ /* END au_write() WRAPPERS */ +#ifdef __APPLE__ /* * audit_token_to_au32() * @@ -1196,6 +1196,7 @@ pid_t *pidp, au_asid_t *asidp, au_tid_t *tidp); +#endif /* !__APPLE__ */ __END_DECLS From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:35:39 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B3A216A4D0; Sat, 23 Apr 2005 11:35:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DFAC16A4CE for ; Sat, 23 Apr 2005 11:35:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2452D43D49 for ; Sat, 23 Apr 2005 11:35:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBZdLI062942 for ; Sat, 23 Apr 2005 11:35:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBZcKF062939 for perforce@freebsd.org; Sat, 23 Apr 2005 11:35:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:35:38 GMT Message-Id: <200504231135.j3NBZcKF062939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:35:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=75792 Change 75792 by rwatson@rwatson_paprika on 2005/04/23 11:35:25 Define free_au_user_ent() so that au_user_ents can be free'd. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#2 (text+ko) ==== @@ -303,3 +303,13 @@ return 0; } + +/* + * Allow the caller to free an au_user_ent. + */ +void +free_au_user_ent(struct au_user_ent *u) +{ + + destroy_user_area(u); +} ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#4 (text+ko) ==== @@ -832,6 +832,7 @@ int au_user_mask(char *username, au_mask_t *mask_p); int getfauditflags(au_mask_t *usremask, au_mask_t *usrdmask, au_mask_t *lastmask); +void free_au_user_ent(struct au_user_ent *u); int au_read_rec(FILE *fp, u_char **buf); From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:40:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23ACC16A4D0; Sat, 23 Apr 2005 11:40:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8B4E16A4CE for ; Sat, 23 Apr 2005 11:40:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC5D743D3F for ; Sat, 23 Apr 2005 11:40:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBejEH063299 for ; Sat, 23 Apr 2005 11:40:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBejQR063296 for perforce@freebsd.org; Sat, 23 Apr 2005 11:40:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:40:45 GMT Message-Id: <200504231140.j3NBejQR063296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:40:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=75794 Change 75794 by rwatson@rwatson_paprika on 2005/04/23 11:39:54 Integrate audit_uevents.h into the bsm tree from the Apple Darwin 7.4 bsm drop. Hook up audit_uevents.h to the bsm include build, remove from the libbsm build. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/Makefile#1 add .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#2 (text+ko) ==== @@ -22,8 +22,7 @@ bsm_user.c \ bsm_wrappers.c -INCS= audit_uevents.h \ - libbsm.h +INCS= libbsm.h MAN= libbsm.3 \ au_class.3 \ From owner-p4-projects@FreeBSD.ORG Sat Apr 23 11:46:54 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09DC416A4D0; Sat, 23 Apr 2005 11:46:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C19D516A4CE for ; Sat, 23 Apr 2005 11:46:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96E7D43D1F for ; Sat, 23 Apr 2005 11:46:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NBkr5E063640 for ; Sat, 23 Apr 2005 11:46:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NBkrTn063637 for perforce@freebsd.org; Sat, 23 Apr 2005 11:46:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 11:46:53 GMT Message-Id: <200504231146.j3NBkrTn063637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 11:46:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=75795 Change 75795 by rwatson@rwatson_paprika on 2005/04/23 11:46:37 'all' target required for bsd.subdir.mk. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile#2 (text+ko) ==== @@ -10,6 +10,7 @@ TARGET= ${DESTDIR}/usr/include/bsm +all: default: clean: From owner-p4-projects@FreeBSD.ORG Sat Apr 23 12:07:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DC6416A4D0; Sat, 23 Apr 2005 12:07:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB09816A4CE for ; Sat, 23 Apr 2005 12:07:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 973B743D45 for ; Sat, 23 Apr 2005 12:07:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NC7IWL064745 for ; Sat, 23 Apr 2005 12:07:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NC7Ipa064742 for perforce@freebsd.org; Sat, 23 Apr 2005 12:07:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 12:07:18 GMT Message-Id: <200504231207.j3NC7Ipa064742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 12:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=75796 Change 75796 by rwatson@rwatson_paprika on 2005/04/23 12:06:24 Merge removal of bogus checks for nul-termination from FreeBSD to OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#3 (text+ko) ==== @@ -74,12 +74,7 @@ return NULL; } - /* Make sure that text is null terminated */ textlen = strlen(text); - if(text[textlen] != '\0') { - return NULL; - } - GET_TOKEN_AREA(t, dptr, 9 + textlen); if(t == NULL) { return NULL; @@ -107,12 +102,7 @@ return NULL; } - /* Make sure that text is null terminated */ textlen = strlen(text); - if(text[textlen] != '\0') { - return NULL; - } - GET_TOKEN_AREA(t, dptr, 13 + textlen); if(t == NULL) { return NULL; @@ -537,12 +527,7 @@ if(file == NULL) { return NULL; } - /* Make sure that text is null terminated */ filelen = strlen(file); - if(file[filelen] != '\0') { - return NULL; - } - GET_TOKEN_AREA(t, dptr, filelen + 12); if(t == NULL) { return NULL; @@ -576,12 +561,7 @@ if(text == NULL) { return NULL; } - /* Make sure that text is null terminated */ textlen = strlen(text); - if(text[textlen] != '\0') { - return NULL; - } - GET_TOKEN_AREA(t, dptr, textlen + 4); if(t == NULL) { return NULL; @@ -610,12 +590,7 @@ if(text == NULL) { return NULL; } - /* Make sure that text is null terminated */ textlen = strlen(text); - if(text[textlen] != '\0') { - return NULL; - } - GET_TOKEN_AREA(t, dptr, textlen + 4); if(t == NULL) { return NULL; @@ -1087,10 +1062,6 @@ int nextlen; nextlen = strlen(nextarg); - if(nextarg[nextlen] != '\0') { - return NULL; - } - totlen += nextlen + 1; count++; nextarg = *(args + count); @@ -1137,10 +1108,6 @@ int nextlen; nextlen = strlen(nextenv); - if(nextenv[nextlen] != '\0') { - return NULL; - } - totlen += nextlen + 1; count++; nextenv = *(env + count); From owner-p4-projects@FreeBSD.ORG Sat Apr 23 12:33:52 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF8EF16A4D0; Sat, 23 Apr 2005 12:33:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C69C16A4CE for ; Sat, 23 Apr 2005 12:33:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75F5743D2D for ; Sat, 23 Apr 2005 12:33:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NCXpBs065869 for ; Sat, 23 Apr 2005 12:33:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NCXpG6065866 for perforce@freebsd.org; Sat, 23 Apr 2005 12:33:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 12:33:51 GMT Message-Id: <200504231233.j3NCXpG6065866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 12:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=75798 Change 75798 by rwatson@rwatson_paprika on 2005/04/23 12:33:10 Look for _KERNEL as well as KERNEL. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ #ifndef _BSM_AUDIT_KERNEL_H #define _BSM_AUDIT_KERNEL_H -#ifdef KERNEL +#if defined(_KERNEL) || defined(KERNEL) #include @@ -395,6 +395,6 @@ #endif /* AUDIT */ -#endif /* KERNEL */ +#endif /* !defined(_KERNEL) || defined(KERNEL) */ #endif /* !_BSM_AUDIT_KERNEL_H */ From owner-p4-projects@FreeBSD.ORG Sat Apr 23 12:36:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5085C16A4D0; Sat, 23 Apr 2005 12:36:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF16E16A4CE for ; Sat, 23 Apr 2005 12:36:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B86C643D39 for ; Sat, 23 Apr 2005 12:36:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NCatCE066207 for ; Sat, 23 Apr 2005 12:36:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NCatTx066204 for perforce@freebsd.org; Sat, 23 Apr 2005 12:36:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 12:36:55 GMT Message-Id: <200504231236.j3NCatTx066204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 12:36:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=75799 Change 75799 by rwatson@rwatson_paprika on 2005/04/23 12:36:14 FreeBSD and Darwin variants on _KERNEL. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#3 (text+ko) ==== @@ -284,7 +284,7 @@ }; typedef struct au_evclass_map au_evclass_map_t; -#ifndef KERNEL +#if !defined(_KERNEL) && !defined(KERNEL) int audit (const void *, int); int auditon (int, void *, int); @@ -295,7 +295,7 @@ int setaudit (const struct auditinfo *); int getaudit_addr (struct auditinfo_addr *, int); int setaudit_addr (const struct auditinfo_addr *, int); -#endif /* !KERNEL */ +#endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS From owner-p4-projects@FreeBSD.ORG Sat Apr 23 12:41:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C1C316A4D0; Sat, 23 Apr 2005 12:41:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D50A316A4CE for ; Sat, 23 Apr 2005 12:41:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F89743D39 for ; Sat, 23 Apr 2005 12:41:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NCf1qe066473 for ; Sat, 23 Apr 2005 12:41:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NCf1LU066470 for perforce@freebsd.org; Sat, 23 Apr 2005 12:41:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 12:41:01 GMT Message-Id: <200504231241.j3NCf1LU066470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 12:41:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=75801 Change 75801 by rwatson@rwatson_paprika on 2005/04/23 12:40:59 #ifdef __APPLE__ various Mach-related things. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#3 (text+ko) ==== @@ -93,8 +93,10 @@ #define ARG_AMASK 0x0000020000000000ULL #define ARG_CTLNAME 0x0000040000000000ULL #define ARG_PROCESS 0x0000080000000000ULL +#ifdef __APPLE__ #define ARG_MACHPORT1 0x0000100000000000ULL #define ARG_MACHPORT2 0x0000200000000000ULL +#endif /* !__APPLE__ */ #define ARG_NONE 0x0000000000000000ULL #define ARG_ALL 0xFFFFFFFFFFFFFFFFULL @@ -211,8 +213,10 @@ int ar_arg_svipc_id; void * ar_arg_svipc_addr; struct posix_ipc_perm ar_arg_pipc_perm; +#ifdef __APPLE__ mach_port_t ar_arg_mach_port1; mach_port_t ar_arg_mach_port2; +#endif /* !__APPLE__ */ union auditon_udata ar_arg_auditon; }; @@ -247,9 +251,11 @@ struct proc *proc, struct uthread *uthread); void audit_syscall_exit(int error, struct proc *proc, struct uthread *uthread); +#ifdef __APPLE__ void audit_mach_syscall_enter(unsigned short audit_event); void audit_mach_syscall_exit(int retval, struct uthread *uthread); +#endif /* !__APPLE__ */ int kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau); @@ -316,8 +322,10 @@ mode_t mode); void audit_arg_auditon(union auditon_udata *udata); void audit_arg_file(struct proc *p, struct file *fp); +#ifdef __APPLE__ void audit_arg_mach_port1(mach_port_t port); void audit_arg_mach_port2(mach_port_t port); +#endif /* !__APPLE__ */ void audit_sysclose(struct proc *p, int fd); @@ -352,6 +360,7 @@ } \ } while (0) +#ifdef __APPLE__ /* * Wrap the audit_mach_syscall_enter() and audit_mach_syscall_exit() * functions in a manner similar to other system call enter/exit functions. @@ -368,6 +377,7 @@ audit_mach_syscall_exit(retval, uthread); \ } \ } while (0) +#endif /* !__APPLE__ */ /* * A Macro to wrap the audit_sysclose() function. @@ -384,11 +394,13 @@ #define AUDIT_SYSCALL_EXIT(error, proc, uthread) do { \ } while (0) +#ifdef __APPLE__ #define AUDIT_MACH_SYSCALL_ENTER(args...) do { \ } while (0) #define AUDIT_MACH_SYSCALL_EXIT(retval) do { \ } while (0) +#endif /* !__APPLE__ */ #define AUDIT_SYSCLOSE(op, args...) do { \ } while (0) From owner-p4-projects@FreeBSD.ORG Sat Apr 23 13:06:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DD9616A4D1; Sat, 23 Apr 2005 13:06:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE1FF16A4CE for ; Sat, 23 Apr 2005 13:06:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82FB343D3F for ; Sat, 23 Apr 2005 13:06:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3ND6XYO074124 for ; Sat, 23 Apr 2005 13:06:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3ND6XnP074112 for perforce@freebsd.org; Sat, 23 Apr 2005 13:06:33 GMT (envelope-from wsalamon@computer.org) Date: Sat, 23 Apr 2005 13:06:33 GMT Message-Id: <200504231306.j3ND6XnP074112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 75803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 13:06:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=75803 Change 75803 by wsalamon@rickenbacker on 2005/04/23 13:06:32 Audit the fork(), vfork(), and rfork() system calls. Change the test program to match, but comment out some unused bits for now. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#7 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tfork.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#4 (text+ko) ==== @@ -139,6 +139,7 @@ if ((uap->flags & RFKERNELONLY) != 0) return (EINVAL); + AUDIT_ARG(fflags, uap->flags); error = fork1(td, uap->flags, 0, &p2); if (error == 0) { td->td_retval[0] = p2 ? p2->p_pid : 0; @@ -412,6 +413,7 @@ p2 = newproc; p2->p_state = PRS_NEW; /* protect against others */ p2->p_pid = trypid; + AUDIT_ARG(pid, p2->p_pid); LIST_INSERT_HEAD(&allproc, p2, p_list); LIST_INSERT_HEAD(PIDHASH(p2->p_pid), p2, p_hash); sx_xunlock(&allproc_lock); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#7 (text+ko) ==== @@ -672,6 +672,10 @@ FD_KPATH1_VNODE1_TOKENS; break; + case AUE_RFORK: + tok = au_to_arg32(1, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + /* fall through */ case AUE_FORK: case AUE_VFORK: tok = au_to_arg32(0, "child PID", ar->ar_arg_pid); ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/process/tfork.c#3 (text+ko) ==== @@ -26,6 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include +#include #include #include #include @@ -45,12 +46,14 @@ void sig_handler(int sig, siginfo_t *sip, struct sigcontext *scp) { +#if 0 /* Generate an AUE_PTRACE record */ if (ptrace(PT_CONTINUE, child_pid, (caddr_t)1, SIGKILL) < 0) { AUT_PERROR("ptrace(PT_CONTINUE)"); exit(1); } aut_assert(AUE_PTRACE); +#endif /* We don't want to see the child dies signal */ act.sa_handler = SIG_DFL; sigaction(SIGCHLD, &act, NULL); @@ -78,37 +81,60 @@ /* Generate an AUE_FORK record */ if ((child_pid = fork()) < 0) AUT_PERROR("fork"); - aut_assert(AUE_FORK); /* Generate a success AUE_EXECVE record */ if (child_pid == 0) { execv("child", argv); AUT_PERROR("child one did not execute"); } + aut_assert(AUE_FORK); aut_assert(AUE_EXECVE); +#if 0 /* Generate an AUE_PTRACE record */ if (ptrace(PT_ATTACH, child_pid, NULL, 0) < 0) AUT_PERROR("ptrace(PT_ATTACH)"); aut_assert(AUE_PTRACE); +#endif while (wait(&status) != child_pid) ; +#if 0 /* Generate a failure AUE_PTRACE record */ ptrace(PT_ATTACH, 0, NULL, 16384); - +#endif /* Generate an AUE_VFORK record */ if ((child_pid = vfork()) < 0) AUT_PERROR("vfork"); + + /* Generate another success AUE_EXECVE record */ + if (child_pid == 0) { + execv("child", argv); + AUT_PERROR("child two did not execute"); + } aut_assert(AUE_VFORK); + aut_assert(AUE_EXECVE); + + while (wait(&status) != child_pid) + ; + /* Generate an AUE_RFORK record */ + if ((child_pid = rfork(RFPROC)) < 0) + AUT_PERROR("rfork"); + /* Generate another success AUE_EXECVE record */ if (child_pid == 0) { execv("child", argv); AUT_PERROR("child two did not execute"); } + aut_assert(AUE_RFORK); + aut_assert(AUE_EXECVE); + + while (wait(&status) != child_pid) + ; +#if 0 if (open(ktrace_file, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR) < 0) { AUT_PERROR("open of ktrace file"); exit(1); @@ -121,7 +147,7 @@ /* Generate an AUE_KTRACE record with a bad filename */ ktrace("ANonExistentKtraceFile", KTROP_SET, KTRFAC_SYSCALL, child_pid); - +#endif /* Generate another AUE_VFORK record */ if ((child_pid = vfork()) < 0) AUT_PERROR("vfork"); @@ -130,6 +156,10 @@ if (child_pid == 0) execv("aChildThatDoesntExist", argv); + aut_assert(AUE_VFORK); + /* A failure AUE_EXECVE record */ + aut_assert(AUE_EXECVE); + unlink(ktrace_file); aut_shutdown(); From owner-p4-projects@FreeBSD.ORG Sat Apr 23 17:30:11 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B82416A4D0; Sat, 23 Apr 2005 17:30:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EFD616A4CE for ; Sat, 23 Apr 2005 17:30:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0740F43D49 for ; Sat, 23 Apr 2005 17:30:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NHUAFB091848 for ; Sat, 23 Apr 2005 17:30:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NHUAp2091845 for perforce@freebsd.org; Sat, 23 Apr 2005 17:30:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 17:30:10 GMT Message-Id: <200504231730.j3NHUAp2091845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 17:30:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=75820 Change 75820 by rwatson@rwatson_paprika on 2005/04/23 17:29:15 Document that OpenBSM is believed to work on FreeBSD and Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#2 (text+ko) ==== @@ -19,6 +19,10 @@ libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages +OpenBMS currently builds on FreeBSD and Darwin. With Makefile adjustment +and minor tweaks, it should build without problems on a broad range of +POSIX-like systems. + Credits The following organizations and individuals have contributed substantially From owner-p4-projects@FreeBSD.ORG Sat Apr 23 17:33:16 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2BF216A4D1; Sat, 23 Apr 2005 17:33:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7632B16A4CF for ; Sat, 23 Apr 2005 17:33:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A8D843D2D for ; Sat, 23 Apr 2005 17:33:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NHXFhW092030 for ; Sat, 23 Apr 2005 17:33:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NHXEBI092027 for perforce@freebsd.org; Sat, 23 Apr 2005 17:33:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 17:33:14 GMT Message-Id: <200504231733.j3NHXEBI092027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 17:33:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=75821 Change 75821 by rwatson@rwatson_paprika on 2005/04/23 17:32:13 Interim top-level Makefile. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 23 17:33:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A76A716A4E6; Sat, 23 Apr 2005 17:33:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8B5216A4D6 for ; Sat, 23 Apr 2005 17:33:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9904843D2D for ; Sat, 23 Apr 2005 17:33:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NHXFmJ092037 for ; Sat, 23 Apr 2005 17:33:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NHXFnB092033 for perforce@freebsd.org; Sat, 23 Apr 2005 17:33:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 17:33:15 GMT Message-Id: <200504231733.j3NHXFnB092033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 17:33:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=75822 Change 75822 by rwatson@rwatson_paprika on 2005/04/23 17:32:43 subdir-based bin/Makefile to recurse into praudit and auditreduce. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 23 20:13:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C34AA16A4E4; Sat, 23 Apr 2005 20:13:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6655716A4E4 for ; Sat, 23 Apr 2005 20:13:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B2F843D41 for ; Sat, 23 Apr 2005 20:13:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3NKDXSS098947 for ; Sat, 23 Apr 2005 20:13:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3NKDWAT098944 for perforce@freebsd.org; Sat, 23 Apr 2005 20:13:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Apr 2005 20:13:32 GMT Message-Id: <200504232013.j3NKDWAT098944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 75833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 20:13:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=75833 Change 75833 by rwatson@rwatson_paprika on 2005/04/23 20:13:29 Add a VERSION file. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#1 add Differences ...