PERFORCE change 153913 for review

Sam Leffler sam at FreeBSD.org
Mon Dec 1 13:17:26 PST 2008


http://perforce.freebsd.org/chv.cgi?CH=153913

Change 153913 by sam at sam_ebb on 2008/12/01 21:17:12

	IFC @ 153912

Affected files ...

.. //depot/projects/vap/Makefile#11 integrate
.. //depot/projects/vap/ObsoleteFiles.inc#21 integrate
.. //depot/projects/vap/UPDATING#23 integrate
.. //depot/projects/vap/lib/libc/gen/times.3#3 integrate
.. //depot/projects/vap/lib/libc/stdio/fread.c#3 integrate
.. //depot/projects/vap/lib/libc/stdlib/malloc.c#18 integrate
.. //depot/projects/vap/lib/libc/sys/recv.2#3 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_fork.c#4 integrate
.. //depot/projects/vap/sbin/geom/class/part/geom_part.c#9 integrate
.. //depot/projects/vap/secure/usr.sbin/sshd/Makefile#6 integrate
.. //depot/projects/vap/share/man/man4/ath_hal.4#3 integrate
.. //depot/projects/vap/share/man/man4/upgt.4#4 integrate
.. //depot/projects/vap/share/man/man9/ktr.9#3 integrate
.. //depot/projects/vap/sys/amd64/Makefile#3 integrate
.. //depot/projects/vap/sys/amd64/amd64/identcpu.c#14 integrate
.. //depot/projects/vap/sys/amd64/conf/GENERIC#24 integrate
.. //depot/projects/vap/sys/amd64/conf/NOTES#16 integrate
.. //depot/projects/vap/sys/arm/arm/busdma_machdep.c#8 integrate
.. //depot/projects/vap/sys/arm/at91/at91_machdep.c#2 integrate
.. //depot/projects/vap/sys/arm/at91/at91_pmc.c#6 integrate
.. //depot/projects/vap/sys/arm/conf/AVILA#17 integrate
.. //depot/projects/vap/sys/arm/conf/BWCT#9 integrate
.. //depot/projects/vap/sys/arm/conf/CRB#8 integrate
.. //depot/projects/vap/sys/arm/conf/DB-78XXX#5 integrate
.. //depot/projects/vap/sys/arm/conf/DB-88F5XXX#5 integrate
.. //depot/projects/vap/sys/arm/conf/DB-88F6XXX#5 integrate
.. //depot/projects/vap/sys/arm/conf/GUMSTIX#4 integrate
.. //depot/projects/vap/sys/arm/conf/KB920X#12 integrate
.. //depot/projects/vap/sys/arm/conf/NSLU#5 integrate
.. //depot/projects/vap/sys/arm/conf/SIMICS#10 integrate
.. //depot/projects/vap/sys/arm/conf/SKYEYE#8 integrate
.. //depot/projects/vap/sys/arm/mv/mv_machdep.c#3 integrate
.. //depot/projects/vap/sys/arm/sa11x0/assabet_machdep.c#7 integrate
.. //depot/projects/vap/sys/arm/xscale/i80321/ep80219_machdep.c#6 integrate
.. //depot/projects/vap/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate
.. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#8 integrate
.. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#10 integrate
.. //depot/projects/vap/sys/arm/xscale/pxa/pxa_machdep.c#4 integrate
.. //depot/projects/vap/sys/conf/Makefile.arm#12 integrate
.. //depot/projects/vap/sys/conf/files#59 integrate
.. //depot/projects/vap/sys/conf/files.amd64#16 integrate
.. //depot/projects/vap/sys/conf/files.arm#10 integrate
.. //depot/projects/vap/sys/conf/files.i386#23 integrate
.. //depot/projects/vap/sys/conf/files.mips#6 integrate
.. //depot/projects/vap/sys/conf/files.pc98#17 integrate
.. //depot/projects/vap/sys/conf/files.powerpc#19 integrate
.. //depot/projects/vap/sys/conf/files.sparc64#14 integrate
.. //depot/projects/vap/sys/conf/kern.pre.mk#13 integrate
.. //depot/projects/vap/sys/conf/options#34 integrate
.. //depot/projects/vap/sys/conf/options.arm#8 integrate
.. //depot/projects/vap/sys/contrib/dev/ath/COPYRIGHT#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/README#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/ah_desc.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/ah_devid.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/ah_soc.h#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap30.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap30.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap30.opt_ah.h#4 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap43.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap43.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap43.opt_ah.h#4 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap51.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap51.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap51.opt_ah.h#4 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap61.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap61.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/ap61.opt_ah.h#4 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#8 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.inc#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/wackelf.c#5 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/wisoc.inc#2 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.inc#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#7 delete
.. //depot/projects/vap/sys/contrib/dev/ath/version.h#7 delete
.. //depot/projects/vap/sys/dev/ata/ata-pci.h#15 integrate
.. //depot/projects/vap/sys/dev/ath/ah_osdep.c#10 integrate
.. //depot/projects/vap/sys/dev/ath/ah_osdep.h#10 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_debug.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_decode.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_desc.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_devid.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_internal.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_soc.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch
.. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#14 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#17 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#26 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#11 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath.c#128 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath_pci.c#10 integrate
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#41 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#18 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#16 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate
.. //depot/projects/vap/sys/dev/hwpmc/hwpmc_logging.c#7 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#32 integrate
.. //depot/projects/vap/sys/dev/sdhci/sdhci.c#3 integrate
.. //depot/projects/vap/sys/dev/usb/if_upgt.c#4 integrate
.. //depot/projects/vap/sys/dev/xen/netfront/netfront.c#4 integrate
.. //depot/projects/vap/sys/geom/geom_bsd.c#7 integrate
.. //depot/projects/vap/sys/geom/part/g_part.c#12 integrate
.. //depot/projects/vap/sys/geom/part/g_part_gpt.c#9 integrate
.. //depot/projects/vap/sys/geom/part/g_part_mbr.c#9 integrate
.. //depot/projects/vap/sys/geom/part/g_part_pc98.c#7 integrate
.. //depot/projects/vap/sys/i386/conf/GENERIC#27 integrate
.. //depot/projects/vap/sys/i386/conf/NOTES#21 integrate
.. //depot/projects/vap/sys/i386/conf/PAE#9 integrate
.. //depot/projects/vap/sys/i386/i386/identcpu.c#14 integrate
.. //depot/projects/vap/sys/kern/Make.tags.inc#6 integrate
.. //depot/projects/vap/sys/kern/subr_sleepqueue.c#19 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#25 integrate
.. //depot/projects/vap/sys/mips/conf/IDT#8 integrate
.. //depot/projects/vap/sys/mips/conf/SENTRY5#8 integrate
.. //depot/projects/vap/sys/mips/mips/machdep.c#6 integrate
.. //depot/projects/vap/sys/modules/Makefile#47 integrate
.. //depot/projects/vap/sys/modules/ath/Makefile#7 integrate
.. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#11 integrate
.. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#11 integrate
.. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#12 integrate
.. //depot/projects/vap/sys/pc98/conf/GENERIC#18 integrate
.. //depot/projects/vap/sys/pc98/conf/NOTES#15 integrate
.. //depot/projects/vap/sys/security/audit/audit_syscalls.c#12 integrate
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#21 integrate
.. //depot/projects/vap/sys/sys/param.h#35 integrate
.. //depot/projects/vap/usr.sbin/cron/crontab/crontab.5#3 integrate
.. //depot/projects/vap/usr.sbin/kldxref/kldxref.c#3 integrate

