Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Dec 2008 10:59:42 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 153949 for review
Message-ID:  <200812021059.mB2AxgYB033211@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=153949

Change 153949 by peter@peter_overcee on 2008/12/02 10:59:39

	IFC @153946

Affected files ...

.. //depot/projects/hammer/Makefile#53 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#62 integrate
.. //depot/projects/hammer/UPDATING#126 integrate
.. //depot/projects/hammer/lib/libc/gen/times.3#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/fread.c#6 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#50 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/jail.2#9 integrate
.. //depot/projects/hammer/lib/libc/sys/recv.2#15 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#39 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#7 integrate
.. //depot/projects/hammer/lib/libutil/Makefile#21 integrate
.. //depot/projects/hammer/lib/libutil/kinfo_getfile.c#1 branch
.. //depot/projects/hammer/lib/libutil/kinfo_getvmmap.c#1 branch
.. //depot/projects/hammer/lib/libutil/libutil.h#12 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#15 integrate
.. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#8 integrate
.. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#20 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#113 integrate
.. //depot/projects/hammer/share/man/man4/ale.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ath_hal.4#11 integrate
.. //depot/projects/hammer/share/man/man4/ddb.4#22 integrate
.. //depot/projects/hammer/share/man/man4/man4.arm/Makefile#3 integrate
.. //depot/projects/hammer/share/man/man4/upgt.4#2 integrate
.. //depot/projects/hammer/share/man/man9/ktr.9#10 integrate
.. //depot/projects/hammer/sys/amd64/Makefile#5 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#64 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#116 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#116 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux.h#11 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#26 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#18 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#18 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#18 integrate
.. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#18 integrate
.. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#30 integrate
.. //depot/projects/hammer/sys/arm/at91/at91_machdep.c#2 integrate
.. //depot/projects/hammer/sys/arm/at91/at91_pmc.c#8 integrate
.. //depot/projects/hammer/sys/arm/conf/AVILA#14 integrate
.. //depot/projects/hammer/sys/arm/conf/BWCT#7 integrate
.. //depot/projects/hammer/sys/arm/conf/CRB#7 integrate
.. //depot/projects/hammer/sys/arm/conf/DB-78XXX#3 integrate
.. //depot/projects/hammer/sys/arm/conf/DB-88F5XXX#3 integrate
.. //depot/projects/hammer/sys/arm/conf/DB-88F6XXX#3 integrate
.. //depot/projects/hammer/sys/arm/conf/GUMSTIX#3 integrate
.. //depot/projects/hammer/sys/arm/conf/KB920X#12 integrate
.. //depot/projects/hammer/sys/arm/conf/NSLU#4 integrate
.. //depot/projects/hammer/sys/arm/conf/SIMICS#15 integrate
.. //depot/projects/hammer/sys/arm/conf/SKYEYE#8 integrate
.. //depot/projects/hammer/sys/arm/mv/mv_machdep.c#3 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#14 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#25 integrate
.. //depot/projects/hammer/sys/arm/xscale/i8134x/crb_machdep.c#8 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#9 integrate
.. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate
.. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32.h#8 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#61 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#61 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#58 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#58 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#58 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#63 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#34 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#28 integrate
.. //depot/projects/hammer/sys/conf/files#192 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#109 integrate
.. //depot/projects/hammer/sys/conf/files.arm#14 integrate
.. //depot/projects/hammer/sys/conf/files.i386#100 integrate
.. //depot/projects/hammer/sys/conf/files.mips#5 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#74 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#35 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#48 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#56 integrate
.. //depot/projects/hammer/sys/conf/options#136 integrate
.. //depot/projects/hammer/sys/conf/options.arm#16 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/COPYRIGHT#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/README#7 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#11 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/ah_desc.h#7 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/ah_devid.h#8 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/ah_soc.h#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/alpha-elf.inc#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap30.hal.o.uu#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap30.inc#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap43.hal.o.uu#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap43.inc#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap51.hal.o.uu#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap51.inc#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap61.hal.o.uu#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap61.inc#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.inc#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.inc#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-elf.inc#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc64-be-elf.inc#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/wackelf.c#3 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/wisoc.inc#2 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.inc#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#4 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.inc#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.inc#6 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#5 delete
.. //depot/projects/hammer/sys/contrib/dev/ath/version.h#11 delete
.. //depot/projects/hammer/sys/dev/asmc/asmc.c#5 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#59 integrate
.. //depot/projects/hammer/sys/dev/ath/ah_osdep.c#6 integrate
.. //depot/projects/hammer/sys/dev/ath/ah_osdep.h#5 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_debug.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_decode.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_desc.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_devid.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_internal.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_soc.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#15 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#17 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#15 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.h#7 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#65 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#20 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athvar.h#36 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus_device.c#3 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbusvar.h#10 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#29 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#26 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#9 integrate
.. //depot/projects/hammer/sys/dev/fb/s3_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#67 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#13 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#13 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#67 integrate
.. //depot/projects/hammer/sys/dev/k8temp/k8temp.c#6 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#64 integrate
.. //depot/projects/hammer/sys/dev/sdhci/sdhci.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/if_upgt.c#2 integrate
.. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#3 integrate
.. //depot/projects/hammer/sys/geom/geom_bsd.c#31 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#17 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#12 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#7 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#7 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#75 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#109 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#27 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#48 integrate
.. //depot/projects/hammer/sys/i386/linux/linux.h#14 integrate
.. //depot/projects/hammer/sys/kern/Make.tags.inc#9 integrate
.. //depot/projects/hammer/sys/kern/kern_cpuset.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#87 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#76 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#75 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#36 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#78 integrate
.. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#36 integrate
.. //depot/projects/hammer/sys/kern/uipc_shm.c#6 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#89 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#101 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#138 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#86 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#62 integrate
.. //depot/projects/hammer/sys/mips/conf/IDT#6 integrate
.. //depot/projects/hammer/sys/mips/conf/SENTRY5#5 integrate
.. //depot/projects/hammer/sys/mips/include/atomic.h#2 integrate
.. //depot/projects/hammer/sys/mips/mips/machdep.c#5 integrate
.. //depot/projects/hammer/sys/modules/Makefile#136 integrate
.. //depot/projects/hammer/sys/modules/ae/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ath/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/ath_hal/Makefile#7 delete
.. //depot/projects/hammer/sys/modules/ath_rate_amrr/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/ath_rate_onoe/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/ath_rate_sample/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/powermac_nvram/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/if.c#83 integrate
.. //depot/projects/hammer/sys/net/rtsock.c#42 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#64 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#59 integrate
.. //depot/projects/hammer/sys/netinet/sctp_pcb.c#26 integrate
.. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#26 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#61 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#62 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#42 integrate
.. //depot/projects/hammer/sys/netinet6/in6_src.c#33 integrate
.. //depot/projects/hammer/sys/netinet6/raw_ip6.c#42 integrate
.. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#44 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#37 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#57 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#69 integrate
.. //depot/projects/hammer/sys/pci/if_rlreg.h#39 integrate
.. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#17 integrate
.. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#35 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#67 integrate
.. //depot/projects/hammer/sys/sys/buf_ring.h#2 integrate
.. //depot/projects/hammer/sys/sys/cpuset.h#6 integrate
.. //depot/projects/hammer/sys/sys/jail.h#16 integrate
.. //depot/projects/hammer/sys/sys/mount.h#60 integrate
.. //depot/projects/hammer/sys/sys/param.h#123 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#45 integrate
.. //depot/projects/hammer/sys/sys/user.h#34 integrate
.. //depot/projects/hammer/usr.bin/cpio/cpio.c#8 integrate
.. //depot/projects/hammer/usr.bin/cpio/cpio.h#4 integrate
.. //depot/projects/hammer/usr.bin/cpio/test/test_option_tv.stdout.uu#2 integrate
.. //depot/projects/hammer/usr.bin/cpuset/cpuset.1#4 integrate
.. //depot/projects/hammer/usr.bin/cpuset/cpuset.c#4 integrate
.. //depot/projects/hammer/usr.bin/procstat/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/procstat/procstat_files.c#6 integrate
.. //depot/projects/hammer/usr.bin/procstat/procstat_vm.c#6 integrate
.. //depot/projects/hammer/usr.bin/tar/config_freebsd.h#8 integrate
.. //depot/projects/hammer/usr.bin/tar/util.c#17 integrate
.. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.5#8 integrate
.. //depot/projects/hammer/usr.sbin/jail/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/jail/jail.8#33 integrate
.. //depot/projects/hammer/usr.sbin/jail/jail.c#14 integrate
.. //depot/projects/hammer/usr.sbin/jexec/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/jexec/jexec.8#7 integrate
.. //depot/projects/hammer/usr.sbin/jexec/jexec.c#7 integrate
.. //depot/projects/hammer/usr.sbin/jls/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/jls/jls.8#2 integrate
.. //depot/projects/hammer/usr.sbin/jls/jls.c#4 integrate
.. //depot/projects/hammer/usr.sbin/kldxref/kldxref.c#9 integrate

