PERFORCE change 176147 for review
John Baldwin
jhb at FreeBSD.org
Fri Mar 26 18:45:13 UTC 2010
http://p4web.freebsd.org/chv.cgi?CH=176147
Change 176147 by jhb at jhb_jhbbsd on 2010/03/26 18:44:50
IFC @176144
Affected files ...
.. //depot/projects/smpng/share/man/man9/fail.9#3 integrate
.. //depot/projects/smpng/share/man/man9/uio.9#2 integrate
.. //depot/projects/smpng/share/man/man9/vfs_mount.9#2 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#16 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#29 integrate
.. //depot/projects/smpng/sys/amd64/amd64/exception.S#26 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#38 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#89 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mca.c#5 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#103 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#46 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#87 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#59 integrate
.. //depot/projects/smpng/sys/amd64/conf/XENHVM#6 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#25 integrate
.. //depot/projects/smpng/sys/amd64/include/elf.h#9 integrate
.. //depot/projects/smpng/sys/amd64/include/mca.h#3 integrate
.. //depot/projects/smpng/sys/amd64/include/reg.h#10 integrate
.. //depot/projects/smpng/sys/amd64/include/specialreg.h#25 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#44 integrate
.. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#33 integrate
.. //depot/projects/smpng/sys/arm/arm/identcpu.c#17 integrate
.. //depot/projects/smpng/sys/arm/arm/machdep.c#29 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#57 integrate
.. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#34 integrate
.. //depot/projects/smpng/sys/arm/conf/BWCT.hints#3 integrate
.. //depot/projects/smpng/sys/arm/conf/LN2410SBC#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/board_ln2410sbc.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/files.s3c2xx0#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c2410reg.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c2410var.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c2440reg.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c24x0.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c24x0_clk.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c24x0_machdep.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c24x0reg.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c24x0var.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c2xx0_space.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c2xx0board.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c2xx0reg.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/s3c2xx0var.h#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/std.ln2410sbc#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/std.s3c2410#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/uart_bus_s3c2410.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/uart_dev_s3c2410.c#1 branch
.. //depot/projects/smpng/sys/arm/s3c2xx0/uart_dev_s3c2410.h#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#36 integrate
.. //depot/projects/smpng/sys/boot/i386/gptboot/gptboot.c#6 integrate
.. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsboot.c#6 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#11 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#6 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#8 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ipc.h#3 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#65 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#62 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#61 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#61 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#62 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_util.h#5 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#66 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_reg.h#2 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#12 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#27 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#83 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_file.c#46 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#69 integrate
.. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#3 integrate
.. //depot/projects/smpng/sys/conf/NOTES#182 integrate
.. //depot/projects/smpng/sys/conf/files#257 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#73 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#68 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#64 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#74 integrate
.. //depot/projects/smpng/sys/conf/options#181 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#28 integrate
.. //depot/projects/smpng/sys/conf/options.ia64#23 integrate
.. //depot/projects/smpng/sys/dev/aac/aac.c#71 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_i810.c#11 integrate
.. //depot/projects/smpng/sys/dev/ahci/ahci.c#7 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-raid.c#60 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#34 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#9 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#20 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#113 integrate
.. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#2 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#18 integrate
.. //depot/projects/smpng/sys/dev/drm/i915_drv.h#14 integrate
.. //depot/projects/smpng/sys/dev/drm/i915_reg.h#3 integrate
.. //depot/projects/smpng/sys/dev/fb/vesa.c#5 integrate
.. //depot/projects/smpng/sys/dev/fb/vga.c#28 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#16 integrate
.. //depot/projects/smpng/sys/dev/isp/isp.c#63 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#65 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#46 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_pci.c#60 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#32 integrate
.. //depot/projects/smpng/sys/dev/isp/ispvar.h#41 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#50 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphyreg.h#9 integrate
.. //depot/projects/smpng/sys/dev/mii/mii.c#20 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#39 integrate
.. //depot/projects/smpng/sys/dev/msk/if_msk.c#24 integrate
.. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#14 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#38 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_standard.c#5 integrate
.. //depot/projects/smpng/sys/dev/pci/vga_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/ppc/ppc_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/siba/siba_core.c#2 integrate
.. //depot/projects/smpng/sys/dev/siis/siis.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#43 integrate
.. //depot/projects/smpng/sys/dev/syscons/scvgarndr.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_s3c24x0.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#16 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.c#20 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.h#16 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_generic.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#150 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_runreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_runvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/xen/netback/netback.c#5 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#36 integrate
.. //depot/projects/smpng/sys/fs/nfs/nfs_commonport.c#5 integrate
.. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#10 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#19 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#18 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#19 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#18 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#18 integrate
.. //depot/projects/smpng/sys/geom/gate/g_gate.c#17 integrate
.. //depot/projects/smpng/sys/geom/geom_dump.c#26 integrate
.. //depot/projects/smpng/sys/geom/geom_io.c#54 integrate
.. //depot/projects/smpng/sys/geom/multipath/g_multipath.c#5 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#37 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#118 integrate
.. //depot/projects/smpng/sys/i386/conf/XEN#9 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#68 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#150 integrate
.. //depot/projects/smpng/sys/i386/i386/mca.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#142 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#121 integrate
.. //depot/projects/smpng/sys/i386/include/mca.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/md_var.h#37 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#29 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#72 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#70 integrate
.. //depot/projects/smpng/sys/ia64/conf/NOTES#13 integrate
.. //depot/projects/smpng/sys/ia64/ia32/ia32_signal.c#6 integrate
.. //depot/projects/smpng/sys/ia64/ia64/clock.c#24 integrate
.. //depot/projects/smpng/sys/ia64/ia64/db_machdep.c#6 integrate
.. //depot/projects/smpng/sys/ia64/ia64/exception.S#15 integrate
.. //depot/projects/smpng/sys/ia64/ia64/genassym.c#32 integrate
.. //depot/projects/smpng/sys/ia64/ia64/highfp.c#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#47 integrate
.. //depot/projects/smpng/sys/ia64/ia64/locore.S#11 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#123 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#46 integrate
.. //depot/projects/smpng/sys/ia64/ia64/nexus.c#21 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#97 integrate
.. //depot/projects/smpng/sys/ia64/ia64/sal.c#15 integrate
.. //depot/projects/smpng/sys/ia64/include/clock.h#10 integrate
.. //depot/projects/smpng/sys/ia64/include/elf.h#16 integrate
.. //depot/projects/smpng/sys/ia64/include/frame.h#4 integrate
.. //depot/projects/smpng/sys/ia64/include/intr.h#7 integrate
.. //depot/projects/smpng/sys/ia64/include/intrcnt.h#5 integrate
.. //depot/projects/smpng/sys/ia64/include/pcb.h#12 integrate
.. //depot/projects/smpng/sys/ia64/include/pcpu.h#11 integrate
.. //depot/projects/smpng/sys/ia64/include/reg.h#11 integrate
.. //depot/projects/smpng/sys/ia64/include/smp.h#11 integrate
.. //depot/projects/smpng/sys/ia64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#71 integrate
.. //depot/projects/smpng/sys/kern/kern_exec.c#127 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#81 integrate
.. //depot/projects/smpng/sys/kern/kern_ktr.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_module.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_rwlock.c#32 integrate
.. //depot/projects/smpng/sys/kern/kern_syscalls.c#8 integrate
.. //depot/projects/smpng/sys/kern/kern_thr.c#55 integrate
.. //depot/projects/smpng/sys/kern/kern_umtx.c#39 integrate
.. //depot/projects/smpng/sys/kern/subr_eventhandler.c#25 integrate
.. //depot/projects/smpng/sys/kern/sys_generic.c#64 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#69 integrate
.. //depot/projects/smpng/sys/kern/sysv_ipc.c#20 integrate
.. //depot/projects/smpng/sys/kern/sysv_msg.c#42 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#55 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#49 integrate
.. //depot/projects/smpng/sys/kern/uipc_mqueue.c#24 integrate
.. //depot/projects/smpng/sys/kern/uipc_sem.c#30 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#136 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#126 integrate
.. //depot/projects/smpng/sys/kern/vfs_aio.c#88 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#65 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#158 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#102 integrate
.. //depot/projects/smpng/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate
.. //depot/projects/smpng/sys/mips/cavium/octeon_machdep.c#2 integrate
.. //depot/projects/smpng/sys/mips/conf/AR71XX#2 integrate
.. //depot/projects/smpng/sys/mips/conf/OCTEON1#2 integrate
.. //depot/projects/smpng/sys/mips/conf/OCTEON1-32#2 integrate
.. //depot/projects/smpng/sys/mips/include/clock.h#2 integrate
.. //depot/projects/smpng/sys/mips/include/cpufunc.h#3 integrate
.. //depot/projects/smpng/sys/mips/include/cpuregs.h#3 integrate
.. //depot/projects/smpng/sys/mips/include/db_machdep.h#3 integrate
.. //depot/projects/smpng/sys/mips/include/kdb.h#3 integrate
.. //depot/projects/smpng/sys/mips/include/param.h#8 integrate
.. //depot/projects/smpng/sys/mips/include/pmap.h#8 integrate
.. //depot/projects/smpng/sys/mips/include/smp.h#5 integrate
.. //depot/projects/smpng/sys/mips/include/trap.h#3 integrate
.. //depot/projects/smpng/sys/mips/mips/db_trace.c#3 integrate
.. //depot/projects/smpng/sys/mips/mips/exception.S#3 integrate
.. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#7 integrate
.. //depot/projects/smpng/sys/mips/mips/nexus.c#4 integrate
.. //depot/projects/smpng/sys/mips/mips/pm_machdep.c#5 integrate
.. //depot/projects/smpng/sys/mips/mips/pmap.c#15 integrate
.. //depot/projects/smpng/sys/mips/mips/support.S#4 integrate
.. //depot/projects/smpng/sys/mips/mips/swtch.S#3 integrate
.. //depot/projects/smpng/sys/mips/mips/tick.c#4 integrate
.. //depot/projects/smpng/sys/mips/mips/trap.c#5 integrate
.. //depot/projects/smpng/sys/mips/mips/vm_machdep.c#4 integrate
.. //depot/projects/smpng/sys/mips/sibyte/sb_asm.S#2 integrate
.. //depot/projects/smpng/sys/mips/sibyte/sb_machdep.c#2 integrate
.. //depot/projects/smpng/sys/mips/sibyte/sb_scd.c#2 integrate
.. //depot/projects/smpng/sys/mips/sibyte/sb_scd.h#2 integrate
.. //depot/projects/smpng/sys/modules/dummynet/Makefile#8 integrate
.. //depot/projects/smpng/sys/modules/linux/Makefile#26 integrate
.. //depot/projects/smpng/sys/modules/procfs/Makefile#9 integrate
.. //depot/projects/smpng/sys/modules/zfs/Makefile#12 integrate
.. //depot/projects/smpng/sys/net/bpf.c#94 integrate
.. //depot/projects/smpng/sys/net/flowtable.c#12 integrate
.. //depot/projects/smpng/sys/net/flowtable.h#9 integrate
.. //depot/projects/smpng/sys/net/if.h#45 integrate
.. //depot/projects/smpng/sys/net/if_llatbl.c#10 integrate
.. //depot/projects/smpng/sys/net/if_llatbl.h#6 integrate
.. //depot/projects/smpng/sys/net/if_media.h#28 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#54 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#68 integrate
.. //depot/projects/smpng/sys/net/if_var.h#75 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#73 integrate
.. //depot/projects/smpng/sys/net/route.h#36 integrate
.. //depot/projects/smpng/sys/net/vnet.c#5 integrate
.. //depot/projects/smpng/sys/net/vnet.h#18 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#49 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#11 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#16 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#14 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_mesh.c#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#38 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#15 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#13 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_var.h#44 integrate
.. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#16 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#49 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socketvar.h#5 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#104 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#69 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#74 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#56 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#110 integrate
.. //depot/projects/smpng/sys/netinet/ip_ipsec.c#20 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#119 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/dn_sched.h#2 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/dn_sched_prio.c#1 branch
.. //depot/projects/smpng/sys/netinet/ipfw/ip_dn_io.c#2 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_dn_private.h#2 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#8 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw2.c#12 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_dynamic.c#3 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_log.c#4 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_private.h#4 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_table.c#4 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/test/Makefile#2 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#91 integrate
.. //depot/projects/smpng/sys/netinet/sctp_crc32.c#12 integrate
.. //depot/projects/smpng/sys/netinet/sctp_crc32.h#8 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#29 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#31 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#36 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#35 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.h#19 integrate
.. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#18 integrate
.. //depot/projects/smpng/sys/netinet/sctp_uio.h#26 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#36 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.h#18 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#121 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#52 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#98 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#71 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.c#64 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#53 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#90 integrate
.. //depot/projects/smpng/sys/pc98/pc98/machdep.c#36 integrate
.. //depot/projects/smpng/sys/powerpc/aim/machdep.c#18 integrate
.. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/aim/nexus.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/aim/ofw_machdep.c#8 integrate
.. //depot/projects/smpng/sys/powerpc/booke/interrupt.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/booke/machdep.c#15 integrate
.. //depot/projects/smpng/sys/powerpc/booke/trap_subr.S#6 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#66 integrate
.. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#9 integrate
.. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/mpc85xx/pci_ocp.c#6 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_real.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/cuda.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/cudavar.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/pmu.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/smu.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#18 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#18 integrate
.. //depot/projects/smpng/sys/rpc/svc.c#5 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#102 integrate
.. //depot/projects/smpng/sys/sparc64/include/dcr.h#2 integrate
.. //depot/projects/smpng/sys/sparc64/include/tlb.h#20 integrate
.. //depot/projects/smpng/sys/sparc64/include/tte.h#15 integrate
.. //depot/projects/smpng/sys/sparc64/include/ver.h#9 integrate
.. //depot/projects/smpng/sys/sparc64/include/wstate.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/pci/schizo.c#8 integrate
.. //depot/projects/smpng/sys/sparc64/pci/schizovar.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/cheetah.c#10 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#22 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#47 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#9 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#100 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#84 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/support.S#15 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#12 integrate
.. //depot/projects/smpng/sys/sun4v/conf/GENERIC#21 integrate
.. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#13 integrate
.. //depot/projects/smpng/sys/sys/eventhandler.h#33 integrate
.. //depot/projects/smpng/sys/sys/imgact.h#19 integrate
.. //depot/projects/smpng/sys/sys/param.h#160 integrate
.. //depot/projects/smpng/sys/sys/pmc.h#19 integrate
.. //depot/projects/smpng/sys/sys/ptrace.h#18 integrate
.. //depot/projects/smpng/sys/sys/sysent.h#35 integrate
.. //depot/projects/smpng/sys/vm/uma_int.h#35 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#83 integrate
Differences ...
==== //depot/projects/smpng/share/man/man9/fail.9#3 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/fail.9,v 1.3 2009/09/18 14:05:56 brueffer Exp $
+.\" $FreeBSD: src/share/man/man9/fail.9,v 1.4 2010/03/12 10:01:06 uqs Exp $
.\"
.Dd May 10, 2009
.Dt FAIL 9
@@ -84,7 +84,7 @@
The remaining
.Fn KFAIL_POINT_*
macros are wrappers around common error injection paths:
-.Bl -tag -width 8
+.Bl -inset
.It Fn KFAIL_POINT_RETURN parent name
is the equivalent of
.Sy KFAIL_POINT_CODE(..., return RETURN_VALUE)
@@ -96,8 +96,7 @@
.Sy KFAIL_POINT_CODE(..., error_var = RETURN_VALUE)
.It Fn KFAIL_POINT_GOTO parent name error_var label
is the equivalent of
-.Sy KFAIL_POINT_CODE(...,
- { error_var = RETURN_VALUE; goto label;})
+.Sy KFAIL_POINT_CODE(..., { error_var = RETURN_VALUE; goto label;})
.El
.Sh SYSCTL VARIABLES
The
==== //depot/projects/smpng/share/man/man9/uio.9#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" (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/share/man/man9/uio.9,v 1.22 2007/10/30 16:03:39 keramida Exp $
+.\" $FreeBSD: src/share/man/man9/uio.9,v 1.23 2010/03/21 16:14:19 kib Exp $
.\"
-.Dd October 30, 2007
+.Dd March 21, 2010
.Os
.Dt UIO 9
.Sh NAME
@@ -41,7 +41,7 @@
struct iovec *uio_iov; /* scatter/gather list */
int uio_iovcnt; /* length of scatter/gather list */
off_t uio_offset; /* offset in target object */
- int uio_resid; /* remaining bytes to copy */
+ ssize_t uio_resid; /* remaining bytes to copy */
enum uio_seg uio_segflg; /* address space */
enum uio_rw uio_rw; /* operation */
struct thread *uio_td; /* owner */
==== //depot/projects/smpng/share/man/man9/vfs_mount.9#2 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.12 2004/11/29 09:56:12 ru Exp $
+.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.13 2010/03/19 14:35:38 avg Exp $
.\"
.Dd November 26, 2004
.Dt VFS_MOUNT 9
@@ -127,8 +127,7 @@
whose errors it returns so this list may not be exhaustive.
.Sh SEE ALSO
.Xr mount 2 ,
-.Xr mount 8 ,
-.Xr vfs_mountedon 9
+.Xr mount 8
.Pp
.Va vfs.usermount
.Sh AUTHORS
==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#16 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.24 2009/10/08 17:41:53 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.25 2010/03/19 12:43:18 jhb Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -627,8 +627,10 @@
if (ACPI_FAILURE(AcpiTbChecksum(table, length))) {
if (bootverbose)
printf("ACPI: Failed checksum for table %s\n", sig);
+#if (ACPI_CHECKSUM_ABORT)
table_unmap(table, length);
return (NULL);
+#endif
}
return (table);
}
==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#29 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.85 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.86 2010/03/11 14:49:06 nwhitehorn Exp $");
#include "opt_compat.h"
@@ -319,7 +319,7 @@
frame_type = INTERRUPT;
else if (strcmp(name, "Xfast_syscall") == 0)
frame_type = SYSCALL;
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
else if (strcmp(name, "Xint0x80_syscall") == 0)
frame_type = SYSCALL;
#endif
==== //depot/projects/smpng/sys/amd64/amd64/exception.S#26 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.141 2010/02/25 14:13:39 attilio Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.142 2010/03/11 14:49:06 nwhitehorn Exp $
*/
#include "opt_atpic.h"
@@ -572,7 +572,7 @@
* included.
*/
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
.data
.p2align 4
.text
==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#38 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.179 2010/02/25 14:13:39 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.180 2010/03/11 14:17:37 jhb Exp $");
#include "opt_cpu.h"
@@ -187,7 +187,9 @@
if (cpu_vendor_id == CPU_VENDOR_INTEL ||
cpu_vendor_id == CPU_VENDOR_AMD ||
cpu_vendor_id == CPU_VENDOR_CENTAUR) {
- printf(" Stepping = %u", cpu_id & 0xf);
+ printf(" Family = %x", CPUID_TO_FAMILY(cpu_id));
+ printf(" Model = %x", CPUID_TO_MODEL(cpu_id));
+ printf(" Stepping = %u", cpu_id & CPUID_STEPPING);
if (cpu_high > 0) {
/*
==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#89 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.714 2010/02/25 14:13:39 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.715 2010/03/25 14:24:00 nwhitehorn Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -841,11 +841,7 @@
* Reset registers to default values on exec.
*/
void
-exec_setregs(td, entry, stack, ps_strings)
- struct thread *td;
- u_long entry;
- u_long stack;
- u_long ps_strings;
+exec_setregs(struct thread *td, struct image_params *imgp, u_long stack)
{
struct trapframe *regs = td->td_frame;
struct pcb *pcb = td->td_pcb;
@@ -863,7 +859,7 @@
pcb->pcb_full_iret = 1;
bzero((char *)regs, sizeof(struct trapframe));
- regs->tf_rip = entry;
+ regs->tf_rip = imgp->entry_addr;
regs->tf_rsp = ((stack - 8) & ~0xFul) + 8;
regs->tf_rdi = stack; /* argv */
regs->tf_rflags = PSL_USER | (regs->tf_rflags & PSL_T);
==== //depot/projects/smpng/sys/amd64/amd64/mca.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.8 2010/03/09 15:12:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.10 2010/03/21 00:13:11 alc Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -186,19 +186,46 @@
return ("???");
}
+static const char *
+mca_error_mmtype(uint16_t mca_error)
+{
+
+ switch ((mca_error & 0x70) >> 4) {
+ case 0x0:
+ return ("GEN");
+ case 0x1:
+ return ("RD");
+ case 0x2:
+ return ("WR");
+ case 0x3:
+ return ("AC");
+ case 0x4:
+ return ("MS");
+ }
+ return ("???");
+}
+
/* Dump details about a single machine check. */
static void __nonnull(1)
mca_log(const struct mca_record *rec)
{
uint16_t mca_error;
- printf("MCA: bank %d, status 0x%016llx\n", rec->mr_bank,
+ printf("MCA: Bank %d, Status 0x%016llx\n", rec->mr_bank,
(long long)rec->mr_status);
- printf("MCA: CPU %d ", rec->mr_apic_id);
+ printf("MCA: Global Cap 0x%016llx, Status 0x%016llx\n",
+ (long long)rec->mr_mcg_cap, (long long)rec->mr_mcg_status);
+ printf("MCA: Vendor \"%s\", ID 0x%x, APIC ID %d\n", cpu_vendor,
+ rec->mr_cpu_id, rec->mr_apic_id);
+ printf("MCA: CPU %d ", rec->mr_cpu);
if (rec->mr_status & MC_STATUS_UC)
printf("UNCOR ");
- else
+ else {
printf("COR ");
+ if (rec->mr_mcg_cap & MCG_CAP_TES_P)
+ printf("(%lld) ", ((long long)rec->mr_status &
+ MC_STATUS_COR_COUNT) >> 38);
+ }
if (rec->mr_status & MC_STATUS_PCC)
printf("PCC ");
if (rec->mr_status & MC_STATUS_OVER)
@@ -221,6 +248,9 @@
case 0x0004:
printf("FRC error");
break;
+ case 0x0005:
+ printf("internal parity error");
+ break;
case 0x0400:
printf("internal timer error");
break;
@@ -245,6 +275,17 @@
break;
}
+ /* Memory controller error. */
+ if ((mca_error & 0xef80) == 0x0080) {
+ printf("%s channel ", mca_error_mmtype(mca_error));
+ if ((mca_error & 0x000f) != 0x000f)
+ printf("%d", mca_error & 0x000f);
+ else
+ printf("??");
+ printf(" memory error");
+ break;
+ }
+
/* Cache error. */
if ((mca_error & 0xef00) == 0x0100) {
printf("%sCACHE %s %s error",
@@ -322,6 +363,11 @@
rec->mr_misc = rdmsr(MSR_MC_MISC(bank));
rec->mr_tsc = rdtsc();
rec->mr_apic_id = PCPU_GET(apic_id);
+ rec->mr_mcg_cap = rdmsr(MSR_MCG_CAP);
+ rec->mr_mcg_status = rdmsr(MSR_MCG_STATUS);
+ rec->mr_cpu_id = cpu_id;
+ rec->mr_cpu_vendor_id = cpu_vendor_id;
+ rec->mr_cpu = PCPU_GET(cpuid);
/*
* Clear machine check. Don't do this for uncorrectable
@@ -519,19 +565,16 @@
/*
* Disable logging of level one TLB parity (L1TP) errors by
- * the data and instruction caches as an alternative
- * workaround for AMD Family 10h Erratum 383. Unlike the
- * recommended workaround, there is no performance penalty to
- * this workaround. However, L1TP errors will go unreported.
+ * the data cache as an alternative workaround for AMD Family
+ * 10h Erratum 383. Unlike the recommended workaround, there
+ * is no performance penalty to this workaround. However,
+ * L1TP errors will go unreported.
*/
if (cpu_vendor_id == CPU_VENDOR_AMD &&
CPUID_TO_FAMILY(cpu_id) == 0x10 && !amd10h_L1TP) {
mask = rdmsr(MSR_MC0_CTL_MASK);
if ((mask & (1UL << 5)) == 0)
wrmsr(MSR_MC0_CTL_MASK, mask | (1UL << 5));
- mask = rdmsr(MSR_MC1_CTL_MASK);
- if ((mask & (1UL << 5)) == 0)
- wrmsr(MSR_MC1_CTL_MASK, mask | (1UL << 5));
}
for (i = 0; i < (mcg_cap & MCG_CAP_COUNT); i++) {
/* By default enable logging of all errors. */
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#103 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.684 2010/03/10 15:50:38 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.687 2010/03/21 00:21:59 alc Exp $");
/*
* Manages physical address maps.
@@ -152,7 +152,7 @@
#if !defined(DIAGNOSTIC)
#ifdef __GNUC_GNU_INLINE__
-#define PMAP_INLINE inline
+#define PMAP_INLINE __attribute__((__gnu_inline__)) inline
#else
#define PMAP_INLINE extern inline
#endif
@@ -576,8 +576,6 @@
virtual_avail = va;
- invltlb();
-
/* Initialize the PAT MSR. */
pmap_init_pat();
}
@@ -1123,7 +1121,7 @@
/*
* No targeted cache flush methods are supported by CPU,
- * or the supplied range is bigger then 2MB.
+ * or the supplied range is bigger than 2MB.
* Globally invalidate cache.
*/
pmap_invalidate_cache();
==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#46 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.267 2010/02/25 14:13:39 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.268 2010/03/11 14:49:06 nwhitehorn Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -439,7 +439,7 @@
*/
cpu_thread_clean(td);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
/*
* Set the trap frame to point at the beginning of the uts
@@ -490,7 +490,7 @@
if ((u_int64_t)tls_base >= VM_MAXUSER_ADDRESS)
return (EINVAL);
-#ifdef COMPAT_IA32
+#ifdef COMPAT_FREEBSD32
if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
td->td_pcb->pcb_gsbase = (register_t)tls_base;
return (0);
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#87 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.539 2010/02/15 23:44:48 attilio Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.541 2010/03/13 09:21:00 ed Exp $
cpu HAMMER
ident GENERIC
@@ -44,8 +44,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty)
-options COMPAT_IA32 # Compatible with i386 binaries
+options COMPAT_FREEBSD32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
==== //depot/projects/smpng/sys/amd64/conf/NOTES#59 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.101 2010/02/08 21:38:42 brucec Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.102 2010/03/11 14:49:06 nwhitehorn Exp $
#
#
@@ -483,7 +483,7 @@
#XXX these 32 bit binaries is added.
# Enable 32-bit runtime support for FreeBSD/i386 binaries.
-options COMPAT_IA32
+options COMPAT_FREEBSD32
# Enable iBCS2 runtime support for SCO and ISC binaries
#XXX#options IBCS2
@@ -494,7 +494,7 @@
# Enable Linux ABI emulation
#XXX#options COMPAT_LINUX
-# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and COMPAT_IA32)
+# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and COMPAT_FREEBSD32)
options COMPAT_LINUX32
# Enable the linux-like proc filesystem support (requires COMPAT_LINUX32
==== //depot/projects/smpng/sys/amd64/conf/XENHVM#6 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.8 2010/02/15 23:44:48 attilio Exp $
+# $FreeBSD: src/sys/amd64/conf/XENHVM,v 1.10 2010/03/13 09:21:00 ed Exp $
cpu HAMMER
ident XENHVM
@@ -45,8 +45,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty)
-options COMPAT_IA32 # Compatible with i386 binaries
+options COMPAT_FREEBSD32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#25 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.24 2009/10/27 10:47:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.25 2010/03/25 14:24:00 nwhitehorn Exp $");
#include "opt_compat.h"
@@ -701,11 +701,7 @@
* Clear registers on exec
*/
void
-ia32_setregs(td, entry, stack, ps_strings)
- struct thread *td;
- u_long entry;
- u_long stack;
- u_long ps_strings;
+ia32_setregs(struct thread *td, struct image_params *imgp, u_long stack)
{
struct trapframe *regs = td->td_frame;
struct pcb *pcb = td->td_pcb;
@@ -721,12 +717,12 @@
pcb->pcb_initial_fpucw = __INITIAL_FPUCW_I386__;
bzero((char *)regs, sizeof(struct trapframe));
- regs->tf_rip = entry;
+ regs->tf_rip = imgp->entry_addr;
regs->tf_rsp = stack;
regs->tf_rflags = PSL_USER | (regs->tf_rflags & PSL_T);
regs->tf_ss = _udatasel;
regs->tf_cs = _ucode32sel;
- regs->tf_rbx = ps_strings;
+ regs->tf_rbx = imgp->ps_strings;
regs->tf_ds = _udatasel;
regs->tf_es = _udatasel;
regs->tf_fs = _ufssel;
==== //depot/projects/smpng/sys/amd64/include/elf.h#9 (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/amd64/include/elf.h,v 1.22 2009/10/10 15:31:24 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/elf.h,v 1.23 2010/03/11 14:49:06 nwhitehorn Exp $
*/
#ifndef _MACHINE_ELF_H_
@@ -42,6 +42,7 @@
#include <sys/elf_generic.h>
#define ELF_ARCH EM_X86_64
+#define ELF_ARCH32 EM_386
#define ELF_MACHINE_OK(x) ((x) == EM_X86_64)
==== //depot/projects/smpng/sys/amd64/include/mca.h#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/mca.h,v 1.2 2009/12/02 15:45:55 avg Exp $
+ * $FreeBSD: src/sys/amd64/include/mca.h,v 1.3 2010/03/16 16:01:19 jhb Exp $
*/
#ifndef __MACHINE_MCA_H__
@@ -37,6 +37,11 @@
uint64_t mr_tsc;
int mr_apic_id;
int mr_bank;
+ uint64_t mr_mcg_cap;
+ uint64_t mr_mcg_status;
+ int mr_cpu_id;
+ int mr_cpu_vendor_id;
+ int mr_cpu;
};
#ifdef _KERNEL
==== //depot/projects/smpng/sys/amd64/include/reg.h#10 (text+ko) ====
@@ -31,12 +31,16 @@
* SUCH DAMAGE.
*
* from: @(#)reg.h 5.5 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/amd64/include/reg.h,v 1.39 2009/04/01 12:44:17 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/reg.h,v 1.40 2010/03/11 14:49:06 nwhitehorn Exp $
*/
#ifndef _MACHINE_REG_H_
#define _MACHINE_REG_H_
+#if defined(_KERNEL) && !defined(_STANDALONE)
+#include "opt_compat.h"
+#endif
+
/*
* Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS.
*/
@@ -116,6 +120,11 @@
#define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr15 by
register number */
+#ifdef COMPAT_FREEBSD32
+#include <machine/fpu.h>
+#include <compat/ia32/ia32_reg.h>
+#endif
+
#ifdef _KERNEL
/*
* XXX these interfaces are MI, so they should be declared in a MI place.
==== //depot/projects/smpng/sys/amd64/include/specialreg.h#25 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.58 2010/03/09 03:30:31 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.61 2010/03/22 15:08:26 jhb Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -267,6 +267,7 @@
#define MSR_MTRR16kBase 0x258
#define MSR_MTRR4kBase 0x268
#define MSR_PAT 0x277
+#define MSR_MC0_CTL2 0x280
#define MSR_MTRRdefType 0x2ff
#define MSR_MC0_CTL 0x400
#define MSR_MC0_STATUS 0x401
@@ -320,16 +321,16 @@
#define MTRR_N64K 8 /* numbers of fixed-size entries */
#define MTRR_N16K 16
#define MTRR_N4K 64
-#define MTRR_CAP_WC 0x0000000000000400UL
-#define MTRR_CAP_FIXED 0x0000000000000100UL
-#define MTRR_CAP_VCNT 0x00000000000000ffUL
-#define MTRR_DEF_ENABLE 0x0000000000000800UL
-#define MTRR_DEF_FIXED_ENABLE 0x0000000000000400UL
-#define MTRR_DEF_TYPE 0x00000000000000ffUL
-#define MTRR_PHYSBASE_PHYSBASE 0x000ffffffffff000UL
-#define MTRR_PHYSBASE_TYPE 0x00000000000000ffUL
-#define MTRR_PHYSMASK_PHYSMASK 0x000ffffffffff000UL
-#define MTRR_PHYSMASK_VALID 0x0000000000000800UL
+#define MTRR_CAP_WC 0x0000000000000400
+#define MTRR_CAP_FIXED 0x0000000000000100
+#define MTRR_CAP_VCNT 0x00000000000000ff
+#define MTRR_DEF_ENABLE 0x0000000000000800
+#define MTRR_DEF_FIXED_ENABLE 0x0000000000000400
+#define MTRR_DEF_TYPE 0x00000000000000ff
+#define MTRR_PHYSBASE_PHYSBASE 0x000ffffffffff000
+#define MTRR_PHYSBASE_TYPE 0x00000000000000ff
+#define MTRR_PHYSMASK_PHYSMASK 0x000ffffffffff000
+#define MTRR_PHYSMASK_VALID 0x0000000000000800
/* Performance Control Register (5x86 only). */
#define PCR0 0x20
@@ -352,27 +353,38 @@
#define MCG_CAP_COUNT 0x000000ff
#define MCG_CAP_CTL_P 0x00000100
#define MCG_CAP_EXT_P 0x00000200
+#define MCG_CAP_CMCI_P 0x00000400
#define MCG_CAP_TES_P 0x00000800
#define MCG_CAP_EXT_CNT 0x00ff0000
+#define MCG_CAP_SER_P 0x01000000
#define MCG_STATUS_RIPV 0x00000001
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list