svn commit: r210278 - in user/jmallett/octeon: . bin/pkill bin/sh
cddl/compat/opensolaris/include cddl/compat/opensolaris/misc
cddl/contrib/opensolaris/cmd/plockstat
cddl/contrib/opensolaris/cmd/py...
Juli Mallett
jmallett at FreeBSD.org
Tue Jul 20 04:46:05 UTC 2010
Author: jmallett
Date: Tue Jul 20 04:46:04 2010
New Revision: 210278
URL: http://svn.freebsd.org/changeset/base/210278
Log:
Merge from head. Some of the style changes in the merge of my MIPS work are
probably wrong and need some hand-fixing.
Added:
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/plockstat/
- copied from r210277, head/cddl/contrib/opensolaris/cmd/plockstat/
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/pyzfs/
- copied from r210277, head/cddl/contrib/opensolaris/cmd/pyzfs/
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/i386/
- copied from r210277, head/cddl/contrib/opensolaris/lib/libdtrace/i386/
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/sparc/
- copied from r210277, head/cddl/contrib/opensolaris/lib/libdtrace/sparc/
user/jmallett/octeon/cddl/contrib/opensolaris/lib/pyzfs/
- copied from r210277, head/cddl/contrib/opensolaris/lib/pyzfs/
user/jmallett/octeon/etc/periodic/security/460.chkportsum
- copied unchanged from r210277, head/etc/periodic/security/460.chkportsum
user/jmallett/octeon/gnu/usr.bin/binutils/as/powerpc64-freebsd/
- copied from r210277, head/gnu/usr.bin/binutils/as/powerpc64-freebsd/
user/jmallett/octeon/gnu/usr.bin/binutils/gdb/Makefile.powerpc64
- copied unchanged from r210277, head/gnu/usr.bin/binutils/gdb/Makefile.powerpc64
user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.powerpc64
- copied unchanged from r210277, head/gnu/usr.bin/binutils/ld/Makefile.powerpc64
user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64
- copied unchanged from r210277, head/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64
user/jmallett/octeon/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
- copied unchanged from r210277, head/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
user/jmallett/octeon/gnu/usr.bin/gdb/arch/powerpc64/
- copied from r210277, head/gnu/usr.bin/gdb/arch/powerpc64/
user/jmallett/octeon/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c
- copied unchanged from r210277, head/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c
user/jmallett/octeon/lib/csu/powerpc64/
- copied from r210277, head/lib/csu/powerpc64/
user/jmallett/octeon/lib/libc/powerpc64/
- copied from r210277, head/lib/libc/powerpc64/
user/jmallett/octeon/lib/libkvm/kvm_powerpc64.c
- copied unchanged from r210277, head/lib/libkvm/kvm_powerpc64.c
user/jmallett/octeon/lib/libthr/arch/powerpc64/
- copied from r210277, head/lib/libthr/arch/powerpc64/
user/jmallett/octeon/lib/libthread_db/arch/powerpc64/
- copied from r210277, head/lib/libthread_db/arch/powerpc64/
user/jmallett/octeon/libexec/rtld-elf/powerpc64/
- copied from r210277, head/libexec/rtld-elf/powerpc64/
user/jmallett/octeon/secure/lib/libcrypto/opensslconf-powerpc64.h
- copied unchanged from r210277, head/secure/lib/libcrypto/opensslconf-powerpc64.h
user/jmallett/octeon/share/doc/psd/15.yacc/ss10
- copied unchanged from r210277, head/share/doc/psd/15.yacc/ss10
user/jmallett/octeon/share/doc/psd/15.yacc/ss11
- copied unchanged from r210277, head/share/doc/psd/15.yacc/ss11
user/jmallett/octeon/share/doc/psd/15.yacc/ss_
- copied unchanged from r210277, head/share/doc/psd/15.yacc/ss_
user/jmallett/octeon/share/man/man4/fdt.4
- copied unchanged from r210277, head/share/man/man4/fdt.4
user/jmallett/octeon/share/man/man4/fdtbus.4
- copied unchanged from r210277, head/share/man/man4/fdtbus.4
user/jmallett/octeon/share/man/man4/simplebus.4
- copied unchanged from r210277, head/share/man/man4/simplebus.4
user/jmallett/octeon/sys/arm/at91/at91_aicreg.h
- copied unchanged from r210277, head/sys/arm/at91/at91_aicreg.h
user/jmallett/octeon/sys/arm/at91/at91_pio_sam9.h
- copied unchanged from r210277, head/sys/arm/at91/at91_pio_sam9.h
user/jmallett/octeon/sys/arm/at91/at91_pit.c
- copied unchanged from r210277, head/sys/arm/at91/at91_pit.c
user/jmallett/octeon/sys/arm/at91/at91_pitreg.h
- copied unchanged from r210277, head/sys/arm/at91/at91_pitreg.h
user/jmallett/octeon/sys/arm/at91/at91sam9.c
- copied unchanged from r210277, head/sys/arm/at91/at91sam9.c
user/jmallett/octeon/sys/arm/at91/at91sam9_machdep.c
- copied unchanged from r210277, head/sys/arm/at91/at91sam9_machdep.c
user/jmallett/octeon/sys/arm/at91/at91sam9g20reg.h
- copied unchanged from r210277, head/sys/arm/at91/at91sam9g20reg.h
user/jmallett/octeon/sys/arm/at91/board_hl201.c
- copied unchanged from r210277, head/sys/arm/at91/board_hl201.c
user/jmallett/octeon/sys/arm/at91/files.at91sam9
- copied unchanged from r210277, head/sys/arm/at91/files.at91sam9
user/jmallett/octeon/sys/arm/at91/if_macb.c
- copied unchanged from r210277, head/sys/arm/at91/if_macb.c
user/jmallett/octeon/sys/arm/at91/if_macbreg.h
- copied unchanged from r210277, head/sys/arm/at91/if_macbreg.h
user/jmallett/octeon/sys/arm/at91/if_macbvar.h
- copied unchanged from r210277, head/sys/arm/at91/if_macbvar.h
user/jmallett/octeon/sys/arm/at91/std.at91sam9
- copied unchanged from r210277, head/sys/arm/at91/std.at91sam9
user/jmallett/octeon/sys/arm/at91/std.hl201
- copied unchanged from r210277, head/sys/arm/at91/std.hl201
user/jmallett/octeon/sys/arm/conf/HL201
- copied unchanged from r210277, head/sys/arm/conf/HL201
user/jmallett/octeon/sys/arm/conf/HL201.hints
- copied unchanged from r210277, head/sys/arm/conf/HL201.hints
user/jmallett/octeon/sys/boot/ofw/libofw/ppc64_elf_freebsd.c
- copied unchanged from r210277, head/sys/boot/ofw/libofw/ppc64_elf_freebsd.c
user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
- copied unchanged from r210277, head/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/
- copied from r210277, head/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
- copied unchanged from r210277, head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/intel/dtrace/
- copied from r210277, head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/
- copied from r210277, head/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/
user/jmallett/octeon/sys/conf/ldscript.mips.64
- copied unchanged from r210277, head/sys/conf/ldscript.mips.64
user/jmallett/octeon/sys/conf/ldscript.powerpc64
- copied unchanged from r210277, head/sys/conf/ldscript.powerpc64
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtcompile.c
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtcompile.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtcompiler.h
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtcompiler.h
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtfield.c
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtfield.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtio.c
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtio.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtsubtable.c
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtsubtable.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dttable.c
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dttable.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dttemplate.c
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dttemplate.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dttemplate.h
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dttemplate.h
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtutils.c
- copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtutils.c
user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu
- copied unchanged from r210277, head/sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu
user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu
- copied unchanged from r210277, head/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu
user/jmallett/octeon/sys/dev/cfi/cfi_bus_fdt.c
- copied unchanged from r210277, head/sys/dev/cfi/cfi_bus_fdt.c
user/jmallett/octeon/sys/dev/fdt/fdt_powerpc.c
- copied unchanged from r210277, head/sys/dev/fdt/fdt_powerpc.c
user/jmallett/octeon/sys/dev/quicc/quicc_bfe_fdt.c
- copied unchanged from r210277, head/sys/dev/quicc/quicc_bfe_fdt.c
user/jmallett/octeon/sys/dev/tsec/if_tsec_fdt.c
- copied unchanged from r210277, head/sys/dev/tsec/if_tsec_fdt.c
user/jmallett/octeon/sys/kern/kern_clocksource.c
- copied unchanged from r210277, head/sys/kern/kern_clocksource.c
user/jmallett/octeon/sys/mips/conf/XLR64
- copied unchanged from r210277, head/sys/mips/conf/XLR64
user/jmallett/octeon/sys/modules/iwnfw/iwn6050/
- copied from r210277, head/sys/modules/iwnfw/iwn6050/
user/jmallett/octeon/sys/powerpc/aim/locore32.S
- copied unchanged from r210277, head/sys/powerpc/aim/locore32.S
user/jmallett/octeon/sys/powerpc/aim/locore64.S
- copied unchanged from r210277, head/sys/powerpc/aim/locore64.S
user/jmallett/octeon/sys/powerpc/aim/slb.c
- copied unchanged from r210277, head/sys/powerpc/aim/slb.c
user/jmallett/octeon/sys/powerpc/aim/swtch32.S
- copied unchanged from r210277, head/sys/powerpc/aim/swtch32.S
user/jmallett/octeon/sys/powerpc/aim/swtch64.S
- copied unchanged from r210277, head/sys/powerpc/aim/swtch64.S
user/jmallett/octeon/sys/powerpc/aim/trap_subr32.S
- copied unchanged from r210277, head/sys/powerpc/aim/trap_subr32.S
user/jmallett/octeon/sys/powerpc/aim/trap_subr64.S
- copied unchanged from r210277, head/sys/powerpc/aim/trap_subr64.S
user/jmallett/octeon/sys/powerpc/conf/GENERIC64
- copied unchanged from r210277, head/sys/powerpc/conf/GENERIC64
user/jmallett/octeon/sys/powerpc/include/fdt.h
- copied unchanged from r210277, head/sys/powerpc/include/fdt.h
user/jmallett/octeon/sys/powerpc/include/slb.h
- copied unchanged from r210277, head/sys/powerpc/include/slb.h
user/jmallett/octeon/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
- copied unchanged from r210277, head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
user/jmallett/octeon/sys/powerpc/mpc85xx/openpic_fdt.c
- copied unchanged from r210277, head/sys/powerpc/mpc85xx/openpic_fdt.c
user/jmallett/octeon/sys/powerpc/mpc85xx/pci_fdt.c
- copied unchanged from r210277, head/sys/powerpc/mpc85xx/pci_fdt.c
user/jmallett/octeon/sys/powerpc/powerpc/elf32_machdep.c
- copied unchanged from r210277, head/sys/powerpc/powerpc/elf32_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/elf64_machdep.c
- copied unchanged from r210277, head/sys/powerpc/powerpc/elf64_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/exec_machdep.c
- copied unchanged from r210277, head/sys/powerpc/powerpc/exec_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/sigcode32.S
- copied unchanged from r210277, head/sys/powerpc/powerpc/sigcode32.S
user/jmallett/octeon/sys/powerpc/powerpc/sigcode64.S
- copied unchanged from r210277, head/sys/powerpc/powerpc/sigcode64.S
user/jmallett/octeon/tools/regression/bin/sh/parser/only-redir1.0
- copied unchanged from r210277, head/tools/regression/bin/sh/parser/only-redir1.0
user/jmallett/octeon/usr.bin/truss/powerpc64-fbsd.c
- copied unchanged from r210277, head/usr.bin/truss/powerpc64-fbsd.c
user/jmallett/octeon/usr.bin/xlint/arch/powerpc64/
- copied from r210277, head/usr.bin/xlint/arch/powerpc64/
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh
- copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/get-packages.sh
- copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend-query/get-packages.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/list-packages.sh
- copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend-query/list-packages.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend/functions-packages.sh
- copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend/functions-packages.sh
Deleted:
user/jmallett/octeon/share/doc/psd/15.yacc/ss..
user/jmallett/octeon/share/doc/psd/15.yacc/ssA
user/jmallett/octeon/share/doc/psd/15.yacc/ssB
user/jmallett/octeon/sys/amd64/acpica/Makefile
user/jmallett/octeon/sys/amd64/acpica/genwakecode.sh
user/jmallett/octeon/sys/amd64/acpica/genwakedata.sh
user/jmallett/octeon/sys/arm/include/bootinfo.h
user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu
user/jmallett/octeon/sys/dev/cfi/cfi_bus_lbc.c
user/jmallett/octeon/sys/dev/fdt/fdt_arm.c
user/jmallett/octeon/sys/dev/quicc/quicc_bfe_ocp.c
user/jmallett/octeon/sys/dev/tsec/if_tsec_ocp.c
user/jmallett/octeon/sys/dev/uart/uart_bus_ocp.c
user/jmallett/octeon/sys/mips/include/asmacros.h
user/jmallett/octeon/sys/pc98/cbus/clock.c
user/jmallett/octeon/sys/powerpc/aim/swtch.S
user/jmallett/octeon/sys/powerpc/include/bootinfo.h
user/jmallett/octeon/sys/powerpc/include/ocpbus.h
user/jmallett/octeon/sys/powerpc/mpc85xx/ds1553_bus_lbc.c
user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.c
user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.h
user/jmallett/octeon/sys/powerpc/mpc85xx/opic.c
user/jmallett/octeon/sys/powerpc/mpc85xx/pci_ocp.c
user/jmallett/octeon/sys/powerpc/powerpc/elf_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/sigcode.S
user/jmallett/octeon/sys/x86/x86/timeevents.c
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-vmware.sh
Modified:
user/jmallett/octeon/Makefile.inc1
user/jmallett/octeon/ObsoleteFiles.inc
user/jmallett/octeon/UPDATING
user/jmallett/octeon/bin/pkill/pkill.1
user/jmallett/octeon/bin/sh/parser.c
user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h
user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c
user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs.8
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/ztest/ztest.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
user/jmallett/octeon/contrib/binutils/bfd/elf64-ppc.c
user/jmallett/octeon/contrib/binutils/ld/emultempl/elf32.em
user/jmallett/octeon/contrib/binutils/ld/lexsup.c
user/jmallett/octeon/contrib/gcc/config/rs6000/freebsd.h
user/jmallett/octeon/contrib/gdb/gdb/ppcfbsd-tdep.c
user/jmallett/octeon/contrib/gdb/gdb/solib-svr4.c
user/jmallett/octeon/etc/defaults/periodic.conf
user/jmallett/octeon/etc/gettytab
user/jmallett/octeon/etc/periodic/security/Makefile
user/jmallett/octeon/games/pom/pom.6
user/jmallett/octeon/games/pom/pom.c
user/jmallett/octeon/gnu/lib/csu/Makefile
user/jmallett/octeon/gnu/lib/libgcc/Makefile
user/jmallett/octeon/gnu/usr.bin/binutils/as/Makefile
user/jmallett/octeon/gnu/usr.bin/binutils/gdb/Makefile
user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile
user/jmallett/octeon/gnu/usr.bin/cc/Makefile.tgt
user/jmallett/octeon/gnu/usr.bin/cc/cc_tools/Makefile
user/jmallett/octeon/gnu/usr.bin/cc/include/Makefile
user/jmallett/octeon/gnu/usr.bin/dialog/dialog.1
user/jmallett/octeon/gnu/usr.bin/dtc/Makefile
user/jmallett/octeon/include/Makefile
user/jmallett/octeon/lib/Makefile
user/jmallett/octeon/lib/bind/config.mk
user/jmallett/octeon/lib/libarchive/libarchive.3
user/jmallett/octeon/lib/libc/Makefile
user/jmallett/octeon/lib/libc/compat-43/sigcompat.c
user/jmallett/octeon/lib/libc/gen/_thread_init.c
user/jmallett/octeon/lib/libc/gmon/gmon.c
user/jmallett/octeon/lib/libc/net/sctp_sys_calls.c
user/jmallett/octeon/lib/libc/posix1e/acl_from_text.c
user/jmallett/octeon/lib/libc/posix1e/acl_from_text_nfs4.c
user/jmallett/octeon/lib/libc/posix1e/acl_support.h
user/jmallett/octeon/lib/libc/stdlib/malloc.c
user/jmallett/octeon/lib/libc/sys/ptrace.2
user/jmallett/octeon/lib/libjail/jail.c
user/jmallett/octeon/lib/libjail/jail_getid.c
user/jmallett/octeon/lib/liblzma/config.h
user/jmallett/octeon/lib/libstand/Makefile
user/jmallett/octeon/lib/libstand/printf.c
user/jmallett/octeon/lib/libthr/thread/thr_sig.c
user/jmallett/octeon/lib/msun/Makefile
user/jmallett/octeon/libexec/rtld-elf/Makefile
user/jmallett/octeon/libexec/rtld-elf/Symbol.map
user/jmallett/octeon/release/Makefile
user/jmallett/octeon/release/picobsd/qemu/PICOBSD
user/jmallett/octeon/release/picobsd/qemu/crunch.conf
user/jmallett/octeon/sbin/dhclient/dhclient.c
user/jmallett/octeon/sbin/geom/class/virstor/geom_virstor.c
user/jmallett/octeon/sbin/ipfw/dummynet.c
user/jmallett/octeon/sbin/iscontrol/iscontrol.8
user/jmallett/octeon/sbin/kldload/kldload.8
user/jmallett/octeon/sbin/kldload/kldload.c
user/jmallett/octeon/share/doc/psd/15.yacc/Makefile
user/jmallett/octeon/share/man/man3/queue.3
user/jmallett/octeon/share/man/man3/tree.3
user/jmallett/octeon/share/man/man4/Makefile
user/jmallett/octeon/share/man/man4/ath.4
user/jmallett/octeon/share/man/man4/u3g.4
user/jmallett/octeon/share/man/man4/uhso.4
user/jmallett/octeon/share/man/man5/rc.conf.5
user/jmallett/octeon/share/misc/committers-ports.dot
user/jmallett/octeon/share/misc/committers-src.dot
user/jmallett/octeon/share/mk/Makefile
user/jmallett/octeon/share/mk/bsd.cpu.mk
user/jmallett/octeon/share/mk/bsd.endian.mk
user/jmallett/octeon/share/mk/sys.mk
user/jmallett/octeon/sys/amd64/acpica/acpi_wakecode.S
user/jmallett/octeon/sys/amd64/amd64/cpu_switch.S
user/jmallett/octeon/sys/amd64/amd64/pmap.c
user/jmallett/octeon/sys/amd64/amd64/trap.c
user/jmallett/octeon/sys/amd64/conf/GENERIC
user/jmallett/octeon/sys/amd64/conf/GENERIC.hints
user/jmallett/octeon/sys/amd64/conf/NOTES
user/jmallett/octeon/sys/amd64/include/clock.h
user/jmallett/octeon/sys/amd64/include/cpu.h
user/jmallett/octeon/sys/amd64/include/pmap.h
user/jmallett/octeon/sys/amd64/include/segments.h
user/jmallett/octeon/sys/arm/at91/at91_pmc.c
user/jmallett/octeon/sys/arm/at91/at91_pmcreg.h
user/jmallett/octeon/sys/arm/include/fdt.h
user/jmallett/octeon/sys/arm/include/metadata.h
user/jmallett/octeon/sys/arm/mv/common.c
user/jmallett/octeon/sys/arm/mv/discovery/std.db78xxx
user/jmallett/octeon/sys/arm/mv/kirkwood/std.db88f6xxx
user/jmallett/octeon/sys/arm/mv/kirkwood/std.sheevaplug
user/jmallett/octeon/sys/arm/mv/mv_machdep.c
user/jmallett/octeon/sys/arm/mv/orion/std.db88f5xxx
user/jmallett/octeon/sys/boot/Makefile
user/jmallett/octeon/sys/boot/common/Makefile.inc
user/jmallett/octeon/sys/boot/fdt/Makefile
user/jmallett/octeon/sys/boot/fdt/dts/mpc8555cds.dts
user/jmallett/octeon/sys/boot/ficl/Makefile
user/jmallett/octeon/sys/boot/ia64/common/exec.c
user/jmallett/octeon/sys/boot/ia64/efi/version
user/jmallett/octeon/sys/boot/ofw/Makefile.inc
user/jmallett/octeon/sys/boot/ofw/libofw/Makefile
user/jmallett/octeon/sys/boot/ofw/libofw/libofw.h
user/jmallett/octeon/sys/boot/powerpc/Makefile.inc
user/jmallett/octeon/sys/boot/powerpc/boot1.chrp/Makefile
user/jmallett/octeon/sys/boot/powerpc/ofw/Makefile
user/jmallett/octeon/sys/boot/powerpc/ofw/conf.c
user/jmallett/octeon/sys/boot/powerpc/ofw/ldscript.powerpc
user/jmallett/octeon/sys/boot/powerpc/ofw/metadata.c
user/jmallett/octeon/sys/boot/powerpc/uboot/Makefile
user/jmallett/octeon/sys/boot/powerpc/uboot/ldscript.powerpc
user/jmallett/octeon/sys/boot/uboot/Makefile.inc
user/jmallett/octeon/sys/boot/uboot/common/metadata.c
user/jmallett/octeon/sys/cam/ata/ata_xpt.c
user/jmallett/octeon/sys/cddl/boot/zfs/zfsimpl.h
user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/misc.h
user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/policy.h
user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/sid.h
user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/uio.h
user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/vnode.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
user/jmallett/octeon/sys/compat/svr4/svr4_filio.c
user/jmallett/octeon/sys/conf/Makefile.powerpc
user/jmallett/octeon/sys/conf/files
user/jmallett/octeon/sys/conf/files.amd64
user/jmallett/octeon/sys/conf/files.arm
user/jmallett/octeon/sys/conf/files.i386
user/jmallett/octeon/sys/conf/files.pc98
user/jmallett/octeon/sys/conf/files.powerpc
user/jmallett/octeon/sys/conf/kern.mk
user/jmallett/octeon/sys/conf/kern.post.mk
user/jmallett/octeon/sys/conf/kern.pre.mk
user/jmallett/octeon/sys/conf/kmod.mk
user/jmallett/octeon/sys/conf/options.arm
user/jmallett/octeon/sys/conf/options.powerpc
user/jmallett/octeon/sys/contrib/dev/acpica/acpica_prep.sh
user/jmallett/octeon/sys/contrib/dev/acpica/changes.txt
user/jmallett/octeon/sys/contrib/dev/acpica/common/adisasm.c
user/jmallett/octeon/sys/contrib/dev/acpica/common/adwalk.c
user/jmallett/octeon/sys/contrib/dev/acpica/common/dmextern.c
user/jmallett/octeon/sys/contrib/dev/acpica/common/dmrestag.c
user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtable.c
user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtbdump.c
user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtbinfo.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslanalyze.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompile.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.h
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.l
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.y
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asldefine.h
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslerror.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslfiles.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslglobal.h
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asllookup.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslmain.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslopt.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslpredef.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslstartup.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltransform.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltree.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltypes.h
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslutils.c
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbcmds.c
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbdisply.c
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbexec.c
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbfileio.c
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbhistry.c
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbinput.c
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbutils.c
user/jmallett/octeon/sys/contrib/dev/acpica/disassembler/dmobject.c
user/jmallett/octeon/sys/contrib/dev/acpica/disassembler/dmopcode.c
user/jmallett/octeon/sys/contrib/dev/acpica/disassembler/dmresrc.c
user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsinit.c
user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsmethod.c
user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsmthdat.c
user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsobject.c
user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsopcode.c
user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsutils.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpe.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeblk.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeinit.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeutil.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evrgnini.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evxface.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evxfevnt.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exdump.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exfldio.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exprep.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exregion.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exsystem.c
user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwgpe.c
user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwsleep.c
user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwvalid.c
user/jmallett/octeon/sys/contrib/dev/acpica/include/acconfig.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acdisasm.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acevents.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acexcep.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acglobal.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/achware.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/aclocal.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acnamesp.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acobject.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acoutput.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acpixf.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acpredef.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acstruct.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/actbl.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/actbl2.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/actypes.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acutils.h
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsaccess.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsalloc.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsdump.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsinit.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsnames.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsparse.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsrepair.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsrepair2.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nssearch.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsutils.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nswalk.c
user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsxfobj.c
user/jmallett/octeon/sys/contrib/dev/acpica/osunixxf.c
user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utglobal.c
user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utmisc.c
user/jmallett/octeon/sys/contrib/dev/acpica/utilities/uttrack.c
user/jmallett/octeon/sys/ddb/db_command.c
user/jmallett/octeon/sys/dev/acpica/Osd/OsdHardware.c
user/jmallett/octeon/sys/dev/acpica/Osd/OsdMemory.c
user/jmallett/octeon/sys/dev/acpica/acpi.c
user/jmallett/octeon/sys/dev/acpica/acpi_button.c
user/jmallett/octeon/sys/dev/acpica/acpi_ec.c
user/jmallett/octeon/sys/dev/acpica/acpi_hpet.c
user/jmallett/octeon/sys/dev/acpica/acpi_lid.c
user/jmallett/octeon/sys/dev/agp/agp.c
user/jmallett/octeon/sys/dev/aic7xxx/aic79xx.reg
user/jmallett/octeon/sys/dev/aic7xxx/aic7xxx.reg
user/jmallett/octeon/sys/dev/aic7xxx/aicasm/aicasm_gram.y
user/jmallett/octeon/sys/dev/ata/ata-all.c
user/jmallett/octeon/sys/dev/ata/ata-disk.c
user/jmallett/octeon/sys/dev/ata/ata-pci.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-acerlabs.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-amd.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-highpoint.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-intel.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-ite.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-jmicron.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-marvell.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-nvidia.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-promise.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-siliconimage.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-sis.c
user/jmallett/octeon/sys/dev/ata/chipsets/ata-via.c
user/jmallett/octeon/sys/dev/ath/if_ath.c
user/jmallett/octeon/sys/dev/bce/if_bce.c
user/jmallett/octeon/sys/dev/bce/if_bcereg.h
user/jmallett/octeon/sys/dev/bge/if_bge.c
user/jmallett/octeon/sys/dev/bge/if_bgereg.h
user/jmallett/octeon/sys/dev/bktr/bktr_core.c
user/jmallett/octeon/sys/dev/bwi/if_bwi_pci.c
user/jmallett/octeon/sys/dev/bwn/if_bwn.c
user/jmallett/octeon/sys/dev/cxgb/common/cxgb_ael1002.c
user/jmallett/octeon/sys/dev/cxgb/common/cxgb_common.h
user/jmallett/octeon/sys/dev/cxgb/common/cxgb_t3_hw.c
user/jmallett/octeon/sys/dev/cxgb/cxgb_adapter.h
user/jmallett/octeon/sys/dev/cxgb/cxgb_main.c
user/jmallett/octeon/sys/dev/cxgb/cxgb_sge.c
user/jmallett/octeon/sys/dev/e1000/if_em.c
user/jmallett/octeon/sys/dev/e1000/if_igb.c
user/jmallett/octeon/sys/dev/e1000/if_lem.c
user/jmallett/octeon/sys/dev/fb/vesa.c
user/jmallett/octeon/sys/dev/fdt/fdt_common.c
user/jmallett/octeon/sys/dev/fdt/fdt_common.h
user/jmallett/octeon/sys/dev/fdt/fdt_pci.c
user/jmallett/octeon/sys/dev/fdt/simplebus.c
user/jmallett/octeon/sys/dev/flash/mx25l.c (contents, props changed)
user/jmallett/octeon/sys/dev/flash/mx25lreg.h (contents, props changed)
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_core.c
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_core.h
user/jmallett/octeon/sys/dev/iicbus/iicbus.c
user/jmallett/octeon/sys/dev/ipmi/ipmi_smbios.c
user/jmallett/octeon/sys/dev/iwn/if_iwn.c
user/jmallett/octeon/sys/dev/iwn/if_iwnreg.h
user/jmallett/octeon/sys/dev/iwn/if_iwnvar.h
user/jmallett/octeon/sys/dev/md/md.c
user/jmallett/octeon/sys/dev/mpt/mpt.c
user/jmallett/octeon/sys/dev/mpt/mpt.h
user/jmallett/octeon/sys/dev/mpt/mpt_pci.c
user/jmallett/octeon/sys/dev/ofw/ofw_if.m
user/jmallett/octeon/sys/dev/ofw/ofw_standard.c
user/jmallett/octeon/sys/dev/ofw/openfirm.c
user/jmallett/octeon/sys/dev/ofw/openfirm.h
user/jmallett/octeon/sys/dev/pci/pcireg.h
user/jmallett/octeon/sys/dev/sec/sec.c
user/jmallett/octeon/sys/dev/sge/if_sge.c
user/jmallett/octeon/sys/dev/sge/if_sgereg.h
user/jmallett/octeon/sys/dev/sk/if_sk.c
user/jmallett/octeon/sys/dev/syscons/scvgarndr.c
user/jmallett/octeon/sys/dev/tsec/if_tsec.c
user/jmallett/octeon/sys/dev/tsec/if_tsec.h
user/jmallett/octeon/sys/dev/twa/tw_cl.h
user/jmallett/octeon/sys/dev/twa/tw_cl_share.h
user/jmallett/octeon/sys/dev/uart/uart_bus_fdt.c
user/jmallett/octeon/sys/dev/uart/uart_cpu_powerpc.c
user/jmallett/octeon/sys/dev/usb/net/uhso.c
user/jmallett/octeon/sys/dev/usb/serial/uplcom.c
user/jmallett/octeon/sys/dev/usb/usbdevs
user/jmallett/octeon/sys/dev/usb/wlan/if_run.c
user/jmallett/octeon/sys/fs/nfs/nfs_commonport.c
user/jmallett/octeon/sys/fs/nfs/nfs_var.h
user/jmallett/octeon/sys/fs/nfsclient/nfs_clport.c
user/jmallett/octeon/sys/fs/nfsclient/nfs_clrpcops.c
user/jmallett/octeon/sys/fs/nfsclient/nfs_clstate.c
user/jmallett/octeon/sys/fs/nfsclient/nfs_clsubs.c
user/jmallett/octeon/sys/fs/nfsclient/nfs_clvnops.c
user/jmallett/octeon/sys/fs/nfsclient/nfsnode.h
user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdstate.c
user/jmallett/octeon/sys/fs/unionfs/union_subr.c
user/jmallett/octeon/sys/geom/cache/g_cache.h
user/jmallett/octeon/sys/i386/conf/GENERIC.hints
user/jmallett/octeon/sys/i386/conf/NOTES
user/jmallett/octeon/sys/i386/i386/pmap.c
user/jmallett/octeon/sys/i386/include/clock.h
user/jmallett/octeon/sys/i386/include/cpu.h
user/jmallett/octeon/sys/i386/include/pmap.h
user/jmallett/octeon/sys/ia64/acpica/acpi_machdep.c
user/jmallett/octeon/sys/ia64/ia64/autoconf.c
user/jmallett/octeon/sys/ia64/ia64/mca.c
user/jmallett/octeon/sys/ia64/include/md_var.h
user/jmallett/octeon/sys/isa/syscons_isa.c
user/jmallett/octeon/sys/kern/kern_clock.c
user/jmallett/octeon/sys/kern/kern_exec.c
user/jmallett/octeon/sys/kern/kern_ktrace.c
user/jmallett/octeon/sys/kern/kern_resource.c
user/jmallett/octeon/sys/kern/kern_sig.c
user/jmallett/octeon/sys/kern/kern_tc.c
user/jmallett/octeon/sys/kern/kern_thread.c
user/jmallett/octeon/sys/kern/sched_ule.c
user/jmallett/octeon/sys/kern/subr_prf.c
user/jmallett/octeon/sys/kern/subr_trap.c
user/jmallett/octeon/sys/kern/subr_unit.c
user/jmallett/octeon/sys/kern/uipc_mbuf.c
user/jmallett/octeon/sys/kern/vfs_bio.c
user/jmallett/octeon/sys/kern/vfs_syscalls.c
user/jmallett/octeon/sys/mips/atheros/ar71xxreg.h
user/jmallett/octeon/sys/mips/atheros/if_arge.c
user/jmallett/octeon/sys/mips/atheros/if_argevar.h
user/jmallett/octeon/sys/mips/conf/XLRN32
user/jmallett/octeon/sys/mips/include/asm.h
user/jmallett/octeon/sys/mips/include/clock.h
user/jmallett/octeon/sys/mips/include/cpu.h
user/jmallett/octeon/sys/mips/include/cpuregs.h
user/jmallett/octeon/sys/mips/include/db_machdep.h
user/jmallett/octeon/sys/mips/include/md_var.h
user/jmallett/octeon/sys/mips/include/runq.h
user/jmallett/octeon/sys/mips/include/tlb.h
user/jmallett/octeon/sys/mips/mips/cache_mipsNN.c
user/jmallett/octeon/sys/mips/mips/cpu.c
user/jmallett/octeon/sys/mips/mips/db_trace.c
user/jmallett/octeon/sys/mips/mips/exception.S
user/jmallett/octeon/sys/mips/mips/fp.S
user/jmallett/octeon/sys/mips/mips/locore.S
user/jmallett/octeon/sys/mips/mips/machdep.c
user/jmallett/octeon/sys/mips/mips/mpboot.S
user/jmallett/octeon/sys/mips/mips/pm_machdep.c
user/jmallett/octeon/sys/mips/mips/pmap.c
user/jmallett/octeon/sys/mips/mips/psraccess.S
user/jmallett/octeon/sys/mips/mips/support.S
user/jmallett/octeon/sys/mips/mips/swtch.S
user/jmallett/octeon/sys/mips/mips/trap.c
user/jmallett/octeon/sys/mips/mips/vm_machdep.c
user/jmallett/octeon/sys/mips/rmi/dev/xlr/rge.c
user/jmallett/octeon/sys/mips/rmi/iodi.c
user/jmallett/octeon/sys/mips/rmi/on_chip.c
user/jmallett/octeon/sys/mips/rmi/xlr_machdep.c
user/jmallett/octeon/sys/mips/rmi/xlr_pci.c
user/jmallett/octeon/sys/mips/sibyte/sb_machdep.c
user/jmallett/octeon/sys/modules/Makefile
user/jmallett/octeon/sys/modules/acpi/acpi/Makefile
user/jmallett/octeon/sys/modules/cas/Makefile
user/jmallett/octeon/sys/modules/hwpmc/Makefile
user/jmallett/octeon/sys/modules/iwnfw/Makefile
user/jmallett/octeon/sys/modules/iwnfw/iwn6000/Makefile
user/jmallett/octeon/sys/modules/opensolaris/Makefile
user/jmallett/octeon/sys/modules/sound/driver/Makefile
user/jmallett/octeon/sys/modules/zfs/Makefile
user/jmallett/octeon/sys/net/pfil.h
user/jmallett/octeon/sys/net/radix.c
user/jmallett/octeon/sys/netgraph/ng_ipfw.c
user/jmallett/octeon/sys/netgraph/ng_pipe.c
user/jmallett/octeon/sys/netgraph/ng_source.c
user/jmallett/octeon/sys/netgraph/ng_source.h
user/jmallett/octeon/sys/netinet/ipfw/dn_heap.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw2.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw_dynamic.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw_log.c
user/jmallett/octeon/sys/netinet/libalias/alias_sctp.h
user/jmallett/octeon/sys/netinet/siftr.c
user/jmallett/octeon/sys/nfsclient/nfs_subs.c
user/jmallett/octeon/sys/nfsclient/nfs_vnops.c
user/jmallett/octeon/sys/nfsclient/nfsnode.h
user/jmallett/octeon/sys/pc98/conf/GENERIC.hints
user/jmallett/octeon/sys/pci/if_rl.c
user/jmallett/octeon/sys/powerpc/aim/copyinout.c
user/jmallett/octeon/sys/powerpc/aim/locore.S
user/jmallett/octeon/sys/powerpc/aim/machdep.c
user/jmallett/octeon/sys/powerpc/aim/mmu_oea.c
user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c
user/jmallett/octeon/sys/powerpc/aim/mp_cpudep.c
user/jmallett/octeon/sys/powerpc/aim/nexus.c
user/jmallett/octeon/sys/powerpc/aim/ofw_machdep.c
user/jmallett/octeon/sys/powerpc/aim/platform_chrp.c
user/jmallett/octeon/sys/powerpc/aim/trap.c
user/jmallett/octeon/sys/powerpc/aim/vm_machdep.c
user/jmallett/octeon/sys/powerpc/booke/locore.S
user/jmallett/octeon/sys/powerpc/booke/machdep.c
user/jmallett/octeon/sys/powerpc/booke/platform_bare.c
user/jmallett/octeon/sys/powerpc/booke/pmap.c
user/jmallett/octeon/sys/powerpc/booke/swtch.S
user/jmallett/octeon/sys/powerpc/booke/vm_machdep.c
user/jmallett/octeon/sys/powerpc/conf/DEFAULTS
user/jmallett/octeon/sys/powerpc/conf/GENERIC
user/jmallett/octeon/sys/powerpc/conf/MPC85XX
user/jmallett/octeon/sys/powerpc/conf/NOTES
user/jmallett/octeon/sys/powerpc/cpufreq/pcr.c
user/jmallett/octeon/sys/powerpc/include/_align.h
user/jmallett/octeon/sys/powerpc/include/_bus.h
user/jmallett/octeon/sys/powerpc/include/_inttypes.h
user/jmallett/octeon/sys/powerpc/include/_limits.h
user/jmallett/octeon/sys/powerpc/include/_stdint.h
user/jmallett/octeon/sys/powerpc/include/_types.h
user/jmallett/octeon/sys/powerpc/include/asm.h
user/jmallett/octeon/sys/powerpc/include/atomic.h
user/jmallett/octeon/sys/powerpc/include/bus.h
user/jmallett/octeon/sys/powerpc/include/cpufunc.h
user/jmallett/octeon/sys/powerpc/include/db_machdep.h
user/jmallett/octeon/sys/powerpc/include/elf.h
user/jmallett/octeon/sys/powerpc/include/frame.h
user/jmallett/octeon/sys/powerpc/include/hid.h
user/jmallett/octeon/sys/powerpc/include/md_var.h
user/jmallett/octeon/sys/powerpc/include/metadata.h
user/jmallett/octeon/sys/powerpc/include/param.h
user/jmallett/octeon/sys/powerpc/include/pcb.h
user/jmallett/octeon/sys/powerpc/include/pcpu.h
user/jmallett/octeon/sys/powerpc/include/pmap.h
user/jmallett/octeon/sys/powerpc/include/proc.h
user/jmallett/octeon/sys/powerpc/include/profile.h
user/jmallett/octeon/sys/powerpc/include/psl.h
user/jmallett/octeon/sys/powerpc/include/pte.h
user/jmallett/octeon/sys/powerpc/include/reg.h
user/jmallett/octeon/sys/powerpc/include/runq.h
user/jmallett/octeon/sys/powerpc/include/smp.h
user/jmallett/octeon/sys/powerpc/include/spr.h
user/jmallett/octeon/sys/powerpc/include/sr.h
user/jmallett/octeon/sys/powerpc/include/trap_aim.h
user/jmallett/octeon/sys/powerpc/include/ucontext.h
user/jmallett/octeon/sys/powerpc/include/vmparam.h
user/jmallett/octeon/sys/powerpc/mpc85xx/atpic.c
user/jmallett/octeon/sys/powerpc/mpc85xx/i2c.c
user/jmallett/octeon/sys/powerpc/mpc85xx/lbc.c
user/jmallett/octeon/sys/powerpc/mpc85xx/lbc.h
user/jmallett/octeon/sys/powerpc/mpc85xx/mpc85xx.c
user/jmallett/octeon/sys/powerpc/mpc85xx/mpc85xx.h
user/jmallett/octeon/sys/powerpc/mpc85xx/nexus.c
user/jmallett/octeon/sys/powerpc/ofw/ofw_real.c
user/jmallett/octeon/sys/powerpc/ofw/ofw_syscons.c
user/jmallett/octeon/sys/powerpc/powermac/grackle.c
user/jmallett/octeon/sys/powerpc/powermac/hrowpic.c
user/jmallett/octeon/sys/powerpc/powerpc/bcopy.c
user/jmallett/octeon/sys/powerpc/powerpc/bus_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/busdma_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/cpu.c
user/jmallett/octeon/sys/powerpc/powerpc/db_interface.c
user/jmallett/octeon/sys/powerpc/powerpc/db_trace.c
user/jmallett/octeon/sys/powerpc/powerpc/genassym.c
user/jmallett/octeon/sys/powerpc/powerpc/in_cksum.c
user/jmallett/octeon/sys/powerpc/powerpc/intr_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/mp_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/openpic.c
user/jmallett/octeon/sys/powerpc/powerpc/setjmp.S
user/jmallett/octeon/sys/powerpc/powerpc/stack_machdep.c
user/jmallett/octeon/sys/powerpc/powerpc/syncicache.c
user/jmallett/octeon/sys/powerpc/powerpc/sys_machdep.c
user/jmallett/octeon/sys/sparc64/include/intr_machdep.h
user/jmallett/octeon/sys/sparc64/sparc64/exception.S
user/jmallett/octeon/sys/sparc64/sparc64/genassym.c
user/jmallett/octeon/sys/sun4v/conf/DEFAULTS
user/jmallett/octeon/sys/sun4v/include/intr_machdep.h
user/jmallett/octeon/sys/sun4v/sun4v/exception.S
user/jmallett/octeon/sys/sys/cdefs.h
user/jmallett/octeon/sys/sys/elf_common.h
user/jmallett/octeon/sys/sys/ktrace.h
user/jmallett/octeon/sys/sys/param.h
user/jmallett/octeon/sys/sys/pcpu.h
user/jmallett/octeon/sys/sys/proc.h
user/jmallett/octeon/sys/sys/resource.h
user/jmallett/octeon/sys/sys/resourcevar.h
user/jmallett/octeon/sys/sys/signalvar.h
user/jmallett/octeon/sys/sys/sysctl.h
user/jmallett/octeon/sys/sys/systm.h
user/jmallett/octeon/sys/vm/vm_page.c
user/jmallett/octeon/sys/vm/vm_page.h
user/jmallett/octeon/sys/x86/isa/atrtc.c
user/jmallett/octeon/sys/x86/isa/clock.c
user/jmallett/octeon/sys/x86/x86/local_apic.c
user/jmallett/octeon/tools/tools/ncpus/biosmptable.c
user/jmallett/octeon/usr.bin/calendar/calendars/calendar.freebsd
user/jmallett/octeon/usr.bin/col/col.c
user/jmallett/octeon/usr.bin/gcore/elfcore.c
user/jmallett/octeon/usr.bin/gcore/extern.h
user/jmallett/octeon/usr.bin/gcore/gcore.1
user/jmallett/octeon/usr.bin/gcore/gcore.c
user/jmallett/octeon/usr.bin/getopt/getopt.1
user/jmallett/octeon/usr.bin/ktrace/ktrace.1
user/jmallett/octeon/usr.bin/make/str.c
user/jmallett/octeon/usr.bin/netstat/if.c
user/jmallett/octeon/usr.bin/systat/vmstat.c
user/jmallett/octeon/usr.bin/xlint/lint1/mem1.c
user/jmallett/octeon/usr.sbin/acpi/acpidump/acpi_user.c
user/jmallett/octeon/usr.sbin/acpi/iasl/Makefile
user/jmallett/octeon/usr.sbin/config/config.8
user/jmallett/octeon/usr.sbin/config/config.y
user/jmallett/octeon/usr.sbin/config/configvers.h
user/jmallett/octeon/usr.sbin/config/main.c
user/jmallett/octeon/usr.sbin/config/mkmakefile.c
user/jmallett/octeon/usr.sbin/config/mkoptions.c
user/jmallett/octeon/usr.sbin/crunch/crunchide/Makefile
user/jmallett/octeon/usr.sbin/crunch/crunchide/exec_elf32.c
user/jmallett/octeon/usr.sbin/fifolog/lib/fifolog_reader.c
user/jmallett/octeon/usr.sbin/freebsd-update/freebsd-update.8
user/jmallett/octeon/usr.sbin/jls/jls.c
user/jmallett/octeon/usr.sbin/mountd/exports.5
user/jmallett/octeon/usr.sbin/nfsdumpstate/nfsdumpstate.c
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/Makefile
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/list-config.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend/Makefile
user/jmallett/octeon/usr.sbin/pc-sysinstall/backend/functions-ftp.sh
user/jmallett/octeon/usr.sbin/pc-sysinstall/doc/help-index
user/jmallett/octeon/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8
user/jmallett/octeon/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh
user/jmallett/octeon/usr.sbin/sysinstall/Makefile
user/jmallett/octeon/usr.sbin/sysinstall/devices.c
user/jmallett/octeon/usr.sbin/sysinstall/install.c
user/jmallett/octeon/usr.sbin/sysinstall/install.cfg
user/jmallett/octeon/usr.sbin/sysinstall/label.c
user/jmallett/octeon/usr.sbin/sysinstall/menus.c
user/jmallett/octeon/usr.sbin/sysinstall/msg.c
user/jmallett/octeon/usr.sbin/sysinstall/network.c
user/jmallett/octeon/usr.sbin/sysinstall/sysinstall.h
user/jmallett/octeon/usr.sbin/tzsetup/tzsetup.c
user/jmallett/octeon/usr.sbin/uhsoctl/uhsoctl.c
Directory Properties:
user/jmallett/octeon/ (props changed)
user/jmallett/octeon/cddl/contrib/opensolaris/ (props changed)
user/jmallett/octeon/share/mk/bsd.arch.inc.mk (props changed)
user/jmallett/octeon/sys/cddl/contrib/opensolaris/ (props changed)
user/jmallett/octeon/sys/contrib/dev/acpica/ (props changed)
Modified: user/jmallett/octeon/Makefile.inc1
==============================================================================
--- user/jmallett/octeon/Makefile.inc1 Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/Makefile.inc1 Tue Jul 20 04:46:04 2010 (r210278)
@@ -128,7 +128,7 @@ TARGET= ${TARGET_ARCH}
TARGET?= ${MACHINE}
TARGET_ARCH?= ${MACHINE_ARCH}
-KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v
+KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v
.if ${TARGET} == ${TARGET_ARCH}
_t= ${TARGET}
.else
@@ -262,34 +262,47 @@ WMAKEENV+= NO_CTF=1
.endif
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
-.if ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
# 32 bit world
LIB32TMP= ${OBJTREE}${.CURDIR}/lib32
+.if ${TARGET_ARCH} == "amd64"
.if empty(TARGET_CPUTYPE)
LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2
.else
LIB32CPUFLAGS= -march=${TARGET_CPUTYPE}
.endif
-LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
+LIB32CPUFLAGS+= -mfancy-math-387
+LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \
+ MACHINE_CPU="i686 mmx sse sse2" \
+ LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+ AS="${AS} --32"
+
+.elif ${TARGET_ARCH} == "powerpc64"
+.if empty(TARGET_CPUTYPE)
+LIB32CPUFLAGS= -mcpu=powerpc
+.else
+LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE}
+.endif
+LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc \
+ LD="${LD} -m elf32ppc"
+.endif
+
+
+LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \
-isystem ${LIB32TMP}/usr/include/ \
-L${LIB32TMP}/usr/lib32 \
-B${LIB32TMP}/usr/lib32
# Yes, the flags are redundant.
-LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
+LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
_SHLIBDIRPREFIX=${LIB32TMP} \
VERSION="${VERSION}" \
- MACHINE=i386 \
- MACHINE_ARCH=i386 \
- MACHINE_CPU="i686 mmx sse sse2" \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \
CC="${CC} ${LIB32FLAGS}" \
CXX="${CXX} ${LIB32FLAGS}" \
OBJC="${OBJC} ${LIB32FLAGS}" \
- LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
- AS="${AS} --32" \
LIBDIR=/usr/lib32 \
SHLIBDIR=/usr/lib32
@@ -336,7 +349,7 @@ _worldtmp:
@echo "--------------------------------------------------------------"
.if !defined(NO_CLEAN)
rm -rf ${WORLDTMP}
-.if ${TARGET_ARCH} == "amd64"
+.if defined(LIB32TMP)
rm -rf ${LIB32TMP}
.endif
.else
@@ -380,7 +393,7 @@ _cleanobj:
@echo ">>> stage 2.1: cleaning up the object tree"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
-.if ${TARGET_ARCH} == "amd64"
+.if defined(LIB32TMP)
${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/}
.endif
.endif
@@ -428,7 +441,7 @@ everything:
@echo ">>> stage 4.4: building everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${WMAKE} par-all
-.if ${TARGET_ARCH} == "amd64"
+.if defined(LIB32TMP)
build32:
@echo
@echo "--------------------------------------------------------------"
@@ -510,7 +523,7 @@ WMAKE_TGTS+= _cleanobj _obj _build-tools
WMAKE_TGTS+= _cross-tools
.endif
WMAKE_TGTS+= _includes _libraries _depend everything
-.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
+.if defined(LIB32TMP) && ${MK_LIB32} != "no"
WMAKE_TGTS+= build32
.endif
@@ -660,7 +673,7 @@ reinstall:
@echo ">>> Installing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
+.if defined(LIB32TMP) && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif
@@ -669,7 +682,7 @@ redistribute:
@echo ">>> Distributing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
-.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
+.if defined(LIB32TMP) && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \
DISTRIBUTION=lib32
.endif
@@ -705,8 +718,12 @@ KERNCONF=${KERNFAST}
KERNCONF= ${KERNEL}
KERNWARN=
.else
+.if ${TARGET_ARCH} == "powerpc64"
+KERNCONF?= GENERIC64
+.else
KERNCONF?= GENERIC
.endif
+.endif
INSTKERNNAME?= kernel
KERNSRCDIR?= ${.CURDIR}/sys
@@ -1108,8 +1125,12 @@ _prereq_libs= gnu/lib/libssp/libssp_nons
# all shared libraries for ELF.
#
_startup_libs= gnu/lib/csu
-.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf)
+.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
+_startup_libs+= lib/csu/${MACHINE_ARCH}-elf
+.elif exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf)
_startup_libs+= lib/csu/${MACHINE_CPUARCH}-elf
+.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
+_startup_libs+= lib/csu/${MACHINE_ARCH}
.else
_startup_libs+= lib/csu/${MACHINE_CPUARCH}
.endif
@@ -1456,9 +1477,11 @@ _xi-links:
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
-FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+"; print $$3}' \
+.if exists(${KERNCONFDIR}/${KERNCONF})
+FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
${KERNCONFDIR}/${KERNCONF}
.endif
+.endif
.endif
Modified: user/jmallett/octeon/ObsoleteFiles.inc
==============================================================================
--- user/jmallett/octeon/ObsoleteFiles.inc Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/ObsoleteFiles.inc Tue Jul 20 04:46:04 2010 (r210278)
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100706: removed pc-sysinstall's detect-vmware.sh
+OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh
# 20100701: [powerpc] removed <machine/intr.h>
.if ${TARGET_ARCH} == "powerpc"
OLD_FILES+=usr/include/machine/intr.h
Modified: user/jmallett/octeon/UPDATING
==============================================================================
--- user/jmallett/octeon/UPDATING Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/UPDATING Tue Jul 20 04:46:04 2010 (r210278)
@@ -23,6 +23,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
ln -s aj /etc/malloc.conf.)
+20100713:
+ Due to the import of powerpc64 support, all existing powerpc kernel
+ configuration files must be updated with a machine directive like this:
+ machine powerpc powerpc
+
+ In addition, an updated config(8) is required to build powerpc kernels
+ after this change.
+
+20100713:
+ A new version of ZFS (version 15) has been merged to -HEAD.
+ This version uses a python library for the following subcommands:
+ zfs allow, zfs unallow, zfs groupspace, zfs userspace.
+ For full functionality of these commands the following port must
+ be installed: sysutils/py-zfs
+
20100429:
'vm_page's are now hashed by physical address to an array of mutexes.
Currently this is only used to serialize access to hold_count. Over
@@ -964,6 +979,22 @@ COMMON ITEMS:
path, and has the highest probability of being successful. Please try
this approach before reporting problems with a major version upgrade.
+ ZFS notes
+ ---------
+ When upgrading the boot ZFS pool to a new version, always follow
+ these two steps:
+
+ 1.) recompile and reinstall the ZFS boot loader and boot block
+ (this is part of "make buildworld" and "make installworld")
+
+ 2.) update the ZFS boot block on your boot drive
+
+ The following example updates the ZFS boot block on the first
+ partition (freebsd-boot) of a GPT partitioned drive ad0:
+ "gpart bootcode -p /boot/gptzfsboot -i 1 ad0"
+
+ Non-boot pools do not need these updates.
+
To build a kernel
-----------------
If you are updating from a prior version of FreeBSD (even one just
Modified: user/jmallett/octeon/bin/pkill/pkill.1
==============================================================================
--- user/jmallett/octeon/bin/pkill/pkill.1 Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/bin/pkill/pkill.1 Tue Jul 20 04:46:04 2010 (r210278)
@@ -53,7 +53,7 @@
.Ar pattern ...
.Nm pkill
.Op Fl Ar signal
-.Op Fl ILafinovx
+.Op Fl ILafilnovx
.Op Fl F Ar pidfile
.Op Fl G Ar gid
.Op Fl M Ar core
Modified: user/jmallett/octeon/bin/sh/parser.c
==============================================================================
--- user/jmallett/octeon/bin/sh/parser.c Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/bin/sh/parser.c Tue Jul 20 04:46:04 2010 (r210278)
@@ -554,6 +554,7 @@ TRACE(("expecting DO got %s %s\n", tokna
checkkwd = 1;
break;
/* Handle an empty command like other simple commands. */
+ case TBACKGND:
case TSEMI:
case TAND:
case TOR:
@@ -609,8 +610,7 @@ simplecmd(union node **rpp, union node *
{
union node *args, **app;
union node **orig_rpp = rpp;
- union node *n = NULL, *n2;
- int negate = 0;
+ union node *n = NULL;
/* If we don't have any redirections already, then we must reset */
/* rpp to be the address of the local redir variable. */
@@ -626,12 +626,6 @@ simplecmd(union node **rpp, union node *
*/
orig_rpp = rpp;
- while (readtoken() == TNOT) {
- TRACE(("command: TNOT recognized\n"));
- negate = !negate;
- }
- tokpushback++;
-
for (;;) {
if (readtoken() == TWORD) {
n = (union node *)stalloc(sizeof (struct narg));
@@ -657,7 +651,7 @@ simplecmd(union node **rpp, union node *
n->type = NDEFUN;
n->narg.next = command();
funclinno = 0;
- goto checkneg;
+ return n;
} else {
tokpushback++;
break;
@@ -670,16 +664,7 @@ simplecmd(union node **rpp, union node *
n->ncmd.backgnd = 0;
n->ncmd.args = args;
n->ncmd.redirect = redir;
-
-checkneg:
- if (negate) {
- n2 = (union node *)stalloc(sizeof (struct nnot));
- n2->type = NNOT;
- n2->nnot.com = n;
- return n2;
- }
- else
- return n;
+ return n;
}
STATIC union node *
Modified: user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h
==============================================================================
--- user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h Tue Jul 20 04:46:04 2010 (r210278)
@@ -3,10 +3,13 @@
#ifndef _OPENSOLARIS_MNTTAB_H_
#define _OPENSOLARIS_MNTTAB_H_
+#include <sys/param.h>
+#include <sys/mount.h>
+
#include <stdio.h>
#include <paths.h>
-#define MNTTAB _PATH_DEVNULL
+#define MNTTAB _PATH_DEVZERO
#define MNT_LINE_MAX 1024
#define umount2(p, f) unmount(p, f)
@@ -17,7 +20,12 @@ struct mnttab {
char *mnt_fstype;
char *mnt_mntopts;
};
+#define extmnttab mnttab
int getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp);
+int getmntent(FILE *fp, struct mnttab *mp);
+char *hasmntopt(struct mnttab *mnt, char *opt);
+
+void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
#endif /* !_OPENSOLARIS_MNTTAB_H_ */
Modified: user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c
==============================================================================
--- user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c Tue Jul 20 04:46:04 2010 (r210278)
@@ -110,11 +110,11 @@ getline(FILE *fd, const char *skip)
*
* Recognized keywords:
*
- * ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet
+ * ro, maproot, mapall, mask, network, sec, alldirs, public, webnfs, index, quiet
*
*/
static const char *known_opts[] = { "ro", "maproot", "mapall", "mask",
- "network", "alldirs", "public", "webnfs", "index", "quiet", NULL };
+ "network", "sec", "alldirs", "public", "webnfs", "index", "quiet", NULL };
static char *
translate_opts(const char *shareopts)
{
Modified: user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c
==============================================================================
--- user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c Tue Jul 20 04:46:04 2010 (r210278)
@@ -36,6 +36,9 @@ __FBSDID("$FreeBSD$");
#include <sys/mount.h>
#include <sys/mntent.h>
#include <sys/mnttab.h>
+
+#include <ctype.h>
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -88,75 +91,126 @@ optadd(char *mntopts, size_t size, const
strlcat(mntopts, opt, size);
}
-int
-getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp)
+void
+statfs2mnttab(struct statfs *sfs, struct mnttab *mp)
{
- static struct statfs *sfs = NULL;
static char mntopts[MNTMAXSTR];
- struct opt *o;
- long i, n, flags;
+ long flags;
- if (sfs != NULL) {
- free(sfs);
- sfs = NULL;
- }
mntopts[0] = '\0';
- n = getfsstat(NULL, 0, MNT_NOWAIT);
- if (n == -1)
- return (-1);
- n = sizeof(*sfs) * (n + 8);
- sfs = malloc(n);
- if (sfs == NULL)
- return (-1);
- n = getfsstat(sfs, n, MNT_WAIT);
- if (n == -1) {
- free(sfs);
- sfs = NULL;
- return (-1);
+ flags = sfs->f_flags;
+#define OPTADD(opt) optadd(mntopts, sizeof(mntopts), (opt))
+ if (flags & MNT_RDONLY)
+ OPTADD(MNTOPT_RO);
+ else
+ OPTADD(MNTOPT_RW);
+ if (flags & MNT_NOSUID)
+ OPTADD(MNTOPT_NOSUID);
+ else
+ OPTADD(MNTOPT_SETUID);
+ if (flags & MNT_UPDATE)
+ OPTADD(MNTOPT_REMOUNT);
+ if (flags & MNT_NOATIME)
+ OPTADD(MNTOPT_NOATIME);
+ else
+ OPTADD(MNTOPT_ATIME);
+ OPTADD(MNTOPT_NOXATTR);
+ if (flags & MNT_NOEXEC)
+ OPTADD(MNTOPT_NOEXEC);
+ else
+ OPTADD(MNTOPT_EXEC);
+#undef OPTADD
+ mp->mnt_special = sfs->f_mntfromname;
+ mp->mnt_mountp = sfs->f_mntonname;
+ mp->mnt_fstype = sfs->f_fstypename;
+ mp->mnt_mntopts = mntopts;
+}
+
+static struct statfs *gsfs = NULL;
+static int allfs = 0;
+
+static int
+statfs_init(void)
+{
+ struct statfs *sfs;
+ int error;
+
+ if (gsfs != NULL) {
+ free(gsfs);
+ gsfs = NULL;
}
- for (i = 0; i < n; i++) {
+ allfs = getfsstat(NULL, 0, MNT_WAIT);
+ if (allfs == -1)
+ goto fail;
+ gsfs = malloc(sizeof(gsfs[0]) * allfs * 2);
+ if (gsfs == NULL)
+ goto fail;
+ allfs = getfsstat(gsfs, (long)(sizeof(gsfs[0]) * allfs * 2),
+ MNT_WAIT);
+ if (allfs == -1)
+ goto fail;
+ sfs = realloc(gsfs, allfs * sizeof(gsfs[0]));
+ if (sfs != NULL)
+ gsfs = sfs;
+ return (0);
+fail:
+ error = errno;
+ if (gsfs != NULL)
+ free(gsfs);
+ gsfs = NULL;
+ allfs = 0;
+ return (error);
+}
+
+int
+getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp)
+{
+ struct statfs *sfs;
+ int i, error;
+
+ error = statfs_init();
+ if (error != 0)
+ return (error);
+
+ for (i = 0; i < allfs; i++) {
if (mrefp->mnt_special != NULL &&
- strcmp(mrefp->mnt_special, sfs[i].f_mntfromname) != 0) {
+ strcmp(mrefp->mnt_special, gsfs[i].f_mntfromname) != 0) {
continue;
}
if (mrefp->mnt_mountp != NULL &&
- strcmp(mrefp->mnt_mountp, sfs[i].f_mntonname) != 0) {
+ strcmp(mrefp->mnt_mountp, gsfs[i].f_mntonname) != 0) {
continue;
}
if (mrefp->mnt_fstype != NULL &&
- strcmp(mrefp->mnt_fstype, sfs[i].f_fstypename) != 0) {
+ strcmp(mrefp->mnt_fstype, gsfs[i].f_fstypename) != 0) {
continue;
}
- flags = sfs[i].f_flags;
-#define OPTADD(opt) optadd(mntopts, sizeof(mntopts), (opt))
- if (flags & MNT_RDONLY)
- OPTADD(MNTOPT_RO);
- else
- OPTADD(MNTOPT_RW);
- if (flags & MNT_NOSUID)
- OPTADD(MNTOPT_NOSUID);
- else
- OPTADD(MNTOPT_SETUID);
- if (flags & MNT_UPDATE)
- OPTADD(MNTOPT_REMOUNT);
- if (flags & MNT_NOATIME)
- OPTADD(MNTOPT_NOATIME);
- else
- OPTADD(MNTOPT_ATIME);
- OPTADD(MNTOPT_NOXATTR);
- if (flags & MNT_NOEXEC)
- OPTADD(MNTOPT_NOEXEC);
- else
- OPTADD(MNTOPT_EXEC);
-#undef OPTADD
- mgetp->mnt_special = sfs[i].f_mntfromname;
- mgetp->mnt_mountp = sfs[i].f_mntonname;
- mgetp->mnt_fstype = sfs[i].f_fstypename;
- mgetp->mnt_mntopts = mntopts;
+ statfs2mnttab(&gsfs[i], mgetp);
return (0);
}
- free(sfs);
- sfs = NULL;
return (-1);
}
+
+int
+getmntent(FILE *fp, struct mnttab *mp)
+{
+ struct statfs *sfs;
+ int error, nfs;
+
+ nfs = (int)lseek(fileno(fp), 0, SEEK_CUR);
+ if (nfs == -1)
+ return (errno);
+ /* If nfs is 0, we want to refresh out cache. */
+ if (nfs == 0 || gsfs == NULL) {
+ error = statfs_init();
+ if (error != 0)
+ return (error);
+ }
+ if (nfs >= allfs)
+ return (-1);
+ statfs2mnttab(&gsfs[nfs], mp);
+ if (lseek(fileno(fp), 1, SEEK_CUR) == -1)
+ return (errno);
+ return (0);
+}
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Jul 20 04:46:04 2010 (r210278)
@@ -1,23 +1,8 @@
'\" te
-.\" CDDL HEADER START
-.\"
-.\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").
-.\" You may not use this file except in compliance with the License.
-.\"
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each
-.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
-.\"
-.\" CDDL HEADER END
.\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
+.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
.TH zdb 1M "31 Oct 2005" "SunOS 5.11" "System Administration Commands"
.SH NAME
zdb \- ZFS debugger
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Jul 20 04:16:51 2010 (r210277)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Jul 20 04:46:04 2010 (r210278)
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -87,8 +87,8 @@ static void
usage(void)
{
(void) fprintf(stderr,
- "Usage: %s [-udibcsv] [-U cachefile_path] "
- "[-S user:cksumalg] "
+ "Usage: %s [-udibcsvL] [-U cachefile_path] [-t txg]\n"
+ "\t [-S user:cksumalg] "
"dataset [object...]\n"
" %s -C [pool]\n"
" %s -l dev\n"
@@ -102,12 +102,16 @@ usage(void)
(void) fprintf(stderr, " -C cached pool configuration\n");
(void) fprintf(stderr, " -i intent logs\n");
(void) fprintf(stderr, " -b block statistics\n");
- (void) fprintf(stderr, " -c checksum all data blocks\n");
+ (void) fprintf(stderr, " -m metaslabs\n");
+ (void) fprintf(stderr, " -c checksum all metadata (twice for "
+ "all data) blocks\n");
(void) fprintf(stderr, " -s report stats on zdb's I/O\n");
(void) fprintf(stderr, " -S <user|all>:<cksum_alg|all> -- "
"dump blkptr signatures\n");
(void) fprintf(stderr, " -v verbose (applies to all others)\n");
(void) fprintf(stderr, " -l dump label contents\n");
+ (void) fprintf(stderr, " -L disable leak tracking (do not "
+ "load spacemaps)\n");
(void) fprintf(stderr, " -U cachefile_path -- use alternate "
"cachefile\n");
(void) fprintf(stderr, " -R read and display block from a "
@@ -115,12 +119,19 @@ usage(void)
(void) fprintf(stderr, " -e Pool is exported/destroyed/"
"has altroot\n");
(void) fprintf(stderr, " -p <Path to vdev dir> (use with -e)\n");
+ (void) fprintf(stderr, " -t <txg> highest txg to use when "
+ "searching for uberblocks\n");
(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
"to make only that option verbose\n");
(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
exit(1);
}
+/*
+ * Called for usage errors that are discovered after a call to spa_open(),
+ * dmu_bonus_hold(), or pool_match(). abort() is called for other errors.
+ */
+
static void
fatal(const char *fmt, ...)
{
@@ -132,7 +143,7 @@ fatal(const char *fmt, ...)
va_end(ap);
(void) fprintf(stderr, "\n");
- abort();
+ exit(1);
}
static void
@@ -205,7 +216,7 @@ dump_packed_nvlist(objset_t *os, uint64_
size_t nvsize = *(uint64_t *)data;
char *packed = umem_alloc(nvsize, UMEM_NOFAIL);
- VERIFY(0 == dmu_read(os, object, 0, nvsize, packed));
+ VERIFY(0 == dmu_read(os, object, 0, nvsize, packed, DMU_READ_PREFETCH));
VERIFY(nvlist_unpack(packed, nvsize, &nv, 0) == 0);
@@ -431,7 +442,7 @@ dump_spacemap(objset_t *os, space_map_ob
alloc = 0;
for (offset = 0; offset < smo->smo_objsize; offset += sizeof (entry)) {
VERIFY(0 == dmu_read(os, smo->smo_object, offset,
- sizeof (entry), &entry));
+ sizeof (entry), &entry, DMU_READ_PREFETCH));
if (SM_DEBUG_DECODE(entry)) {
(void) printf("\t\t[%4llu] %s: txg %llu, pass %llu\n",
(u_longlong_t)(offset / sizeof (entry)),
@@ -463,6 +474,21 @@ dump_spacemap(objset_t *os, space_map_ob
}
static void
+dump_metaslab_stats(metaslab_t *msp)
+{
+ char maxbuf[5];
+ space_map_t *sm = &msp->ms_map;
+ avl_tree_t *t = sm->sm_pp_root;
+ int free_pct = sm->sm_space * 100 / sm->sm_size;
+
+ nicenum(space_map_maxsize(sm), maxbuf);
+
+ (void) printf("\t %20s %10lu %7s %6s %4s %4d%%\n",
+ "segments", avl_numnodes(t), "maxsize", maxbuf,
+ "freepct", free_pct);
+}
+
+static void
dump_metaslab(metaslab_t *msp)
{
char freebuf[5];
@@ -472,22 +498,28 @@ dump_metaslab(metaslab_t *msp)
nicenum(msp->ms_map.sm_size - smo->smo_alloc, freebuf);
- if (dump_opt['d'] <= 5) {
- (void) printf("\t%10llx %10llu %5s\n",
- (u_longlong_t)msp->ms_map.sm_start,
- (u_longlong_t)smo->smo_object,
- freebuf);
- return;
- }
-
(void) printf(
- "\tvdev %llu offset %08llx spacemap %4llu free %5s\n",
+ "\tvdev %5llu offset %12llx spacemap %6llu free %5s\n",
(u_longlong_t)vd->vdev_id, (u_longlong_t)msp->ms_map.sm_start,
(u_longlong_t)smo->smo_object, freebuf);
- ASSERT(msp->ms_map.sm_size == (1ULL << vd->vdev_ms_shift));
+ if (dump_opt['m'] > 1) {
+ mutex_enter(&msp->ms_lock);
+ VERIFY(space_map_load(&msp->ms_map, zfs_metaslab_ops,
+ SM_FREE, &msp->ms_smo, spa->spa_meta_objset) == 0);
+ dump_metaslab_stats(msp);
+ space_map_unload(&msp->ms_map);
+ mutex_exit(&msp->ms_lock);
+ }
+
+ if (dump_opt['d'] > 5 || dump_opt['m'] > 2) {
+ ASSERT(msp->ms_map.sm_size == (1ULL << vd->vdev_ms_shift));
+
+ mutex_enter(&msp->ms_lock);
+ dump_spacemap(spa->spa_meta_objset, smo, &msp->ms_map);
+ mutex_exit(&msp->ms_lock);
+ }
- dump_spacemap(spa->spa_meta_objset, smo, &msp->ms_map);
}
static void
@@ -502,14 +534,12 @@ dump_metaslabs(spa_t *spa)
for (c = 0; c < rvd->vdev_children; c++) {
vd = rvd->vdev_child[c];
- (void) printf("\n vdev %llu\n\n", (u_longlong_t)vd->vdev_id);
+ (void) printf("\t%-10s %-19s %-15s %-10s\n",
+ "vdev", "offset", "spacemap", "free");
+ (void) printf("\t%10s %19s %15s %10s\n",
+ "----------", "-------------------",
+ "---------------", "-------------");
- if (dump_opt['d'] <= 5) {
- (void) printf("\t%10s %10s %5s\n",
- "offset", "spacemap", "free");
- (void) printf("\t%10s %10s %5s\n",
- "------", "--------", "----");
- }
for (m = 0; m < vd->vdev_ms_count; m++)
dump_metaslab(vd->vdev_ms[m]);
(void) printf("\n");
@@ -517,44 +547,52 @@ dump_metaslabs(spa_t *spa)
}
static void
+dump_dtl_seg(space_map_t *sm, uint64_t start, uint64_t size)
+{
+ char *prefix = (void *)sm;
+
+ (void) printf("%s [%llu,%llu) length %llu\n",
+ prefix,
+ (u_longlong_t)start,
+ (u_longlong_t)(start + size),
+ (u_longlong_t)(size));
+}
+
+static void
dump_dtl(vdev_t *vd, int indent)
{
- avl_tree_t *t = &vd->vdev_dtl_map.sm_root;
- space_seg_t *ss;
- vdev_t *pvd;
- int c;
+ spa_t *spa = vd->vdev_spa;
+ boolean_t required;
+ char *name[DTL_TYPES] = { "missing", "partial", "scrub", "outage" };
+ char prefix[256];
+
+ spa_vdev_state_enter(spa);
+ required = vdev_dtl_required(vd);
+ (void) spa_vdev_state_exit(spa, NULL, 0);
if (indent == 0)
(void) printf("\nDirty time logs:\n\n");
- (void) printf("\t%*s%s\n", indent, "",
+ (void) printf("\t%*s%s [%s]\n", indent, "",
vd->vdev_path ? vd->vdev_path :
- vd->vdev_parent ? vd->vdev_ops->vdev_op_type :
- spa_name(vd->vdev_spa));
-
- for (ss = avl_first(t); ss; ss = AVL_NEXT(t, ss)) {
- /*
- * Everything in this DTL must appear in all parent DTL unions.
- */
- for (pvd = vd; pvd; pvd = pvd->vdev_parent)
- ASSERT(vdev_dtl_contains(&pvd->vdev_dtl_map,
- ss->ss_start, ss->ss_end - ss->ss_start));
- (void) printf("\t%*soutage [%llu,%llu] length %llu\n",
- indent, "",
- (u_longlong_t)ss->ss_start,
- (u_longlong_t)ss->ss_end - 1,
- (u_longlong_t)(ss->ss_end - ss->ss_start));
- }
-
- (void) printf("\n");
+ vd->vdev_parent ? vd->vdev_ops->vdev_op_type : spa_name(spa),
+ required ? "DTL-required" : "DTL-expendable");
- if (dump_opt['d'] > 5 && vd->vdev_children == 0) {
- dump_spacemap(vd->vdev_spa->spa_meta_objset, &vd->vdev_dtl,
- &vd->vdev_dtl_map);
- (void) printf("\n");
+ for (int t = 0; t < DTL_TYPES; t++) {
+ space_map_t *sm = &vd->vdev_dtl[t];
+ if (sm->sm_space == 0)
+ continue;
+ (void) snprintf(prefix, sizeof (prefix), "\t%*s%s",
+ indent + 2, "", name[t]);
+ mutex_enter(sm->sm_lock);
+ space_map_walk(sm, dump_dtl_seg, (void *)prefix);
+ mutex_exit(sm->sm_lock);
+ if (dump_opt['d'] > 5 && vd->vdev_children == 0)
+ dump_spacemap(spa->spa_meta_objset,
+ &vd->vdev_dtl_smo, sm);
}
- for (c = 0; c < vd->vdev_children; c++)
+ for (int c = 0; c < vd->vdev_children; c++)
dump_dtl(vd->vdev_child[c], indent + 4);
}
@@ -668,7 +706,8 @@ visit_indirect(spa_t *spa, const dnode_p
break;
fill += cbp->blk_fill;
}
- ASSERT3U(fill, ==, bp->blk_fill);
+ if (!err)
+ ASSERT3U(fill, ==, bp->blk_fill);
(void) arc_buf_remove_ref(buf, &buf);
}
@@ -904,6 +943,7 @@ dump_uidgid(objset_t *os, znode_phys_t *
/* first find the fuid object. It lives in the master node */
VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZFS_FUID_TABLES,
8, 1, &fuid_obj) == 0);
+ zfs_fuid_avl_tree_create(&idx_tree, &domain_tree);
(void) zfs_fuid_table_load(os, fuid_obj,
&idx_tree, &domain_tree);
fuid_table_loaded = B_TRUE;
@@ -1007,6 +1047,8 @@ static object_viewer_t *object_viewer[DM
dump_packed_nvlist, /* FUID nvlist size */
dump_zap, /* DSL dataset next clones */
dump_zap, /* DSL scrub queue */
+ dump_zap, /* ZFS user/group used */
+ dump_zap, /* ZFS user/group quota */
};
static void
@@ -1070,6 +1112,14 @@ dump_object(objset_t *os, uint64_t objec
}
if (verbosity >= 4) {
+ (void) printf("\tdnode flags: %s%s\n",
+ (dn->dn_phys->dn_flags & DNODE_FLAG_USED_BYTES) ?
+ "USED_BYTES " : "",
+ (dn->dn_phys->dn_flags & DNODE_FLAG_USERUSED_ACCOUNTED) ?
+ "USERUSED_ACCOUNTED " : "");
+ (void) printf("\tdnode maxblkid: %llu\n",
+ (longlong_t)dn->dn_phys->dn_maxblkid);
+
object_viewer[doi.doi_bonus_type](os, object, bonus, bsize);
object_viewer[doi.doi_type](os, object, NULL, 0);
*print_header = 1;
@@ -1124,7 +1174,7 @@ dump_dir(objset_t *os)
uint64_t object, object_count;
uint64_t refdbytes, usedobjs, scratch;
char numbuf[8];
- char blkbuf[BP_SPRINTF_LEN];
+ char blkbuf[BP_SPRINTF_LEN + 20];
char osname[MAXNAMELEN];
char *type = "UNKNOWN";
int verbosity = dump_opt['d'];
@@ -1150,8 +1200,8 @@ dump_dir(objset_t *os)
nicenum(refdbytes, numbuf);
if (verbosity >= 4) {
- (void) strcpy(blkbuf, ", rootbp ");
- sprintf_blkptr(blkbuf + strlen(blkbuf),
+ (void) sprintf(blkbuf + strlen(blkbuf), ", rootbp ");
+ (void) sprintf_blkptr(blkbuf + strlen(blkbuf),
BP_SPRINTF_LEN - strlen(blkbuf), os->os->os_rootbp);
} else {
blkbuf[0] = '\0';
@@ -1186,7 +1236,12 @@ dump_dir(objset_t *os)
}
dump_object(os, 0, verbosity, &print_header);
- object_count = 1;
+ object_count = 0;
+ if (os->os->os_userused_dnode &&
+ os->os->os_userused_dnode->dn_type != 0) {
+ dump_object(os, DMU_USERUSED_OBJECT, verbosity, &print_header);
+ dump_object(os, DMU_GROUPUSED_OBJECT, verbosity, &print_header);
+ }
object = 0;
while ((error = dmu_object_next(os, &object, B_FALSE, 0)) == 0) {
@@ -1198,8 +1253,10 @@ dump_dir(objset_t *os)
(void) printf("\n");
- if (error != ESRCH)
- fatal("dmu_object_next() = %d", error);
+ if (error != ESRCH) {
+ (void) fprintf(stderr, "dmu_object_next() = %d\n", error);
+ abort();
+ }
}
static void
@@ -1390,7 +1447,8 @@ static space_map_ops_t zdb_space_map_ops
zdb_space_map_unload,
NULL, /* alloc */
zdb_space_map_claim,
- NULL /* free */
+ NULL, /* free */
+ NULL /* maxsize */
};
static void
@@ -1489,8 +1547,9 @@ zdb_count_block(spa_t *spa, zdb_cb_t *zc
}
}
- VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp,
- NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0);
+ if (!dump_opt['L'])
+ VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp,
+ NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0);
}
static int
@@ -1499,13 +1558,25 @@ zdb_blkptr_cb(spa_t *spa, blkptr_t *bp,
{
zdb_cb_t *zcb = arg;
char blkbuf[BP_SPRINTF_LEN];
+ dmu_object_type_t type;
+ boolean_t is_l0_metadata;
if (bp == NULL)
return (0);
- zdb_count_block(spa, zcb, bp, BP_GET_TYPE(bp));
+ type = BP_GET_TYPE(bp);
+
+ zdb_count_block(spa, zcb, bp, type);
- if (dump_opt['c'] || dump_opt['S']) {
+ /*
+ * if we do metadata-only checksumming there's no need to checksum
+ * indirect blocks here because it is done during traverse
+ */
+ is_l0_metadata = (BP_GET_LEVEL(bp) == 0 && type < DMU_OT_NUMTYPES &&
+ dmu_ot[type].ot_metadata);
+
+ if (dump_opt['c'] > 1 || dump_opt['S'] ||
+ (dump_opt['c'] && is_l0_metadata)) {
int ioerr, size;
void *data;
@@ -1517,7 +1588,7 @@ zdb_blkptr_cb(spa_t *spa, blkptr_t *bp,
free(data);
/* We expect io errors on intent log */
- if (ioerr && BP_GET_TYPE(bp) != DMU_OT_INTENT_LOG) {
+ if (ioerr && type != DMU_OT_INTENT_LOG) {
zcb->zcb_haderrors = 1;
zcb->zcb_errors[ioerr]++;
@@ -1565,9 +1636,12 @@ dump_block_stats(spa_t *spa)
int c, e;
if (!dump_opt['S']) {
- (void) printf("\nTraversing all blocks to %sverify"
- " nothing leaked ...\n",
- dump_opt['c'] ? "verify checksums and " : "");
+ (void) printf("\nTraversing all blocks %s%s%s%s%s...\n",
+ (dump_opt['c'] || !dump_opt['L']) ? "to verify " : "",
+ (dump_opt['c'] == 1) ? "metadata " : "",
+ dump_opt['c'] ? "checksums " : "",
+ (dump_opt['c'] && !dump_opt['L']) ? "and verify " : "",
+ !dump_opt['L'] ? "nothing leaked " : "");
}
/*
@@ -1578,7 +1652,8 @@ dump_block_stats(spa_t *spa)
* it's not part of any space map) is a double allocation,
* reference to a freed block, or an unclaimed log block.
*/
- zdb_leak_init(spa);
+ if (!dump_opt['L'])
+ zdb_leak_init(spa);
/*
* If there's a deferred-free bplist, process that first.
@@ -1620,7 +1695,8 @@ dump_block_stats(spa_t *spa)
/*
* Report any leaked segments.
*/
- zdb_leak_fini(spa);
+ if (!dump_opt['L'])
+ zdb_leak_fini(spa);
/*
* If we're interested in printing out the blkptr signatures,
@@ -1646,14 +1722,16 @@ dump_block_stats(spa_t *spa)
tzb = &zcb.zcb_type[ZB_TOTAL][DMU_OT_TOTAL];
if (tzb->zb_asize == alloc + logalloc) {
- (void) printf("\n\tNo leaks (block sum matches space"
- " maps exactly)\n");
+ if (!dump_opt['L'])
+ (void) printf("\n\tNo leaks (block sum matches space"
+ " maps exactly)\n");
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list