Differences ...

==== //depot/projects/hammer/Makefile#53 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.354 2008/11/24 11:23:14 des Exp $
+# $FreeBSD: src/Makefile,v 1.355 2008/12/01 00:45:51 alfred Exp $
 #
 # The user-driven targets are:
 #
@@ -267,6 +267,10 @@
 		${MMAKE} all && \
 		${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
 
+tinderbox:
+	cd ${.CURDIR} && \
+		DOING_TINDERBOX=YES ${MAKE} ${JFLAG} universe
+
 #
 # universe
 #
@@ -274,14 +278,24 @@
 # with a reasonable chance of success, regardless of how old your
 # existing system is.
 #
-.if make(universe)
+.if make(universe) || make(tinderbox)
 TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v
 
+.if defined(DOING_TINDERBOX)
+FAILFILE=tinderbox.failed
+MAKEFAIL=tee -a ${FAILFILE}
+.else
+MAKEFAIL=cat
+.endif
+
 universe: universe_prologue
 universe_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
+.if defined(DOING_TINDERBOX)
+	rm -f ${FAILFILE}
+.endif
 .for target in ${TARGETS}
 KERNCONFS!=	cd ${.CURDIR}/sys/${target}/conf && \
 		find [A-Z]*[A-Z] -type f -maxdepth 0 \
@@ -296,15 +310,15 @@
 	    ${MAKE} ${JFLAG} buildworld \
 	    TARGET=${target} \
 	    > _.${target}.buildworld 2>&1 || \
-	    echo "${target} world failed," \
-	    "check _.${target}.buildworld for details")
+	    (echo "${target} world failed," \
+	    "check _.${target}.buildworld for details" | ${MAKEFAIL}))
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
 .endif
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
 	@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
 	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
