Date: Wed, 3 Sep 2008 16:24:43 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149125 for review Message-ID: <200809031624.m83GOhMn016801@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149125 Change 149125 by julian@julian_trafmon1 on 2008/09/03 16:24:30 IFC@149123 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/metadata.c#2 delete .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.mips#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/ah_soc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap30.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap43.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap51.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/ap61.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/md/md.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec_ocp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/bpf_jit_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/bpf_jit_machdep.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/aha/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/an/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ar/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ce/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cx/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/sync_ar/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/sync_sr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/patm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/rp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/trm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wi/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/ethernet.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/pmap_prot.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/rpcb_prot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/ioccom.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/wait.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.c#5 (text+ko) ==== @@ -23,14 +23,14 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.14 2008/08/26 21:06:31 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -107,10 +107,6 @@ */ emit_func emitm; - /* Do not compile an empty filter. */ - if (nins == 0) - return (NULL); - /* Allocate the reference table for the jumps */ #ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.h#5 (text+ko) ==== @@ -23,12 +23,12 @@ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $ */ #include <machine/asmacros.h> @@ -109,8 +109,24 @@ movq %rsp,PCB_RSP(%r8) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq PCB_FSBASE(%r8),%r9 - movq PCB_GSBASE(%r8),%r10 + + /* + * Reread fs and gs bases. Explicit fs segment register load + * by the usermode code may change actual fs base without + * updating pcb_{fs,gs}base. + * + * %rdx still contains the mtx, save %rdx around rdmsr. + */ + movq %rdx,%r11 + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r9 + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%r10 + movq %r11,%rdx testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_seg ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.687 2008/07/09 19:44:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.688 2008/09/02 17:52:11 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -734,6 +734,7 @@ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); + pcb->pcb_flags &= ~(PCB_32BIT | PCB_GS32BIT); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.19 2008/09/02 17:52:11 kib Exp $"); #include "opt_compat.h" @@ -742,5 +742,6 @@ /* Return via doreti so that we can change to a different %cs */ pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#2 (text) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.28 2008/08/31 18:20:01 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -170,7 +170,8 @@ struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; int err; - u_char eaddr[6]; + u_char eaddr[ETHER_ADDR_LEN]; + uint32_t rnd; sc->dev = dev; err = ate_activate(dev); @@ -179,7 +180,7 @@ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; - /*Sysctls*/ + /* Sysctls */ sctx = device_get_sysctl_ctx(dev); soid = device_get_sysctl_tree(dev); SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "rmii", @@ -191,8 +192,25 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set\n"); - goto out; + /* + * No MAC address configured. Generate the random one. + */ + if (bootverbose) + device_printf(dev, + "Generating random ethernet address.\n"); + rnd = arc4random(); + + /* + * Set OUI to convenient locally assigned address. 'b' + * is 0x62, which has the locally assigned bit set, and + * the broadcast/multicast bit clear. + */ + eaddr[0] = 'b'; + eaddr[1] = 's'; + eaddr[2] = 'd'; + eaddr[3] = (rnd >> 16) & 0xff; + eaddr[4] = (rnd >> 8) & 0xff; + eaddr[5] = rnd & 0xff; } ate_set_mac(sc, eaddr); @@ -586,24 +604,29 @@ static int ate_get_mac(struct ate_softc *sc, u_char *eaddr) { + bus_size_t sa_low_reg[] = { ETH_SA1L, ETH_SA2L, ETH_SA3L, ETH_SA4L }; + bus_size_t sa_high_reg[] = { ETH_SA1H, ETH_SA2H, ETH_SA3H, ETH_SA4H }; uint32_t low, high; + int i; /* * The boot loader setup the MAC with an address, if one is set in - * the loader. The TSC loader will also set the MAC address in a - * similar way. Grab the MAC address from the SA1[HL] registers. + * the loader. Grab one MAC address from the SA[1-4][HL] registers. */ - low = RD4(sc, ETH_SA1L); - high = RD4(sc, ETH_SA1H); - if ((low | (high & 0xffff)) == 0) - return (ENXIO); - eaddr[0] = low & 0xff; - eaddr[1] = (low >> 8) & 0xff; - eaddr[2] = (low >> 16) & 0xff; - eaddr[3] = (low >> 24) & 0xff; - eaddr[4] = high & 0xff; - eaddr[5] = (high >> 8) & 0xff; - return (0); + for (i = 0; i < 4; i++) { + low = RD4(sc, sa_low_reg[i]); + high = RD4(sc, sa_high_reg[i]); + if ((low | (high & 0xffff)) != 0) { + eaddr[0] = low & 0xff; + eaddr[1] = (low >> 8) & 0xff; + eaddr[2] = (low >> 16) & 0xff; + eaddr[3] = (low >> 24) & 0xff; + eaddr[4] = high & 0xff; + eaddr[5] = (high >> 8) & 0xff; + return (0); + } + } + return (ENXIO); } static void ==== //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.131 2008/08/11 04:54:43 weongyo Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.132 2008/08/26 13:27:48 matteo Exp $ ############################################################## ### Basic configuration options ############################ @@ -149,6 +149,7 @@ geom_eli_load="NO" # Disk encryption driver (see geli(8)) geom_gate_load="NO" # Userland disk driver (see geom_gate(4), # ggatec(8), ggated(8), ggatel(8)) +geom_journal_load="NO" # Journaled filesystem driver (see gjournal(8)) geom_label_load="NO" # File system labels (see glabel(8)) geom_md_load="NO" # Memory disk driver (vnode/swap/malloc) (see # md(4), mdconfig(8)) ==== //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/uboot/Makefile,v 1.2 2008/02/23 19:45:20 marcel Exp $ +# $FreeBSD: src/sys/boot/powerpc/uboot/Makefile,v 1.3 2008/09/03 15:52:05 raj Exp $ PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} @@ -7,7 +7,7 @@ NO_MAN= # Architecture-specific loader code -SRCS= start.S conf.c metadata.c vers.c +SRCS= start.S conf.c vers.c LOADER_DISK_SUPPORT?= no LOADER_UFS_SUPPORT?= no ==== //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.34 2008/08/22 20:28:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.35 2008/08/30 16:03:22 marius Exp $"); /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -36,6 +36,7 @@ #include <machine/tte.h> #include <machine/tlb.h> #include <machine/upa.h> +#include <machine/ver.h> #include "bootstrap.h" #include "libofw.h" @@ -57,8 +58,10 @@ typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); +static inline u_long dtlb_get_data_sun4u(int slot); static void dtlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t); +static inline u_long itlb_get_data_sun4u(int slot); static void itlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t); extern vm_offset_t md_load(char *, vm_offset_t *); @@ -92,6 +95,7 @@ struct tlb_entry *itlb_store; int dtlb_slot; int itlb_slot; +int cpu_impl; static int dtlb_slot_max; static int itlb_slot_max; @@ -365,6 +369,30 @@ panic("%s: exec returned", __func__); } +static inline u_long +dtlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_DTLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG)); +} + +static inline u_long +itlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_ITLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG)); +} + static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t va) { @@ -375,7 +403,9 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + reg = dtlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); @@ -391,34 +421,38 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + reg = itlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); } static void -itlb_enter_sun4u(u_long vpn, u_long data) +dtlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_IMMU_TAR, ASI_IMMU, vpn); - stxa(0, ASI_ITLB_DATA_IN_REG, data); + stxa(AA_DMMU_TAR, ASI_DMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); } static void -dtlb_enter_sun4u(u_long vpn, u_long data) +itlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_DMMU_TAR, ASI_DMMU, vpn); - stxa(0, ASI_DTLB_DATA_IN_REG, data); + stxa(AA_IMMU_TAR, ASI_IMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_ITLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); } @@ -539,19 +573,18 @@ u_int bootcpu; u_int cpu; + cpu_impl = VER_IMPL(rdpr(ver)); bootcpu = UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)); for (child = OF_child(root); child != 0; child = OF_peer(child)) { - if (child == -1) - panic("%s: can't get child phandle", __func__); - if (OF_getprop(child, "device_type", buf, sizeof(buf)) > 0 && - strcmp(buf, "cpu") == 0) { - if (OF_getprop(child, "upa-portid", &cpu, - sizeof(cpu)) == -1 && OF_getprop(child, "portid", - &cpu, sizeof(cpu)) == -1) - panic("%s: can't get portid", __func__); - if (cpu == bootcpu) - break; - } + if (OF_getprop(child, "device_type", buf, sizeof(buf)) <= 0) + continue; + if (strcmp(buf, "cpu") != 0) + continue; + if (OF_getprop(child, cpu_impl < CPU_IMPL_ULTRASPARCIII ? + "upa-portid" : "portid", &cpu, sizeof(cpu)) <= 0) + continue; + if (cpu == bootcpu) + break; } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); @@ -712,10 +745,14 @@ pmap_print_tlb_sun4u(void) { tte_t tag, tte; + u_long pstate; int i; + pstate = rdpr(pstate); for (i = 0; i < itlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = itlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); @@ -723,7 +760,9 @@ pmap_print_tte_sun4u(tag, tte); } for (i = 0; i < dtlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = dtlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/common/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/sys/boot/uboot/common/Makefile.inc,v 1.1 2008/02/16 22:13:11 marcel Exp $ +# $FreeBSD: src/sys/boot/uboot/common/Makefile.inc,v 1.2 2008/09/03 15:52:05 raj Exp $ -SRCS+= main.c +SRCS+= main.c metadata.c ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/common/main.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/uboot/common/main.c,v 1.3 2008/03/13 17:54:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/common/main.c,v 1.4 2008/09/03 15:39:50 raj Exp $"); #include <stand.h> @@ -46,8 +46,6 @@ extern char bootprog_date[]; extern char bootprog_maker[]; -static char bootargs[128]; - extern unsigned char _etext[]; extern unsigned char _edata[]; extern unsigned char __bss_start[]; @@ -110,10 +108,8 @@ int main(void) { - char **bargv; - char *ch; - int bargc, i; struct api_signature *sig = NULL; + int i; if (!api_search_sig(&sig)) return -1; @@ -134,7 +130,7 @@ */ cons_probe(); - printf("Compatible API signature found @%x\n", sig); + printf("Compatible API signature found @%x\n", (uint32_t)sig); dump_sig(sig); dump_addr_info(); @@ -205,7 +201,8 @@ static int command_heap(int argc, char *argv[]) { - printf("heap base at %p, top at %p, used %ld\n", end, sbrk(0), + + printf("heap base at %p, top at %p, used %d\n", end, sbrk(0), sbrk(0) - end); return(CMD_OK); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/sys/boot/uboot/lib/Makefile,v 1.3 2008/03/13 17:54:21 obrien Exp $ +# $FreeBSD: src/sys/boot/uboot/lib/Makefile,v 1.4 2008/09/03 15:39:50 raj Exp $ LIB= uboot INTERNALLIB= +WARNS?= 2 SRCS= devicename.c elf_freebsd.c console.c copy.c disk.c \ module.c net.c reboot.c time.c glue.c ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/console.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/console.c,v 1.2 2008/03/12 16:01:34 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/console.c,v 1.3 2008/09/03 15:39:50 raj Exp $"); #include <stand.h> #include "bootstrap.h" +#include "glue.h" int console; @@ -60,7 +61,7 @@ uboot_cons_init(int arg) { - return 0; + return (0); } static void ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/elf_freebsd.c#2 (text+ko) ==== @@ -26,11 +26,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/elf_freebsd.c,v 1.2 2008/03/13 17:54:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/elf_freebsd.c,v 1.3 2008/09/03 15:39:50 raj Exp $"); #include <sys/param.h> #include <sys/linker.h> +#include <machine/md_var.h> #include <machine/metadata.h> #include <machine/elf.h> @@ -38,11 +39,13 @@ #include "bootstrap.h" +extern vm_offset_t md_load(char *, vm_offset_t *); + int __elfN(uboot_load)(char *filename, u_int64_t dest, struct preloaded_file **result) { - int r; + int r; r = __elfN(loadfile)(filename, dest, result); if (r != 0) @@ -62,20 +65,20 @@ int __elfN(uboot_exec)(struct preloaded_file *fp) { - struct file_metadata *fmp; - vm_offset_t mdp; - Elf_Ehdr *e; - int error; + struct file_metadata *fmp; + vm_offset_t mdp; + Elf_Ehdr *e; + int error; - if ((fmp = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) { + if ((fmp = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) return (EFTYPE); - } + e = (Elf_Ehdr *)&fmp->md_data; if ((error = md_load(fp->f_args, &mdp)) != 0) return (error); - printf("Kernel entry at 0x%lx ...\n", e->e_entry); + printf("Kernel entry at 0x%x ...\n", e->e_entry); dev_cleanup(); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.2 2008/03/13 17:54:21 obrien Exp $ + * $FreeBSD: src/sys/boot/uboot/lib/glue.h,v 1.3 2008/09/03 15:39:50 raj Exp $ */ /* @@ -33,8 +33,10 @@ #ifndef _API_GLUE_H_ #define _API_GLUE_H_ +#include "api_public.h" + int syscall(int, int *, ...); -void * syscall_ptr; +void *syscall_ptr; int api_search_sig(struct api_signature **sig); @@ -53,16 +55,16 @@ /* system */ void ub_reset(void); -struct sys_info * ub_get_sys_info(void); +struct sys_info *ub_get_sys_info(void); /* time */ void ub_udelay(unsigned long); unsigned long ub_get_timer(unsigned long); /* env vars */ -char * ub_env_get(const char *name); +char *ub_env_get(const char *name); void ub_env_set(const char *name, char *value); -const char * ub_env_enum(const char *last); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809031624.m83GOhMn016801>