Differences ...

==== //depot/projects/vap/Makefile#11 (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/vap/ObsoleteFiles.inc#21 (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/vap/UPDATING#23 (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	ATH_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.550 2008/12/01 16:53:01 sam Exp $

==== //depot/projects/vap/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/vap/lib/libc/stdio/fread.c#3 (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/vap/lib/libc/stdlib/malloc.c#18 (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/vap/lib/libc/sys/recv.2#3 (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/vap/lib/libthr/thread/thr_fork.c#4 (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.10 2008/11/29 21:46:28 kib Exp $
  */
 
 /*
@@ -172,6 +172,7 @@
 
 		if (unlock_malloc) {
 			_rtld_atfork_post(rtld_locks);
+			_malloc_postfork();
 		}
 
 		/* Run down atfork child handlers. */

==== //depot/projects/vap/sbin/geom/class/part/geom_part.c#9 (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
 	},
-	{ "commit", 0, NULL, G_NULL_OPTS, "geom", NULL },
-	{ "create", 0, NULL, {
+	{ "commit", 0, gpart_issue, G_NULL_OPTS, "geom", NULL },
+	{ "create", 0, gpart_issue, {
 		{ 's', "scheme", NULL, G_TYPE_STRING },
 		{ 'n', "entries", optional, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "provider", NULL
 	},
-	{ "delete", 0, NULL, {
+	{ "delete", 0, gpart_issue, {
 		{ 'i', index_param, NULL, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL
 	},
-	{ "destroy", 0, NULL, {
+	{ "destroy", 0, gpart_issue, {
 		{ 'f', "flags", flags, G_TYPE_STRING },
 		G_OPT_SENTINEL },
 	  "geom", NULL },
-	{ "modify", 0, NULL, {
+	{ "modify", 0, gpart_issue, {
 		{ 'i', index_param, NULL, G_TYPE_STRING },
 		{ 'l', "label", optional, G_TYPE_STRING },
 		{ 't', "type", optional, G_TYPE_STRING },
@@ -110,7 +111,7 @@
 		G_OPT_SENTINEL },
 	  "geom", NULL
 	},
-	{ "set", 0, NULL, {
+	{ "set", 0, gpart_issue, {
 		{ 'a', "attrib", NULL, G_TYPE_STRING },
 		{ 'i', index_param, NULL, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
@@ -123,8 +124,8 @@
 		G_OPT_SENTINEL },
 	  NULL, "[-lr] [geom ...]"
 	},
-	{ "undo", 0, NULL, G_NULL_OPTS, "geom", NULL },
-	{ "unset", 0, NULL, {
+	{ "undo", 0, gpart_issue, G_NULL_OPTS, "geom", NULL },
+	{ "unset", 0, gpart_issue, {
 		{ 'a', "attrib", NULL, G_TYPE_STRING },
 		{ 'i', index_param, NULL, G_TYPE_STRING },
 		{ 'f', "flags", flags, G_TYPE_STRING },
@@ -446,7 +447,7 @@
 }
 
 static void
-gpart_bootcode(struct gctl_req *req, unsigned int fl __unused)
+gpart_bootcode(struct gctl_req *req, unsigned int fl)
 {
 	const char *s;
 	char *sp;
@@ -501,9 +502,42 @@
 			errx(EXIT_FAILURE, "no -b nor -p");
 	}
 
-	if (bootcode != NULL) {
-		s = gctl_issue(req);
-		if (s != NULL)
-			errx(EXIT_FAILURE, "%s", s);
+	if (bootcode != NULL)
+		gpart_issue(req, fl);
+}
+
+static void
+gpart_issue(struct gctl_req *req, unsigned int fl __unused)
+{
+	char buf[4096];
+	char *errmsg;
+	const char *errstr;
+	int error, status;
+
+	bzero(buf, sizeof(buf));
+	gctl_rw_param(req, "output", sizeof(buf), buf);
+	errstr = gctl_issue(req);
+	if (errstr == NULL || errstr[0] == '\0') {
+		if (buf[0] != '\0')
+			printf("%s", buf);
+		status = EXIT_SUCCESS;
+		goto done;
 	}
+
+	error = strtol(errstr, &errmsg, 0);
+	if (errmsg != errstr) {
+		while (errmsg[0] == ' ')
+			errmsg++;
+		if (errmsg[0] != '\0')
+			warnc(error, "%s", errmsg);
+		else
+			warnc(error, NULL);
+	} else
+		warnx("%s", errmsg);
+
+	status = EXIT_FAILURE;
+
+ done:
+	gctl_free(req);
+	exit(status);
 }

==== //depot/projects/vap/secure/usr.sbin/sshd/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.53 2008/08/01 02:48:36 des Exp $
+# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.54 2008/11/30 15:35:24 csjp Exp $
 #
 
 .include <bsd.own.mk>
@@ -26,7 +26,7 @@
 LDADD=	-lssh -lutil -lz -lwrap ${MINUSLPAM}
 
 .if ${MK_AUDIT} != "no"
-CFLAGS+= -DUSE_BSM_AUDIT
+CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR
 DPADD+=  ${LIBBSM}
 LDADD+=  -lbsm
 .endif

==== //depot/projects/vap/share/man/man4/ath_hal.4#3 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
+.\" Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
 .\" All rights reserved.
 .\""
 .\" Redistribution and use in source and binary forms, with or without
@@ -12,9 +12,6 @@
 .\"    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
 .\"    redistribution must be conditioned upon including a substantially
 .\"    similar Disclaimer requirement for further binary redistribution.
-.\" 3. Neither the names of the above-listed copyright holders nor the names
-.\"    of any contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
 .\"
 .\" NO WARRANTY
 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -29,9 +26,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.11 2005/01/15 12:49:11 ru Exp $
+.\" $FreeBSD: src/share/man/man4/ath_hal.4,v 1.12 2008/12/01 16:53:01 sam Exp $
 .\"/
-.Dd August 26, 2004
+.Dd November 30, 2008
 .Dt ATH_HAL 4
 .Os
 .Sh NAME
@@ -39,18 +36,44 @@
 .Nd "Atheros Hardware Access Layer (HAL)"
 .Sh SYNOPSIS
 .Cd "device ath_hal"
+.Cd "options AH_SUPPORT_AR5416"
+or
+.Cd "device ath_ar5210"
+.Cd "device ath_ar5211"
+.Cd "device ath_ar5212"
+.Cd "device ath_rf2413"
+.Cd "device ath_rf2417"
+.Cd "device ath_rf2425"
+.Cd "device ath_rf5111"
+.Cd "device ath_rf5112"
+.Cd "device ath_rf5413"
+.Cd "device ath_ar5416"
+.\".Cd "device ath_ar5312"
+.\".Cd "device ath_rf2136"
+.\".Cd "device ath_rf2137"
+.Cd "device ath_ar9160"
+.Cd "options AH_SUPPORT_AR5416"
 .Sh DESCRIPTION
-The
+The hal provides hardware support for wireless network adapters based on
+the Atheros AR5210, AR5211, AR5212, AR5416, and AR9160 chips.
+This code is part of the
+.Xr ath 4
+driver but configured separately to allow fine-grained control
+over the set of chips supported.
+Selecting
 .Nm
-module provides hardware support for wireless network adapters based on
-the Atheros AR5210, AR5211, and AR5212 chips.
-This module is required by the
-.Xr ath 4
-driver.
+enables support for all PCI and Cardbus devices.
+Note this includes AR5416 devices and must be accompanied by the
+AH_SUPPORT_AR5416
+option to enable the extended hardware descriptor format used by
+AR5416 and later devices.
+.Pp
+Devices supported come in either Cardbus or mini-PCI packages.
 .Pp
-Devices supported by the
-.Nm
-module come in either Cardbus or mini-PCI packages.
+Historically this code has been released in a binary-only form
+and packaged as a separate module.
+With the release of source code for the hal this is no longer true
+and the code is tightly integrated with the driver.
 .Sh HARDWARE
 The following cards are among those supported by the
 .Nm
@@ -105,16 +128,6 @@
 .Nm
 module first appeared in
 .Fx 5.2 .
-.Sh CAVEATS
-The
-.Nm
-module is constructed from a binary component and
-operating system-dependent source code.
-Redistribution and use in source and binary forms, without
-modification, are permitted provided that the conditions
-set forth in
-.Pa sys/contrib/dev/ath/COPYRIGHT
-are observed.
 .Sh BUGS
 See
 .Xr ath 4

==== //depot/projects/vap/share/man/man4/upgt.4#4 (text+ko) ====

@@ -1,5 +1,5 @@
 .\" $OpenBSD: upgt.4,v 1.6 2008/04/17 14:01:22 jmc Exp $
-.\" $FreeBSD: src/share/man/man4/upgt.4,v 1.2 2008/11/29 18:58:20 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/upgt.4,v 1.3 2008/12/01 10:05:34 kevlo Exp $
 .\"
 .\" Copyright (c) 2007 Marcus Glocker <mglocker at openbsd.org>
 .\" Copyright (c) 2005-2007
@@ -168,8 +168,6 @@
 .It
 Inventel UR045G
 .It
-Netgear WG111v2
-.It
 SMC EZ ConnectG SMC2862W-G
 .It
 Sagem XG703A

==== //depot/projects/vap/share/man/man9/ktr.9#3 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ktr.9,v 1.13 2006/10/16 07:59:05 danger Exp $
+.\" $FreeBSD: src/share/man/man9/ktr.9,v 1.14 2008/11/30 13:18:35 kib Exp $
 .\"
-.Dd December 27, 2005
+.Dd November 30, 2008
 .Dt KTR 9
 .Os
 .Sh NAME
@@ -84,9 +84,16 @@
 .Fa format
 string are zero to five arguments referenced by
 .Fa format .
+Each event is logged with a file name and source line number of the
+originating CTR call, and a timestamp in addition to the log message.
+.Pp
+The event is stored in the circular buffer with supplied arguments as is,
+and formatting is done at the dump time.
+Do not use pointers to the objects with limited lifetime, for instance,
+strings, because the pointer may become invalid when buffer is printed.
+.Pp
 Note that the different macros differ only in the number of arguments each
 one takes, as indicated by its name.
-Each event is logged with a timestamp in addition to the log message.
 .Pp
 The
 .Va ktr_entries
@@ -121,13 +128,11 @@
 	 * Pick a new current process and record its start time.
 	 */
 	...
-	CTR3(KTR_PROC, "mi_switch: old proc %p (pid %d, %s)", p, p->p_pid,
-	    p->p_comm);
+	CTR3(KTR_PROC, "mi_switch: old proc %p (pid %d)", p, p->p_pid);
 	...
 	cpu_switch();
 	...
-	CTR3(KTR_PROC, "mi_switch: new proc %p (pid %d, %s)", p, p->p_pid,
-	    p->p_comm);
+	CTR3(KTR_PROC, "mi_switch: new proc %p (pid %d)", p, p->p_pid);
 	...
 }
 .Ed

==== //depot/projects/vap/sys/amd64/Makefile#3 (text+ko) ====

@@ -1,39 +1,38 @@
-# $FreeBSD: src/sys/amd64/Makefile,v 1.11 2002/06/21 06:18:02 mckusick Exp $
+# $FreeBSD: src/sys/amd64/Makefile,v 1.12 2008/12/01 14:15:10 kensmith Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
-# Makefile for i386 links, tags file
+# Makefile for amd64 links, tags file
 
 # SYS is normally set in Make.tags.inc
-# SYS=/sys

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


More information about the p4-projects mailing list