-	    echo "${target} 'make LINT' failed," \
-	    "check _.${target}.makeLINT for details")
+	    (echo "${target} 'make LINT' failed," \
+	    "check _.${target}.makeLINT for details"| ${MAKEFAIL}))
 .endif
 .for kernel in ${KERNCONFS}
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
@@ -312,8 +326,8 @@
 	    TARGET=${target} \
 	    KERNCONF=${kernel} \
 	    > _.${target}.${kernel} 2>&1 || \
-	    echo "${target} ${kernel} kernel failed," \
-	    "check _.${target}.${kernel} for details")
+	    (echo "${target} ${kernel} kernel failed," \
+	    "check _.${target}.${kernel} for details"| ${MAKEFAIL}))
 .endfor
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
@@ -323,4 +337,11 @@
 	@echo ">>> make universe completed on `LC_ALL=C date`"
 	@echo "                      (started ${STARTTIME})"
 	@echo "--------------------------------------------------------------"
+.if defined(DOING_TINDERBOX)
+	@if [ -e ${FAILFILE} ] ; then \
+		echo "Tinderbox failed:" ;\
+		cat ${FAILFILE} ;\
+		exit 1 ;\
+	fi
+.endif
 .endif

==== //depot/projects/hammer/ObsoleteFiles.inc#62 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.164 2008/11/30 11:03:16 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20081123: vfs_mountedon.9 removed
+OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz
+# 20081023: FREE.9 and MALLOC.9 removed
+OLD_FILES+=usr/share/man/man9/FREE.9.gz
+OLD_FILES+=usr/share/man/man9/MALLOC.9.gz
 # 20080928: removal of inaccurate device_ids(9) manual page
 OLD_FILES+=usr/share/man/man9/device_ids.9.gz
 OLD_FILES+=usr/share/man/man9/major.9.gz

