Date: Mon, 14 Apr 2008 23:24:06 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140052 for review Message-ID: <200804142324.m3ENO6ll077998@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140052 Change 140052 by julian@julian_trafmon1 on 2008/04/14 23:24:04 IFC to 140046 Affected files ... .. //depot/projects/qingli_mpath/src/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/qingli_mpath/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/qingli_mpath/src/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/restore/dirs.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/conf/Makefile.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/files#7 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files.amd64#4 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files.i386#4 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/files.pc98#2 integrate .. //depot/projects/qingli_mpath/src/sys/conf/ldscript.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/options#6 integrate .. //depot/projects/qingli_mpath/src/sys/conf/options.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/isa/atrtc.c#1 branch .. //depot/projects/qingli_mpath/src/sys/isa/rtc.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/ADM5120#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/IDT#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/MALTA#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/QEMU#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_bus.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_limits.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_stdint.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_types.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/asm.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/asmacros.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/atomic.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bus.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cache.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/clock.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpu.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cputypes.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/defs.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/elf.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/endian.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/exec.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/float.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/fpu.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/frame.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ieee.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/intr.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/iodev.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/kdb.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/limits.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/locore.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/md_var.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/memdev.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/metadata.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/minidump.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/mutex.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/param.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pcb.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pcpu.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pmap.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ppireg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/proc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/profile.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/psl.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pte.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ptrace.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/queue.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/reg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/regnum.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/reloc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/resource.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/runq.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/segments.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/setjmp.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/sigframe.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/signal.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/smp.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/stdarg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/sysarch.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/timerreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/trap.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ucontext.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/varargs.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/vmparam.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/cache.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/copystr.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/cpu.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/exception.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/genassym.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/locore.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mem.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/nexus.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/pmap.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/support.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/swtch.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/tick.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/trap.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/modules/Makefile#6 integrate .. //depot/projects/qingli_mpath/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/net/radix.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/radix.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/route.c#6 integrate .. //depot/projects/qingli_mpath/src/sys/net/route.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/rtsock.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/lock.h#3 integrate Differences ... ==== //depot/projects/qingli_mpath/src/lib/libc/stdlib/strfmon.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include <sys/types.h> #include <ctype.h> @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rwlock.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/libthr/thread/thr_rwlock.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.15 2008/04/14 08:08:40 davidxu Exp $ */ #include <errno.h> @@ -32,7 +32,6 @@ #include "namespace.h" #include <pthread.h> -#include <pthread_np.h> #include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/qingli_mpath/src/sbin/geom/class/journal/gjournal.8#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/qingli_mpath/src/sbin/geom/class/part/geom_part.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include <stdio.h> #include <stdint.h> @@ -39,6 +39,7 @@ #include <paths.h> #include <errno.h> #include <assert.h> +#include <sys/stat.h> #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/qingli_mpath/src/sbin/restore/dirs.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.34 2008/04/14 20:15:53 mckusick Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -120,6 +120,7 @@ static void rst_seekdir(RST_DIR *, long, long); static long rst_telldir(RST_DIR *); static struct direct *searchdir(ino_t, char *); +static void fail_dirtmp(char *); /* * Extract directory contents, building up a directory structure @@ -147,7 +148,7 @@ if (fd == -1 || (df = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create directory temporary\nfopen", dirfile); + warn("%s: cannot create directory database", dirfile); done(1); } if (genmode != 0) { @@ -160,7 +161,7 @@ if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create modefile\nfopen", modefile); + warn("%s: cannot create modefile", modefile); done(1); } } @@ -172,25 +173,24 @@ for (;;) { curfile.name = "<directory file - name unknown>"; curfile.action = USING; - if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) { - (void) fclose(df); - dirp = opendirfile(dirfile); - if (dirp == NULL) - fprintf(stderr, "opendirfile: %s\n", - strerror(errno)); - if (mf != NULL) - (void) fclose(mf); - i = dirlookup(dot); - if (i == 0) - panic("Root directory is not on tape\n"); - return; - } + if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) + break; itp = allocinotab(&curfile, seekpt); getfile(putdir, putdirattrs, xtrnull); putent(&nulldir); flushent(); itp->t_size = seekpt - itp->t_seekpt; } + if (fclose(df) != 0) + fail_dirtmp(dirfile); + dirp = opendirfile(dirfile); + if (dirp == NULL) + fprintf(stderr, "opendirfile: %s\n", strerror(errno)); + if (mf != NULL && fclose(mf) != 0) + fail_dirtmp(modefile); + i = dirlookup(dot); + if (i == 0) + panic("Root directory is not on tape\n"); } /* @@ -390,7 +390,8 @@ if (dirloc + dp->d_reclen > DIRBLKSIZ) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, 1, DIRBLKSIZ, df); + if (fwrite(dirbuf, DIRBLKSIZ, 1, df) != 1) + fail_dirtmp(dirfile); dirloc = 0; } memmove(dirbuf + dirloc, dp, (long)dp->d_reclen); @@ -405,7 +406,8 @@ flushent(void) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, (int)dirloc, 1, df); + if (fwrite(dirbuf, (int)dirloc, 1, df) != 1) + fail_dirtmp(dirfile); seekpt = ftell(df); dirloc = 0; } @@ -417,8 +419,8 @@ putdirattrs(char *buf, long size) { - if (mf != NULL) - (void) fwrite(buf, 1, size, mf); + if (mf != NULL && fwrite(buf, size, 1, mf) != 1) + fail_dirtmp(modefile); } /* @@ -582,6 +584,11 @@ myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", modefile); + fprintf(stderr, "Mode, owner, and times not set.\n"); + break; + } if (feof(mf)) break; if (node.extsize > 0) { @@ -596,8 +603,22 @@ } if (bufsize >= node.extsize) { (void) fread(buf, 1, node.extsize, mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", + modefile); + fprintf(stderr, "Not all external "); + fprintf(stderr, "attributes set.\n"); + break; + } } else { (void) fseek(mf, node.extsize, SEEK_CUR); + if (ferror(mf)) { + warn("%s: cannot seek in modefile.", + modefile); + fprintf(stderr, "Not all directory "); + fprintf(stderr, "attributes set.\n"); + break; + } } } ep = lookupino(node.ino); @@ -639,8 +660,6 @@ } if (bufsize > 0) free(buf); - if (ferror(mf)) - panic("error setting directory modes\n"); (void) fclose(mf); } @@ -734,7 +753,8 @@ node.flags = ctxp->file_flags; node.uid = ctxp->uid; node.gid = ctxp->gid; - (void) fwrite((char *)&node, 1, sizeof(struct modeinfo), mf); + if (fwrite((char *)&node, sizeof(struct modeinfo), 1, mf) != 1) + fail_dirtmp(modefile); return (itp); } @@ -760,9 +780,33 @@ { closemt(); - if (modefile[0] != '#') + if (modefile[0] != '#') { + (void) truncate(modefile, 0); (void) unlink(modefile); - if (dirfile[0] != '#') + } + if (dirfile[0] != '#') { + (void) truncate(dirfile, 0); (void) unlink(dirfile); + } exit(exitcode); } + +/* + * Print out information about the failure to save directory, + * extended attribute, and mode information. + */ +static void +fail_dirtmp(char *filename) +{ + const char *tmpdir; + + warn("%s: cannot write directory database", filename); + if (errno == ENOSPC) { + if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') + tmpdir = _PATH_TMP; + fprintf(stderr, "Try making space in %s, %s\n%s\n", tmpdir, + "or set environment variable TMPDIR", + "to an alternate location with more disk space."); + } + done(1); +} ==== //depot/projects/qingli_mpath/src/sys/amd64/include/clock.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,8 +27,6 @@ * Driver to clock driver interface. */ -int rtcin(int reg); -void writertc(int reg, unsigned char val); void init_TSC(void); void init_TSC_tc(void); ==== //depot/projects/qingli_mpath/src/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -33,19 +33,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $"); /* * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko <chmr@edvz.tu-graz.ac.at> - * - * reintroduced and updated by Chris Stenton <chris@gnome.co.uk> 8/10/94 - */ - #include "opt_clock.h" #include "opt_isa.h" @@ -62,7 +55,6 @@ #include <sys/module.h> #include <sys/sched.h> #include <sys/sysctl.h> -#include <sys/cons.h> #include <machine/clock.h> #include <machine/cpu.h> @@ -78,13 +70,6 @@ #include <isa/isavar.h> #endif -/* - * 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. - */ -#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) -#define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) - #define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x)) int clkintr_pending; @@ -98,20 +83,14 @@ TUNABLE_INT("hw.i8254.freq", &i8254_freq); int i8254_max_count; static int i8254_real_max_count; -#define RTC_LOCK mtx_lock_spin(&clock_lock) -#define RTC_UNLOCK mtx_unlock_spin(&clock_lock) -static struct mtx clock_lock; -static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; +struct mtx clock_lock; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; -static int rtc_reg = -1; -static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; -static u_char rtc_statusb = RTCSB_24HR; /* Values for timerX_state: */ #define RELEASED 0 @@ -239,19 +218,6 @@ return(flag ? FILTER_HANDLED : FILTER_STRAY); } -#include "opt_ddb.h" -#ifdef DDB -#include <ddb/ddb.h> - -DB_SHOW_COMMAND(rtc, rtc) -{ - printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n", - rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY), - rtcin(RTC_HRS), rtcin(RTC_MIN), rtcin(RTC_SEC), - rtcin(RTC_STATUSA), rtcin(RTC_STATUSB), rtcin(RTC_INTR)); -} -#endif /* DDB */ - static int getit(void) { @@ -386,50 +352,6 @@ #endif } -/* - * RTC support routines - */ - -int -rtcin(reg) - int reg; -{ - u_char val; - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - val = inb(IO_RTC + 1); - RTC_UNLOCK; - return (val); -} - -void -writertc(int reg, u_char val) -{ - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - outb(IO_RTC + 1, val); - inb(0x84); - RTC_UNLOCK; -} - -static __inline int -readrtc(int port) -{ - return(bcd2bin(rtcin(port))); -} - static void set_i8254_freq(u_int freq, int intr_freq) { @@ -468,8 +390,7 @@ startrtclock() { - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); set_i8254_freq(i8254_freq, hz); tc_init(&i8254_timecounter); @@ -478,140 +399,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - unsigned long sec, days; - int year, month; - int y, m, s; - struct timespec ts; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) - goto wrong_time; - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - - days = 0; -#ifdef USE_RTC_CENTURY - year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; -#else - year = readrtc(RTC_YEAR) + 1900; - if (year < 1970) - year += 100; -#endif - if (year < 1970) { - splx(s); - goto wrong_time; - } - month = readrtc(RTC_MONTH); - for (m = 1; m < month; m++) - days += daysinmonth[m-1]; - if ((month > 2) && LEAPYEAR(year)) - days ++; - days += readrtc(RTC_DAY) - 1; - for (y = 1970; y < year; y++) - days += DAYSPERYEAR + LEAPYEAR(y); - sec = ((( days * 24 + - readrtc(RTC_HRS)) * 60 + - readrtc(RTC_MIN)) * 60 + - readrtc(RTC_SEC)); - /* sec now contains the number of seconds, since Jan 1 1970, - in the local time zone */ - - sec += utc_offset(); - - y = time_second - sec; - if (y <= -2 || y >= 2) { - /* badly off, adjust it */ - ts.tv_sec = sec; - ts.tv_nsec = 0; - tc_setclock(&ts); - } - splx(s); - return; - -wrong_time: - printf("Invalid time in clock: check and reset the date!\n"); -} - -/* - * Write system time back to RTC - */ -void -resettodr() -{ - unsigned long tm; - int y, m, s; - - if (disable_rtc_set) - return; - - s = splclock(); - tm = time_second; - splx(s); - - /* Disable RTC updates and interrupts. */ - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); - - /* Calculate local time to put in RTC */ - - tm -= utc_offset(); - - writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ - writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ - writertc(RTC_HRS, bin2bcd(tm%24)); tm /= 24; /* Write back Hours */ - - /* We have now the days since 01-01-1970 in tm */ - writertc(RTC_WDAY, (tm + 4) % 7 + 1); /* Write back Weekday */ - for (y = 1970, m = DAYSPERYEAR + LEAPYEAR(y); - tm >= m; - y++, m = DAYSPERYEAR + LEAPYEAR(y)) - tm -= m; - - /* Now we have the years in y and the day-of-the-year in tm */ - writertc(RTC_YEAR, bin2bcd(y%100)); /* Write back Year */ -#ifdef USE_RTC_CENTURY - writertc(RTC_CENTURY, bin2bcd(y/100)); /* ... and Century */ -#endif - for (m = 0; ; m++) { - int ml; - - ml = daysinmonth[m]; - if (m == 1 && LEAPYEAR(y)) - ml++; - if (tm < ml) - break; - tm -= ml; - } - - writertc(RTC_MONTH, bin2bcd(m + 1)); /* Write back Month */ - writertc(RTC_DAY, bin2bcd(tm + 1)); /* Write back Month Day */ - - /* Reenable RTC updates and interrupts. */ - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); -} - - -/* * Start both clocks running. */ void @@ -627,8 +414,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, - INTR_TYPE_CLK, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, + NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -641,8 +428,7 @@ } /* Initialize RTC. */ - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); /* * If the separate statistics clock hasn't been explicility disabled @@ -653,19 +439,18 @@ if (!statclock_disable && !using_lapic_timer) { diag = rtcin(RTC_DIAG); if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + printf("RTC BIOS diagnostic error %b\n", + diag, RTCDG_BITS); /* Setting stathz to nonzero early helps avoid races. */ stathz = RTC_NOPROFRATE; profhz = RTC_PROFRATE; /* Enable periodic interrupts from the RTC. */ - rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + intr_add_handler("rtc", 8, + (driver_filter_t *)rtcintr, NULL, NULL, INTR_TYPE_CLK, NULL); - - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); + atrtc_enable_intr(); } init_TSC_tc(); @@ -677,8 +462,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_PROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; } @@ -688,8 +472,7 @@ if (using_lapic_timer) return; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804142324.m3ENO6ll077998>