Date: Sun, 23 Aug 2009 09:09:35 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 167643 for review Message-ID: <200908230909.n7N99ZfN042646@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=167643 Change 167643 by zec@zec_tpx32 on 2009/08/23 09:09:30 IFC @ 167626 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#10 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/XENHVM#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cpufunc.h#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pmc_mdep.h#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/smp.h#7 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/minidump_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#9 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptboot/gptboot.c#4 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit.h#6 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#8 integrate .. //depot/projects/vimage-commit/src/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#7 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/taskq.h#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/vnode.h#8 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#6 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#4 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#5 delete .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#13 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#23 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#31 integrate .. //depot/projects/vimage-commit/src/sys/conf/newvers.sh#9 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#20 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.amd64#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.i386#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.pc98#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#12 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#12 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ioctl.c#11 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_subr.c#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#8 integrate .. //depot/projects/vimage-commit/src/sys/contrib/rdma/rdma_cma.c#8 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_sym.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/alc/if_alc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/amdtemp/amdtemp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/amr/amr.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#15 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r600_cp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drv.h#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_ich8lan.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#15 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_igb.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/vimage-commit/src/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/isc_cam.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ispfw/asm_2400.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ispfw/asm_2500.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi_ioctl.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/mlx/mlx.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#12 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/vpo.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/pst/pst-iop.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/rp/rp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/siis/siis.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/siis/siis.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/twe/twe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/avr32dci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci_pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ulpt.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_controller.h#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#12 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_handle_request.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_parse.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uath.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_upgt.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/blkback/blkback.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/netback/netback.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsport.h#8 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clbio.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clstate.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvfsops.c#7 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvnops.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_gpt.c#7 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum.c#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/bios/smapi.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#15 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/trap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/apicvar.h#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/cpufunc.h#10 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/md_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pmap.h#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pmc_mdep.h#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/sf_buf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/smp.h#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/pmap.c#10 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/genassym.c#3 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/vimage-commit/src/sys/ia64/include/smp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/init_main.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exec.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#14 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#19 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#14 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lock.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_poll.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_proc.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sx.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#13 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#22 delete .. //depot/projects/vimage-commit/src/sys/kern/link_elf_obj.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_bus.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_sglist.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_smp.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_pts.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/vimage-commit/src/sys/mips/include/smp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/mp_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/pmap.c#11 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#22 integrate .. //depot/projects/vimage-commit/src/sys/modules/if_epair/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/ispfw/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/ispfw/isp_2400_multi/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/ispfw/isp_2500/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/ispfw/isp_2500_multi/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/siis/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/wlan/Makefile#8 integrate .. //depot/projects/vimage-commit/src/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf.c#14 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf_buffer.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf_zerocopy.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/bpfdesc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net/bridgestp.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net/flowtable.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/flowtable.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#28 integrate .. //depot/projects/vimage-commit/src/sys/net/if_bridge.c#13 integrate .. //depot/projects/vimage-commit/src/sys/net/if_clone.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_clone.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ef.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_enc.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net/if_epair.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/vimage-commit/src/sys/net/if_faith.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.c#17 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.h#13 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gre.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net/if_llatbl.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#22 integrate .. //depot/projects/vimage-commit/src/sys/net/if_mib.c#15 integrate .. //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#13 integrate .. //depot/projects/vimage-commit/src/sys/net/if_stf.c#14 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tun.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#20 integrate .. //depot/projects/vimage-commit/src/sys/net/if_vlan.c#13 integrate .. //depot/projects/vimage-commit/src/sys/net/netisr.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/netisr.h#7 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_cb.c#14 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_cb.h#7 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#14 integrate .. //depot/projects/vimage-commit/src/sys/net/route.c#19 integrate .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#19 integrate .. //depot/projects/vimage-commit/src/sys/net/vnet.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/vnet.h#12 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#15 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_crypto.h#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#16 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#15 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_input.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan_sta.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netatalk/at_control.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/atm/ng_atm.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_gif.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_pipe.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_source.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/icmp6.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/icmp_var.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#26 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in.c#19 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#19 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_proto.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_var.h#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#22 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#19 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_var.h#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ipfw/ip_fw2.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ipfw/ip_fw_nat.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_offload.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#24 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#21 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_var.h#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/dest6.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#20 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_mcast.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_var.h#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_forward.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#20 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_var.h#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#19 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#19 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.h#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/route6.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/tcp6_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ah_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/esp_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipcomp_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipip_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#22 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#12 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec6.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_mbuf.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key_debug.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/keysock.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/keysock.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_tcp.c#6 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#12 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_subs.c#8 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/vimage-commit/src/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/pmap.c#11 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/smp.h#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/mpc85xx/lbc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/mp_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit.c#11 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit.h#8 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_token.c#8 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_private.h#9 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/param.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/bus.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/domain.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/jail.h#13 integrate .. //depot/projects/vimage-commit/src/sys/sys/kernel.h#12 integrate .. //depot/projects/vimage-commit/src/sys/sys/lock.h#8 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#27 integrate .. //depot/projects/vimage-commit/src/sys/sys/pcpu.h#7 integrate .. //depot/projects/vimage-commit/src/sys/sys/priv.h#12 integrate .. //depot/projects/vimage-commit/src/sys/sys/sglist.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/smp.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/sockio.h#7 integrate .. //depot/projects/vimage-commit/src/sys/sys/sysctl.h#15 integrate .. //depot/projects/vimage-commit/src/sys/sys/systm.h#10 integrate .. //depot/projects/vimage-commit/src/sys/sys/taskqueue.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/ucred.h#8 integrate .. //depot/projects/vimage-commit/src/sys/sys/user.h#8 integrate .. //depot/projects/vimage-commit/src/sys/sys/vimage.h#32 delete .. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/vm/device_pager.c#6 integrate .. //depot/projects/vimage-commit/src/sys/vm/sg_pager.c#1 branch .. //depot/projects/vimage-commit/src/sys/vm/vm.h#5 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_fault.c#9 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_map.c#9 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_meter.c#9 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_object.c#11 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_object.h#6 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_page.c#11 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_pageout.c#10 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_pager.c#5 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_pager.h#4 integrate .. //depot/projects/vimage-commit/src/sys/xdr/xdr_mbuf.c#4 integrate .. //depot/projects/vimage-commit/src/sys/xen/evtchn/evtchn.c#7 integrate .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_probe.c#6 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/initcpu.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.53 2009/01/12 19:17:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); #include "opt_cpu.h" @@ -65,6 +65,7 @@ u_int cpu_vendor_id; /* CPU vendor ID */ u_int cpu_fxsr; /* SSE enabled */ u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ +u_int cpu_clflush_line_size = 32; SYSCTL_UINT(_hw, OID_AUTO, via_feature_rng, CTLFLAG_RD, &via_feature_rng, 0, "VIA C3/C7 RNG feature available in CPU"); @@ -156,4 +157,12 @@ AMD64_CPU_FAMILY(cpu_id) == 0x6 && AMD64_CPU_MODEL(cpu_id) >= 0xf) init_via(); + + /* + * CPUID with %eax = 1, %ebx returns + * Bits 15-8: CLFLUSH line size + * (Value * 8 = cache line size in bytes) + */ + if ((cpu_feature & CPUID_CLFSH) != 0) + cpu_clflush_line_size = ((cpu_procinfo >> 8) & 0xff) * 8; } ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.58 2009/07/01 17:20:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.60 2009/08/14 21:05:08 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -123,7 +123,7 @@ { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT }, /* Error */ - { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */ + { 1, 1, 1, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT }, /* Thermal */ }; @@ -305,11 +305,9 @@ lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); -#ifdef HWPMC_HOOKS /* Program the PMC LVT entry if present. */ if (maxlvt >= LVT_PMC) lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint); -#endif /* Program timer LVT and setup handler. */ lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); @@ -332,6 +330,88 @@ intr_restore(eflags); } +void +lapic_reenable_pmc(void) +{ +#ifdef HWPMC_HOOKS + uint32_t value; + + value = lapic->lvt_pcint; + value &= ~APIC_LVT_M; + lapic->lvt_pcint = value; +#endif +} + +#ifdef HWPMC_HOOKS +static void +lapic_update_pmc(void *dummy) +{ + struct lapic *la; + + la = &lapics[lapic_id()]; + lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint); +} +#endif + +int +lapic_enable_pmc(void) +{ +#ifdef HWPMC_HOOKS + u_int32_t maxlvt; + + /* Fail if the local APIC is not present. */ + if (lapic == NULL) + return (0); + + /* Fail if the PMC LVT is not present. */ + maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + if (maxlvt < LVT_PMC) + return (0); + + lvts[LVT_PMC].lvt_masked = 0; + +#ifdef SMP + /* + * If hwpmc was loaded at boot time then the APs may not be + * started yet. In that case, don't forward the request to + * them as they will program the lvt when they start. + */ + if (smp_started) + smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL); + else +#endif + lapic_update_pmc(NULL); + return (1); +#else + return (0); +#endif +} + +void +lapic_disable_pmc(void) +{ +#ifdef HWPMC_HOOKS + u_int32_t maxlvt; + + /* Fail if the local APIC is not present. */ + if (lapic == NULL) + return; + + /* Fail if the PMC LVT is not present. */ + maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + if (maxlvt < LVT_PMC) + return; + + lvts[LVT_PMC].lvt_masked = 1; + +#ifdef SMP + /* The APs should always be started when hwpmc is unloaded. */ + KASSERT(mp_ncpus == 1 || smp_started, ("hwpmc unloaded too early")); +#endif + smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL); +#endif +} + /* * Called by cpu_initclocks() on the BSP to setup the local APIC timer so * that it can drive hardclock, statclock, and profclock. This function @@ -1238,8 +1318,17 @@ KASSERT((vector & ~APIC_VECTOR_MASK) == 0, ("%s: invalid vector %d", __func__, vector)); - icrlo = vector | APIC_DELMODE_FIXED | APIC_DESTMODE_PHY | - APIC_LEVEL_DEASSERT | APIC_TRIGMOD_EDGE; + icrlo = APIC_DESTMODE_PHY | APIC_TRIGMOD_EDGE; + + /* + * IPI_STOP_HARD is just a "fake" vector used to send a NMI. + * Use special rules regard NMI if passed, otherwise specify + * the vector. + */ + if (vector == IPI_STOP_HARD) + icrlo |= APIC_DELMODE_NMI | APIC_LEVEL_ASSERT; + else + icrlo |= vector | APIC_DELMODE_FIXED | APIC_LEVEL_DEASSERT; destfield = 0; switch (dest) { case APIC_IPI_DEST_SELF: ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.705 2009/07/09 09:34:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.709 2009/08/20 22:58:05 jkim Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -213,7 +213,12 @@ */ sysenv = getenv("smbios.system.product"); if (sysenv != NULL) { - if (strncmp(sysenv, "MacBook", 7) == 0) { + if (strncmp(sysenv, "MacBook1,1", 10) == 0 || + strncmp(sysenv, "MacBook3,1", 10) == 0 || + strncmp(sysenv, "MacBookPro1,1", 13) == 0 || + strncmp(sysenv, "MacBookPro1,2", 13) == 0 || + strncmp(sysenv, "MacBookPro3,1", 13) == 0 || + strncmp(sysenv, "Macmini1,1", 10) == 0) { if (bootverbose) printf("Disabling LEGACY_USB_EN bit on " "Intel ICH.\n"); @@ -231,19 +236,21 @@ #ifdef PERFMON perfmon_init(); #endif + realmem = Maxmem; + + /* + * Display physical memory if SMBIOS reports reasonable amount. + */ + memsize = 0; sysenv = getenv("smbios.memory.enabled"); if (sysenv != NULL) { - memsize = (uintmax_t)strtoul(sysenv, (char **)NULL, 10); + memsize = (uintmax_t)strtoul(sysenv, (char **)NULL, 10) << 10; freeenv(sysenv); - } else - memsize = 0; - if (memsize > 0) - printf("real memory = %ju (%ju MB)\n", memsize << 10, - memsize >> 10); - else - printf("real memory = %ju (%ju MB)\n", ptoa((uintmax_t)Maxmem), - ptoa((uintmax_t)Maxmem) / 1048576); - realmem = Maxmem; + } + if (memsize < ptoa((uintmax_t)cnt.v_free_count)) + memsize = ptoa((uintmax_t)Maxmem); + printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20); + /* * Display any holes after the first chunk of extended memory. */ ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.309 2009/06/23 22:42:39 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.310 2009/08/13 17:09:45 attilio Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -114,31 +114,12 @@ extern inthand_t IDTVEC(fast_syscall), IDTVEC(fast_syscall32); -#ifdef STOP_NMI -static volatile cpumask_t ipi_nmi_pending; - -static void ipi_nmi_selected(cpumask_t cpus); -#endif - /* * Local data and functions. */ -#ifdef STOP_NMI -/* - * Provide an alternate method of stopping other CPUs. If another CPU has - * disabled interrupts the conventional STOP IPI will be blocked. This - * NMI-based stop should get through in that case. - */ -static int stop_cpus_with_nmi = 1; -SYSCTL_INT(_debug, OID_AUTO, stop_cpus_with_nmi, CTLTYPE_INT | CTLFLAG_RW, - &stop_cpus_with_nmi, 0, ""); -TUNABLE_INT("debug.stop_cpus_with_nmi", &stop_cpus_with_nmi); -#else -#define stop_cpus_with_nmi 0 -#endif - static u_int logical_cpus; +static volatile cpumask_t ipi_nmi_pending; /* used to hold the AP's until we are ready to release them */ static struct mtx ap_boot_mtx; @@ -1158,12 +1139,14 @@ ipi = IPI_BITMAP_VECTOR; } -#ifdef STOP_NMI - if (ipi == IPI_STOP && stop_cpus_with_nmi) { - ipi_nmi_selected(cpus); - return; - } -#endif + /* + * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit + * of help in order to understand what is the source. + * Set the mask of receiving CPUs for this purpose. + */ + if (ipi == IPI_STOP_HARD) + atomic_set_int(&ipi_nmi_pending, cpus); + CTR3(KTR_SMP, "%s: cpus: %x ipi: %x", __func__, cpus, ipi); while ((cpu = ffs(cpus)) != 0) { cpu--; @@ -1194,64 +1177,43 @@ ipi_all_but_self(u_int ipi) { - if (IPI_IS_BITMAPED(ipi) || (ipi == IPI_STOP && stop_cpus_with_nmi)) { + if (IPI_IS_BITMAPED(ipi)) { ipi_selected(PCPU_GET(other_cpus), ipi); return; } + + /* + * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit + * of help in order to understand what is the source. + * Set the mask of receiving CPUs for this purpose. + */ + if (ipi == IPI_STOP_HARD) + atomic_set_int(&ipi_nmi_pending, PCPU_GET(other_cpus)); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS); } -#ifdef STOP_NMI -/* - * send NMI IPI to selected CPUs - */ - -#define BEFORE_SPIN 1000000 - -static void -ipi_nmi_selected(cpumask_t cpus) -{ - int cpu; - register_t icrlo; - - icrlo = APIC_DELMODE_NMI | APIC_DESTMODE_PHY | APIC_LEVEL_ASSERT - | APIC_TRIGMOD_EDGE; - - CTR2(KTR_SMP, "%s: cpus: %x nmi", __func__, cpus); - - atomic_set_int(&ipi_nmi_pending, cpus); - - while ((cpu = ffs(cpus)) != 0) { - cpu--; - cpus &= ~(1 << cpu); - - KASSERT(cpu_apic_ids[cpu] != -1, - ("IPI NMI to non-existent CPU %d", cpu)); - - /* Wait for an earlier IPI to finish. */ - if (!lapic_ipi_wait(BEFORE_SPIN)) - panic("ipi_nmi_selected: previous IPI has not cleared"); - - lapic_ipi_raw(icrlo, cpu_apic_ids[cpu]); - } -} - int -ipi_nmi_handler(void) +ipi_nmi_handler() { - int cpumask = PCPU_GET(cpumask); + cpumask_t cpumask; - if (!(ipi_nmi_pending & cpumask)) - return 1; + /* + * As long as there is not a simple way to know about a NMI's + * source, if the bitmask for the current CPU is present in + * the global pending bitword an IPI_STOP_HARD has been issued + * and should be handled. + */ + cpumask = PCPU_GET(cpumask); + if ((ipi_nmi_pending & cpumask) == 0) + return (1); atomic_clear_int(&ipi_nmi_pending, cpumask); cpustop_handler(); - return 0; + return (0); } -#endif /* STOP_NMI */ - /* * Handle an IPI_STOP by saving our current context and spinning until we * are resumed. ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.663 2009/07/12 23:31:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.668 2009/08/17 13:27:55 kib Exp $"); /* * Manages physical address maps. @@ -231,6 +231,7 @@ vm_page_t m, vm_prot_t prot, vm_page_t mpte); static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); +static void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); @@ -752,21 +753,6 @@ /* The PAT bit is different for PTE's and PDE's. */ pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT; - /* If we don't support PAT, map extended modes to older ones. */ - if (!(cpu_feature & CPUID_PAT)) { - switch (mode) { - case PAT_UNCACHEABLE: - case PAT_WRITE_THROUGH: - case PAT_WRITE_BACK: - break; - case PAT_UNCACHED: - case PAT_WRITE_COMBINING: - case PAT_WRITE_PROTECTED: - mode = PAT_UNCACHEABLE; - break; - } - } - /* Map the caching mode to a PAT index. */ switch (mode) { case PAT_UNCACHEABLE: @@ -936,6 +922,40 @@ } #endif /* !SMP */ +static void +pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva) +{ + + KASSERT((sva & PAGE_MASK) == 0, + ("pmap_invalidate_cache_range: sva not page-aligned")); + KASSERT((eva & PAGE_MASK) == 0, + ("pmap_invalidate_cache_range: eva not page-aligned")); + + if (cpu_feature & CPUID_SS) + ; /* If "Self Snoop" is supported, do nothing. */ + else if (cpu_feature & CPUID_CLFSH) { + + /* + * Otherwise, do per-cache line flush. Use the mfence + * instruction to insure that previous stores are + * included in the write-back. The processor + * propagates flush to other processors in the cache + * coherence domain. + */ + mfence(); + for (; eva < sva; eva += cpu_clflush_line_size) + clflush(eva); + mfence(); + } else { + + /* + * No targeted cache flush methods are supported by CPU, + * globally invalidate cache as a last resort. + */ + pmap_invalidate_cache(); + } +} + /* * Are we current address space or kernel? */ @@ -2241,6 +2261,8 @@ " in pmap %p", va, pmap); return (FALSE); } + if (va < VM_MAXUSER_ADDRESS) + pmap->pm_stats.resident_count++; } mptepa = VM_PAGE_TO_PHYS(mpte); firstpte = (pt_entry_t *)PHYS_TO_DMAP(mptepa); @@ -3339,7 +3361,7 @@ int pat_mode; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); - KASSERT(object->type == OBJT_DEVICE, + KASSERT(object->type == OBJT_DEVICE || object->type == OBJT_SG, ("pmap_object_init_pt: non-device object")); if ((addr & (NBPDR - 1)) == 0 && (size & (NBPDR - 1)) == 0) { if (!vm_object_populate(object, pindex, pindex + atop(size))) @@ -4271,7 +4293,8 @@ void * pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, int mode) { - vm_offset_t va, tmpva, offset; + vm_offset_t va, offset; + vm_size_t tmpsize; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908230909.n7N99ZfN042646>