==== //depot/projects/hammer/UPDATING#126 (text+ko) ====

@@ -22,6 +22,21 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20081130:
+	__FreeBSD_version 800057 marks the switchover from the
+	binary ath hal to source code. Users must add the line:
+
+	options	AH_SUPPORT_AR5416
+
+	to their kernel config files when specifying:
+
+	device	ath_hal
+
+	The ath_hal module no longer exists; the code is now compiled
+	together with the driver in the ath module.  It is now
+	possible to tailor chip support (i.e. reduce the set of chips
+	and thereby the code size); consult ath_hal(4) for details.
+
 20081121:
 	__FreeBSD_version 800054 adds memory barriers to 
 	<machine/atomic.h>, new interfaces to ifnet to facilitate 
@@ -1163,4 +1178,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.549 2008/11/22 05:55:56 kmacy Exp $
+$FreeBSD: src/UPDATING,v 1.551 2008/12/01 23:09:58 sam Exp $

==== //depot/projects/hammer/lib/libc/gen/times.3#3 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)times.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/times.3,v 1.11 2007/01/09 00:27:55 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/times.3,v 1.12 2008/12/01 15:27:00 keramida Exp $
 .\"
-.Dd June 4, 1993
+.Dd December 1, 2008
 .Dt TIMES 3
 .Os
 .Sh NAME
@@ -52,9 +52,13 @@
 .Fn times
 function returns the value of time in
 .Dv CLK_TCK Ns 's
-of a second since
-0 hours, 0 minutes, 0 seconds, January 1, 1970, Coordinated Universal
-Time.
+of a second since the system startup time.
+The current value of
+.Dv CLK_TCK ,
+the frequency of the statistics clock in ticks per second, may be
+obtained through the
+.Xr sysconf 3
+interface.
 .Pp
 It also fills in the structure pointed to by
 .Fa tp
@@ -131,6 +135,7 @@
 .Xr getrusage 2 ,
 .Xr gettimeofday 2 ,
 .Xr wait 2 ,
+.Xr sysconf 3 ,
 .Xr clocks 7
 .Sh STANDARDS
 The

