PERFORCE change 160338 for review
John Baldwin
jhb at FreeBSD.org
Tue Apr 7 10:49:10 PDT 2009
http://perforce.freebsd.org/chv.cgi?CH=160338
Change 160338 by jhb at jhb_jhbbsd on 2009/04/07 17:48:51
IFC @160321
Affected files ...
.. //depot/projects/smpng/sys/amd64/acpica/acpi_switch.S#2 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_wakecode.S#3 integrate
.. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#7 integrate
.. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#17 integrate
.. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#25 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#9 integrate
.. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#28 integrate
.. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#16 integrate
.. //depot/projects/smpng/sys/amd64/amd64/exception.S#23 integrate
.. //depot/projects/smpng/sys/amd64/amd64/genassym.c#27 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#77 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#54 integrate
.. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#9 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#65 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#42 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_exception.S#5 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_reg.c#4 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#22 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_sigtramp.S#6 integrate
.. //depot/projects/smpng/sys/amd64/include/asmacros.h#9 integrate
.. //depot/projects/smpng/sys/amd64/include/frame.h#9 integrate
.. //depot/projects/smpng/sys/amd64/include/md_var.h#19 integrate
.. //depot/projects/smpng/sys/amd64/include/pcb.h#17 integrate
.. //depot/projects/smpng/sys/amd64/include/pcpu.h#12 integrate
.. //depot/projects/smpng/sys/amd64/include/proc.h#7 integrate
.. //depot/projects/smpng/sys/amd64/include/reg.h#9 integrate
.. //depot/projects/smpng/sys/amd64/include/segments.h#8 integrate
.. //depot/projects/smpng/sys/amd64/include/signal.h#8 integrate
.. //depot/projects/smpng/sys/amd64/include/sysarch.h#7 integrate
.. //depot/projects/smpng/sys/amd64/include/ucontext.h#6 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux.h#20 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_locore.s#5 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#32 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#38 integrate
.. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#12 integrate
.. //depot/projects/smpng/sys/arm/arm/locore.S#19 integrate
.. //depot/projects/smpng/sys/arm/at91/files.at91#8 integrate
.. //depot/projects/smpng/sys/arm/conf/AVILA#16 integrate
.. //depot/projects/smpng/sys/arm/conf/CAMBRIA#7 integrate
.. //depot/projects/smpng/sys/arm/include/atomic.h#32 integrate
.. //depot/projects/smpng/sys/arm/include/vmparam.h#12 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#60 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#6 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#56 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#7 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#57 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#51 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#51 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#51 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#51 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#55 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#11 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#23 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#9 integrate
.. //depot/projects/smpng/sys/conf/files#235 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#65 integrate
.. //depot/projects/smpng/sys/conf/files.i386#122 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#64 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#49 integrate
.. //depot/projects/smpng/sys/conf/newvers.sh#24 integrate
.. //depot/projects/smpng/sys/conf/options#165 integrate
.. //depot/projects/smpng/sys/contrib/dev/uath/ar5523.bin.uu#1 branch
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#15 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#44 integrate
.. //depot/projects/smpng/sys/dev/age/if_age.c#6 integrate
.. //depot/projects/smpng/sys/dev/age/if_agereg.h#2 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#73 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#63 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#6 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-marvell.c#5 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#5 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#5 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-sis.c#5 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#73 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athvar.h#45 integrate
.. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#17 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_pci.c#7 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#13 integrate
.. //depot/projects/smpng/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#22 integrate
.. //depot/projects/smpng/sys/dev/ed/ax88x90reg.h#2 integrate
.. //depot/projects/smpng/sys/dev/ed/dl100xxreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#42 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#19 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#18 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#45 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#16 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_wd80x3.c#5 integrate
.. //depot/projects/smpng/sys/dev/ed/if_edreg.h#8 integrate
.. //depot/projects/smpng/sys/dev/ed/if_edvar.h#16 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#49 integrate
.. //depot/projects/smpng/sys/dev/firewire/sbp.h#6 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#55 integrate
.. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#19 integrate
.. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#30 integrate
.. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#5 integrate
.. //depot/projects/smpng/sys/dev/malo/if_malo.c#3 integrate
.. //depot/projects/smpng/sys/dev/malo/if_malo_pci.c#3 integrate
.. //depot/projects/smpng/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/smpng/sys/dev/mii/axphy.c#1 branch
.. //depot/projects/smpng/sys/dev/mii/axphyreg.h#1 branch
.. //depot/projects/smpng/sys/dev/mii/miidevs#34 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_standard.c#2 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.c#14 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#65 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#21 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#106 integrate
.. //depot/projects/smpng/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2560.c#14 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2560var.h#6 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2661.c#10 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2661var.h#5 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#73 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#31 integrate
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#24 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_mbus.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uhci.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/input/uhid.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/input/ums.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cdcereg.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uark.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umct.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/umass.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/urio.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.h#17 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_bus.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_controller.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_core.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_dev.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.h#7 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_endian.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_generic.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hid.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hid.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hub.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hub.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_parse.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_parse.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_request.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_request.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_sw_transfer.c#3 delete
.. //depot/projects/smpng/sys/dev/usb/usb_sw_transfer.h#2 delete
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#133 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uathreg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uathvar.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/usb_wlan.h#2 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#91 integrate
.. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#8 integrate
.. //depot/projects/smpng/sys/dev/wpi/if_wpireg.h#3 integrate
.. //depot/projects/smpng/sys/dev/xen/balloon/balloon.c#3 integrate
.. //depot/projects/smpng/sys/dev/xen/console/console.c#6 integrate
.. //depot/projects/smpng/sys/geom/geom.h#53 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#55 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.h#8 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#57 integrate
.. //depot/projects/smpng/sys/geom/journal/g_journal.c#11 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#38 integrate
.. //depot/projects/smpng/sys/geom/part/g_part.c#18 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_apm.c#8 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#12 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#6 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#10 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#7 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#10 integrate
.. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#39 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#19 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#14 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_create.c#1 branch
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#24 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_events.c#1 branch
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#13 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_list.c#5 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_move.c#4 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#16 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#9 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.h#8 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rename.c#4 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#15 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.c#7 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.h#3 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#9 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#16 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#12 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#12 integrate
.. //depot/projects/smpng/sys/i386/cpufreq/hwpstate.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#18 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#138 integrate
.. //depot/projects/smpng/sys/i386/include/signal.h#12 integrate
.. //depot/projects/smpng/sys/i386/include/ucontext.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/vmparam.h#15 integrate
.. //depot/projects/smpng/sys/i386/include/xen/xenpmap.h#4 integrate
.. //depot/projects/smpng/sys/i386/include/xen/xenvar.h#3 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#67 integrate
.. //depot/projects/smpng/sys/i386/xen/pmap.c#7 integrate
.. //depot/projects/smpng/sys/i386/xen/xen_machdep.c#9 integrate
.. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#25 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#66 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#65 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#75 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#50 integrate
.. //depot/projects/smpng/sys/kern/vfs_cache.c#53 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#57 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#90 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#164 integrate
.. //depot/projects/smpng/sys/mips/include/bus.h#2 integrate
.. //depot/projects/smpng/sys/mips/mips/elf64_machdep.c#3 integrate
.. //depot/projects/smpng/sys/mips/mips/elf_machdep.c#6 integrate
.. //depot/projects/smpng/sys/modules/ath/Makefile#8 integrate
.. //depot/projects/smpng/sys/modules/cpufreq/Makefile#7 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_vinum/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/mii/Makefile#14 integrate
.. //depot/projects/smpng/sys/modules/nfsclient/Makefile#13 integrate
.. //depot/projects/smpng/sys/modules/usb/Makefile#15 integrate
.. //depot/projects/smpng/sys/modules/usb/uath/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/usb/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/bpf.h#26 integrate
.. //depot/projects/smpng/sys/net/bsd_comp.c#14 delete
.. //depot/projects/smpng/sys/net/if.c#115 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#48 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#53 integrate
.. //depot/projects/smpng/sys/net/if_ppp.c#50 delete
.. //depot/projects/smpng/sys/net/if_ppp.h#3 delete
.. //depot/projects/smpng/sys/net/if_pppvar.h#13 delete
.. //depot/projects/smpng/sys/net/if_sl.c#35 delete
.. //depot/projects/smpng/sys/net/if_slvar.h#6 delete
.. //depot/projects/smpng/sys/net/ppp_comp.h#5 delete
.. //depot/projects/smpng/sys/net/ppp_deflate.c#10 delete
.. //depot/projects/smpng/sys/net/ppp_tty.c#24 delete
.. //depot/projects/smpng/sys/net/route.c#44 integrate
.. //depot/projects/smpng/sys/net/slip.h#3 delete
.. //depot/projects/smpng/sys/net/vnet.h#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#38 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.h#19 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#13 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#18 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#18 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#9 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#45 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#20 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#44 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_output.c#40 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#22 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_scan.c#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_scan.h#4 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_superg.c#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_superg.h#2 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#9 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_tdma.h#4 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_var.h#36 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#7 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#67 integrate
.. //depot/projects/smpng/sys/netinet/igmp.c#29 integrate
.. //depot/projects/smpng/sys/netinet/in_mcast.c#11 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#47 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#106 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#25 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#96 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#23 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#25 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#29 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#28 integrate
.. //depot/projects/smpng/sys/netinet/sctp_structs.h#15 integrate
.. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#12 integrate
.. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#9 integrate
.. //depot/projects/smpng/sys/netinet/sctp_uio.h#20 integrate
.. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#26 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#29 integrate
.. //depot/projects/smpng/sys/netinet/tcp_reass.c#7 integrate
.. //depot/projects/smpng/sys/netinet/tcp_sack.c#29 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#110 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timewait.c#11 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#76 integrate
.. //depot/projects/smpng/sys/netinet/vinet.h#7 integrate
.. //depot/projects/smpng/sys/netinet6/frag6.c#22 integrate
.. //depot/projects/smpng/sys/netinet6/in6_src.c#40 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_input.c#59 integrate
.. //depot/projects/smpng/sys/netinet6/scope6.c#14 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec.c#32 integrate
.. //depot/projects/smpng/sys/netipsec/key.c#33 integrate
.. //depot/projects/smpng/sys/netipsec/xform_ah.c#16 integrate
.. //depot/projects/smpng/sys/netipsec/xform_esp.c#17 integrate
.. //depot/projects/smpng/sys/netipsec/xform_ipcomp.c#14 integrate
.. //depot/projects/smpng/sys/netipsec/xform_ipip.c#20 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_socket.c#7 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs.h#35 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_krpc.c#3 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#58 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#38 integrate
.. //depot/projects/smpng/sys/pc98/pc98/machdep.c#30 integrate
.. //depot/projects/smpng/sys/powerpc/aim/machdep.c#10 integrate
.. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#6 integrate
.. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#1 branch
.. //depot/projects/smpng/sys/powerpc/aim/mp_cpudep.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/aim/ofw_machdep.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/aim/swtch.S#6 integrate
.. //depot/projects/smpng/sys/powerpc/aim/trap_subr.S#7 integrate
.. //depot/projects/smpng/sys/powerpc/aim/uio_machdep.c#2 delete
.. //depot/projects/smpng/sys/powerpc/aim/uma_machdep.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/aim/vm_machdep.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/booke/machdep.c#8 integrate
.. //depot/projects/smpng/sys/powerpc/booke/pmap.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/booke/uio_machdep.c#2 delete
.. //depot/projects/smpng/sys/powerpc/include/hid.h#5 integrate
.. //depot/projects/smpng/sys/powerpc/include/intr.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/md_var.h#13 integrate
.. //depot/projects/smpng/sys/powerpc/include/pmap.h#22 integrate
.. //depot/projects/smpng/sys/powerpc/include/sf_buf.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/include/spr.h#12 integrate
.. //depot/projects/smpng/sys/powerpc/include/sysarch.h#1 branch
.. //depot/projects/smpng/sys/powerpc/include/vmparam.h#10 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_real.c#1 branch
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#13 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/cpcht.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/cpchtvar.h#1 branch
.. //depot/projects/smpng/sys/powerpc/powerpc/bus_machdep.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#12 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/dump_machdep.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#18 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/mem.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#10 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#14 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#57 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#34 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#51 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#24 integrate
.. //depot/projects/smpng/sys/sys/elf_common.h#16 integrate
.. //depot/projects/smpng/sys/sys/imgact_elf.h#13 integrate
.. //depot/projects/smpng/sys/sys/jail.h#24 integrate
.. //depot/projects/smpng/sys/sys/kerneldump.h#11 integrate
.. //depot/projects/smpng/sys/sys/param.h#141 integrate
.. //depot/projects/smpng/sys/sys/systm.h#92 integrate
.. //depot/projects/smpng/sys/sys/vimage.h#6 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#97 integrate
.. //depot/projects/smpng/sys/tools/vnode_if.awk#17 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#73 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#65 integrate
.. //depot/projects/smpng/sys/vm/vm_extern.h#32 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#75 integrate
.. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#6 integrate
.. //depot/projects/smpng/sys/xen/reboot.c#2 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/acpica/acpi_switch.S#2 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.1 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.4 2009/04/02 01:46:57 jkim Exp $
*/
#include <machine/asmacros.h>
@@ -64,12 +64,15 @@
/* Fetch PCB. */
movq WAKEUP_CTX(xpcb), %r11
- /* Restore segment registers. */
- mov WAKEUP_PCB(DS), %ds
- mov WAKEUP_PCB(ES), %es
- mov WAKEUP_XPCB(SS), %ss
- mov WAKEUP_PCB(FS), %fs
- mov WAKEUP_PCB(GS), %gs
+ /* Force kernel segment registers. */
+ movl $KDSEL, %eax
+ movw %ax, %ds
+ movw %ax, %es
+ movw %ax, %ss
+ movl $KUF32SEL, %eax
+ movw %ax, %fs
+ movl $KUG32SEL, %eax
+ movw %ax, %gs
movl $MSR_FSBASE, %ecx
movl WAKEUP_PCB(FSBASE), %eax
@@ -123,9 +126,19 @@
/* Restore descriptor tables. */
lidt WAKEUP_XPCB(IDT)
lldt WAKEUP_XPCB(LDT)
+
+#define SDT_SYSTSS 9
+#define SDT_SYSBSY 11
+
+ /* Clear "task busy" bit and reload TR. */
+ movq PCPU(TSS), %rax
+ andb $(~SDT_SYSBSY | SDT_SYSTSS), 5(%rax)
movw WAKEUP_XPCB(TR), %ax
ltr %ax
+#undef SDT_SYSTSS
+#undef SDT_SYSBSY
+
/* Restore other callee saved registers. */
movq WAKEUP_PCB(R15), %r15
movq WAKEUP_PCB(R14), %r14
==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakecode.S#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/acpica/acpi_wakecode.S,v 1.2 2009/03/23 22:35:30 jkim Exp $
+ * $FreeBSD: src/sys/amd64/acpica/acpi_wakecode.S,v 1.3 2009/04/02 00:23:56 jkim Exp $
*/
#define LOCORE
@@ -223,6 +223,12 @@
bootgdt:
.long 0x00000000
.long 0x00000000
+ .long 0x00000000
+ .long 0x00000000
+ .long 0x00000000
+ .long 0x00000000
+ .long 0x00000000
+ .long 0x00000000
bootcode64:
.long 0x0000ffff
@@ -261,6 +267,8 @@
wakeup_gdt:
.word 0
.quad 0
+
+ ALIGN_DATA
wakeup_efer:
.quad 0
wakeup_pat:
==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#7 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.24 2009/03/23 22:35:30 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.25 2009/04/02 00:23:56 jkim Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,6 @@
int acpi_restorecpu(struct xpcb *, vm_offset_t);
int acpi_savecpu(struct xpcb *);
-static void acpi_reset_tss(int cpu);
static void acpi_alloc_wakeup_handler(void);
static void acpi_stop_beep(void *);
@@ -116,8 +115,6 @@
stopxpcbs[cpu].xpcb_gdt.rd_base);
WAKECODE_FIXUP(wakeup_cpu, int, cpu);
- acpi_reset_tss(cpu);
-
/* do an INIT IPI: assert RESET */
lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id);
@@ -220,19 +217,6 @@
}
#endif
-static void
-acpi_reset_tss(int cpu)
-{
- uint32_t *tss;
-
- /*
- * We have to clear "task busy" bit in TSS to restore
- * task register later. Otherwise, ltr causes GPF.
- */
- tss = (uint32_t *)&gdt[NGDT * cpu + GPROC0_SEL] + 1;
- *tss &= ~((SDT_SYSBSY ^ SDT_SYSTSS) << 8);
-}
-
int
acpi_sleep_machdep(struct acpi_softc *sc, int state)
{
@@ -289,8 +273,6 @@
stopxpcbs[0].xpcb_gdt.rd_base);
WAKECODE_FIXUP(wakeup_cpu, int, 0);
- acpi_reset_tss(0);
-
/* Call ACPICA to enter the desired sleep state */
if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
status = AcpiEnterSleepStateS4bios();
==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#17 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.111 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.112 2009/04/01 13:09:26 kib Exp $
*/
/*
@@ -219,10 +219,8 @@
movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */
call cpustop_handler
+ jmp doreti
- POP_FRAME
- iretq
-
/*
* Executed by a CPU when it receives an IPI_SUSPEND from another CPU.
*/
@@ -251,6 +249,5 @@
call smp_rendezvous_action
movq lapic, %rax
movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */
- POP_FRAME /* Why not doreti? */
- iretq
+ jmp doreti
#endif /* SMP */
==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#25 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.167 2009/03/17 00:48:11 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.168 2009/04/01 13:09:26 kib Exp $
*/
#include <machine/asmacros.h>
@@ -75,8 +75,6 @@
1:
movq TD_PCB(%rdi),%r8 /* Old pcb */
movl PCPU(CPUID), %eax
- movq PCB_FSBASE(%r8),%r9
- movq PCB_GSBASE(%r8),%r10
/* release bit from old pm_active */
movq TD_PROC(%rdi), %rdx /* oldtd->td_proc */
movq P_VMSPACE(%rdx), %rdx /* proc->p_vmspace */
@@ -110,28 +108,6 @@
movq %rbx,PCB_RBX(%r8)
movq %rax,PCB_RIP(%r8)
- /*
- * Reread fs and gs bases. Explicit fs segment register load
- * by the usermode code may change actual fs base without
- * updating pcb_{fs,gs}base.
- *
- * %rdx still contains the mtx, save %rdx around rdmsr.
- */
- movq %rdx,%r11
- movl $MSR_FSBASE,%ecx
- rdmsr
- shlq $32,%rdx
- leaq (%rax,%rdx),%r9
- movl $MSR_KGSBASE,%ecx
- rdmsr
- shlq $32,%rdx
- leaq (%rax,%rdx),%r10
- movq %r11,%rdx
-
- testl $PCB_32BIT,PCB_FLAGS(%r8)
- jnz store_seg
-done_store_seg:
-
testl $PCB_DBREGS,PCB_FLAGS(%r8)
jnz store_dr /* static predict not taken */
done_store_dr:
@@ -192,36 +168,47 @@
testl $TDP_KTHREAD,TD_PFLAGS(%rsi)
jnz do_kthread
- testl $PCB_32BIT,PCB_FLAGS(%r8)
- jnz load_seg
-done_load_seg:
+ /*
+ * Load ldt register
+ */
+ movq TD_PROC(%rsi),%rcx
+ cmpq $0, P_MD+MD_LDT(%rcx)
+ jne do_ldt
+ xorl %eax,%eax
+ld_ldt: lldt %ax
- cmpq PCB_FSBASE(%r8),%r9
- jz 1f
- /* Restore userland %fs */
-restore_fsbase:
- movl $MSR_FSBASE,%ecx
+ /* Restore fs base in GDT */
movl PCB_FSBASE(%r8),%eax
- movl PCB_FSBASE+4(%r8),%edx
- wrmsr
-1:
- cmpq PCB_GSBASE(%r8),%r10
- jz 2f
- /* Restore userland %gs */
- movl $MSR_KGSBASE,%ecx
+ movq PCPU(FS32P),%rdx
+ movw %ax,2(%rdx)
+ shrl $16,%eax
+ movb %al,4(%rdx)
+ shrl $8,%eax
+ movb %al,7(%rdx)
+
+ /* Restore gs base in GDT */
movl PCB_GSBASE(%r8),%eax
- movl PCB_GSBASE+4(%r8),%edx
- wrmsr
-2:
+ movq PCPU(GS32P),%rdx
+ movw %ax,2(%rdx)
+ shrl $16,%eax
+ movb %al,4(%rdx)
+ shrl $8,%eax
+ movb %al,7(%rdx)
-do_tss:
+do_kthread:
+ /* Do we need to reload tss ? */
+ movq PCPU(TSSP),%rax
+ movq PCB_TSSP(%r8),%rdx
+ testq %rdx,%rdx
+ cmovzq PCPU(COMMONTSSP),%rdx
+ cmpq %rax,%rdx
+ jne do_tss
+done_tss:
+ movq %r8,PCPU(RSP0)
+ movq %r8,PCPU(CURPCB)
/* Update the TSS_RSP0 pointer for the next interrupt */
- movq PCPU(TSSP), %rax
- movq %r8, PCPU(RSP0)
- movq %r8, PCPU(CURPCB)
- addq $COMMON_TSS_RSP0, %rax
- movq %rsi, PCPU(CURTHREAD) /* into next thread */
- movq %r8, (%rax)
+ movq %r8,COMMON_TSS_RSP0(%rdx)
+ movq %rsi,PCPU(CURTHREAD) /* into next thread */
/* Test if debug registers should be restored. */
testl $PCB_DBREGS,PCB_FLAGS(%r8)
@@ -250,45 +237,6 @@
* We use jumps rather than call in order to avoid the stack.
*/
-do_kthread:
- /*
- * Copy old fs/gsbase to new kthread pcb for future switches
- * This maintains curpcb->pcb_[fg]sbase as caches of the MSR
- */
- movq %r9,PCB_FSBASE(%r8)
- movq %r10,PCB_GSBASE(%r8)
- jmp do_tss
-
-store_seg:
- mov %gs,PCB_GS(%r8)
- testl $PCB_GS32BIT,PCB_FLAGS(%r8)
- jnz 2f
-1: mov %ds,PCB_DS(%r8)
- mov %es,PCB_ES(%r8)
- mov %fs,PCB_FS(%r8)
- jmp done_store_seg
-2: movq PCPU(GS32P),%rax
- movq (%rax),%rax
- movq %rax,PCB_GS32SD(%r8)
- jmp 1b
-
-load_seg:
- testl $PCB_GS32BIT,PCB_FLAGS(%r8)
- jnz 2f
-1: movl $MSR_GSBASE,%ecx
- rdmsr
- mov PCB_GS(%r8),%gs
- wrmsr
- mov PCB_DS(%r8),%ds
- mov PCB_ES(%r8),%es
- mov PCB_FS(%r8),%fs
- jmp restore_fsbase
- /* Restore userland %gs while preserving kernel gsbase */
-2: movq PCPU(GS32P),%rax
- movq PCB_GS32SD(%r8),%rcx
- movq %rcx,(%rax)
- jmp 1b
-
store_dr:
movq %dr7,%rax /* yes, do the save */
movq %dr0,%r15
@@ -325,6 +273,29 @@
movq %r11,%dr6
movq %rax,%dr7
jmp done_load_dr
+
+do_tss: movq %rdx,PCPU(TSSP)
+ movq %rdx,%rcx
+ movq PCPU(TSS),%rax
+ movw %rcx,2(%rax)
+ shrq $16,%rcx
+ movb %cl,4(%rax)
+ shrq $8,%rcx
+ movb %cl,7(%rax)
+ shrq $8,%rcx
+ movl %ecx,8(%rax)
+ movb $0x89,5(%rax) /* unset busy */
+ movl $TSSSEL,%eax
+ ltr %ax
+ jmp done_tss
+
+do_ldt: movq PCPU(LDT),%rax
+ movq P_MD+MD_LDT_SD(%rcx),%rdx
+ movq %rdx,(%rax)
+ movq P_MD+MD_LDT_SD+8(%rcx),%rdx
+ movq %rdx,8(%rax)
+ movl $LDTSEL,%eax
+ jmp ld_ldt
END(cpu_switch)
/*
@@ -398,12 +369,6 @@
movq (%rsp),%rax
movq %rax,PCB_RIP(%r8)
- mov %ds,PCB_DS(%r8)
- mov %es,PCB_ES(%r8)
- mov %ss,XPCB_SS(%r8)
- mov %fs,PCB_FS(%r8)
- mov %gs,PCB_GS(%r8)
-
movq %rbx,PCB_RBX(%r8)
movq %rsp,PCB_RSP(%r8)
movq %rbp,PCB_RBP(%r8)
==== //depot/projects/smpng/sys/amd64/amd64/db_interface.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.81 2005/01/05 20:17:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.82 2009/04/01 13:09:26 kib Exp $");
/*
* Interface to new debugger.
@@ -139,7 +139,11 @@
db_show_mdpcpu(struct pcpu *pc)
{
-#if 0
- db_printf("currentldt = 0x%x\n", pc->pc_currentldt);
-#endif
+ db_printf("curpmap = %p\n", pc->pc_curpmap);
+ db_printf("tssp = %p\n", pc->pc_tssp);
+ db_printf("commontssp = %p\n", pc->pc_commontssp);
+ db_printf("rsp0 = 0x%lx\n", pc->pc_rsp0);
+ db_printf("gs32p = %p\n", pc->pc_gs32p);
+ db_printf("ldt = %p\n", pc->pc_ldt);
+ db_printf("tss = %p\n", pc->pc_tss);
}
==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#28 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.84 2009/03/17 00:48:11 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.85 2009/04/01 13:09:26 kib Exp $");
#include "opt_compat.h"
@@ -69,12 +69,10 @@
#define DB_OFFSET(x) (db_expr_t *)offsetof(struct trapframe, x)
struct db_variable db_regs[] = {
{ "cs", DB_OFFSET(tf_cs), db_frame },
-#if 0
{ "ds", DB_OFFSET(tf_ds), db_frame },
{ "es", DB_OFFSET(tf_es), db_frame },
{ "fs", DB_OFFSET(tf_fs), db_frame },
{ "gs", DB_OFFSET(tf_gs), db_frame },
-#endif
{ "ss", NULL, db_ss },
{ "rax", DB_OFFSET(tf_rax), db_frame },
{ "rcx", DB_OFFSET(tf_rcx), db_frame },
@@ -94,7 +92,7 @@
{ "r15", DB_OFFSET(tf_r15), db_frame },
{ "rip", DB_OFFSET(tf_rip), db_frame },
{ "rflags", DB_OFFSET(tf_rflags), db_frame },
-#define DB_N_SHOW_REGS 20 /* Don't show registers after here. */
+#define DB_N_SHOW_REGS 24 /* Don't show registers after here. */
{ "dr0", NULL, db_dr0 },
{ "dr1", NULL, db_dr1 },
{ "dr2", NULL, db_dr2 },
@@ -357,7 +355,7 @@
rbp = tf->tf_rbp;
switch (frame_type) {
case TRAP:
- db_printf("--- trap %#lr", tf->tf_trapno);
+ db_printf("--- trap %#r", tf->tf_trapno);
break;
case SYSCALL:
db_printf("--- syscall");
==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#16 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.29 2009/03/13 16:40:51 dchagin Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.30 2009/04/05 09:27:19 dchagin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -85,7 +85,7 @@
.sysvec = &elf64_freebsd_sysvec,
.interp_newpath = NULL,
.brand_note = &elf64_freebsd_brandnote,
- .flags = BI_CAN_EXEC_DYN
+ .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE
};
SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -101,7 +101,7 @@
.sysvec = &elf64_freebsd_sysvec,
.interp_newpath = NULL,
.brand_note = &elf64_freebsd_brandnote,
- .flags = BI_CAN_EXEC_DYN
+ .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE
};
SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/smpng/sys/amd64/amd64/exception.S#23 (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.137 2009/02/03 09:01:45 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.138 2009/04/01 13:09:26 kib Exp $
*/
#include "opt_atpic.h"
@@ -42,6 +42,7 @@
#include <machine/asmacros.h>
#include <machine/psl.h>
#include <machine/trap.h>
+#include <machine/specialreg.h>
#include "assym.s"
@@ -99,7 +100,7 @@
/* Traps that we leave interrupts disabled for.. */
#define TRAP_NOEN(a) \
subq $TF_RIP,%rsp; \
- movq $(a),TF_TRAPNO(%rsp) ; \
+ movl $(a),TF_TRAPNO(%rsp) ; \
movq $0,TF_ADDR(%rsp) ; \
movq $0,TF_ERR(%rsp) ; \
jmp alltraps_noen
@@ -111,7 +112,7 @@
/* Regular traps; The cpu does not supply tf_err for these. */
#define TRAP(a) \
subq $TF_RIP,%rsp; \
- movq $(a),TF_TRAPNO(%rsp) ; \
+ movl $(a),TF_TRAPNO(%rsp) ; \
movq $0,TF_ADDR(%rsp) ; \
movq $0,TF_ERR(%rsp) ; \
jmp alltraps
@@ -139,7 +140,7 @@
/* This group of traps have tf_err already pushed by the cpu */
#define TRAP_ERR(a) \
subq $TF_ERR,%rsp; \
- movq $(a),TF_TRAPNO(%rsp) ; \
+ movl $(a),TF_TRAPNO(%rsp) ; \
movq $0,TF_ADDR(%rsp) ; \
jmp alltraps
IDTVEC(tss)
@@ -164,6 +165,10 @@
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz alltraps_testi /* already running with kernel GS.base */
swapgs
+ movw %fs,TF_FS(%rsp)
+ movw %gs,TF_GS(%rsp)
+ movw %es,TF_ES(%rsp)
+ movw %ds,TF_DS(%rsp)
alltraps_testi:
testl $PSL_I,TF_RFLAGS(%rsp)
jz alltraps_pushregs
@@ -185,6 +190,7 @@
movq %r13,TF_R13(%rsp)
movq %r14,TF_R14(%rsp)
movq %r15,TF_R15(%rsp)
+ movl $TF_HASSEGS,TF_FLAGS(%rsp)
FAKE_MCOUNT(TF_RIP(%rsp))
#ifdef KDTRACE_HOOKS
/*
@@ -193,7 +199,7 @@
* interrupt. For all other trap types, just handle them in
* the usual way.
*/
- cmpq $T_BPTFLT,TF_TRAPNO(%rsp)
+ cmpl $T_BPTFLT,TF_TRAPNO(%rsp)
jne calltrap
/* Check if there is no DTrace hook registered. */
@@ -228,13 +234,17 @@
.type alltraps_noen, at function
alltraps_noen:
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
- jz alltraps_pushregs /* already running with kernel GS.base */
+ jz 1f /* already running with kernel GS.base */
swapgs
+1: movw %fs,TF_FS(%rsp)
+ movw %gs,TF_GS(%rsp)
+ movw %es,TF_ES(%rsp)
+ movw %ds,TF_DS(%rsp)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list