==== //depot/projects/hammer/lib/libc/stdio/fread.c#6 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.14 2007/01/09 00:28:06 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.15 2008/12/01 14:33:34 ru Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
@@ -50,7 +50,7 @@
 size_t
 fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
 {
-	int ret;
+	size_t ret;
 
 	FLOCKFILE(fp);
 	ret = __fread(buf, size, count, fp);

==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#50 (text+ko) ====

@@ -156,7 +156,7 @@
 #define	MALLOC_DSS
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.180 2008/11/03 21:17:18 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.183 2008/12/01 10:20:59 jasone Exp $");
 
 #include "libc_private.h"
 #ifdef MALLOC_DEBUG
@@ -1262,18 +1262,20 @@
 
 	if (__isthreaded) {
 		if (_pthread_mutex_trylock(lock) != 0) {
-			unsigned i;
-			volatile unsigned j;
+			/* Exponentially back off if there are multiple CPUs. */
+			if (ncpus > 1) {
+				unsigned i;
+				volatile unsigned j;
+
+				for (i = 1; i <= SPIN_LIMIT_2POW; i++) {
+					for (j = 0; j < (1U << i); j++) {
+						ret++;
+						CPU_SPINWAIT;
+					}
 
-			/* Exponentially back off. */
-			for (i = 1; i <= SPIN_LIMIT_2POW; i++) {
-				for (j = 0; j < (1U << i); j++) {
-					ret++;
-					CPU_SPINWAIT;
+					if (_pthread_mutex_trylock(lock) == 0)
+						return (ret);
 				}
-
-				if (_pthread_mutex_trylock(lock) == 0)
-					return (ret);
 			}
 
 			/*
@@ -1282,7 +1284,7 @@
 			 * inversion.
 			 */
 			_pthread_mutex_lock(lock);
-			assert((ret << BLOCK_COST_2POW) != 0);
+			assert((ret << BLOCK_COST_2POW) != 0 || ncpus == 1);
 			return (ret << BLOCK_COST_2POW);
 		}
 	}
@@ -5513,16 +5515,41 @@
 void
 _malloc_prefork(void)
 {
-	unsigned i;
+	bool again;
+	unsigned i, j;
+	arena_t *larenas[narenas], *tarenas[narenas];
 
 	/* Acquire all mutexes in a safe order. */
 
-	malloc_spin_lock(&arenas_lock);
-	for (i = 0; i < narenas; i++) {
-		if (arenas[i] != NULL)
-			malloc_spin_lock(&arenas[i]->lock);
-	}
-	malloc_spin_unlock(&arenas_lock);
+	/*
+	 * arenas_lock must be acquired after all of the arena mutexes, in
+	 * order to avoid potential deadlock with arena_lock_balance[_hard]().
+	 * Since arenas_lock protects the arenas array, the following code has
+	 * to race with arenas_extend() callers until it succeeds in locking
+	 * all arenas before locking arenas_lock.
+	 */
+	memset(larenas, 0, sizeof(arena_t *) * narenas);
+	do {
+		again = false;
+
+		malloc_spin_lock(&arenas_lock);
+		for (i = 0; i < narenas; i++) {
+			if (arenas[i] != larenas[i]) {
+				memcpy(tarenas, arenas, sizeof(arena_t *) *
+				    narenas);
+				malloc_spin_unlock(&arenas_lock);
+				for (j = 0; j < narenas; j++) {
+					if (larenas[j] != tarenas[j]) {
+						larenas[j] = tarenas[j];
+						malloc_spin_lock(
+						    &larenas[j]->lock);
+					}
+				}
+				again = true;
+				break;
+			}
+		}
+	} while (again);
 
 	malloc_mutex_lock(&base_mtx);
 
@@ -5537,6 +5564,7 @@
 _malloc_postfork(void)
 {
 	unsigned i;
+	arena_t *larenas[narenas];
 
 	/* Release all mutexes, now that fork() has completed. */
 
@@ -5548,12 +5576,12 @@
 
 	malloc_mutex_unlock(&base_mtx);
 
-	malloc_spin_lock(&arenas_lock);
+	memcpy(larenas, arenas, sizeof(arena_t *) * narenas);
+	malloc_spin_unlock(&arenas_lock);
 	for (i = 0; i < narenas; i++) {
-		if (arenas[i] != NULL)
-			malloc_spin_unlock(&arenas[i]->lock);
+		if (larenas[i] != NULL)
+			malloc_spin_unlock(&larenas[i]->lock);
 	}
-	malloc_spin_unlock(&arenas_lock);
 }
 
 /*

==== //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#4 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.3 2008/09/29 15:44:48 jhb Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.4 2008/11/29 14:32:14 bz Exp $
 .\"
-.Dd March 29, 2008
+.Dd November 29, 2008
 .Dt CPUSET 2
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@
 and
 .Fn cpuset_setaffinity
 allow the manipulation of sets of CPUs available to processes, threads, 
-interrupts and other resources.
+interrupts, jails and other resources.
 These functions may manipulate sets of CPUs that contain many processes
 or per-object anonymous masks that effect only a single object.
 .Pp

==== //depot/projects/hammer/lib/libc/sys/jail.2#9 (text+ko) ====

@@ -6,9 +6,9 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD: src/lib/libc/sys/jail.2,v 1.29 2008/08/03 21:56:58 trhodes Exp $
+.\" $FreeBSD: src/lib/libc/sys/jail.2,v 1.30 2008/11/29 14:32:14 bz Exp $
 .\"
-.Dd August 3, 2008
+.Dd November 29, 2008
 .Dt JAIL 2
 .Os
 .Sh NAME
@@ -32,15 +32,20 @@
 .Bd -literal -offset indent
 struct jail {
 	u_int32_t	version;
-        char 		*path;
-        char 		*hostname;
-        u_int32_t	ip_number;
+	char		*path;
+	char		*hostname;
+	char		*jailname;
+	unsigned int	ip4s;
+	unsigned int	ip6s;
+	struct in_addr	*ip4;
+	struct in6_addr	*ip6;
 };
 .Ed
 .Pp
 .Dq Li version
 defines the version of the API in use.
-It should be set to zero at this time.
+.Dv JAIL_API_VERSION
+is defined for the current version.
 .Pp
 The
 .Dq Li path
@@ -54,8 +59,24 @@
 from the inside of the prison.
 .Pp
 The
-.Dq Li ip_number
-can be set to the IP number assigned to the prison.
+.Dq Li jailname
+pointer is an optional name that can be assigned to the jail
+for example for managment purposes.
+.Pp
+The
+.Dq Li ip4s
+and
+.Dq Li ip6s
+give the numbers of IPv4 and IPv6 addresses that will be passed
+via their respective pointers.
+.Pp
+The
+.Dq Li ip4
+and
+.Dq Li ip6
+pointers can be set to an arrays of IPv4 and IPv6 addresses to be assigned to
+the prison, or NULL if none.
+IPv4 addresses must be in network byte order.
 .Pp
 The
 .Fn jail_attach

==== //depot/projects/hammer/lib/libc/sys/recv.2#15 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.34 2007/01/09 00:28:15 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/recv.2,v 1.35 2008/11/30 21:40:01 ivoras Exp $
 .\"
 .Dd December 28, 2006
 .Dt RECV 2
@@ -83,7 +83,6 @@
 null pointer passed as its
 .Fa from
 argument.
-As it is redundant, it may not be supported in future releases.
 .Pp
 All three routines return the length of the message on successful
 completion.

==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#39 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.97 2008/03/12 10:00:33 jeff Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.98 2008/11/29 14:32:14 bz Exp $");
 
 /*
  * Proc traversal interface for kvm.  ps and w are (probably) the exclusive
@@ -54,10 +54,11 @@
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 #include <sys/_task.h>
+#include <sys/cpuset.h>
+#include <sys/user.h>
+#include <sys/proc.h>
 #define	_WANT_PRISON	/* make jail.h give us 'struct prison' */
 #include <sys/jail.h>
-#include <sys/user.h>
-#include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/stat.h>
 #include <sys/sysent.h>

==== //depot/projects/hammer/lib/libthr/thread/thr_fork.c#7 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_fork.c,v 1.9 2008/11/27 11:27:59 kib Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_fork.c,v 1.11 2008/12/01 21:00:25 kan Exp $
  */
 
 /*
@@ -158,6 +158,9 @@
 		/* clear other threads locked us. */
 		_thr_umutex_init(&curthread->lock);
 		_thr_umutex_init(&_thr_atfork_lock);
+
+		if (unlock_malloc)
+			_rtld_atfork_post(rtld_locks);
 		_thr_setthreaded(0);
 
 		/* reinitialize libc spinlocks. */
@@ -170,9 +173,8 @@
 		/* Ready to continue, unblock signals. */ 
 		_thr_signal_unblock(curthread);
 
-		if (unlock_malloc) {
-			_rtld_atfork_post(rtld_locks);
-		}
+		if (unlock_malloc)
+			_malloc_postfork();
 
 		/* Run down atfork child handlers. */
 		TAILQ_FOREACH(af, &_thr_atfork_list, qe) {

==== //depot/projects/hammer/lib/libutil/Makefile#21 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD: src/lib/libutil/Makefile,v 1.72 2008/11/23 23:26:12 scf Exp $
+#	$FreeBSD: src/lib/libutil/Makefile,v 1.73 2008/12/02 06:50:26 peter Exp $
 
 SHLIBDIR?= /lib
 
@@ -9,7 +9,8 @@
 SHLIB_MAJOR= 7
 
 SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
-	hexdump.c humanize_number.c kld.c login.c login_auth.c login_cap.c \
+	hexdump.c humanize_number.c kinfo_getfile.c kinfo_getvmmap.c kld.c \
+	login.c login_auth.c login_cap.c \
 	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
 	logout.c logwtmp.c pidfile.c property.c pty.c pw_util.c realhostname.c \
 	stub.c trimdomain.c uucplock.c

==== //depot/projects/hammer/lib/libutil/libutil.h#12 (text+ko) ====

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libutil/libutil.h,v 1.48 2008/07/01 22:30:57 jhb Exp $
+ * $FreeBSD: src/lib/libutil/libutil.h,v 1.49 2008/12/02 06:50:26 peter Exp $
  */
 
 #ifndef _LIBUTIL_H_
@@ -64,6 +64,8 @@
 struct winsize;
 struct utmp;
 struct in_addr;
+struct kinfo_file;
+struct kinfo_vmentry;
 
 __BEGIN_DECLS
 void	clean_environment(const char * const *_white,
@@ -100,6 +102,10 @@
 
 int	kld_isloaded(const char *name);
 int	kld_load(const char *name);
+struct kinfo_file *
+	kinfo_getfile(pid_t _pid, int *_cntp);
+struct kinfo_vmentry *
+	kinfo_getvmmap(pid_t _pid, int *_cntp);
 
 #ifdef _STDIO_H_	/* avoid adding new includes */
 char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#15 (text+ko) ====

@@ -17,7 +17,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.342 2008/11/24 01:26:22 delphij Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.343 2008/12/01 21:15:04 brueffer Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -712,6 +712,8 @@
 
       &hwlist.ixgb;
 
+      &hwlist.ixgbe;
+
       &hwlist.jme;
 
       &hwlist.kue;
@@ -838,6 +840,8 @@
 
       &hwlist.rum;
 
+      &hwlist.upgt;
+
       &hwlist.ural;
 
       <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent

==== //depot/projects/hammer/sbin/geom/class/part/geom_part.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.13 2008/11/18 04:04:01 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.16 2008/11/30 23:46:31 marcel Exp $");
 
 #include <sys/stat.h>
 
@@ -63,10 +63,11 @@
 static char partcode_param[] = "partcode";
 
 static void gpart_bootcode(struct gctl_req *, unsigned int);
+static void gpart_issue(struct gctl_req *, unsigned int);
 static void gpart_show(struct gctl_req *, unsigned int);
 
 struct g_command PUBSYM(class_commands)[] = {
-	{ "add", 0, NULL, {
+	{ "add", 0, gpart_issue, {
 		{ 'b', "start", NULL, G_TYPE_STRING },
 		{ 's', "size", NULL, G_TYPE_STRING },
 		{ 't', "type", NULL, G_TYPE_STRING },
@@ -84,25 +85,25 @@
 		G_OPT_SENTINEL },
 	  "geom", NULL

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812021059.mB2AxgYB033211>